Compare commits
1 Commits
2f11c43dd8
...
8379ab4685
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8379ab4685 |
@@ -12,7 +12,7 @@ const {
|
|||||||
balanceLine,
|
balanceLine,
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, currentAddress, saveState } = require("../../shared/state");
|
const { state, currentAddress, saveState } = require("../../shared/state");
|
||||||
const { TOKEN_BY_ADDRESS, resolveSymbol } = require("../../shared/tokenList");
|
const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
|
||||||
const {
|
const {
|
||||||
formatUsd,
|
formatUsd,
|
||||||
getPrice,
|
getPrice,
|
||||||
@@ -96,11 +96,14 @@ function show() {
|
|||||||
const tb = (addr.tokenBalances || []).find(
|
const tb = (addr.tokenBalances || []).find(
|
||||||
(t) => t.address.toLowerCase() === tokenId.toLowerCase(),
|
(t) => t.address.toLowerCase() === tokenId.toLowerCase(),
|
||||||
);
|
);
|
||||||
symbol = resolveSymbol(
|
const tracked = (state.trackedTokens || []).find(
|
||||||
tokenId,
|
(t) => t.address.toLowerCase() === tokenId.toLowerCase(),
|
||||||
addr.tokenBalances,
|
|
||||||
state.trackedTokens,
|
|
||||||
);
|
);
|
||||||
|
symbol =
|
||||||
|
(tb && tb.symbol) ||
|
||||||
|
(tracked && tracked.symbol) ||
|
||||||
|
(knownToken && knownToken.symbol) ||
|
||||||
|
"?";
|
||||||
amount = tb ? parseFloat(tb.balance || "0") : 0;
|
amount = tb ? parseFloat(tb.balance || "0") : 0;
|
||||||
price = getPrice(symbol);
|
price = getPrice(symbol);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ const {
|
|||||||
const { state, currentAddress } = require("../../shared/state");
|
const { state, currentAddress } = require("../../shared/state");
|
||||||
let ctx;
|
let ctx;
|
||||||
const { getProvider } = require("../../shared/balances");
|
const { getProvider } = require("../../shared/balances");
|
||||||
const { KNOWN_SYMBOLS, resolveSymbol } = require("../../shared/tokenList");
|
const { KNOWN_SYMBOLS, TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
|
||||||
const { getAddress } = require("ethers");
|
const { getAddress } = require("ethers");
|
||||||
|
|
||||||
const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
|
const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
|
||||||
@@ -174,11 +174,15 @@ function updateSendBalance() {
|
|||||||
const tb = (addr.tokenBalances || []).find(
|
const tb = (addr.tokenBalances || []).find(
|
||||||
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
||||||
);
|
);
|
||||||
const symbol = resolveSymbol(
|
const knownToken = TOKEN_BY_ADDRESS.get(token.toLowerCase());
|
||||||
token,
|
const tracked = (state.trackedTokens || []).find(
|
||||||
addr.tokenBalances,
|
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
||||||
state.trackedTokens,
|
|
||||||
);
|
);
|
||||||
|
const symbol =
|
||||||
|
(tb && tb.symbol) ||
|
||||||
|
(tracked && tracked.symbol) ||
|
||||||
|
(knownToken && knownToken.symbol) ||
|
||||||
|
"?";
|
||||||
const bal = tb ? tb.balance || "0" : "0";
|
const bal = tb ? tb.balance || "0" : "0";
|
||||||
$("send-balance").textContent =
|
$("send-balance").textContent =
|
||||||
"Current balance: " + bal + " " + symbol;
|
"Current balance: " + bal + " " + symbol;
|
||||||
@@ -245,11 +249,15 @@ function init(_ctx) {
|
|||||||
const tb = (addr.tokenBalances || []).find(
|
const tb = (addr.tokenBalances || []).find(
|
||||||
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
||||||
);
|
);
|
||||||
tokenSymbol = resolveSymbol(
|
const knownTk = TOKEN_BY_ADDRESS.get(token.toLowerCase());
|
||||||
token,
|
const trackedTk = (state.trackedTokens || []).find(
|
||||||
addr.tokenBalances,
|
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
||||||
state.trackedTokens,
|
|
||||||
);
|
);
|
||||||
|
tokenSymbol =
|
||||||
|
(tb && tb.symbol) ||
|
||||||
|
(trackedTk && trackedTk.symbol) ||
|
||||||
|
(knownTk && knownTk.symbol) ||
|
||||||
|
"?";
|
||||||
tokenBalance = tb ? tb.balance || "0" : "0";
|
tokenBalance = tb ? tb.balance || "0" : "0";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3645,27 +3645,10 @@ async function getTopTokenPrices(n) {
|
|||||||
return prices;
|
return prices;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Resolve a token symbol from multiple sources, never returning "?".
|
|
||||||
function resolveSymbol(tokenAddress, tokenBalances, trackedTokens) {
|
|
||||||
const lower = (tokenAddress || "").toLowerCase();
|
|
||||||
const tb = (tokenBalances || []).find(
|
|
||||||
(t) => t.address.toLowerCase() === lower,
|
|
||||||
);
|
|
||||||
if (tb && tb.symbol) return tb.symbol;
|
|
||||||
const known = TOKEN_BY_ADDRESS.get(lower);
|
|
||||||
if (known && known.symbol) return known.symbol;
|
|
||||||
const tracked = (trackedTokens || []).find(
|
|
||||||
(t) => t.address.toLowerCase() === lower,
|
|
||||||
);
|
|
||||||
if (tracked && tracked.symbol) return tracked.symbol;
|
|
||||||
return lower.slice(0, 10) + "\u2026";
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
TOKENS,
|
TOKENS,
|
||||||
TOKEN_BY_ADDRESS,
|
TOKEN_BY_ADDRESS,
|
||||||
KNOWN_SYMBOLS,
|
KNOWN_SYMBOLS,
|
||||||
getTopTokens,
|
getTopTokens,
|
||||||
getTopTokenPrices,
|
getTopTokenPrices,
|
||||||
resolveSymbol,
|
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user