[DDW-500] Correct tx api payload and correct ADA display in the confi…

…rmation
input-output-hk · Feb 24, 2021 · 04bc4ec · 04bc4ec
1 parent 9f0c1b4
commit 04bc4ec
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 6 deletions.
diff --git a/source/renderer/app/api/api.js b/source/renderer/app/api/api.js
@@ -762,6 +762,7 @@ export default class AdaApi {
       assets,
       withdrawal = TransactionWithdrawal,
     } = request;
+    console.log('request', request);
 
     try {
       const data = {
@@ -777,6 +778,7 @@ export default class AdaApi {
         ],
         passphrase,
       };
+      console.log('data', data);
 
       let response: Transaction;
       if (isLegacy) {

diff --git a/source/renderer/app/components/wallet/WalletAssetsSendConfirmationDialog.js b/source/renderer/app/components/wallet/WalletAssetsSendConfirmationDialog.js
@@ -205,9 +205,12 @@ export default class WalletAssetsSendConfirmationDialog extends Component<
           assetsAmounts: assetsAmountsStr,
         } = this.props;
         const { passphrase } = form.values();
-        const assetsAmounts = assetsAmountsStr && assetsAmountsStr.length ? assetsAmountsStr.map((assetAmount) =>
-          amountToNaturalUnits(assetAmount)
-        ) : null;
+        const assetsAmounts =
+          assetsAmountsStr && assetsAmountsStr.length
+            ? assetsAmountsStr.map((assetAmount) =>
+                amountToNaturalUnits(assetAmount)
+              )
+            : null;
         const transactionData = {
           receiver,
           amount: amountToNaturalUnits(amount),
@@ -273,7 +276,7 @@ export default class WalletAssetsSendConfirmationDialog extends Component<
 
   getAssetFormattedAmount = (asset: WalletSummaryAsset, index: number) => {
     const { assetsAmounts } = this.props;
-    const strAmount = get(assetsAmounts, `[${index}]`, 0);
+    const strAmount = get(assetsAmounts, index, 0);
     const assetAmount = new BigNumber(strAmount);
     const { metadata } = asset;
     return formattedTokenWalletAmount(assetAmount, metadata);
@@ -373,7 +376,16 @@ export default class WalletAssetsSendConfirmationDialog extends Component<
                         }}
                       />
                       <div className={styles.assetsContainer}>
-                        {formattedWalletAmount(amount)}
+                        <h3>
+                          <span>
+                            {intl.formatMessage(globalMessages.unitAda)}
+                          </span>
+                        </h3>
+                        <div className={styles.amountFeesWrapper}>
+                          <div className={styles.amount}>
+                            {formattedWalletAmount(new BigNumber(amount))}
+                          </div>
+                        </div>
                       </div>
                       {assets.map((asset, assetIndex) => {
                         const assetAmount = this.getAssetFormattedAmount(

diff --git a/source/renderer/app/stores/WalletsStore.js b/source/renderer/app/stores/WalletsStore.js
@@ -763,14 +763,29 @@ export default class WalletsStore extends Store {
     amount,
     passphrase,
     assets,
-    assetsAmounts,
+    assetsAmounts: assetsAmountsStr,
   }: {
     receiver: string,
     amount: string,
     passphrase: string,
     assets?: Array<WalletSummaryAsset>,
     assetsAmounts?: Array<string>,
   }) => {
+    const assetsAmounts = assetsAmountsStr
+      ? assetsAmountsStr.map((assetAmount) => parseInt(assetAmount, 10))
+      : null;
+    const formattedAssets =
+      assets && assets.length
+        ? assets.map(
+            // eslint-disable-next-line
+            ({ policyId: policy_id, assetName: asset_name }, index) => ({
+              policy_id,
+              asset_name,
+              quantity: get(assetsAmounts, index, 0),
+            })
+          )
+        : null;
+
     const wallet = this.active;
     if (!wallet) throw new Error('Active wallet required before sending.');
     await this.sendMoneyRequest.execute({
@@ -779,6 +794,7 @@ export default class WalletsStore extends Store {
       passphrase,
       walletId: wallet.id,
       isLegacy: wallet.isLegacy,
+      assets: formattedAssets,
     });
     this.refreshWalletsData();
     this.actions.dialogs.closeActiveDialog.trigger();