Merge branch 'develop' into feature/ddw-691-implement-custom-browser-…

…protocol-to-launch-daedalus
input-output-hk · Jul 29, 2021 · 702e58c · 702e58c
2 parents f6e22c5 + 26e94dc
commit 702e58c
Show file tree

Hide file tree

Showing 23 changed files with 830 additions and 812 deletions.
diff --git a/.babelrc b/.babelrc
@@ -13,6 +13,7 @@
         "loose": true
       }
     ],
+    ["@babel/plugin-proposal-optional-chaining"],
     ["@babel/plugin-proposal-object-rest-spread", {}],
     ["@babel/plugin-transform-runtime", {}],
     ["@babel/plugin-proposal-unicode-property-regex", { "useUnicodeFlag": false }],

diff --git a/.flowconfig b/.flowconfig
@@ -23,5 +23,6 @@ flow/declarations/
 
 [options]
 esproposal.decorators=ignore
+esproposal.optional_chaining=enable
 module.ignore_non_literal_requires=true
 module.name_mapper.extension='scss' -> '<PROJECT_ROOT>/flow/mappers/CSSModule.js.flow'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,10 @@ Changelog
 ### Fixes
 - Enter key not working on send ([PR 2621](https://github.com/input-output-hk/daedalus/pull/2621))
 
-###
+### Features
+- Emptying wallet - warning ([PR 2617](https://github.com/input-output-hk/daedalus/pull/2617))
+
+### Chores
 
 - Removed "Decentralization countdown" tada icon and info tab ([PR 2625](https://github.com/input-output-hk/daedalus/pull/2625))
 

diff --git a/source/renderer/app/api/assets/types.js b/source/renderer/app/api/assets/types.js
@@ -53,7 +53,9 @@ export type Token = {
   assetName: string,
   quantity: BigNumber,
   address?: ?string,
+  uniqueId?: string,
 };
+
 export type Tokens = Array<Token>;
 export type WalletTokens = {
   available: Tokens,

diff --git a/source/renderer/app/components/wallet/WalletSendForm.js b/source/renderer/app/components/wallet/WalletSendForm.js
@@ -742,7 +742,7 @@ export default class WalletSendForm extends Component<Props, State> {
 
     const receiverFieldClasses = classNames([
       styles.receiverInput,
-      this.isAddressFromSameWallet() ? styles.sameRecieverInput : null,
+      this.isAddressFromSameWallet() ? styles.sameReceiverInput : null,
     ]);
 
     const minAdaRequiredTooltip = selectedAssetUniqueIds.length
@@ -933,13 +933,11 @@ export default class WalletSendForm extends Component<Props, State> {
     const adaAmountField = form.$('adaAmount');
     const adaAmount = new BigNumber(adaAmountField.value || 0);
 
-    let fees = null;
-    let total = null;
+    let fees = '0';
+    let total: BigNumber = adaAmount;
     if (isTransactionFeeCalculated) {
       fees = transactionFee.toFormat(currencyMaxFractionalDigits);
-      total = adaAmount
-        .plus(transactionFee)
-        .toFormat(currencyMaxFractionalDigits);
+      total = adaAmount.plus(transactionFee);
     }
 
     const calculatingFeesSpinnerButtonClasses = classNames([
@@ -1008,7 +1006,7 @@ export default class WalletSendForm extends Component<Props, State> {
           <WalletSendConfirmationDialogContainer
             currencyUnit={currencyUnit}
             receiver={receiver}
-            assets={this.selectedAssets}
+            selectedAssets={this.selectedAssets}
             assetsAmounts={this.selectedAssetsAmounts}
             amount={adaAmount.toFormat(currencyMaxFractionalDigits)}
             amountToNaturalUnits={formattedAmountToNaturalUnits}
@@ -1017,6 +1015,7 @@ export default class WalletSendForm extends Component<Props, State> {
             hwDeviceStatus={hwDeviceStatus}
             isHardwareWallet={isHardwareWallet}
             onExternalLinkClick={onExternalLinkClick}
+            formattedTotalAmount={total.toFormat(currencyMaxFractionalDigits)}
           />
         ) : null}
       </div>

diff --git a/source/renderer/app/components/wallet/WalletSendForm.scss b/source/renderer/app/components/wallet/WalletSendForm.scss
@@ -129,7 +129,7 @@
     }
   }
 
-  &.sameRecieverInput {
+  &.sameReceiverInput {
     input {
       border-color: var(--rp-password-input-warning-score-color) !important;
     }