Merge branch 'refs/heads/unified-balance' into release/desktop

Author: tanx

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "lightning-app",
-  "version": "0.4.0-alpha",
+  "version": "0.4.1-alpha",
   "description": "Lightning Wallet Application",
   "author": "Lightning Labs, Inc",
   "homepage": "./",

package.json

@@ -3,7 +3,7 @@
  * call the corresponding GRPC apis for channel management.
  */
 
-import { toSatoshis } from '../helper';
+import { toSatoshis, poll } from '../helper';
 import * as log from './log';
 
 class ChannelAction {
@@ -58,7 +58,6 @@ class ChannelAction {
    */
   init() {
     this._nav.goChannels();
-    this.update();
   }
 
   /**
@@ -70,7 +69,6 @@ class ChannelAction {
   select({ item }) {
     this._store.selectedChannel = item;
     this._nav.goChannelDetail();
-    this.update();
   }
 
   /**
@@ -87,6 +85,14 @@ class ChannelAction {
     ]);
   }
 
+  /**
+   * Poll the channels in the background since there is no streaming grpc api
+   * @return {Promise<undefined>}
+   */
+  async pollChannels() {
+    await poll(() => this.update());
+  }
+
   //
   // Generic channel actions
   //

src/action/channel.js

@@ -100,7 +100,7 @@ when(
     wallet.getNewAddress();
     wallet.pollBalances();
     wallet.pollExchangeRate();
-    channel.update();
+    channel.pollChannels();
     transaction.update();
     info.pollInfo();
   }
@@ -123,9 +123,9 @@ setTimeout(
   () => (store.walletAddress = 'ra2XT898gWTp9q2DwMgtwMJsUEh3oMeS4K'),
   3000
 );
-store.balanceSatoshis = 798765432;
-store.pendingBalanceSatoshis = 100000000;
-store.channelBalanceSatoshis = 59876000;
+store.balanceSatoshis = 76543;
+store.pendingBalanceSatoshis = 800000;
+store.channelBalanceSatoshis = 598760;
 store.settings.exchangeRate.usd = 0.00016341;
 store.settings.exchangeRate.eur = 0.0001896;
 store.settings.exchangeRate.gbp = 0.00021405;

src/action/index-mobile.js

@@ -91,7 +91,7 @@ when(
     wallet.getNewAddress();
     wallet.pollBalances();
     wallet.pollExchangeRate();
-    channel.update();
+    channel.pollChannels();
     transaction.update();
     transaction.subscribeTransactions();
     transaction.subscribeInvoices();

src/action/index.js

@@ -63,7 +63,7 @@ class TransactionAction {
         amount: transaction.amount,
         fee: transaction.totalFees,
         confirmations: transaction.numConfirmations,
-        status: transaction.numConfirmations < 1 ? 'unconfirmed' : 'confirmed',
+        status: transaction.numConfirmations < 3 ? 'unconfirmed' : 'confirmed',
         date: parseDate(transaction.timeStamp),
       }));
     } catch (err) {

src/action/transaction.js

@@ -35,40 +35,59 @@ const ComputedChannel = store => {
       });
       return all;
     },
-    get channelBalanceOpenLabel() {
-      const { channels, settings } = store;
-      const sum = (channels || [])
+    get channelBalanceOpenSatoshis() {
+      return (store.channels || [])
         .filter(c => c.active)
         .map(c => Number(c.localBalance))
         .reduce((a, b) => a + b, 0);
-      return toAmountLabel(sum, settings);
     },
-    get channelBalanceInactiveLabel() {
-      const { channels, settings } = store;
-      const sum = (channels || [])
+    get channelBalanceOpenLabel() {
+      const { channelBalanceOpenSatoshis, settings } = store;
+      return toAmountLabel(channelBalanceOpenSatoshis, settings);
+    },
+    get channelBalanceInactiveSatoshis() {
+      return (store.channels || [])
         .filter(c => !c.active)
         .map(c => Number(c.localBalance))
         .reduce((a, b) => a + b, 0);
-      return toAmountLabel(sum, settings);
     },
-    get channelBalancePendingLabel() {
-      const { pendingChannels, settings } = store;
-      const sum = (pendingChannels || [])
+    get channelBalanceInactiveLabel() {
+      const { channelBalanceInactiveSatoshis, settings } = store;
+      return toAmountLabel(channelBalanceInactiveSatoshis, settings);
+    },
+    get channelBalancePendingSatoshis() {
+      return (store.pendingChannels || [])
         .filter(c => c.status.includes('open'))
         .map(c => Number(c.localBalance))
         .reduce((a, b) => a + b, 0);
-      return toAmountLabel(sum, settings);
     },
-    get channelBalanceClosingLabel() {
-      const { pendingChannels, settings } = store;
-      const sum = (pendingChannels || [])
+    get channelBalancePendingLabel() {
+      const { channelBalancePendingSatoshis, settings } = store;
+      return toAmountLabel(channelBalancePendingSatoshis, settings);
+    },
+    get channelBalanceClosingSatoshis() {
+      return (store.pendingChannels || [])
         .filter(c => !c.status.includes('open'))
         .map(c => Number(c.localBalance))
         .reduce((a, b) => a + b, 0);
-      return toAmountLabel(sum, settings);
     },
-    get showChannelAlert() {
-      return (store.channels || []).length === 0;
+    get channelBalanceClosingLabel() {
+      const { channelBalanceClosingSatoshis, settings } = store;
+      return toAmountLabel(channelBalanceClosingSatoshis, settings);
+    },
+    get channelStatus() {
+      const {
+        channelBalanceOpenSatoshis: opened,
+        channelBalanceInactiveSatoshis: inactive,
+        channelBalancePendingSatoshis: pending,
+      } = store;
+      return opened
+        ? 'success'
+        : inactive
+          ? 'inactive'
+          : pending
+            ? 'info'
+            : 'error';
     },
   });
 };

src/computed/channel.js

@@ -16,12 +16,16 @@ const ComputedWallet = store => {
     get walletAddressUri() {
       return store.walletAddress ? `bitcoin:${store.walletAddress}` : '';
     },
-    get depositLabel() {
-      const { balanceSatoshis, pendingBalanceSatoshis, settings } = store;
-      return toAmountLabel(balanceSatoshis + pendingBalanceSatoshis, settings);
+    get totalBalanceSatoshis() {
+      const {
+        balanceSatoshis,
+        pendingBalanceSatoshis,
+        channelBalanceSatoshis,
+      } = store;
+      return balanceSatoshis + pendingBalanceSatoshis + channelBalanceSatoshis;
     },
-    get channelBalanceLabel() {
-      return toAmountLabel(store.channelBalanceSatoshis, store.settings);
+    get totalBalanceLabel() {
+      return toAmountLabel(store.totalBalanceSatoshis, store.settings);
     },
     get unitFiatLabel() {
       const { displayFiat, unit, fiat } = store.settings;
@@ -31,6 +35,15 @@ const ComputedWallet = store => {
       const { settings } = store;
       return !settings.displayFiat ? UNITS[settings.unit].display : null;
     },
+    get channelPercentageLabel() {
+      const {
+        channelBalanceSatoshis: opened,
+        pendingBalanceSatoshis: pending,
+        totalBalanceSatoshis: total,
+      } = store;
+      const percent = total ? (opened + pending) / total * 100 : 0;
+      return `${Math.round(percent)}% on Lightning`;
+    },
     get newPasswordCopy() {
       const { newPassword } = store.wallet;
       return getNewPasswordCopy({ newPassword });