Compare commits
1 Commits
fix/70-con
...
4bee1f0e2b
| Author | SHA1 | Date | |
|---|---|---|---|
| 4bee1f0e2b |
@@ -463,12 +463,12 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- ERC-20 token contract (hidden for ETH) -->
|
<!-- ERC-20 token contract (hidden for ETH) -->
|
||||||
<div
|
<div id="confirm-token-section" class="mb-3 hidden">
|
||||||
id="confirm-token-section"
|
<div class="text-xs text-muted mb-1">Token contract</div>
|
||||||
class="bg-hover rounded-md mx-1 p-3 mb-3 text-xs hidden"
|
<div
|
||||||
>
|
id="confirm-token-contract"
|
||||||
<div class="font-bold mb-2">Token Contract</div>
|
class="text-xs break-all"
|
||||||
<div id="confirm-token-contract" class="break-all"></div>
|
></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ const {
|
|||||||
showError,
|
showError,
|
||||||
hideError,
|
hideError,
|
||||||
showView,
|
showView,
|
||||||
|
showFlash,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
@@ -98,20 +99,19 @@ function show(txInfo) {
|
|||||||
const dot = addressDotHtml(txInfo.token);
|
const dot = addressDotHtml(txInfo.token);
|
||||||
const link = etherscanTokenLink(txInfo.token);
|
const link = etherscanTokenLink(txInfo.token);
|
||||||
$("confirm-token-contract").innerHTML =
|
$("confirm-token-contract").innerHTML =
|
||||||
`<div class="flex items-center">` +
|
`<div class="flex items-center">${dot}` +
|
||||||
dot +
|
`<span class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(txInfo.token)}">${escapeHtml(txInfo.token)}</span>` +
|
||||||
`<span class="break-all underline decoration-dashed cursor-pointer" id="confirm-token-contract-copy" data-copy="${escapeHtml(txInfo.token)}">${escapeHtml(txInfo.token)}</span>` +
|
|
||||||
`<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>` +
|
`<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>` +
|
||||||
`</div>`;
|
`</div>`;
|
||||||
if (txInfo.tokenName) {
|
|
||||||
$("confirm-token-contract").innerHTML +=
|
|
||||||
`<div class="mt-1"><span class="text-muted">Name:</span> ${escapeHtml(txInfo.tokenName)}</div>`;
|
|
||||||
}
|
|
||||||
if (txInfo.tokenSymbol) {
|
|
||||||
$("confirm-token-contract").innerHTML +=
|
|
||||||
`<div class="mt-1"><span class="text-muted">Symbol:</span> ${escapeHtml(txInfo.tokenSymbol)}</div>`;
|
|
||||||
}
|
|
||||||
tokenSection.classList.remove("hidden");
|
tokenSection.classList.remove("hidden");
|
||||||
|
// Attach click-to-copy on the contract address
|
||||||
|
const copyEl = tokenSection.querySelector("[data-copy]");
|
||||||
|
if (copyEl) {
|
||||||
|
copyEl.onclick = () => {
|
||||||
|
navigator.clipboard.writeText(copyEl.dataset.copy);
|
||||||
|
showFlash("Copied!");
|
||||||
|
};
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
tokenSection.classList.add("hidden");
|
tokenSection.classList.add("hidden");
|
||||||
}
|
}
|
||||||
@@ -285,13 +285,6 @@ function hidePasswordModal() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function init(ctx) {
|
function init(ctx) {
|
||||||
$("confirm-token-section").addEventListener("click", (e) => {
|
|
||||||
const copyEl = e.target.closest("[data-copy]");
|
|
||||||
if (copyEl) {
|
|
||||||
navigator.clipboard.writeText(copyEl.dataset.copy);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$("btn-confirm-send").addEventListener("click", () => {
|
$("btn-confirm-send").addEventListener("click", () => {
|
||||||
showPasswordModal();
|
showPasswordModal();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -10,11 +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 {
|
const { KNOWN_SYMBOLS, resolveSymbol } = require("../../shared/tokenList");
|
||||||
KNOWN_SYMBOLS,
|
|
||||||
TOKEN_BY_ADDRESS,
|
|
||||||
resolveSymbol,
|
|
||||||
} = require("../../shared/tokenList");
|
|
||||||
|
|
||||||
const EXT_ICON =
|
const EXT_ICON =
|
||||||
`<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
|
`<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
|
||||||
@@ -128,7 +124,6 @@ function init(_ctx) {
|
|||||||
|
|
||||||
let tokenSymbol = null;
|
let tokenSymbol = null;
|
||||||
let tokenBalance = null;
|
let tokenBalance = null;
|
||||||
let tokenName = null;
|
|
||||||
if (token !== "ETH") {
|
if (token !== "ETH") {
|
||||||
const tb = (addr.tokenBalances || []).find(
|
const tb = (addr.tokenBalances || []).find(
|
||||||
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
||||||
@@ -139,17 +134,6 @@ function init(_ctx) {
|
|||||||
state.trackedTokens,
|
state.trackedTokens,
|
||||||
);
|
);
|
||||||
tokenBalance = tb ? tb.balance || "0" : "0";
|
tokenBalance = tb ? tb.balance || "0" : "0";
|
||||||
// Resolve token name from balances, tracked tokens, or known list
|
|
||||||
const lower = token.toLowerCase();
|
|
||||||
tokenName =
|
|
||||||
(tb && tb.name) ||
|
|
||||||
(
|
|
||||||
(state.trackedTokens || []).find(
|
|
||||||
(t) => t.address.toLowerCase() === lower,
|
|
||||||
) || {}
|
|
||||||
).name ||
|
|
||||||
(TOKEN_BY_ADDRESS.get(lower) || {}).name ||
|
|
||||||
null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.showConfirmTx({
|
ctx.showConfirmTx({
|
||||||
@@ -161,7 +145,6 @@ function init(_ctx) {
|
|||||||
balance: addr.balance,
|
balance: addr.balance,
|
||||||
tokenSymbol: tokenSymbol,
|
tokenSymbol: tokenSymbol,
|
||||||
tokenBalance: tokenBalance,
|
tokenBalance: tokenBalance,
|
||||||
tokenName: tokenName,
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user