add withdrawals to transaction amount

Emurgo · Jun 9, 2021 · c0f9db9 · c0f9db9
1 parent 67003d4
commit c0f9db9
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/packages/yoroi-extension/app/domain/CardanoShelleyTransaction.js b/packages/yoroi-extension/app/domain/CardanoShelleyTransaction.js
@@ -73,6 +73,17 @@ export default class CardanoShelleyTransaction extends WalletTransaction {
       throw new Error(`${nameof(CardanoShelleyTransaction)}::${this.constructor.fromAnnotatedTx} missing extra data`);
     }
 
+    const withdrawals = toAddr({
+      rows: tx.accountingInputs,
+      addressLookupMap,
+      tokens: tx.tokens,
+      defaultToken,
+    });
+    const amount = tx.amount.joinAddCopy(tx.fee);
+    for (const {value} of withdrawals) {
+      amount.joinAddMutable(value);
+    }
+
     return new CardanoShelleyTransaction({
       txid: tx.transaction.Hash,
       block: tx.block,
@@ -89,20 +100,15 @@ export default class CardanoShelleyTransaction extends WalletTransaction {
       ),
       ttl: Extra.Ttl != null ? new BigNumber(Extra.Ttl) : undefined,
       metadata: Extra.Metadata,
-      amount: tx.amount.joinAddCopy(tx.fee),
+      amount,
       date: tx.block != null
         ? tx.block.BlockTime
         : new Date(tx.transaction.LastUpdateTime),
       addresses: {
         from: toAddr({ rows: tx.utxoInputs, addressLookupMap, tokens: tx.tokens, defaultToken, }),
         to: toAddr({ rows: tx.utxoOutputs, addressLookupMap, tokens: tx.tokens, defaultToken, }),
       },
-      withdrawals: toAddr({
-        rows: tx.accountingInputs,
-        addressLookupMap,
-        tokens: tx.tokens,
-        defaultToken,
-      }),
+      withdrawals,
       certificates: tx.certificates,
       state: tx.transaction.Status,
       errorMsg: tx.transaction.ErrorMessage,