this should maybe be refactored, pt.1

cw_bitcoin/lib/electrum_balance.dart

@@ -7,7 +7,14 @@ class ElectrumBalance extends Balance {
     required this.confirmed,
     required this.unconfirmed,
     required this.frozen,
-  }) : super(confirmed, unconfirmed);
+    this.secondConfirmed,
+    this.secondUnconfirmed,
+  }) : super(
+          confirmed,
+          unconfirmed,
+          secondAvailable: secondConfirmed,
+          secondAdditional: secondUnconfirmed,
+        );
 
   static ElectrumBalance? fromJSON(String? jsonSource) {
     if (jsonSource == null) {
@@ -25,6 +32,8 @@ class ElectrumBalance extends Balance {
   int confirmed;
   int unconfirmed;
   final int frozen;
+  int? secondConfirmed;
+  int? secondUnconfirmed;
 
   @override
   String get formattedAvailableBalance => bitcoinAmountToString(amount: confirmed - frozen);
@@ -38,6 +47,17 @@ class ElectrumBalance extends Balance {
     return frozenFormatted == '0.0' ? '' : frozenFormatted;
   }
 
-  String toJSON() =>
+  @override
-      json.encode({'confirmed': confirmed, 'unconfirmed': unconfirmed, 'frozen': frozen});
+  String get formattedSecondAvailableBalance => bitcoinAmountToString(amount: secondConfirmed ?? 0);
+
+  @override
+  String get formattedSecondAdditionalBalance => bitcoinAmountToString(amount: secondUnconfirmed ?? 0);
+
+  String toJSON() => json.encode({
+        'confirmed': confirmed,
+        'unconfirmed': unconfirmed,
+        'frozen': frozen,
+        'secondConfirmed': secondConfirmed,
+        'secondUnconfirmed': secondUnconfirmed
+      });
 }

cw_core/lib/balance.dart

@@ -1,13 +1,16 @@
 abstract class Balance {
-  const Balance(this.available, this.additional);
+  const Balance(this.available, this.additional, {this.secondAvailable, this.secondAdditional});
 
   final int available;
 
   final int additional;
 
+  final int? secondAvailable;
+  final int? secondAdditional;
+
   String get formattedAvailableBalance;
-
   String get formattedAdditionalBalance;
-
   String get formattedUnAvailableBalance => '';
+  String get formattedSecondAvailableBalance => '';
+  String get formattedSecondAdditionalBalance => '';
 }

lib/src/screens/dashboard/pages/balance_page.dart

@@ -131,7 +131,7 @@ class CryptoBalanceWidget extends StatelessWidget {
               builder: (_) {
                 if (dashboardViewModel.getMoneroError != null) {
                   return Padding(
-                    padding: const EdgeInsets.fromLTRB(16,0,16,16),
+                    padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
                     child: DashBoardRoundedCardWidget(
                       title: "Invalid monero bindings",
                       subTitle: dashboardViewModel.getMoneroError.toString(),
@@ -146,13 +146,12 @@ class CryptoBalanceWidget extends StatelessWidget {
               builder: (_) {
                 if (dashboardViewModel.getWowneroError != null) {
                   return Padding(
-                    padding: const EdgeInsets.fromLTRB(16,0,16,16),
+                      padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
-                    child: DashBoardRoundedCardWidget(
+                      child: DashBoardRoundedCardWidget(
-                      title: "Invalid wownero bindings",
+                        title: "Invalid wownero bindings",
-                      subTitle: dashboardViewModel.getWowneroError.toString(),
+                        subTitle: dashboardViewModel.getWowneroError.toString(),
-                      onTap: () {},
+                        onTap: () {},
-                    )
+                      ));
-                  );
                 }
                 return Container();
               },
@@ -273,6 +272,19 @@ class CryptoBalanceWidget extends StatelessWidget {
                         currency: balance.asset,
                         hasAdditionalBalance:
                             dashboardViewModel.balanceViewModel.hasAdditionalBalance,
+                        hasSecondAdditionalBalance:
+                            dashboardViewModel.balanceViewModel.hasSecondAdditionalBalance,
+                        hasSecondAvailableBalance:
+                            dashboardViewModel.balanceViewModel.hasSecondAvailableBalance,
+                        secondAdditionalBalance: balance.secondAdditionalBalance,
+                        secondAdditionalFiatBalance: balance.fiatSecondAdditionalBalance,
+                        secondAvailableBalance: balance.secondAvailableBalance,
+                        secondAvailableFiatBalance: balance.fiatSecondAvailableBalance,
+                        secondAdditionalBalanceLabel:
+                            '${dashboardViewModel.balanceViewModel.additionalBalanceLabel}',
+                        secondAvailableBalanceLabel:
+                            '${dashboardViewModel.balanceViewModel.availableBalanceLabel}',
+
                         isTestnet: dashboardViewModel.isTestnet,
                       );
                     });
@@ -286,16 +298,15 @@ class CryptoBalanceWidget extends StatelessWidget {
                   if (dashboardViewModel.isMoneroWalletBrokenReasons.isNotEmpty) ...[
                     SizedBox(height: 10),
                     Padding(
-                      padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
+                        padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
-                      child: DashBoardRoundedCardWidget(
+                        child: DashBoardRoundedCardWidget(
-                        customBorder: 30,
+                          customBorder: 30,
-                        title: "This wallet has encountered an issue",
+                          title: "This wallet has encountered an issue",
-                        subTitle: "Here are the things that you should note:\n - "
+                          subTitle: "Here are the things that you should note:\n - " +
-                        +dashboardViewModel.isMoneroWalletBrokenReasons.join("\n - ")
+                              dashboardViewModel.isMoneroWalletBrokenReasons.join("\n - ") +
-                        +"\n\nPlease restart your wallet and if it doesn't help contact our support.",
+                              "\n\nPlease restart your wallet and if it doesn't help contact our support.",
-                        onTap: () {},
+                          onTap: () {},
-                      )
+                        ))
-                    )
                   ],
                   if (dashboardViewModel.showSilentPaymentsCard) ...[
                     SizedBox(height: 10),
@@ -494,10 +505,18 @@ class BalanceRowWidget extends StatelessWidget {
     required this.additionalBalanceLabel,
     required this.additionalBalance,
     required this.additionalFiatBalance,
+    required this.secondAvailableBalanceLabel,
+    required this.secondAvailableBalance,
+    required this.secondAvailableFiatBalance,
+    required this.secondAdditionalBalanceLabel,
+    required this.secondAdditionalBalance,
+    required this.secondAdditionalFiatBalance,
     required this.frozenBalance,
     required this.frozenFiatBalance,
     required this.currency,
     required this.hasAdditionalBalance,
+    required this.hasSecondAvailableBalance,
+    required this.hasSecondAdditionalBalance,
     required this.isTestnet,
     super.key,
   });
@@ -508,10 +527,18 @@ class BalanceRowWidget extends StatelessWidget {
   final String additionalBalanceLabel;
   final String additionalBalance;
   final String additionalFiatBalance;
+  final String secondAvailableBalanceLabel;
+  final String secondAvailableBalance;
+  final String secondAvailableFiatBalance;
+  final String secondAdditionalBalanceLabel;
+  final String secondAdditionalBalance;
+  final String secondAdditionalFiatBalance;
   final String frozenBalance;
   final String frozenFiatBalance;
   final CryptoCurrency currency;
   final bool hasAdditionalBalance;
+  final bool hasSecondAvailableBalance;
+  final bool hasSecondAdditionalBalance;
   final bool isTestnet;
 
   // void _showBalanceDescription(BuildContext context) {
@@ -759,6 +786,94 @@ class BalanceRowWidget extends StatelessWidget {
                     ),
                 ],
               ),
+            if (hasSecondAvailableBalance)
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  SizedBox(height: 24),
+                  Text(
+                    '${additionalBalanceLabel}',
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
+                      fontSize: 12,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w400,
+                      color: Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
+                      height: 1,
+                    ),
+                  ),
+                  SizedBox(height: 8),
+                  AutoSizeText(
+                    additionalBalance,
+                    style: TextStyle(
+                      fontSize: 20,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w400,
+                      color: Theme.of(context).extension<BalancePageTheme>()!.assetTitleColor,
+                      height: 1,
+                    ),
+                    maxLines: 1,
+                    textAlign: TextAlign.center,
+                  ),
+                  SizedBox(height: 4),
+                  if (!isTestnet)
+                    Text(
+                      '${additionalFiatBalance}',
+                      textAlign: TextAlign.center,
+                      style: TextStyle(
+                        fontSize: 12,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.w400,
+                        color: Theme.of(context).extension<BalancePageTheme>()!.textColor,
+                        height: 1,
+                      ),
+                    ),
+                ],
+              ),
+            if (hasSecondAdditionalBalance)
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  SizedBox(height: 24),
+                  Text(
+                    '${additionalBalanceLabel}',
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
+                      fontSize: 12,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w400,
+                      color: Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
+                      height: 1,
+                    ),
+                  ),
+                  SizedBox(height: 8),
+                  AutoSizeText(
+                    additionalBalance,
+                    style: TextStyle(
+                      fontSize: 20,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w400,
+                      color: Theme.of(context).extension<BalancePageTheme>()!.assetTitleColor,
+                      height: 1,
+                    ),
+                    maxLines: 1,
+                    textAlign: TextAlign.center,
+                  ),
+                  SizedBox(height: 4),
+                  if (!isTestnet)
+                    Text(
+                      '${additionalFiatBalance}',
+                      textAlign: TextAlign.center,
+                      style: TextStyle(
+                        fontSize: 12,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.w400,
+                        color: Theme.of(context).extension<BalancePageTheme>()!.textColor,
+                        height: 1,
+                      ),
+                    ),
+                ],
+              ),
           ],
         ),
       ),

