Bump cardano-wallet revision and use available wallet balance as main…

… wallet balance
input-output-hk · Jul 6, 2020 · de1d0a0 · de1d0a0
1 parent f1c2490
commit de1d0a0
Show file tree

Hide file tree

Showing 17 changed files with 117 additions and 220 deletions.
diff --git a/nix/sources.json b/nix/sources.json
@@ -29,10 +29,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "173631602fa7ecd337b94b161384689835b5ccda",
-        "sha256": "1j9pwkjqq2q5hac2pi23600acpyvb1783c2xv4y1qwk6nzcnvlx1",
+        "rev": "dfd32b37ef1f5157bfdb2d3b3fb467156ddaa5e2",
+        "sha256": "04vjj9yg5p4i25fl8vssdihbxl5qaja8l4i1azz9qh2c339skw4s",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/173631602fa7ecd337b94b161384689835b5ccda.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/dfd32b37ef1f5157bfdb2d3b3fb467156ddaa5e2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "version": "v2020-07-06"
     },

diff --git a/source/renderer/app/components/layout/TopBar.js b/source/renderer/app/components/layout/TopBar.js
@@ -46,7 +46,7 @@ export default class TopBar extends Component<Props> {
       activeWallet &&
       activeWallet.isLegacy &&
       isIncentivizedTestnet &&
-      activeWallet.amount.gt(0) &&
+      activeWallet.availableAmount.gt(0) &&
       !activeWallet.isRestoring &&
       ((hasRewardsWallets && onTransferFunds) || onWalletAdd);
 
@@ -65,7 +65,7 @@ export default class TopBar extends Component<Props> {
         </span>
         <span className={styles.walletAmount}>
           {// show currency and use long format
-          formattedWalletAmount(activeWallet.amount)}
+          formattedWalletAmount(activeWallet.availableAmount)}
         </span>
       </span>
     ) : null;

diff --git a/source/renderer/app/components/staking/delegation-center/WalletRow.scss b/source/renderer/app/components/staking/delegation-center/WalletRow.scss
@@ -11,8 +11,8 @@
     .SimpleBubble_root {
       .SimpleBubble_bubble {
         left: initial;
-        right: -10px;
         line-height: initial;
+        right: -10px;
       }
     }
   }

diff --git a/...derer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseWalletDialog.js b/...derer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseWalletDialog.js
@@ -130,7 +130,7 @@ export default class DelegationStepsChooseWalletDialog extends Component<
       wallets.find(
         (wallet: Wallet) => wallet && wallet.id === selectedWalletId
       ) || null;
