Merge pull request #607 from onflow:606-bug-transfer-list-doesnt-incl…

…uded-additional-message-in-key fix: Add additional message to transaction details and key generation
onflow · Feb 25, 2025 · c5831b3 · c5831b3
2 parents b063901 + b434d3e
commit c5831b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/background/service/transaction.ts b/src/background/service/transaction.ts
@@ -239,6 +239,7 @@ class Transaction {
         transactionHolder.token = tx.token;
         transactionHolder.type = tx.type;
         transactionHolder.transferType = tx.transfer_type;
+        transactionHolder.additionalMessage = tx.additional_message;
         // see if there's a pending item for this transaction
         const pendingItem = this.session.pendingItem[network].find(
           (item) =>

diff --git a/src/ui/views/Wallet/TransferList.tsx b/src/ui/views/Wallet/TransferList.tsx
@@ -193,7 +193,7 @@ const TransferList = () => {
             <>
               {' '}
               {(transactions || []).map((tx) => {
-                const txCombinedKey = `${tx.cadenceTxId || tx.hash}${tx.evmTxIds ? `_${tx.evmTxIds.join('_')}` : ''}_${tx.transferType}_${tx.interaction}`;
+                const txCombinedKey = `${tx.cadenceTxId || tx.hash}${tx.evmTxIds ? `_${tx.evmTxIds.join('_')}` : ''}_${tx.transferType}_${tx.additionalMessage}_${tx.interaction}`;
                 return (
                   <ListItem
                     key={txCombinedKey}