lib/view_model/dashboard/balance_view_model.dart

@@ -21,10 +21,14 @@ class BalanceRecord {
   const BalanceRecord(
       {required this.availableBalance,
       required this.additionalBalance,
+      required this.secondAvailableBalance,
+      required this.secondAdditionalBalance,
       required this.frozenBalance,
       required this.fiatAvailableBalance,
       required this.fiatAdditionalBalance,
       required this.fiatFrozenBalance,
+      required this.fiatSecondAvailableBalance,
+      required this.fiatSecondAdditionalBalance,
       required this.asset,
       required this.formattedAssetTitle});
   final String fiatAdditionalBalance;
@@ -33,6 +37,10 @@ class BalanceRecord {
   final String additionalBalance;
   final String availableBalance;
   final String frozenBalance;
+  final String secondAvailableBalance;
+  final String secondAdditionalBalance;
+  final String fiatSecondAdditionalBalance;
+  final String fiatSecondAvailableBalance;
   final CryptoCurrency asset;
   final String formattedAssetTitle;
 }
@@ -243,9 +251,13 @@ abstract class BalanceViewModelBase with Store {
                 availableBalance: '---',
                 additionalBalance: '---',
                 frozenBalance: '---',
+                secondAvailableBalance: '---',
+                secondAdditionalBalance: '---',
                 fiatAdditionalBalance: isFiatDisabled ? '' : '---',
                 fiatAvailableBalance: isFiatDisabled ? '' : '---',
                 fiatFrozenBalance: isFiatDisabled ? '' : '---',
+                fiatSecondAvailableBalance: isFiatDisabled ? '' : '---',
+                fiatSecondAdditionalBalance: isFiatDisabled ? '' : '---',
                 asset: key,
                 formattedAssetTitle: _formatterAsset(key)));
       }
