fix: display swaps and contract calls correctly in tx history (closes #3) #10

clawbot · 2026-02-27T21:04:14+01:00

clawbot commented

2026-02-27 21:04:14 +01:00

Summary

Fixes #3: Swap transactions were displaying as "Sent" or "Received" in transaction history instead of showing the actual method name (e.g. "Execute" for Uniswap swaps).

Changes

`src/shared/transactions.js`

When token transfers merge with normal txs in fetchRecentTransactions, preserve contract call metadata (direction, directionLabel, method, isContractCall) from the original parsed tx

`src/popup/views/home.js` and `src/popup/views/addressDetail.js`

Handle direction === "contract" when determining counterparty address for display (show the contract address, not the from address)

`src/popup/views/transactionDetail.js`

For contract call transactions, fetch raw input data from Blockscout and decode it using decodeCalldata from approval.js
Show decoded swap/approval/transfer details in the same style as the signing confirmation view
Show "Unknown contract call" with copyable raw hex data for unrecognized calldata

`src/popup/views/approval.js`

Export decodeCalldata for reuse in transaction detail view

`src/popup/index.html`

Add calldata display section to transaction detail view

`make check` output

Test Suites: 2 passed, 2 total
Tests:       14 passed, 14 total
All matched files use Prettier code style!

## Summary Fixes #3: Swap transactions were displaying as "Sent" or "Received" in transaction history instead of showing the actual method name (e.g. "Execute" for Uniswap swaps). ## Changes ### `src/shared/transactions.js` - When token transfers merge with normal txs in `fetchRecentTransactions`, preserve contract call metadata (`direction`, `directionLabel`, `method`, `isContractCall`) from the original parsed tx ### `src/popup/views/home.js` and `src/popup/views/addressDetail.js` - Handle `direction === "contract"` when determining counterparty address for display (show the contract address, not the from address) ### `src/popup/views/transactionDetail.js` - For contract call transactions, fetch raw input data from Blockscout and decode it using `decodeCalldata` from approval.js - Show decoded swap/approval/transfer details in the same style as the signing confirmation view - Show "Unknown contract call" with copyable raw hex data for unrecognized calldata ### `src/popup/views/approval.js` - Export `decodeCalldata` for reuse in transaction detail view ### `src/popup/index.html` - Add calldata display section to transaction detail view ## `make check` output ``` Test Suites: 2 passed, 2 total Tests: 14 passed, 14 total All matched files use Prettier code style! ```

clawbot added 1 commit 2026-02-27 21:04:15 +01:00

fix: display swaps and contract calls correctly in tx history (closes #3 )

check / check (push) Successful in 22s

Details

1f5b60104c

- Preserve contract call metadata (direction, label, method) when token
  transfers merge with normal txs in fetchRecentTransactions
- Handle 'contract' direction in counterparty display for home and
  address detail list views
- Add decoded calldata display to transaction detail view, fetching
  raw input from Blockscout and using decodeCalldata from approval.js
- Show 'Unknown contract call' with raw hex for unrecognized calldata
- Export decodeCalldata from approval.js for reuse

clawbot requested review from sneak 2026-02-27 21:04:23 +01:00

clawbot commented

2026-02-27 21:04:55 +01:00

Reviewed. Changes are clean and well-scoped:

transactions.js correctly preserves contract call metadata when token transfers merge
List views handle direction === "contract" for counterparty display
Detail view fetches raw calldata from Blockscout, decodes via reused decodeCalldata, falls back to "Unknown contract call" + raw hex
HTML additions are minimal

One minor note: displayData variable on line 185 is computed but not used (the full inputData is passed to copyableHtml instead). Not a blocker.

Assigned to sneak for merge.

Reviewed. Changes are clean and well-scoped: 1. `transactions.js` correctly preserves contract call metadata when token transfers merge 2. List views handle `direction === "contract"` for counterparty display 3. Detail view fetches raw calldata from Blockscout, decodes via reused `decodeCalldata`, falls back to "Unknown contract call" + raw hex 4. HTML additions are minimal One minor note: `displayData` variable on line 185 is computed but not used (the full `inputData` is passed to `copyableHtml` instead). Not a blocker. Assigned to sneak for merge.

sneak was assigned by clawbot

2026-02-27 21:04:56 +01:00

sneak commented

2026-02-27 21:06:11 +01:00

Quoting #3:

they should say "Swap" in the tx lists and the detail page should show all of the swap details (if we are able to decode it).

Quoting #3: > they should say "Swap" in the tx lists and the detail page should show all of the swap details (if we are able to decode it).

sneak removed their assignment 2026-02-27 21:06:21 +01:00

clawbot was assigned by sneak

2026-02-27 21:06:21 +01:00

clawbot referenced this issue from a commit

2026-02-27 21:07:50 +01:00

fix: label swap methods as "Swap" in tx lists, remove unused variable

clawbot added 1 commit 2026-02-27 21:07:50 +01:00

fix: label swap methods as "Swap" in tx lists, remove unused variable

check / check (push) Failing after 13s

Details

d883ddadf2

- Map known DEX methods (execute, swap, multicall, etc.) to "Swap"
  label instead of raw method name like "Execute"
- Remove unused displayData variable in transactionDetail.js

Addresses review feedback on PR #10.

clawbot commented

2026-02-27 21:08:00 +01:00

Addressed the feedback:

Known DEX methods (execute, swap, multicall, swapExactTokensForTokens, etc.) now display as "Swap" in tx lists instead of the raw method name
Removed unused displayData variable

The detail page already shows full decoded swap details via decodeCalldata → uniswap.decode(). Re-assigned to sneak.

Addressed the feedback: 1. Known DEX methods (`execute`, `swap`, `multicall`, `swapExactTokensForTokens`, etc.) now display as **"Swap"** in tx lists instead of the raw method name 2. Removed unused `displayData` variable The detail page already shows full decoded swap details via `decodeCalldata` → `uniswap.decode()`. Re-assigned to sneak.

clawbot removed their assignment 2026-02-27 21:08:01 +01:00

sneak was assigned by clawbot

2026-02-27 21:08:01 +01:00

clawbot referenced this pull request

2026-02-27 21:08:28 +01:00

fix: show swap transactions with decoded calldata in history and detail views (closes #3) #12

sneak removed their assignment 2026-02-27 21:30:15 +01:00

clawbot was assigned by sneak

2026-02-27 21:30:15 +01:00

clawbot force-pushed fix/swap-display from d883ddadf2 to 3fd3e30f44

2026-02-27 21:31:30 +01:00

Compare

clawbot referenced this issue from a commit

2026-02-27 21:31:30 +01:00

fix: label swap methods as "Swap" in tx lists, remove unused variable

clawbot commented

2026-02-27 21:31:36 +01:00

Rebased on main (after PR #11 merge), fixed prettier formatting. make check passes. Re-assigned to sneak.

Rebased on main (after PR #11 merge), fixed prettier formatting. `make check` passes. Re-assigned to sneak.

clawbot removed their assignment 2026-02-27 21:31:37 +01:00

sneak was assigned by clawbot

2026-02-27 21:31:37 +01:00

sneak commented

2026-02-27 21:54:48 +01:00

The transaction detail page displays the addresses inconsistently. On one it has the color dot next to the address title, and on the other (and everywhere else) it has it next to the address itself. Please be more careful now and in the future when laying things out that you follow existing conventions. Consistency is key.

sneak removed their assignment 2026-02-27 21:54:56 +01:00

clawbot was assigned by sneak

2026-02-27 21:54:56 +01:00

clawbot added 1 commit 2026-02-27 22:00:09 +01:00

fix: show Swap type label and heading on transaction detail page

check / check (push) Successful in 21s

Details

aaeb38d7c6

clawbot commented

2026-02-27 22:00:18 +01:00

Pushed aaeb38d: the transaction detail page now shows "Swap" (or the relevant method label) as both the page heading and a Type field for contract interactions. Previously the detail view just said "Transaction" with no type indicator.

Changes:

HTML: added tx-detail-heading id, tx-detail-type-section with Type label (hidden for regular sends/receives)
JS: render() sets heading text and type field based on direction === "contract" + directionLabel

make check passes (14 tests + prettier).

Pushed `aaeb38d`: the transaction detail page now shows "Swap" (or the relevant method label) as both the page heading and a Type field for contract interactions. Previously the detail view just said "Transaction" with no type indicator. Changes: - HTML: added `tx-detail-heading` id, `tx-detail-type-section` with Type label (hidden for regular sends/receives) - JS: `render()` sets heading text and type field based on `direction === "contract"` + `directionLabel` `make check` passes (14 tests + prettier).

clawbot removed their assignment 2026-02-27 22:00:23 +01:00

sneak was assigned by clawbot

2026-02-27 22:00:23 +01:00

clawbot added 1 commit 2026-02-27 22:01:56 +01:00

fix: match approval view display consistency for decoded calldata

check / check (push) Successful in 21s

Details

8824237db6

- Restructured calldata section to use same well layout as approval view:
  Action label + bold name + structured details
- Always show raw data section below decoded well
- Unknown contract calls show method name in well instead of inline

clawbot commented

2026-02-27 22:02:05 +01:00

Pushed 8824237 — reworked the transaction detail calldata display to match the approval view exactly:

Same well structure: border border-border border-dashed p-2 with "Action" label → bold name → structured details
Each detail: muted label on its own line, then bold value (or address dot + copyable address)
Raw data always shown below the decoded well in its own section
Unknown contract calls: method name in the Action field, raw hex below

This matches the approve-tx-decoded well in the approval view for display consistency per #3.

make check passes (14 tests + prettier).

Pushed `8824237` — reworked the transaction detail calldata display to match the approval view exactly: - Same well structure: `border border-border border-dashed p-2` with "Action" label → bold name → structured details - Each detail: muted label on its own line, then bold value (or address dot + copyable address) - Raw data always shown below the decoded well in its own section - Unknown contract calls: method name in the Action field, raw hex below This matches the `approve-tx-decoded` well in the approval view for display consistency per #3. `make check` passes (14 tests + prettier).

clawbot commented

2026-02-27 22:03:26 +01:00

Found it — in txAddressHtml(), the color dot is placed next to the title when a title exists:

html += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;

But the convention everywhere else (home, addressDetail, addressToken) is dot next to the address/ENS name, never next to a label.

Fix: remove dot from the title line, ensure it always appears next to the address or ENS name, matching the existing pattern. Pushing fix now.

Found it — in `txAddressHtml()`, the color dot is placed next to the title when a title exists: ```js html += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`; ``` But the convention everywhere else (home, addressDetail, addressToken) is dot next to the address/ENS name, never next to a label. Fix: remove dot from the title line, ensure it always appears next to the address or ENS name, matching the existing pattern. Pushing fix now.

clawbot added 1 commit 2026-02-27 22:03:45 +01:00

fix: place color dot next to address, not title, matching convention

check / check (push) Successful in 22s

Details

5936199676

clawbot commented

2026-02-27 22:03:50 +01:00

Fixed — color dot now always appears next to the address/ENS name, never next to the title. Matches the convention in home, addressDetail, and addressToken views.

sneak added 1 commit 2026-02-27 23:07:32 +01:00

Merge branch 'main' into fix/swap-display

check / check (push) Successful in 22s

Details

2f57370155

sneak merged commit 8226495994 into main

2026-02-27 23:08:16 +01:00

sneak deleted branch fix/swap-display

2026-02-27 23:08:16 +01:00

sneak referenced this issue from a commit

2026-02-27 23:08:17 +01:00

Merge pull request 'fix: display swaps and contract calls correctly in tx history (closes #3)' (#10) from fix/swap-display into main

Sign in to join this conversation.

2 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: sneak/AutistMask#10

fix: display swaps and contract calls correctly in tx history (closes #3) #10

Summary

Changes

src/shared/transactions.js

src/popup/views/home.js and src/popup/views/addressDetail.js

src/popup/views/transactionDetail.js

src/popup/views/approval.js

src/popup/index.html

make check output

`src/shared/transactions.js`

`src/popup/views/home.js` and `src/popup/views/addressDetail.js`

`src/popup/views/transactionDetail.js`

`src/popup/views/approval.js`

`src/popup/index.html`

`make check` output