test: add V4 swap ERC20→ERC20 decoder regression test

Adds a test that constructs a Uniswap V4 USDT→USDC swap using
SETTLE/SWAP_EXACT_IN_SINGLE/TAKE sub-actions inside a V4_SWAP command.
Without decodeV4Swap(), the output token would be unresolvable and the
swap name would not show 'USDT → USDC'. This test fails on the old code
and passes with the decodeV4Swap() fix.

Refs: #59

.gitignore

@@ -25,4 +25,3 @@ dist/
 
 # Yarn
 .yarn-integrity
-package-lock.json

src/popup/views/approval.js

@@ -78,12 +78,10 @@ function decodeCalldata(data, toAddress) {
                     "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 );
                 const isUnlimited = rawAmount === maxUint;
-                const amountRaw = isUnlimited
-                    ? "Unlimited"
-                    : formatTxValue(formatUnits(rawAmount, tokenDecimals));
                 const amountStr = isUnlimited
                     ? "Unlimited"
-                    : amountRaw + (tokenSymbol ? " " + tokenSymbol : "");
+                    : formatTxValue(formatUnits(rawAmount, tokenDecimals)) +
+                      (tokenSymbol ? " " + tokenSymbol : "");
 
                 return {
                     name: "Token Approval",
@@ -102,11 +100,7 @@ function decodeCalldata(data, toAddress) {
                             value: spender,
                             address: spender,
                         },
-                        {
+                        { label: "Amount", value: amountStr },
-                            label: "Amount",
-                            value: amountStr,
-                            rawValue: amountRaw,
-                        },
                     ],
                 };
             }
@@ -114,11 +108,9 @@ function decodeCalldata(data, toAddress) {
             if (parsed.name === "transfer") {
                 const to = parsed.args[0];
                 const rawAmount = parsed.args[1];
-                const amountRaw = formatTxValue(
-                    formatUnits(rawAmount, tokenDecimals),
-                );
                 const amountStr =
-                    amountRaw + (tokenSymbol ? " " + tokenSymbol : "");
+                    formatTxValue(formatUnits(rawAmount, tokenDecimals)) +
+                    (tokenSymbol ? " " + tokenSymbol : "");
 
                 return {
                     name: "Token Transfer",
@@ -133,11 +125,7 @@ function decodeCalldata(data, toAddress) {
                             isToken: true,
                         },
                         { label: "Recipient", value: to, address: to },
-                        {
+                        { label: "Amount", value: amountStr },
-                            label: "Amount",
-                            value: amountStr,
-                            rawValue: amountRaw,
-                        },
                     ],
                 };
             }
@@ -167,31 +155,20 @@ function showTxApproval(details) {
         tokenSymbol: token ? token.symbol : null,
     };
 
-    // If this is an ERC-20 call or a swap, extract the real recipient, amount, and token info
+    // If this is an ERC-20 call, try to extract the real recipient and amount
     const decoded = decodeCalldata(details.txParams.data, toAddr || "");
     if (decoded && decoded.details) {
-        let decodedTokenSymbol = null;
-        let decodedTokenAddress = null;
         for (const d of decoded.details) {
             if (d.label === "Recipient" && d.address) {
                 pendingTxDetails.to = d.address;
             }
             if (d.label === "Amount") {
-                pendingTxDetails.amount = d.rawValue || d.value;
+                pendingTxDetails.amount = d.value;
-            }
-            if (d.label === "Token In" && !decodedTokenSymbol) {
-                // Extract token symbol and address from decoded details
-                decodedTokenSymbol = d.value;
-                if (d.address) decodedTokenAddress = d.address;
             }
         }
         if (token) {
             pendingTxDetails.token = toAddr;
             pendingTxDetails.tokenSymbol = token.symbol;
-        } else if (decodedTokenAddress) {
-            // For swaps through routers: use the input token info
-            pendingTxDetails.token = decodedTokenAddress;
-            pendingTxDetails.tokenSymbol = decodedTokenSymbol;
         }
     }
 

src/shared/uniswap.js

@@ -445,19 +445,12 @@ function decode(data, toAddress) {
             const maxUint160 = BigInt(
                 "0xffffffffffffffffffffffffffffffffffffffff",
             );
-            const rawAmount =
-                inputAmount >= maxUint160
-                    ? "Unlimited"
-                    : formatAmount(inputAmount, inInfo.decimals);
             const amountStr =
                 inputAmount >= maxUint160
                     ? "Unlimited"
-                    : rawAmount + (inSymbol ? " " + inSymbol : "");
+                    : formatAmount(inputAmount, inInfo.decimals) +
-            details.push({
+                      (inSymbol ? " " + inSymbol : "");
-                label: "Amount",
+            details.push({ label: "Amount", value: amountStr });
-                value: amountStr,
-                rawValue: rawAmount,
-            });
         }
 
         if (outSymbol) {