Compare commits
7 Commits
fix/87-con
...
feature/co
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8135b78b5c | ||
| 812fc01a98 | |||
|
|
811c125cb9 | ||
|
|
3005813f2c | ||
|
|
5565e76796 | ||
| dc8ec7d28f | |||
|
|
2fbed343db |
@@ -104,10 +104,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"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div
|
|
||||||
id="add-wallet-error"
|
|
||||||
class="text-xs mb-2 min-h-[1.25rem] hidden"
|
|
||||||
></div>
|
|
||||||
<button
|
<button
|
||||||
id="btn-add-wallet-confirm"
|
id="btn-add-wallet-confirm"
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
|
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
|
||||||
@@ -166,10 +162,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"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div
|
|
||||||
id="import-key-error"
|
|
||||||
class="text-xs mb-2 min-h-[1.25rem] hidden"
|
|
||||||
></div>
|
|
||||||
<button
|
<button
|
||||||
id="btn-import-key-confirm"
|
id="btn-import-key-confirm"
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
|
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
|
||||||
@@ -373,8 +365,8 @@
|
|||||||
transfer all funds from this address. Never share it.
|
transfer all funds from this address. Never share it.
|
||||||
</p>
|
</p>
|
||||||
<div
|
<div
|
||||||
id="export-privkey-error"
|
id="export-privkey-flash"
|
||||||
class="text-xs mb-2 min-h-[1.25rem] hidden"
|
class="text-xs mb-2 hidden"
|
||||||
></div>
|
></div>
|
||||||
<div id="export-privkey-password-section" class="mb-2">
|
<div id="export-privkey-password-section" class="mb-2">
|
||||||
<label class="block mb-1">Password</label>
|
<label class="block mb-1">Password</label>
|
||||||
@@ -923,8 +915,8 @@
|
|||||||
funds will be unrecoverable without your recovery phrase.
|
funds will be unrecoverable without your recovery phrase.
|
||||||
</p>
|
</p>
|
||||||
<div
|
<div
|
||||||
id="delete-wallet-error"
|
id="delete-wallet-flash"
|
||||||
class="text-xs mb-2 min-h-[1.25rem] hidden"
|
class="text-xs text-red-500 mb-2 hidden"
|
||||||
></div>
|
></div>
|
||||||
<div class="mb-2">
|
<div class="mb-2">
|
||||||
<label class="block mb-1">Password</label>
|
<label class="block mb-1">Password</label>
|
||||||
|
|||||||
@@ -15,6 +15,21 @@
|
|||||||
--color-section: #dddddd;
|
--color-section: #dddddd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@keyframes copy-flash {
|
||||||
|
0% {
|
||||||
|
background-color: var(--color-fg);
|
||||||
|
color: var(--color-bg);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
background-color: transparent;
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.copy-flash {
|
||||||
|
animation: copy-flash 500ms ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
width: 396px;
|
width: 396px;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const { $, showView, showFlash, showError, hideError } = require("./helpers");
|
const { $, showView, showFlash } = require("./helpers");
|
||||||
const {
|
const {
|
||||||
generateMnemonic,
|
generateMnemonic,
|
||||||
hdWalletFromMnemonic,
|
hdWalletFromMnemonic,
|
||||||
@@ -13,7 +13,6 @@ function show() {
|
|||||||
$("add-wallet-password").value = "";
|
$("add-wallet-password").value = "";
|
||||||
$("add-wallet-password-confirm").value = "";
|
$("add-wallet-password-confirm").value = "";
|
||||||
$("add-wallet-phrase-warning").classList.add("hidden");
|
$("add-wallet-phrase-warning").classList.add("hidden");
|
||||||
hideError("add-wallet-error");
|
|
||||||
showView("add-wallet");
|
showView("add-wallet");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,16 +25,14 @@ function init(ctx) {
|
|||||||
$("btn-add-wallet-confirm").addEventListener("click", async () => {
|
$("btn-add-wallet-confirm").addEventListener("click", async () => {
|
||||||
const mnemonic = $("wallet-mnemonic").value.trim();
|
const mnemonic = $("wallet-mnemonic").value.trim();
|
||||||
if (!mnemonic) {
|
if (!mnemonic) {
|
||||||
showError(
|
showFlash(
|
||||||
"add-wallet-error",
|
|
||||||
"Enter a recovery phrase or press the die to generate one.",
|
"Enter a recovery phrase or press the die to generate one.",
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const words = mnemonic.split(/\s+/);
|
const words = mnemonic.split(/\s+/);
|
||||||
if (words.length !== 12 && words.length !== 24) {
|
if (words.length !== 12 && words.length !== 24) {
|
||||||
showError(
|
showFlash(
|
||||||
"add-wallet-error",
|
|
||||||
"Recovery phrase must be 12 or 24 words. You entered " +
|
"Recovery phrase must be 12 or 24 words. You entered " +
|
||||||
words.length +
|
words.length +
|
||||||
".",
|
".",
|
||||||
@@ -43,27 +40,21 @@ function init(ctx) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!isValidMnemonic(mnemonic)) {
|
if (!isValidMnemonic(mnemonic)) {
|
||||||
showError(
|
showFlash("Invalid recovery phrase. Check for typos.");
|
||||||
"add-wallet-error",
|
|
||||||
"Invalid recovery phrase. Check for typos.",
|
|
||||||
);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const pw = $("add-wallet-password").value;
|
const pw = $("add-wallet-password").value;
|
||||||
const pw2 = $("add-wallet-password-confirm").value;
|
const pw2 = $("add-wallet-password-confirm").value;
|
||||||
if (!pw) {
|
if (!pw) {
|
||||||
showError("add-wallet-error", "Please choose a password.");
|
showFlash("Please choose a password.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (pw.length < 12) {
|
if (pw.length < 12) {
|
||||||
showError(
|
showFlash("Password must be at least 12 characters.");
|
||||||
"add-wallet-error",
|
|
||||||
"Password must be at least 12 characters.",
|
|
||||||
);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (pw !== pw2) {
|
if (pw !== pw2) {
|
||||||
showError("add-wallet-error", "Passwords do not match.");
|
showFlash("Passwords do not match.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
|
const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
|
||||||
@@ -75,15 +66,13 @@ function init(ctx) {
|
|||||||
firstAddress.toLowerCase(),
|
firstAddress.toLowerCase(),
|
||||||
);
|
);
|
||||||
if (duplicate) {
|
if (duplicate) {
|
||||||
showError(
|
showFlash(
|
||||||
"add-wallet-error",
|
|
||||||
"This recovery phrase is already added (" +
|
"This recovery phrase is already added (" +
|
||||||
duplicate.name +
|
duplicate.name +
|
||||||
").",
|
").",
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
hideError("add-wallet-error");
|
|
||||||
const encrypted = await encryptWithPassword(mnemonic, pw);
|
const encrypted = await encryptWithPassword(mnemonic, pw);
|
||||||
const walletNum = state.wallets.length + 1;
|
const walletNum = state.wallets.length + 1;
|
||||||
const wallet = {
|
const wallet = {
|
||||||
|
|||||||
@@ -2,8 +2,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
showError,
|
flashCopyElement,
|
||||||
hideError,
|
|
||||||
balanceLinesForAddress,
|
balanceLinesForAddress,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
@@ -239,9 +238,11 @@ function renderTransactions(txs) {
|
|||||||
function init(_ctx) {
|
function init(_ctx) {
|
||||||
ctx = _ctx;
|
ctx = _ctx;
|
||||||
$("address-full").addEventListener("click", () => {
|
$("address-full").addEventListener("click", () => {
|
||||||
const addr = $("address-full").dataset.full;
|
const el = $("address-full");
|
||||||
|
const addr = el.dataset.full;
|
||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
|
flashCopyElement(el);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -312,7 +313,8 @@ function init(_ctx) {
|
|||||||
$("export-privkey-address").textContent = addr.address;
|
$("export-privkey-address").textContent = addr.address;
|
||||||
$("export-privkey-address").dataset.full = addr.address;
|
$("export-privkey-address").dataset.full = addr.address;
|
||||||
$("export-privkey-password").value = "";
|
$("export-privkey-password").value = "";
|
||||||
hideError("export-privkey-error");
|
$("export-privkey-flash").classList.add("hidden");
|
||||||
|
$("export-privkey-flash").textContent = "";
|
||||||
$("export-privkey-password-section").classList.remove("hidden");
|
$("export-privkey-password-section").classList.remove("hidden");
|
||||||
$("export-privkey-result").classList.add("hidden");
|
$("export-privkey-result").classList.add("hidden");
|
||||||
$("export-privkey-value").textContent = "";
|
$("export-privkey-value").textContent = "";
|
||||||
@@ -322,7 +324,8 @@ function init(_ctx) {
|
|||||||
$("btn-export-privkey-confirm").addEventListener("click", async () => {
|
$("btn-export-privkey-confirm").addEventListener("click", async () => {
|
||||||
const password = $("export-privkey-password").value;
|
const password = $("export-privkey-password").value;
|
||||||
if (!password) {
|
if (!password) {
|
||||||
showError("export-privkey-error", "Password is required.");
|
$("export-privkey-flash").textContent = "Password is required.";
|
||||||
|
$("export-privkey-flash").classList.remove("hidden");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const btn = $("btn-export-privkey-confirm");
|
const btn = $("btn-export-privkey-confirm");
|
||||||
@@ -343,9 +346,10 @@ function init(_ctx) {
|
|||||||
$("export-privkey-password-section").classList.add("hidden");
|
$("export-privkey-password-section").classList.add("hidden");
|
||||||
$("export-privkey-value").textContent = privateKey;
|
$("export-privkey-value").textContent = privateKey;
|
||||||
$("export-privkey-result").classList.remove("hidden");
|
$("export-privkey-result").classList.remove("hidden");
|
||||||
hideError("export-privkey-error");
|
$("export-privkey-flash").classList.add("hidden");
|
||||||
} catch {
|
} catch {
|
||||||
showError("export-privkey-error", "Wrong password.");
|
$("export-privkey-flash").textContent = "Wrong password.";
|
||||||
|
$("export-privkey-flash").classList.remove("hidden");
|
||||||
} finally {
|
} finally {
|
||||||
btn.disabled = false;
|
btn.disabled = false;
|
||||||
btn.classList.remove("text-muted");
|
btn.classList.remove("text-muted");
|
||||||
@@ -353,17 +357,21 @@ function init(_ctx) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
$("export-privkey-value").addEventListener("click", () => {
|
$("export-privkey-value").addEventListener("click", () => {
|
||||||
const key = $("export-privkey-value").textContent;
|
const el = $("export-privkey-value");
|
||||||
|
const key = el.textContent;
|
||||||
if (key) {
|
if (key) {
|
||||||
navigator.clipboard.writeText(key);
|
navigator.clipboard.writeText(key);
|
||||||
|
flashCopyElement(el);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$("export-privkey-address").addEventListener("click", () => {
|
$("export-privkey-address").addEventListener("click", () => {
|
||||||
const full = $("export-privkey-address").dataset.full;
|
const el = $("export-privkey-address");
|
||||||
|
const full = el.dataset.full;
|
||||||
if (full) {
|
if (full) {
|
||||||
navigator.clipboard.writeText(full);
|
navigator.clipboard.writeText(full);
|
||||||
|
flashCopyElement(el);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyElement,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
@@ -313,9 +314,11 @@ function renderTransactions(txs) {
|
|||||||
function init(_ctx) {
|
function init(_ctx) {
|
||||||
ctx = _ctx;
|
ctx = _ctx;
|
||||||
$("address-token-full").addEventListener("click", () => {
|
$("address-token-full").addEventListener("click", () => {
|
||||||
const addr = $("address-token-full").dataset.full;
|
const el = $("address-token-full");
|
||||||
|
const addr = el.dataset.full;
|
||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
|
flashCopyElement(el);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -324,6 +327,7 @@ function init(_ctx) {
|
|||||||
const copyEl = e.target.closest("[data-copy]");
|
const copyEl = e.target.closest("[data-copy]");
|
||||||
if (copyEl) {
|
if (copyEl) {
|
||||||
navigator.clipboard.writeText(copyEl.dataset.copy);
|
navigator.clipboard.writeText(copyEl.dataset.copy);
|
||||||
|
flashCopyElement(copyEl);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -372,6 +376,7 @@ function init(_ctx) {
|
|||||||
if (copyEl) {
|
if (copyEl) {
|
||||||
copyEl.addEventListener("click", () => {
|
copyEl.addEventListener("click", () => {
|
||||||
navigator.clipboard.writeText(copyEl.dataset.copy);
|
navigator.clipboard.writeText(copyEl.dataset.copy);
|
||||||
|
flashCopyElement(copyEl);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -172,6 +172,8 @@ function showTxApproval(details) {
|
|||||||
// If this is an ERC-20 call, try to extract the real recipient and amount
|
// If this is an ERC-20 call, try to extract the real recipient and amount
|
||||||
const decoded = decodeCalldata(details.txParams.data, toAddr || "");
|
const decoded = decodeCalldata(details.txParams.data, toAddr || "");
|
||||||
if (decoded && decoded.details) {
|
if (decoded && decoded.details) {
|
||||||
|
let decodedTokenAddr = null;
|
||||||
|
let decodedTokenSymbol = null;
|
||||||
for (const d of decoded.details) {
|
for (const d of decoded.details) {
|
||||||
if (d.label === "Recipient" && d.address) {
|
if (d.label === "Recipient" && d.address) {
|
||||||
pendingTxDetails.to = d.address;
|
pendingTxDetails.to = d.address;
|
||||||
@@ -179,10 +181,20 @@ function showTxApproval(details) {
|
|||||||
if (d.label === "Amount") {
|
if (d.label === "Amount") {
|
||||||
pendingTxDetails.amount = d.rawValue || d.value;
|
pendingTxDetails.amount = d.rawValue || d.value;
|
||||||
}
|
}
|
||||||
|
if (d.label === "Token In" && d.isToken && d.address) {
|
||||||
|
const t = TOKEN_BY_ADDRESS.get(d.address.toLowerCase());
|
||||||
|
if (t) {
|
||||||
|
decodedTokenAddr = d.address;
|
||||||
|
decodedTokenSymbol = t.symbol;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (token) {
|
if (token) {
|
||||||
pendingTxDetails.token = toAddr;
|
pendingTxDetails.token = toAddr;
|
||||||
pendingTxDetails.tokenSymbol = token.symbol;
|
pendingTxDetails.tokenSymbol = token.symbol;
|
||||||
|
} else if (decodedTokenAddr) {
|
||||||
|
pendingTxDetails.token = decodedTokenAddr;
|
||||||
|
pendingTxDetails.tokenSymbol = decodedTokenSymbol;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ const {
|
|||||||
hideError,
|
hideError,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyElement,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
@@ -116,6 +117,7 @@ function show(txInfo) {
|
|||||||
if (copyEl) {
|
if (copyEl) {
|
||||||
copyEl.onclick = () => {
|
copyEl.onclick = () => {
|
||||||
navigator.clipboard.writeText(copyEl.dataset.copy);
|
navigator.clipboard.writeText(copyEl.dataset.copy);
|
||||||
|
flashCopyElement(copyEl);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const { $, showView, showFlash, showError, hideError } = require("./helpers");
|
const { $, showView, showFlash } = require("./helpers");
|
||||||
const { state, saveState } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const { decryptWithPassword } = require("../../shared/vault");
|
const { decryptWithPassword } = require("../../shared/vault");
|
||||||
|
|
||||||
@@ -11,7 +11,8 @@ function show(walletIdx) {
|
|||||||
$("delete-wallet-name").textContent =
|
$("delete-wallet-name").textContent =
|
||||||
wallet.name || "Wallet " + (walletIdx + 1);
|
wallet.name || "Wallet " + (walletIdx + 1);
|
||||||
$("delete-wallet-password").value = "";
|
$("delete-wallet-password").value = "";
|
||||||
hideError("delete-wallet-error");
|
$("delete-wallet-flash").textContent = "";
|
||||||
|
$("delete-wallet-flash").classList.add("hidden");
|
||||||
showView("delete-wallet-confirm");
|
showView("delete-wallet-confirm");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,15 +27,16 @@ function init(_ctx) {
|
|||||||
$("btn-delete-wallet-confirm").addEventListener("click", async () => {
|
$("btn-delete-wallet-confirm").addEventListener("click", async () => {
|
||||||
const pw = $("delete-wallet-password").value;
|
const pw = $("delete-wallet-password").value;
|
||||||
if (!pw) {
|
if (!pw) {
|
||||||
showError("delete-wallet-error", "Please enter your password.");
|
$("delete-wallet-flash").textContent =
|
||||||
|
"Please enter your password.";
|
||||||
|
$("delete-wallet-flash").classList.remove("hidden");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (deleteWalletIndex === null) {
|
if (deleteWalletIndex === null) {
|
||||||
showError(
|
$("delete-wallet-flash").textContent =
|
||||||
"delete-wallet-error",
|
"No wallet selected for deletion.";
|
||||||
"No wallet selected for deletion.",
|
$("delete-wallet-flash").classList.remove("hidden");
|
||||||
);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +51,8 @@ function init(_ctx) {
|
|||||||
try {
|
try {
|
||||||
await decryptWithPassword(wallet.encryptedSecret, pw);
|
await decryptWithPassword(wallet.encryptedSecret, pw);
|
||||||
} catch (_e) {
|
} catch (_e) {
|
||||||
showError("delete-wallet-error", "Wrong password.");
|
$("delete-wallet-flash").textContent = "Wrong password.";
|
||||||
|
$("delete-wallet-flash").classList.remove("hidden");
|
||||||
btn.disabled = false;
|
btn.disabled = false;
|
||||||
btn.classList.remove("text-muted");
|
btn.classList.remove("text-muted");
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -76,6 +76,18 @@ function clearFlash() {
|
|||||||
$("flash-msg").textContent = "";
|
$("flash-msg").textContent = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function flashCopyElement(el) {
|
||||||
|
el.classList.remove("copy-flash");
|
||||||
|
// Force reflow so re-adding the class restarts the animation.
|
||||||
|
void el.offsetWidth;
|
||||||
|
el.classList.add("copy-flash");
|
||||||
|
el.addEventListener(
|
||||||
|
"animationend",
|
||||||
|
() => el.classList.remove("copy-flash"),
|
||||||
|
{ once: true },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function showFlash(msg, duration = 2000) {
|
function showFlash(msg, duration = 2000) {
|
||||||
clearFlash();
|
clearFlash();
|
||||||
$("flash-msg").textContent = msg;
|
$("flash-msg").textContent = msg;
|
||||||
@@ -265,6 +277,7 @@ module.exports = {
|
|||||||
hideError,
|
hideError,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyElement,
|
||||||
balanceLine,
|
balanceLine,
|
||||||
balanceLinesForAddress,
|
balanceLinesForAddress,
|
||||||
addressColor,
|
addressColor,
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyElement,
|
||||||
balanceLinesForAddress,
|
balanceLinesForAddress,
|
||||||
isoDate,
|
isoDate,
|
||||||
timeAgo,
|
timeAgo,
|
||||||
@@ -85,8 +86,9 @@ function renderActiveAddress() {
|
|||||||
el.innerHTML =
|
el.innerHTML =
|
||||||
`<span class="underline decoration-dashed cursor-pointer" id="active-addr-copy">${dot}${escapeHtml(addr)}</span>` +
|
`<span class="underline decoration-dashed cursor-pointer" id="active-addr-copy">${dot}${escapeHtml(addr)}</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>`;
|
||||||
$("active-addr-copy").addEventListener("click", () => {
|
$("active-addr-copy").addEventListener("click", (e) => {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
|
flashCopyElement(e.currentTarget);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const { $, showView, showError, hideError } = require("./helpers");
|
const { $, showView, showFlash } = require("./helpers");
|
||||||
const { addressFromPrivateKey } = require("../../shared/wallet");
|
const { addressFromPrivateKey } = require("../../shared/wallet");
|
||||||
const { encryptWithPassword } = require("../../shared/vault");
|
const { encryptWithPassword } = require("../../shared/vault");
|
||||||
const { state, saveState } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
@@ -7,7 +7,6 @@ function show() {
|
|||||||
$("import-private-key").value = "";
|
$("import-private-key").value = "";
|
||||||
$("import-key-password").value = "";
|
$("import-key-password").value = "";
|
||||||
$("import-key-password-confirm").value = "";
|
$("import-key-password-confirm").value = "";
|
||||||
hideError("import-key-error");
|
|
||||||
showView("import-key");
|
showView("import-key");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -15,34 +14,30 @@ function init(ctx) {
|
|||||||
$("btn-import-key-confirm").addEventListener("click", async () => {
|
$("btn-import-key-confirm").addEventListener("click", async () => {
|
||||||
const key = $("import-private-key").value.trim();
|
const key = $("import-private-key").value.trim();
|
||||||
if (!key) {
|
if (!key) {
|
||||||
showError("import-key-error", "Please enter your private key.");
|
showFlash("Please enter your private key.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let addr;
|
let addr;
|
||||||
try {
|
try {
|
||||||
addr = addressFromPrivateKey(key);
|
addr = addressFromPrivateKey(key);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
showError("import-key-error", "Invalid private key.");
|
showFlash("Invalid private key.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const pw = $("import-key-password").value;
|
const pw = $("import-key-password").value;
|
||||||
const pw2 = $("import-key-password-confirm").value;
|
const pw2 = $("import-key-password-confirm").value;
|
||||||
if (!pw) {
|
if (!pw) {
|
||||||
showError("import-key-error", "Please choose a password.");
|
showFlash("Please choose a password.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (pw.length < 12) {
|
if (pw.length < 12) {
|
||||||
showError(
|
showFlash("Password must be at least 12 characters.");
|
||||||
"import-key-error",
|
|
||||||
"Password must be at least 12 characters.",
|
|
||||||
);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (pw !== pw2) {
|
if (pw !== pw2) {
|
||||||
showError("import-key-error", "Passwords do not match.");
|
showFlash("Passwords do not match.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
hideError("import-key-error");
|
|
||||||
const encrypted = await encryptWithPassword(key, pw);
|
const encrypted = await encryptWithPassword(key, pw);
|
||||||
const walletNum = state.wallets.length + 1;
|
const walletNum = state.wallets.length + 1;
|
||||||
state.wallets.push({
|
state.wallets.push({
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyElement,
|
||||||
formatAddressHtml,
|
formatAddressHtml,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
@@ -61,17 +62,21 @@ function show() {
|
|||||||
|
|
||||||
function init(ctx) {
|
function init(ctx) {
|
||||||
$("receive-address-block").addEventListener("click", () => {
|
$("receive-address-block").addEventListener("click", () => {
|
||||||
const addr = $("receive-address-block").dataset.full;
|
const el = $("receive-address-block");
|
||||||
|
const addr = el.dataset.full;
|
||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
|
flashCopyElement(el);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$("btn-receive-copy").addEventListener("click", () => {
|
$("btn-receive-copy").addEventListener("click", () => {
|
||||||
const addr = $("receive-address-block").dataset.full;
|
const block = $("receive-address-block");
|
||||||
|
const addr = block.dataset.full;
|
||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
|
flashCopyElement(block);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyElement,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
@@ -158,8 +159,9 @@ function render() {
|
|||||||
loadCalldata(tx.hash, tx.to);
|
loadCalldata(tx.hash, tx.to);
|
||||||
}
|
}
|
||||||
|
|
||||||
$("tx-detail-time").textContent =
|
const isoStr = isoDate(tx.timestamp);
|
||||||
isoDate(tx.timestamp) + " (" + timeAgo(tx.timestamp) + ")";
|
$("tx-detail-time").innerHTML =
|
||||||
|
copyableHtml(isoStr) + " (" + escapeHtml(timeAgo(tx.timestamp)) + ")";
|
||||||
$("tx-detail-status").textContent = tx.isError ? "Failed" : "Success";
|
$("tx-detail-status").textContent = tx.isError ? "Failed" : "Success";
|
||||||
showView("transaction");
|
showView("transaction");
|
||||||
|
|
||||||
@@ -169,6 +171,7 @@ function render() {
|
|||||||
.forEach((el) => {
|
.forEach((el) => {
|
||||||
el.onclick = () => {
|
el.onclick = () => {
|
||||||
navigator.clipboard.writeText(el.dataset.copy);
|
navigator.clipboard.writeText(el.dataset.copy);
|
||||||
|
flashCopyElement(el);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@@ -246,6 +249,7 @@ async function loadCalldata(txHash, toAddress) {
|
|||||||
container.querySelectorAll("[data-copy]").forEach((el) => {
|
container.querySelectorAll("[data-copy]").forEach((el) => {
|
||||||
el.onclick = () => {
|
el.onclick = () => {
|
||||||
navigator.clipboard.writeText(el.dataset.copy);
|
navigator.clipboard.writeText(el.dataset.copy);
|
||||||
|
flashCopyElement(el);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyElement,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
@@ -43,10 +44,11 @@ function toAddressHtml(address) {
|
|||||||
if (title) {
|
if (title) {
|
||||||
return (
|
return (
|
||||||
`<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>` +
|
`<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>` +
|
||||||
`<div class="break-all">${escapeHtml(address)}${extLink}</div>`
|
`<div class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(address)}">${escapeHtml(address)}</div>` +
|
||||||
|
extLink
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(address)}</span>${extLink}</div>`;
|
return `<div class="flex items-center">${dot}<span class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(address)}">${escapeHtml(address)}</span>${extLink}</div>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function txHashHtml(hash) {
|
function txHashHtml(hash) {
|
||||||
@@ -58,6 +60,16 @@ function txHashHtml(hash) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function blockNumberHtml(blockNumber) {
|
||||||
|
const num = String(blockNumber);
|
||||||
|
const link = `https://etherscan.io/block/${num}`;
|
||||||
|
const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
|
||||||
|
return (
|
||||||
|
`<span class="underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(num)}">${escapeHtml(num)}</span>` +
|
||||||
|
extLink
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function attachCopyHandlers(viewId) {
|
function attachCopyHandlers(viewId) {
|
||||||
document
|
document
|
||||||
.getElementById(viewId)
|
.getElementById(viewId)
|
||||||
@@ -65,6 +77,7 @@ function attachCopyHandlers(viewId) {
|
|||||||
.forEach((el) => {
|
.forEach((el) => {
|
||||||
el.onclick = () => {
|
el.onclick = () => {
|
||||||
navigator.clipboard.writeText(el.dataset.copy);
|
navigator.clipboard.writeText(el.dataset.copy);
|
||||||
|
flashCopyElement(el);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@@ -139,7 +152,7 @@ function etherscanTokenLink(address) {
|
|||||||
|
|
||||||
function decodedDetailsHtml(decoded) {
|
function decodedDetailsHtml(decoded) {
|
||||||
if (!decoded || !decoded.details) return "";
|
if (!decoded || !decoded.details) return "";
|
||||||
let html = "";
|
let html = `<div class="border border-border border-dashed p-2 mb-3">`;
|
||||||
if (decoded.name) {
|
if (decoded.name) {
|
||||||
html += `<div class="mb-2"><div class="text-xs text-muted mb-1">Action</div>`;
|
html += `<div class="mb-2"><div class="text-xs text-muted mb-1">Action</div>`;
|
||||||
html += `<div class="font-bold">${escapeHtml(decoded.name)}</div></div>`;
|
html += `<div class="font-bold">${escapeHtml(decoded.name)}</div></div>`;
|
||||||
@@ -164,20 +177,36 @@ function decodedDetailsHtml(decoded) {
|
|||||||
}
|
}
|
||||||
html += `</div>`;
|
html += `</div>`;
|
||||||
}
|
}
|
||||||
|
html += `</div>`;
|
||||||
return html;
|
return html;
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderSuccess() {
|
function renderSuccess() {
|
||||||
const d = state.viewData;
|
const d = state.viewData;
|
||||||
if (!d || !d.hash) return;
|
if (!d || !d.hash) return;
|
||||||
$("success-tx-summary").textContent = d.amount + " " + d.symbol;
|
|
||||||
$("success-tx-to").innerHTML = toAddressHtml(d.to);
|
const hasDecoded = d.decoded && d.decoded.details;
|
||||||
$("success-tx-block").textContent = String(d.blockNumber);
|
|
||||||
|
// When decoded details are present, the Amount and To are already
|
||||||
|
// shown inside the decoded well — hide the top-level duplicates.
|
||||||
|
const summarySection = $("success-tx-summary").parentElement;
|
||||||
|
const toSection = $("success-tx-to").parentElement;
|
||||||
|
if (hasDecoded) {
|
||||||
|
summarySection.classList.add("hidden");
|
||||||
|
toSection.classList.add("hidden");
|
||||||
|
} else {
|
||||||
|
summarySection.classList.remove("hidden");
|
||||||
|
toSection.classList.remove("hidden");
|
||||||
|
$("success-tx-summary").textContent = d.amount + " " + d.symbol;
|
||||||
|
$("success-tx-to").innerHTML = toAddressHtml(d.to);
|
||||||
|
}
|
||||||
|
|
||||||
|
$("success-tx-block").innerHTML = blockNumberHtml(d.blockNumber);
|
||||||
$("success-tx-hash").innerHTML = txHashHtml(d.hash);
|
$("success-tx-hash").innerHTML = txHashHtml(d.hash);
|
||||||
|
|
||||||
// Show decoded calldata details if present
|
// Show decoded calldata details if present
|
||||||
const decodedEl = $("success-tx-decoded");
|
const decodedEl = $("success-tx-decoded");
|
||||||
if (decodedEl && d.decoded) {
|
if (decodedEl && hasDecoded) {
|
||||||
decodedEl.innerHTML = decodedDetailsHtml(d.decoded);
|
decodedEl.innerHTML = decodedDetailsHtml(d.decoded);
|
||||||
decodedEl.classList.remove("hidden");
|
decodedEl.classList.remove("hidden");
|
||||||
} else if (decodedEl) {
|
} else if (decodedEl) {
|
||||||
|
|||||||
@@ -445,12 +445,18 @@ function decode(data, toAddress) {
|
|||||||
const maxUint160 = BigInt(
|
const maxUint160 = BigInt(
|
||||||
"0xffffffffffffffffffffffffffffffffffffffff",
|
"0xffffffffffffffffffffffffffffffffffffffff",
|
||||||
);
|
);
|
||||||
const amountStr =
|
const isUnlimited = inputAmount >= maxUint160;
|
||||||
inputAmount >= maxUint160
|
const amountRaw = isUnlimited
|
||||||
? "Unlimited"
|
? "Unlimited"
|
||||||
: formatAmount(inputAmount, inInfo.decimals) +
|
: formatAmount(inputAmount, inInfo.decimals);
|
||||||
(inSymbol ? " " + inSymbol : "");
|
const amountStr = isUnlimited
|
||||||
details.push({ label: "Amount", value: amountStr });
|
? "Unlimited"
|
||||||
|
: amountRaw + (inSymbol ? " " + inSymbol : "");
|
||||||
|
details.push({
|
||||||
|
label: "Amount",
|
||||||
|
value: amountStr,
|
||||||
|
rawValue: amountRaw,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (outSymbol) {
|
if (outSymbol) {
|
||||||
|
|||||||
Reference in New Issue
Block a user