Compare commits
1 Commits
e1eb1f15db
...
fix/77-con
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d2f7284975 |
@@ -496,11 +496,6 @@
|
|||||||
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
||||||
placeholder="Address (0x...) or ENS name"
|
placeholder="Address (0x...) or ENS name"
|
||||||
/>
|
/>
|
||||||
<div
|
|
||||||
id="send-to-error"
|
|
||||||
class="text-xs"
|
|
||||||
style="min-height: 1.25rem; color: #cc0000"
|
|
||||||
></div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-2">
|
<div class="mb-2">
|
||||||
<div class="flex justify-between mb-1">
|
<div class="flex justify-between mb-1">
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ const RESTORABLE_VIEWS = new Set([
|
|||||||
"settings",
|
"settings",
|
||||||
"settings-addtoken",
|
"settings-addtoken",
|
||||||
"transaction",
|
"transaction",
|
||||||
|
"confirm-tx",
|
||||||
"success-tx",
|
"success-tx",
|
||||||
"error-tx",
|
"error-tx",
|
||||||
]);
|
]);
|
||||||
@@ -134,6 +135,13 @@ function restoreView() {
|
|||||||
fallbackView();
|
fallbackView();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case "confirm-tx":
|
||||||
|
if (state.viewData && state.viewData.pendingTx) {
|
||||||
|
confirmTx.show(state.viewData.pendingTx);
|
||||||
|
} else {
|
||||||
|
fallbackView();
|
||||||
|
}
|
||||||
|
break;
|
||||||
case "success-tx":
|
case "success-tx":
|
||||||
if (state.viewData && state.viewData.hash) {
|
if (state.viewData && state.viewData.hash) {
|
||||||
txStatus.renderSuccess();
|
txStatus.renderSuccess();
|
||||||
|
|||||||
@@ -15,11 +15,7 @@ const {
|
|||||||
filterTransactions,
|
filterTransactions,
|
||||||
} = require("../../shared/transactions");
|
} = require("../../shared/transactions");
|
||||||
const { resolveEnsNames } = require("../../shared/ens");
|
const { resolveEnsNames } = require("../../shared/ens");
|
||||||
const {
|
const { updateSendBalance, renderSendTokenSelect } = require("./send");
|
||||||
updateSendBalance,
|
|
||||||
renderSendTokenSelect,
|
|
||||||
resetSendValidation,
|
|
||||||
} = require("./send");
|
|
||||||
const { log } = require("../../shared/log");
|
const { log } = require("../../shared/log");
|
||||||
const makeBlockie = require("ethereum-blockies-base64");
|
const makeBlockie = require("ethereum-blockies-base64");
|
||||||
const { decryptWithPassword } = require("../../shared/vault");
|
const { decryptWithPassword } = require("../../shared/vault");
|
||||||
@@ -263,7 +259,6 @@ function init(_ctx) {
|
|||||||
$("send-token").classList.remove("hidden");
|
$("send-token").classList.remove("hidden");
|
||||||
$("send-token-static").classList.add("hidden");
|
$("send-token-static").classList.add("hidden");
|
||||||
updateSendBalance();
|
updateSendBalance();
|
||||||
resetSendValidation();
|
|
||||||
showView("send");
|
showView("send");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -325,9 +320,6 @@ function init(_ctx) {
|
|||||||
$("export-privkey-flash").classList.remove("hidden");
|
$("export-privkey-flash").classList.remove("hidden");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const btn = $("btn-export-privkey-confirm");
|
|
||||||
btn.disabled = true;
|
|
||||||
btn.classList.add("text-muted");
|
|
||||||
const wallet = state.wallets[state.selectedWallet];
|
const wallet = state.wallets[state.selectedWallet];
|
||||||
try {
|
try {
|
||||||
const secret = await decryptWithPassword(
|
const secret = await decryptWithPassword(
|
||||||
@@ -347,9 +339,6 @@ function init(_ctx) {
|
|||||||
} catch {
|
} catch {
|
||||||
$("export-privkey-flash").textContent = "Wrong password.";
|
$("export-privkey-flash").textContent = "Wrong password.";
|
||||||
$("export-privkey-flash").classList.remove("hidden");
|
$("export-privkey-flash").classList.remove("hidden");
|
||||||
} finally {
|
|
||||||
btn.disabled = false;
|
|
||||||
btn.classList.remove("text-muted");
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -23,11 +23,7 @@ const {
|
|||||||
filterTransactions,
|
filterTransactions,
|
||||||
} = require("../../shared/transactions");
|
} = require("../../shared/transactions");
|
||||||
const { resolveEnsNames } = require("../../shared/ens");
|
const { resolveEnsNames } = require("../../shared/ens");
|
||||||
const {
|
const { updateSendBalance, renderSendTokenSelect } = require("./send");
|
||||||
updateSendBalance,
|
|
||||||
renderSendTokenSelect,
|
|
||||||
resetSendValidation,
|
|
||||||
} = require("./send");
|
|
||||||
const { log } = require("../../shared/log");
|
const { log } = require("../../shared/log");
|
||||||
const makeBlockie = require("ethereum-blockies-base64");
|
const makeBlockie = require("ethereum-blockies-base64");
|
||||||
|
|
||||||
@@ -376,7 +372,6 @@ function init(_ctx) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
updateSendBalance();
|
updateSendBalance();
|
||||||
resetSendValidation();
|
|
||||||
showView("send");
|
showView("send");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -14,12 +14,11 @@ const {
|
|||||||
showError,
|
showError,
|
||||||
hideError,
|
hideError,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
|
||||||
addressTitle,
|
addressTitle,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const { getSignerForAddress } = require("../../shared/wallet");
|
const { getSignerForAddress } = require("../../shared/wallet");
|
||||||
const { decryptWithPassword } = require("../../shared/vault");
|
const { decryptWithPassword } = require("../../shared/vault");
|
||||||
const { formatUsd, getPrice } = require("../../shared/prices");
|
const { formatUsd, getPrice } = require("../../shared/prices");
|
||||||
@@ -96,22 +95,11 @@ function show(txInfo) {
|
|||||||
// Token contract section (ERC-20 only)
|
// Token contract section (ERC-20 only)
|
||||||
const tokenSection = $("confirm-token-section");
|
const tokenSection = $("confirm-token-section");
|
||||||
if (isErc20) {
|
if (isErc20) {
|
||||||
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">${dot}` +
|
escapeHtml(txInfo.token) +
|
||||||
`<span class="break-all underline decoration-dashed cursor-pointer" 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>`;
|
|
||||||
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");
|
||||||
}
|
}
|
||||||
@@ -231,6 +219,10 @@ function show(txInfo) {
|
|||||||
$("confirm-fee-amount").textContent = "Estimating...";
|
$("confirm-fee-amount").textContent = "Estimating...";
|
||||||
showView("confirm-tx");
|
showView("confirm-tx");
|
||||||
|
|
||||||
|
// Persist txInfo so the view survives popup close/reopen
|
||||||
|
state.viewData = { pendingTx: txInfo };
|
||||||
|
saveState();
|
||||||
|
|
||||||
estimateGas(txInfo);
|
estimateGas(txInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,10 +40,6 @@ function init(_ctx) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const btn = $("btn-delete-wallet-confirm");
|
|
||||||
btn.disabled = true;
|
|
||||||
btn.classList.add("text-muted");
|
|
||||||
|
|
||||||
const walletIdx = deleteWalletIndex;
|
const walletIdx = deleteWalletIndex;
|
||||||
const wallet = state.wallets[walletIdx];
|
const wallet = state.wallets[walletIdx];
|
||||||
|
|
||||||
@@ -53,8 +49,6 @@ function init(_ctx) {
|
|||||||
} catch (_e) {
|
} catch (_e) {
|
||||||
$("delete-wallet-flash").textContent = "Wrong password.";
|
$("delete-wallet-flash").textContent = "Wrong password.";
|
||||||
$("delete-wallet-flash").classList.remove("hidden");
|
$("delete-wallet-flash").classList.remove("hidden");
|
||||||
btn.disabled = false;
|
|
||||||
btn.classList.remove("text-muted");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,11 +11,7 @@ const {
|
|||||||
truncateMiddle,
|
truncateMiddle,
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, saveState, currentAddress } = require("../../shared/state");
|
const { state, saveState, currentAddress } = require("../../shared/state");
|
||||||
const {
|
const { updateSendBalance, renderSendTokenSelect } = require("./send");
|
||||||
updateSendBalance,
|
|
||||||
renderSendTokenSelect,
|
|
||||||
resetSendValidation,
|
|
||||||
} = require("./send");
|
|
||||||
const { deriveAddressFromXpub } = require("../../shared/wallet");
|
const { deriveAddressFromXpub } = require("../../shared/wallet");
|
||||||
const {
|
const {
|
||||||
formatUsd,
|
formatUsd,
|
||||||
@@ -392,7 +388,6 @@ function init(ctx) {
|
|||||||
$("send-token-static").classList.add("hidden");
|
$("send-token-static").classList.add("hidden");
|
||||||
renderSendTokenSelect(addr);
|
renderSendTokenSelect(addr);
|
||||||
updateSendBalance();
|
updateSendBalance();
|
||||||
resetSendValidation();
|
|
||||||
showView("send");
|
showView("send");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -11,107 +11,6 @@ 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, resolveSymbol } = require("../../shared/tokenList");
|
||||||
const { getAddress } = require("ethers");
|
|
||||||
|
|
||||||
const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Validate a destination address string.
|
|
||||||
* Returns { valid: true } or { valid: false, error: "..." }.
|
|
||||||
*/
|
|
||||||
function validateToAddress(value) {
|
|
||||||
const v = value.trim();
|
|
||||||
if (!v) return { valid: false, error: "" };
|
|
||||||
|
|
||||||
// ENS names: contains a dot and doesn't start with 0x
|
|
||||||
if (v.includes(".") && !v.startsWith("0x")) {
|
|
||||||
// Basic ENS format check: at least one label before and after dot
|
|
||||||
if (/^[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/.test(v)) {
|
|
||||||
return { valid: true };
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
valid: false,
|
|
||||||
error: "Please enter a valid ENS name.",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Must look like an Ethereum address
|
|
||||||
if (!/^0x[0-9a-fA-F]{40}$/.test(v)) {
|
|
||||||
return {
|
|
||||||
valid: false,
|
|
||||||
error: "Please enter a valid Ethereum address.",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reject zero address
|
|
||||||
if (v.toLowerCase() === ZERO_ADDRESS) {
|
|
||||||
return {
|
|
||||||
valid: false,
|
|
||||||
error: "Sending to the zero address is not allowed.",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// EIP-55 checksum validation: all-lowercase is ok, otherwise must match checksum
|
|
||||||
if (v !== v.toLowerCase()) {
|
|
||||||
try {
|
|
||||||
const checksummed = getAddress(v);
|
|
||||||
if (checksummed !== v) {
|
|
||||||
return {
|
|
||||||
valid: false,
|
|
||||||
error: "Address checksum is invalid. Please double-check the address.",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
return {
|
|
||||||
valid: false,
|
|
||||||
error: "Address checksum is invalid. Please double-check the address.",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Warn if sending to own address
|
|
||||||
const addr = currentAddress();
|
|
||||||
if (addr && v.toLowerCase() === addr.address.toLowerCase()) {
|
|
||||||
// Allow but will warn — we return valid with a warning
|
|
||||||
return {
|
|
||||||
valid: true,
|
|
||||||
warning: "This is your own address. Are you sure?",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return { valid: true };
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateToValidation() {
|
|
||||||
const input = $("send-to");
|
|
||||||
const errorEl = $("send-to-error");
|
|
||||||
const btn = $("btn-send-review");
|
|
||||||
const value = input.value.trim();
|
|
||||||
|
|
||||||
if (!value) {
|
|
||||||
errorEl.textContent = "";
|
|
||||||
btn.disabled = true;
|
|
||||||
btn.classList.add("opacity-50");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = validateToAddress(value);
|
|
||||||
if (!result.valid) {
|
|
||||||
errorEl.textContent = result.error;
|
|
||||||
errorEl.style.color = "#cc0000";
|
|
||||||
btn.disabled = true;
|
|
||||||
btn.classList.add("opacity-50");
|
|
||||||
} else if (result.warning) {
|
|
||||||
errorEl.textContent = result.warning;
|
|
||||||
errorEl.style.color = "#b8860b";
|
|
||||||
btn.disabled = false;
|
|
||||||
btn.classList.remove("opacity-50");
|
|
||||||
} else {
|
|
||||||
errorEl.textContent = "";
|
|
||||||
btn.disabled = false;
|
|
||||||
btn.classList.remove("opacity-50");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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">` +
|
||||||
@@ -189,13 +88,6 @@ function init(_ctx) {
|
|||||||
ctx = _ctx;
|
ctx = _ctx;
|
||||||
$("send-token").addEventListener("change", updateSendBalance);
|
$("send-token").addEventListener("change", updateSendBalance);
|
||||||
|
|
||||||
// Initial state: disable review button until address is entered
|
|
||||||
$("btn-send-review").disabled = true;
|
|
||||||
$("btn-send-review").classList.add("opacity-50");
|
|
||||||
|
|
||||||
// Validate address on input
|
|
||||||
$("send-to").addEventListener("input", updateToValidation);
|
|
||||||
|
|
||||||
$("btn-send-review").addEventListener("click", async () => {
|
$("btn-send-review").addEventListener("click", async () => {
|
||||||
const to = $("send-to").value.trim();
|
const to = $("send-to").value.trim();
|
||||||
const amount = $("send-amount").value.trim();
|
const amount = $("send-amount").value.trim();
|
||||||
@@ -203,15 +95,6 @@ function init(_ctx) {
|
|||||||
showFlash("Please enter a recipient address.");
|
showFlash("Please enter a recipient address.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Re-validate before proceeding
|
|
||||||
const validation = validateToAddress(to);
|
|
||||||
if (!validation.valid) {
|
|
||||||
showFlash(
|
|
||||||
validation.error || "Please enter a valid Ethereum address.",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!amount || isNaN(parseFloat(amount)) || parseFloat(amount) <= 0) {
|
if (!amount || isNaN(parseFloat(amount)) || parseFloat(amount) <= 0) {
|
||||||
showFlash("Please enter a valid amount.");
|
showFlash("Please enter a valid amount.");
|
||||||
return;
|
return;
|
||||||
@@ -276,19 +159,4 @@ function init(_ctx) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function resetSendValidation() {
|
module.exports = { init, updateSendBalance, renderSendTokenSelect };
|
||||||
const errorEl = $("send-to-error");
|
|
||||||
const btn = $("btn-send-review");
|
|
||||||
if (errorEl) errorEl.textContent = "";
|
|
||||||
if (btn) {
|
|
||||||
btn.disabled = true;
|
|
||||||
btn.classList.add("opacity-50");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
init,
|
|
||||||
updateSendBalance,
|
|
||||||
renderSendTokenSelect,
|
|
||||||
resetSendValidation,
|
|
||||||
};
|
|
||||||
|
|||||||
Reference in New Issue
Block a user