From 9cce0426e366b3d109b8c77a51ed94cec111e951 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Thu, 30 May 2019 08:20:15 +0200
Subject: [PATCH] Only render positive numbers (#1241)

* Only render postive numbers

* Don't render 5xxxx address
---
 packages/ui-app/src/AddressInfo.tsx    |  6 +++---
 packages/ui-app/src/AddressSummary.tsx | 29 +++++++++++++-------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/packages/ui-app/src/AddressInfo.tsx b/packages/ui-app/src/AddressInfo.tsx
index de186b887d..4183aeff9a 100644
--- a/packages/ui-app/src/AddressInfo.tsx
+++ b/packages/ui-app/src/AddressInfo.tsx
@@ -64,13 +64,13 @@ class AddressInfo extends React.PureComponent<Props> {
 
     return (
       <div className='column'>
-        {balanceDisplay.free && (
+        {balanceDisplay.free && balances_all.freeBalance.gtn(-1) && (
           <>
             <Label label={t('total')} />
             <div className='result'>{formatBalance(balances_all.freeBalance)}</div>
           </>
         )}
-        {balanceDisplay.available && (
+        {balanceDisplay.available && balances_all.availableBalance.gtn(-1) && (
           <>
             <Label label={t('available')} />
             <div className='result'>{formatBalance(balances_all.availableBalance)}</div>
@@ -112,7 +112,7 @@ class AddressInfo extends React.PureComponent<Props> {
 
     return (
       <div className='column'>
-        {extendedDisplay.nonce && (
+        {extendedDisplay.nonce && balances_all.accountNonce.gtn(-1) && (
           <>
             <Label label={t('transactions')} />
             <div className='result'>{formatNumber(balances_all.accountNonce)}</div>
diff --git a/packages/ui-app/src/AddressSummary.tsx b/packages/ui-app/src/AddressSummary.tsx
index c97d9323a7..5e020dc05d 100644
--- a/packages/ui-app/src/AddressSummary.tsx
+++ b/packages/ui-app/src/AddressSummary.tsx
@@ -217,10 +217,10 @@ class AddressSummary extends React.PureComponent<Props, State> {
   }
 
   protected renderAvailable () {
-    const { t, withAvailable } = this.props;
-    const { address } = this.state;
+    const { accounts_idAndIndex = [], t, withAvailable } = this.props;
+    const [accountId] = accounts_idAndIndex;
 
-    if (!withAvailable || !address) {
+    if (!withAvailable || !accountId) {
       return null;
     }
 
@@ -228,7 +228,7 @@ class AddressSummary extends React.PureComponent<Props, State> {
       <AvailableDisplay
         className='ui--AddressSummary-available'
         label={<label>{t('available')}</label>}
-        params={address}
+        params={accountId}
       />
     );
   }
@@ -249,10 +249,10 @@ class AddressSummary extends React.PureComponent<Props, State> {
   }
 
   protected renderBalance () {
-    const { balance, t, withBalance } = this.props;
-    const { address } = this.state;
+    const { accounts_idAndIndex = [], balance, t, withBalance } = this.props;
+    const [accountId] = accounts_idAndIndex;
 
-    if (!withBalance || !address) {
+    if (!withBalance || !accountId) {
       return null;
     }
 
@@ -261,16 +261,16 @@ class AddressSummary extends React.PureComponent<Props, State> {
         balance={balance}
         className='ui--AddressSummary-balance'
         label={<label>{t('total')}</label>}
-        params={address}
+        params={accountId}
       />
     );
   }
 
   protected renderBonded () {
-    const { bonded, t, withBonded } = this.props;
-    const { address } = this.state;
+    const { accounts_idAndIndex = [], bonded, t, withBonded } = this.props;
+    const [accountId] = accounts_idAndIndex;
 
-    if (!withBonded || !address) {
+    if (!withBonded || !accountId) {
       return null;
     }
 
@@ -279,7 +279,7 @@ class AddressSummary extends React.PureComponent<Props, State> {
         bonded={bonded}
         className='ui--AddressSummary-bonded'
         label={<label>{t('bonded')}</label>}
-        params={address}
+        params={accountId}
       />
     );
   }
@@ -311,8 +311,9 @@ class AddressSummary extends React.PureComponent<Props, State> {
   }
 
   protected renderIcon (className: string = 'ui--AddressSummary-icon', size?: number) {
-    const { identIconSize = ICON_SIZE, withIcon = true } = this.props;
+    const { accounts_idAndIndex = [], identIconSize = ICON_SIZE, withIcon = true } = this.props;
     const { address } = this.state;
+    const [accountId] = accounts_idAndIndex;
 
     if (!withIcon) {
       return null;
@@ -320,7 +321,7 @@ class AddressSummary extends React.PureComponent<Props, State> {
 
     // Since we do queries to storage in the wrapped example, we don't want
     // to follow that route if we don't have a valid address.
-    const Component = address
+    const Component = accountId
       ? IdentityIcon
       : BaseIdentityIcon;