Merge branch 'main' into feat/export-private-key

2026-02-28 20:31:50 +01:00
parent 676109860a bbf5945ff1
commit 16f9e98b25
9 changed files with 663 additions and 382 deletions
--- a/src/popup/views/addressDetail.js
+++ b/src/popup/views/addressDetail.js
@@ -188,10 +188,14 @@ function renderTransactions(txs) {
    let html = "";
    let i = 0;
    for (const tx of txs) {
+        // For swap transactions, show the user's own labelled wallet
+        // address instead of the contract address (see issue #55).
        const counterparty =
-            tx.direction === "sent" || tx.direction === "contract"
-                ? tx.to
-                : tx.from;
+            tx.direction === "contract" && tx.directionLabel === "Swap"
+                ? tx.from
+                : tx.direction === "sent" || tx.direction === "contract"
+                  ? tx.to
+                  : tx.from;
        const ensName = ensNameMap.get(counterparty) || null;
        const title = addressTitle(counterparty, state.wallets);
        const dirLabel = tx.directionLabel;