@@ -274,15 +286,31 @@ abstract class BalanceViewModelBase with Store {
               ' ' +
               _getFiatBalance(price: price, cryptoAmount: getFormattedFrozenBalance(value)));
 
+      final secondAdditionalFiatBalance = isFiatDisabled
+          ? ''
+          : (fiatCurrency.toString() +
+              ' ' +
+              _getFiatBalance(price: price, cryptoAmount: value.formattedSecondAdditionalBalance));
+
+      final secondAvailableFiatBalance = isFiatDisabled
+          ? ''
+          : (fiatCurrency.toString() +
+              ' ' +
+              _getFiatBalance(price: price, cryptoAmount: value.formattedSecondAvailableBalance));
+
       return MapEntry(
           key,
           BalanceRecord(
               availableBalance: value.formattedAvailableBalance,
               additionalBalance: value.formattedAdditionalBalance,
               frozenBalance: getFormattedFrozenBalance(value),
+              secondAvailableBalance: value.formattedSecondAvailableBalance,
+              secondAdditionalBalance: value.formattedSecondAdditionalBalance,
               fiatAdditionalBalance: additionalFiatBalance,
               fiatAvailableBalance: availableFiatBalance,
               fiatFrozenBalance: frozenFiatBalance,
+              fiatSecondAvailableBalance: secondAvailableFiatBalance,
+              fiatSecondAdditionalBalance: secondAdditionalFiatBalance,
               asset: key,
               formattedAssetTitle: _formatterAsset(key)));
     });
@@ -291,6 +319,12 @@ abstract class BalanceViewModelBase with Store {
   @computed
   bool get hasAdditionalBalance => _hasAdditionBalanceForWalletType(wallet.type);
 
+  @computed
+  bool get hasSecondAdditionalBalance => _hasSecondAddtionalBalanceForWalletType(wallet.type);
+
+  @computed
+  bool get hasSecondAvailableBalance => _hasSecondAvailableBalanceForWalletType(wallet.type);
+
   bool _hasAdditionBalanceForWalletType(WalletType type) {
     switch (type) {
       case WalletType.ethereum:
@@ -303,6 +337,24 @@ abstract class BalanceViewModelBase with Store {
     }
   }
 
+  bool _hasSecondAddtionalBalanceForWalletType(WalletType type) {
+    switch (type) {
+      case WalletType.litecoin:
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  bool _hasSecondAvailableBalanceForWalletType(WalletType type) {
+    switch (type) {
+      case WalletType.litecoin:
+        return true;
+      default:
+        return false;
+    }
+  }
+
   @computed
   List<BalanceRecord> get formattedBalances {
     final balance = balances.values.toList();