src/popup/views/addressToken.js

@@ -96,7 +96,14 @@ function show() {
         const tb = (addr.tokenBalances || []).find(
             (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
         );
-        symbol = (tb && tb.symbol) || (knownToken && knownToken.symbol) || "?";
+        const tracked = (state.trackedTokens || []).find(
+            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
+        );
+        symbol =
+            (tb && tb.symbol) ||
+            (tracked && tracked.symbol) ||
+            (knownToken && knownToken.symbol) ||
+            "?";
         amount = tb ? parseFloat(tb.balance || "0") : 0;
         price = getPrice(symbol);
     }
@@ -139,15 +146,26 @@ function show() {
         const tb = (addr.tokenBalances || []).find(
             (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
         );
+        const tracked = (state.trackedTokens || []).find(
+            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
+        );
         const rawName =
-            (tb && tb.name) || (knownToken && knownToken.name) || null;
+            (tb && tb.name) ||
+            (tracked && tracked.name) ||
+            (knownToken && knownToken.name) ||
+            null;
         const rawSymbol =
-            (tb && tb.symbol) || (knownToken && knownToken.symbol) || null;
+            (tb && tb.symbol) ||
+            (tracked && tracked.symbol) ||
+            (knownToken && knownToken.symbol) ||
+            null;
         const tokenName = rawName ? escapeHtml(rawName) : null;
         const tokenSymbol = rawSymbol ? escapeHtml(rawSymbol) : null;
         const tokenDecimals =
             tb && tb.decimals != null
                 ? tb.decimals
+                : tracked && tracked.decimals != null
+                  ? tracked.decimals
                   : knownToken && knownToken.decimals != null
                     ? knownToken.decimals
                     : null;

src/popup/views/send.js

@@ -74,8 +74,14 @@ function updateSendBalance() {
             (t) => t.address.toLowerCase() === token.toLowerCase(),
         );
         const knownToken = TOKEN_BY_ADDRESS.get(token.toLowerCase());
+        const tracked = (state.trackedTokens || []).find(
+            (t) => t.address.toLowerCase() === token.toLowerCase(),
+        );
         const symbol =
-            (tb && tb.symbol) || (knownToken && knownToken.symbol) || "?";
+            (tb && tb.symbol) ||
+            (tracked && tracked.symbol) ||
+            (knownToken && knownToken.symbol) ||
+            "?";
         const bal = tb ? tb.balance || "0" : "0";
         $("send-balance").textContent =
             "Current balance: " + bal + " " + symbol;
@@ -127,8 +133,14 @@ function init(_ctx) {
                 (t) => t.address.toLowerCase() === token.toLowerCase(),
             );
             const knownTk = TOKEN_BY_ADDRESS.get(token.toLowerCase());
+            const trackedTk = (state.trackedTokens || []).find(
+                (t) => t.address.toLowerCase() === token.toLowerCase(),
+            );
             tokenSymbol =
-                (tb && tb.symbol) || (knownTk && knownTk.symbol) || "?";
+                (tb && tb.symbol) ||
+                (trackedTk && trackedTk.symbol) ||
+                (knownTk && knownTk.symbol) ||
+                "?";
             tokenBalance = tb ? tb.balance || "0" : "0";
         }