Add on-chain balance and pending-channel balances in depositLabel

Author: tanx

src/computed/wallet.js

@@ -7,9 +7,10 @@ const ComputedWallet = store => {
     walletAddressUri: computed(
       () => (store.walletAddress ? `bitcoin:${store.walletAddress}` : '')
     ),
-    balanceLabel: computed(() =>
-      toAmountLabel(store.balanceSatoshis, store.settings)
-    ),
+    depositLabel: computed(() => {
+      const { balanceSatoshis, pendingBalanceSatoshis, settings } = store;
+      return toAmountLabel(balanceSatoshis + pendingBalanceSatoshis, settings);
+    }),
     channelBalanceLabel: computed(() =>
       toAmountLabel(store.channelBalanceSatoshis, store.settings)
     ),

test/unit/computed/wallet.spec.js

@@ -12,7 +12,7 @@ describe('Computed Wallet Unit Tests', () => {
     it('should work with initial store', () => {
       ComputedWallet(store);
       expect(store.walletAddressUri, 'to equal', '');
-      expect(store.balanceLabel, 'to equal', '0');
+      expect(store.depositLabel, 'to equal', '0');
       expect(store.channelBalanceLabel, 'to equal', '0');
       expect(store.unitFiatLabel, 'to equal', 'BTC');
       expect(store.unitLabel, 'to equal', 'BTC');
@@ -32,23 +32,25 @@ describe('Computed Wallet Unit Tests', () => {
     it('should display channel balance in usd', () => {
       store.settings.displayFiat = true;
       store.settings.exchangeRate.usd = 0.00014503;
-      store.balanceSatoshis = 100000000;
+      store.balanceSatoshis = 50000000;
+      store.pendingBalanceSatoshis = 50000000;
       store.channelBalanceSatoshis = 10000;
       ComputedWallet(store);
-      expect(store.balanceLabel, 'to match', /6[,.]895[,.]13/);
+      expect(store.depositLabel, 'to match', /6[,.]895[,.]13/);
       expect(store.channelBalanceLabel, 'to match', /0[,.]69/);
       expect(store.unitFiatLabel, 'to equal', '$');
       expect(store.unitLabel, 'to equal', null);
     });
 
     it('should display channel balance in sat', () => {
       store.settings.exchangeRate.usd = 0.00014503;
-      store.balanceSatoshis = 100000001;
+      store.balanceSatoshis = 50000001;
+      store.pendingBalanceSatoshis = 50000000;
       store.channelBalanceSatoshis = 10000;
       store.settings.unit = 'bit';
       ComputedWallet(store);
       expect(
-        store.balanceLabel,
+        store.depositLabel,
         'to match',
         /^1{1}[,.]0{3}[,.]0{3}[,.]0{1}1{1}$/
       );