Compare commits
6 Commits
f290298244
...
fix/116-ti
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28f3a22c32 | ||
| 753fb5658a | |||
| bdb2031d46 | |||
| 25ecaee128 | |||
|
|
ff4b5ee24d | ||
|
|
ca6e9054f9 |
@@ -19,3 +19,16 @@ body {
|
|||||||
width: 396px;
|
width: 396px;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Copy-flash feedback: inverts colors then fades back */
|
||||||
|
.copy-flash-active {
|
||||||
|
background-color: var(--color-fg) !important;
|
||||||
|
color: var(--color-bg) !important;
|
||||||
|
transition: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.copy-flash-fade {
|
||||||
|
transition:
|
||||||
|
background-color 300ms ease-out,
|
||||||
|
color 300ms ease-out;
|
||||||
|
}
|
||||||
|
|||||||
@@ -11,6 +11,25 @@ const { encryptWithPassword } = require("../../shared/vault");
|
|||||||
const { state, saveState } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const { scanForAddresses } = require("../../shared/balances");
|
const { scanForAddresses } = require("../../shared/balances");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if an address already exists in ANY wallet (hd, xprv, or key).
|
||||||
|
* Returns the wallet object if found, or undefined.
|
||||||
|
*/
|
||||||
|
function findWalletByAddress(addr) {
|
||||||
|
const lower = addr.toLowerCase();
|
||||||
|
return state.wallets.find((w) =>
|
||||||
|
w.addresses.some((a) => a.address.toLowerCase() === lower),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if an xpub already exists in any HD-type wallet (hd or xprv).
|
||||||
|
* Returns the wallet object if found, or undefined.
|
||||||
|
*/
|
||||||
|
function findWalletByXpub(xpub) {
|
||||||
|
return state.wallets.find((w) => w.xpub && w.xpub === xpub);
|
||||||
|
}
|
||||||
|
|
||||||
let currentMode = "mnemonic";
|
let currentMode = "mnemonic";
|
||||||
|
|
||||||
const MODES = ["mnemonic", "privkey", "xprv"];
|
const MODES = ["mnemonic", "privkey", "xprv"];
|
||||||
@@ -97,18 +116,18 @@ async function importMnemonic(ctx) {
|
|||||||
const pw = validatePassword();
|
const pw = validatePassword();
|
||||||
if (!pw) return;
|
if (!pw) return;
|
||||||
const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
|
const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
|
||||||
const duplicate = state.wallets.find(
|
const xpubDup = findWalletByXpub(xpub);
|
||||||
(w) =>
|
if (xpubDup) {
|
||||||
w.type === "hd" &&
|
|
||||||
w.addresses[0] &&
|
|
||||||
w.addresses[0].address.toLowerCase() === firstAddress.toLowerCase(),
|
|
||||||
);
|
|
||||||
if (duplicate) {
|
|
||||||
showFlash(
|
showFlash(
|
||||||
"This recovery phrase is already added (" + duplicate.name + ").",
|
"This recovery phrase is already added (" + xpubDup.name + ").",
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const addrDup = findWalletByAddress(firstAddress);
|
||||||
|
if (addrDup) {
|
||||||
|
showFlash("Address already exists in wallet (" + addrDup.name + ").");
|
||||||
|
return;
|
||||||
|
}
|
||||||
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 = {
|
||||||
@@ -162,15 +181,10 @@ async function importPrivateKey(ctx) {
|
|||||||
}
|
}
|
||||||
const pw = validatePassword();
|
const pw = validatePassword();
|
||||||
if (!pw) return;
|
if (!pw) return;
|
||||||
const duplicate = state.wallets.find(
|
const duplicate = findWalletByAddress(addr);
|
||||||
(w) =>
|
|
||||||
w.type === "key" &&
|
|
||||||
w.addresses[0] &&
|
|
||||||
w.addresses[0].address.toLowerCase() === addr.toLowerCase(),
|
|
||||||
);
|
|
||||||
if (duplicate) {
|
if (duplicate) {
|
||||||
showFlash(
|
showFlash(
|
||||||
"This private key is already added (" + duplicate.name + ").",
|
"This address already exists in wallet (" + duplicate.name + ").",
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -208,14 +222,14 @@ async function importXprvKey(ctx) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const { xpub, firstAddress } = result;
|
const { xpub, firstAddress } = result;
|
||||||
const duplicate = state.wallets.find(
|
const xpubDup = findWalletByXpub(xpub);
|
||||||
(w) =>
|
if (xpubDup) {
|
||||||
(w.type === "hd" || w.type === "xprv") &&
|
showFlash("This key is already added (" + xpubDup.name + ").");
|
||||||
w.addresses[0] &&
|
return;
|
||||||
w.addresses[0].address.toLowerCase() === firstAddress.toLowerCase(),
|
}
|
||||||
);
|
const addrDup = findWalletByAddress(firstAddress);
|
||||||
if (duplicate) {
|
if (addrDup) {
|
||||||
showFlash("This key is already added (" + duplicate.name + ").");
|
showFlash("Address already exists in wallet (" + addrDup.name + ").");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const pw = validatePassword();
|
const pw = validatePassword();
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyFeedback,
|
||||||
balanceLinesForAddress,
|
balanceLinesForAddress,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
@@ -94,6 +95,10 @@ function show() {
|
|||||||
function isoDate(timestamp) {
|
function isoDate(timestamp) {
|
||||||
const d = new Date(timestamp * 1000);
|
const d = new Date(timestamp * 1000);
|
||||||
const pad = (n) => String(n).padStart(2, "0");
|
const pad = (n) => String(n).padStart(2, "0");
|
||||||
|
const off = -d.getTimezoneOffset();
|
||||||
|
const sign = off >= 0 ? "+" : "-";
|
||||||
|
const absOff = Math.abs(off);
|
||||||
|
const tz = sign + pad(Math.floor(absOff / 60)) + ":" + pad(absOff % 60);
|
||||||
return (
|
return (
|
||||||
d.getFullYear() +
|
d.getFullYear() +
|
||||||
"-" +
|
"-" +
|
||||||
@@ -105,7 +110,8 @@ function isoDate(timestamp) {
|
|||||||
":" +
|
":" +
|
||||||
pad(d.getMinutes()) +
|
pad(d.getMinutes()) +
|
||||||
":" +
|
":" +
|
||||||
pad(d.getSeconds())
|
pad(d.getSeconds()) +
|
||||||
|
tz
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -241,6 +247,7 @@ function init(_ctx) {
|
|||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback($("address-full"));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -358,6 +365,7 @@ function init(_ctx) {
|
|||||||
if (key) {
|
if (key) {
|
||||||
navigator.clipboard.writeText(key);
|
navigator.clipboard.writeText(key);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback($("export-privkey-value"));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -366,6 +374,7 @@ function init(_ctx) {
|
|||||||
if (full) {
|
if (full) {
|
||||||
navigator.clipboard.writeText(full);
|
navigator.clipboard.writeText(full);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback($("export-privkey-address"));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyFeedback,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
@@ -47,6 +48,10 @@ function etherscanAddressLink(address) {
|
|||||||
function isoDate(timestamp) {
|
function isoDate(timestamp) {
|
||||||
const d = new Date(timestamp * 1000);
|
const d = new Date(timestamp * 1000);
|
||||||
const pad = (n) => String(n).padStart(2, "0");
|
const pad = (n) => String(n).padStart(2, "0");
|
||||||
|
const off = -d.getTimezoneOffset();
|
||||||
|
const sign = off >= 0 ? "+" : "-";
|
||||||
|
const absOff = Math.abs(off);
|
||||||
|
const tz = sign + pad(Math.floor(absOff / 60)) + ":" + pad(absOff % 60);
|
||||||
return (
|
return (
|
||||||
d.getFullYear() +
|
d.getFullYear() +
|
||||||
"-" +
|
"-" +
|
||||||
@@ -58,7 +63,8 @@ function isoDate(timestamp) {
|
|||||||
":" +
|
":" +
|
||||||
pad(d.getMinutes()) +
|
pad(d.getMinutes()) +
|
||||||
":" +
|
":" +
|
||||||
pad(d.getSeconds())
|
pad(d.getSeconds()) +
|
||||||
|
tz
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -317,6 +323,7 @@ function init(_ctx) {
|
|||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback($("address-token-full"));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -325,6 +332,7 @@ function init(_ctx) {
|
|||||||
if (copyEl) {
|
if (copyEl) {
|
||||||
navigator.clipboard.writeText(copyEl.dataset.copy);
|
navigator.clipboard.writeText(copyEl.dataset.copy);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback(copyEl);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -373,6 +381,7 @@ function init(_ctx) {
|
|||||||
copyEl.addEventListener("click", () => {
|
copyEl.addEventListener("click", () => {
|
||||||
navigator.clipboard.writeText(copyEl.dataset.copy);
|
navigator.clipboard.writeText(copyEl.dataset.copy);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback(copyEl);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
updateSendBalance();
|
updateSendBalance();
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ const {
|
|||||||
hideError,
|
hideError,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyFeedback,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
@@ -117,6 +118,7 @@ function show(txInfo) {
|
|||||||
copyEl.onclick = () => {
|
copyEl.onclick = () => {
|
||||||
navigator.clipboard.writeText(copyEl.dataset.copy);
|
navigator.clipboard.writeText(copyEl.dataset.copy);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback(copyEl);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -226,6 +226,10 @@ function formatAddressHtml(address, ensName, maxLen, title) {
|
|||||||
function isoDate(timestamp) {
|
function isoDate(timestamp) {
|
||||||
const d = new Date(timestamp * 1000);
|
const d = new Date(timestamp * 1000);
|
||||||
const pad = (n) => String(n).padStart(2, "0");
|
const pad = (n) => String(n).padStart(2, "0");
|
||||||
|
const off = -d.getTimezoneOffset();
|
||||||
|
const sign = off >= 0 ? "+" : "-";
|
||||||
|
const absOff = Math.abs(off);
|
||||||
|
const tz = sign + pad(Math.floor(absOff / 60)) + ":" + pad(absOff % 60);
|
||||||
return (
|
return (
|
||||||
d.getFullYear() +
|
d.getFullYear() +
|
||||||
"-" +
|
"-" +
|
||||||
@@ -237,7 +241,8 @@ function isoDate(timestamp) {
|
|||||||
":" +
|
":" +
|
||||||
pad(d.getMinutes()) +
|
pad(d.getMinutes()) +
|
||||||
":" +
|
":" +
|
||||||
pad(d.getSeconds())
|
pad(d.getSeconds()) +
|
||||||
|
tz
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -258,12 +263,26 @@ function timeAgo(timestamp) {
|
|||||||
return years + " year" + (years !== 1 ? "s" : "") + " ago";
|
return years + " year" + (years !== 1 ? "s" : "") + " ago";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function flashCopyFeedback(el) {
|
||||||
|
if (!el) return;
|
||||||
|
el.classList.remove("copy-flash-fade");
|
||||||
|
el.classList.add("copy-flash-active");
|
||||||
|
setTimeout(() => {
|
||||||
|
el.classList.remove("copy-flash-active");
|
||||||
|
el.classList.add("copy-flash-fade");
|
||||||
|
setTimeout(() => {
|
||||||
|
el.classList.remove("copy-flash-fade");
|
||||||
|
}, 350);
|
||||||
|
}, 100);
|
||||||
|
}
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
$,
|
$,
|
||||||
showError,
|
showError,
|
||||||
hideError,
|
hideError,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyFeedback,
|
||||||
balanceLine,
|
balanceLine,
|
||||||
balanceLinesForAddress,
|
balanceLinesForAddress,
|
||||||
addressColor,
|
addressColor,
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyFeedback,
|
||||||
balanceLinesForAddress,
|
balanceLinesForAddress,
|
||||||
isoDate,
|
isoDate,
|
||||||
timeAgo,
|
timeAgo,
|
||||||
@@ -85,9 +86,10 @@ 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);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback(e.currentTarget);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
el.textContent = "";
|
el.textContent = "";
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyFeedback,
|
||||||
formatAddressHtml,
|
formatAddressHtml,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
@@ -60,11 +61,12 @@ function show() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function init(ctx) {
|
function init(ctx) {
|
||||||
$("receive-address-block").addEventListener("click", () => {
|
$("receive-address-block").addEventListener("click", (e) => {
|
||||||
const addr = $("receive-address-block").dataset.full;
|
const addr = $("receive-address-block").dataset.full;
|
||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback(e.currentTarget);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -73,6 +75,7 @@ function init(ctx) {
|
|||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback($("receive-address-block"));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyFeedback,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
@@ -171,6 +172,7 @@ function render() {
|
|||||||
el.onclick = () => {
|
el.onclick = () => {
|
||||||
navigator.clipboard.writeText(el.dataset.copy);
|
navigator.clipboard.writeText(el.dataset.copy);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback(el);
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -248,6 +250,7 @@ async function loadCalldata(txHash, toAddress) {
|
|||||||
el.onclick = () => {
|
el.onclick = () => {
|
||||||
navigator.clipboard.writeText(el.dataset.copy);
|
navigator.clipboard.writeText(el.dataset.copy);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback(el);
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
|
flashCopyFeedback,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
@@ -77,6 +78,7 @@ function attachCopyHandlers(viewId) {
|
|||||||
el.onclick = () => {
|
el.onclick = () => {
|
||||||
navigator.clipboard.writeText(el.dataset.copy);
|
navigator.clipboard.writeText(el.dataset.copy);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
flashCopyFeedback(el);
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -487,7 +487,10 @@ function decode(data, toAddress) {
|
|||||||
const deadlineDate = new Date(Number(deadline) * 1000);
|
const deadlineDate = new Date(Number(deadline) * 1000);
|
||||||
details.push({
|
details.push({
|
||||||
label: "Deadline",
|
label: "Deadline",
|
||||||
value: deadlineDate.toISOString().replace("T", " ").slice(0, 19),
|
value: deadlineDate
|
||||||
|
.toISOString()
|
||||||
|
.replace("T", " ")
|
||||||
|
.replace(".000Z", "Z"),
|
||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user