-    const amount = selectedWallet ? selectedWallet.amount : null;
+    const amount = selectedWallet ? selectedWallet.availableAmount : null;
     const isAcceptableSetupWallet = amount && isWalletAcceptable(amount);
 
     const dialogClassName = classNames([

diff --git a/source/renderer/app/components/wallet/summary/WalletSummary.js b/source/renderer/app/components/wallet/summary/WalletSummary.js
@@ -25,14 +25,25 @@ const messages = defineMessages({
   },
   walletBalancelabel: {
     id: 'wallet.summary.page.walletBalancelabel',
-    defaultMessage: '!!!Wallet balance',
+    defaultMessage: '!!!Total balance',
+    description: '"Wallet amount" label on Wallet summary page',
+  },
+  walletAvailableBalanceLabel: {
+    id: 'wallet.summary.page.walletAvailableBalanceLabel',
+    defaultMessage: '!!!Available balance',
     description: '"Wallet amount" label on Wallet summary page',
   },
   rewardsAccountBalancelabel: {
     id: 'wallet.summary.page.rewardsAccountBalancelabel',
-    defaultMessage: '!!!Rewards account balance',
+    defaultMessage: '!!!Rewards balance',
     description: '"Rewards account balance" label on Wallet summary page',
   },
+  rewardsSpendingNote: {
+    id: 'wallet.summary.page.rewardsSpendingNote',
+    defaultMessage:
+      '!!!Temporary Daedalus limitations prevent reward spending.',
+    description: '"Rewards account balance" spending note',
+  },
 });
 
 type Props = {
@@ -70,7 +81,7 @@ export default class WalletSummary extends Component<Props> {
         <BorderedBox>
           <div className={styles.walletName}>{wallet.name}</div>
           <div className={styles.walletAmount}>
-            {wallet.amount.toFormat(DECIMAL_PLACES_IN_ADA)}
+            {wallet.availableAmount.toFormat(DECIMAL_PLACES_IN_ADA)}
             <SVGInline
               svg={adaSymbolBig}
               className={styles.currencySymbolBig}
@@ -81,12 +92,20 @@ export default class WalletSummary extends Component<Props> {
             <div className={styles.balancesWrapper}>
               <div className={styles.walletBalance}>
                 {intl.formatMessage(messages.walletBalancelabel)}:&nbsp;
-                {wallet.amount.toFormat(DECIMAL_PLACES_IN_ADA)}
+                <span>{wallet.amount.toFormat(DECIMAL_PLACES_IN_ADA)}</span>
+                <SVGInline svg={adaSymbol} className={styles.currencySymbol} />
+              </div>
+              <div className={styles.walletAvailableBalance}>
+                {intl.formatMessage(messages.walletAvailableBalanceLabel)}
+                :&nbsp;
+                <span>
+                  {wallet.availableAmount.toFormat(DECIMAL_PLACES_IN_ADA)}
+                </span>
                 <SVGInline svg={adaSymbol} className={styles.currencySymbol} />
               </div>
               <div className={styles.rewardsAccountBalance}>
                 {intl.formatMessage(messages.rewardsAccountBalancelabel)}:&nbsp;
-                {wallet.reward.toFormat(DECIMAL_PLACES_IN_ADA)}
+                <span>{wallet.reward.toFormat(DECIMAL_PLACES_IN_ADA)}</span>
                 <SVGInline svg={adaSymbol} className={styles.currencySymbol} />
               </div>
             </div>
@@ -96,14 +115,19 @@ export default class WalletSummary extends Component<Props> {
             <div className={styles.transactionsCountWrapper}>
               <div className={styles.numberOfPendingTransactions}>
                 {intl.formatMessage(messages.pendingTransactionsLabel)}:&nbsp;
-                {numberOfPendingTransactions}
+                <span>{numberOfPendingTransactions}</span>
               </div>
               <div className={numberOfTransactionsStyles}>
                 {intl.formatMessage(messages.transactionsLabel)}:&nbsp;
-                {numberOfTransactions || numberOfRecentTransactions}
+                <span>
+                  {numberOfTransactions || numberOfRecentTransactions}
+                </span>
               </div>
             </div>
           ) : null}
+          <p className={styles.rewardsSpendingNote}>
+            {intl.formatMessage(messages.rewardsSpendingNote)}
+          </p>
         </BorderedBox>
       </div>
     );

diff --git a/source/renderer/app/components/wallet/summary/WalletSummary.scss b/source/renderer/app/components/wallet/summary/WalletSummary.scss
@@ -2,7 +2,7 @@
 
 %smallText {
   color: var(--theme-bordered-box-text-color);
-  font-family: var(--font-regular);
+  font-family: var(--font-medium);
   font-size: 14px;
   height: 19px;
   letter-spacing: 0.5px;
@@ -52,20 +52,29 @@
 
 .balancesWrapper {
   .walletBalance,
-  .rewardsAccountBalance {
+  .rewardsAccountBalance,
+  .walletAvailableBalance {
     @extend %smallText;
 
     .currencySymbol {
       display: inline-block;
       margin-left: 4px;
       & > svg {
-        height: 12px;
-        width: 12px;
+        height: 10px;
+        opacity: 0.8;
         & > g > g {
           stroke: var(--theme-icon-ada-summary-wallet-amount-symbol-color);
         }
       }
     }
+
+    span {
+      font-family: var(--font-light);
+    }
+  }
+  .rewardsAccountBalance,
+  .walletAvailableBalance {
+    opacity: 0.5;
   }
 }
 
@@ -76,5 +85,18 @@
     &.isLoadingNumberOfTransactions {
       @include animated-ellipsis($width: 16px);
     }
+    opacity: 0.5;
+    span {
+      font-family: var(--font-light);
+    }
   }
 }
+
+.rewardsSpendingNote {
+  color: var(--theme-bordered-box-text-color);
+  font-family: var(--font-light);
+  font-size: 14px;
+  line-height: 1.36;
+  margin-top: 8px;
+  opacity: 0.5;
+}
diff --git a/source/renderer/app/components/wallet/transfer-funds/TransferFundsStep1Dialog.js b/source/renderer/app/components/wallet/transfer-funds/TransferFundsStep1Dialog.js
@@ -82,7 +82,7 @@ export default class TransferFundsStep1Dialog extends Component<Props> {
         <div className={styles.sourceWallet}>
           <WalletsDropdownOption
             label={sourceWallet.name}
-            detail={formattedWalletAmount(sourceWallet.amount)}
+            detail={formattedWalletAmount(sourceWallet.availableAmount)}
             numberOfStakePools={numberOfStakePools}
             delegatedStakePool={getStakePoolById(
               sourceWallet.delegatedStakePoolId

diff --git a/source/renderer/app/components/wallet/transfer-funds/TransferFundsStep2Dialog.js b/source/renderer/app/components/wallet/transfer-funds/TransferFundsStep2Dialog.js
@@ -91,7 +91,10 @@ export default class TransferFundsStep2Dialog extends Component<Props, State> {
   };
 
   state = {
-    total: formattedWalletAmount(this.props.sourceWallet.amount, false),
+    total: formattedWalletAmount(
+      this.props.sourceWallet.availableAmount,
+      false
+    ),
     fees: null,
     amount: null,
   };
@@ -102,7 +105,7 @@ export default class TransferFundsStep2Dialog extends Component<Props, State> {
     if (transferFundsFee && !this.state.fees && !this.state.amount) {
       const fees = transferFundsFee.toFormat(DECIMAL_PLACES_IN_ADA);
       const amount = formattedWalletAmount(
-        sourceWallet.amount.minus(transferFundsFee),
+        sourceWallet.availableAmount.minus(transferFundsFee),
         false
       );
       this.setState({ fees, amount }); // eslint-disable-line

diff --git a/source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js b/source/renderer/app/containers/staking/dialogs/DelegationSetupWizardDialogContainer.js
@@ -163,7 +163,7 @@ export default class DelegationSetupWizardDialogContainer extends Component<
     );
 
     const acceptableWallets = find(wallets.allWallets, wallet =>
-      this.handleIsWalletAcceptable(wallet.amount)
+      this.handleIsWalletAcceptable(wallet.availableAmount)
     );
 
     return (

diff --git a/source/renderer/app/containers/wallet/WalletSendPage.js b/source/renderer/app/containers/wallet/WalletSendPage.js
@@ -53,7 +53,7 @@ export default class WalletSendPage extends Component<Props> {
             amount,
           })
         }
-        walletAmount={activeWallet.amount}
+        walletAmount={activeWallet.availableAmount}
         addressValidator={isValidAddress}
         isDialogOpen={uiDialogs.isOpen}
         openDialogAction={actions.dialogs.open.trigger}

diff --git a/source/renderer/app/containers/wallet/WalletUtxoPage.js b/source/renderer/app/containers/wallet/WalletUtxoPage.js
@@ -38,7 +38,7 @@ export default class WalletSettingsPage extends Component<Props> {
 
     return (
       <WalletUtxo
-        walletAmount={activeWallet.amount}
+        walletAmount={activeWallet.availableAmount}
         walletUtxosAmount={walletUtxosAmount}
         chartData={chartData}
         onExternalLinkClick={app.openExternalLink}

diff --git a/source/renderer/app/domains/Wallet.js b/source/renderer/app/domains/Wallet.js
@@ -113,7 +113,7 @@ export default class Wallet {
   }
 
   @computed get hasFunds(): boolean {
-    return this.amount.gt(0);
+    return this.availableAmount.gt(0);
   }
 
   @computed get isRestoring(): boolean {