Compare commits
1 Commits
a655c546b7
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
| b9c3d99fed |
@@ -305,26 +305,6 @@
|
|||||||
>
|
>
|
||||||
+ Token
|
+ Token
|
||||||
</button>
|
</button>
|
||||||
<div class="relative">
|
|
||||||
<button
|
|
||||||
id="btn-more-menu"
|
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
|
|
||||||
aria-label="More actions"
|
|
||||||
>
|
|
||||||
···
|
|
||||||
</button>
|
|
||||||
<div
|
|
||||||
id="more-menu-dropdown"
|
|
||||||
class="hidden absolute right-0 top-full mt-1 border border-border bg-bg z-50 whitespace-nowrap py-1"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
id="btn-export-privkey"
|
|
||||||
class="block w-full text-left px-4 py-1.5 text-xs font-light text-muted hover:bg-hover hover:text-fg cursor-pointer"
|
|
||||||
>
|
|
||||||
Export Private Key
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- transactions -->
|
<!-- transactions -->
|
||||||
@@ -338,60 +318,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- ============ EXPORT PRIVATE KEY VIEW ============ -->
|
|
||||||
<div id="view-export-privkey" class="view hidden">
|
|
||||||
<button
|
|
||||||
id="btn-export-privkey-back"
|
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mb-2"
|
|
||||||
>
|
|
||||||
< Back
|
|
||||||
</button>
|
|
||||||
<div
|
|
||||||
id="export-privkey-jazzicon"
|
|
||||||
class="flex justify-center mt-1 mb-3"
|
|
||||||
></div>
|
|
||||||
<h2 class="font-bold mb-1">Export Private Key</h2>
|
|
||||||
<p class="text-xs mb-1" id="export-privkey-title"></p>
|
|
||||||
<p class="text-xs mb-3">
|
|
||||||
<span id="export-privkey-dot"></span>
|
|
||||||
<span
|
|
||||||
id="export-privkey-address"
|
|
||||||
class="cursor-pointer"
|
|
||||||
title="Click to copy"
|
|
||||||
></span>
|
|
||||||
</p>
|
|
||||||
<p class="text-xs mb-3 text-muted">
|
|
||||||
Warning: anyone with this private key can access and
|
|
||||||
transfer all funds from this address. Never share it.
|
|
||||||
</p>
|
|
||||||
<div
|
|
||||||
id="export-privkey-flash"
|
|
||||||
class="text-xs mb-2 hidden"
|
|
||||||
></div>
|
|
||||||
<div id="export-privkey-password-section" class="mb-2">
|
|
||||||
<label class="block mb-1">Password</label>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
id="export-privkey-password"
|
|
||||||
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
|
||||||
placeholder="Enter your password to continue"
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
id="btn-export-privkey-confirm"
|
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mt-2"
|
|
||||||
>
|
|
||||||
Reveal
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div id="export-privkey-result" class="hidden">
|
|
||||||
<div
|
|
||||||
id="export-privkey-value"
|
|
||||||
class="bg-danger-well rounded p-2 font-mono text-xs break-all cursor-pointer mb-1"
|
|
||||||
title="Click to copy"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- ============ ADDRESS-TOKEN DETAIL VIEW ============ -->
|
<!-- ============ ADDRESS-TOKEN DETAIL VIEW ============ -->
|
||||||
<div id="view-address-token" class="view hidden">
|
<div id="view-address-token" class="view hidden">
|
||||||
<button
|
<button
|
||||||
@@ -711,10 +637,16 @@
|
|||||||
<div class="flex justify-center mb-3">
|
<div class="flex justify-center mb-3">
|
||||||
<canvas id="receive-qr"></canvas>
|
<canvas id="receive-qr"></canvas>
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
id="receive-ens"
|
||||||
|
class="font-bold mb-1 hidden flex items-center"
|
||||||
|
></div>
|
||||||
<div
|
<div
|
||||||
class="border border-border p-2 break-all mb-3 text-xs cursor-pointer"
|
class="border border-border p-2 break-all mb-3 text-xs cursor-pointer"
|
||||||
|
title="Click to copy"
|
||||||
>
|
>
|
||||||
<span id="receive-address-block" class="select-all"></span>
|
<span id="receive-address-dot"></span>
|
||||||
|
<span id="receive-address-full"></span>
|
||||||
<span id="receive-etherscan-link"></span>
|
<span id="receive-etherscan-link"></span>
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
--color-border-light: #cccccc;
|
--color-border-light: #cccccc;
|
||||||
--color-hover: #eeeeee;
|
--color-hover: #eeeeee;
|
||||||
--color-well: #f5f5f5;
|
--color-well: #f5f5f5;
|
||||||
--color-danger-well: #fef2f2;
|
|
||||||
--color-section: #dddddd;
|
--color-section: #dddddd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,8 +18,6 @@ const { resolveEnsNames } = require("../../shared/ens");
|
|||||||
const { updateSendBalance, renderSendTokenSelect } = require("./send");
|
const { updateSendBalance, renderSendTokenSelect } = 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 { getSignerForAddress } = require("../../shared/wallet");
|
|
||||||
|
|
||||||
let ctx;
|
let ctx;
|
||||||
|
|
||||||
@@ -267,102 +265,6 @@ function init(_ctx) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
$("btn-add-token").addEventListener("click", ctx.showAddTokenView);
|
$("btn-add-token").addEventListener("click", ctx.showAddTokenView);
|
||||||
|
|
||||||
// More menu dropdown
|
|
||||||
const moreBtn = $("btn-more-menu");
|
|
||||||
const moreDropdown = $("more-menu-dropdown");
|
|
||||||
moreBtn.addEventListener("click", (e) => {
|
|
||||||
e.stopPropagation();
|
|
||||||
const isOpen = !moreDropdown.classList.toggle("hidden");
|
|
||||||
moreBtn.classList.toggle("bg-fg", isOpen);
|
|
||||||
moreBtn.classList.toggle("text-bg", isOpen);
|
|
||||||
});
|
|
||||||
document.addEventListener("click", () => {
|
|
||||||
moreDropdown.classList.add("hidden");
|
|
||||||
moreBtn.classList.remove("bg-fg", "text-bg");
|
|
||||||
});
|
|
||||||
moreDropdown.addEventListener("click", (e) => {
|
|
||||||
e.stopPropagation();
|
|
||||||
});
|
|
||||||
|
|
||||||
$("btn-export-privkey").addEventListener("click", () => {
|
|
||||||
moreDropdown.classList.add("hidden");
|
|
||||||
moreBtn.classList.remove("bg-fg", "text-bg");
|
|
||||||
const wallet = state.wallets[state.selectedWallet];
|
|
||||||
const addr = wallet.addresses[state.selectedAddress];
|
|
||||||
const blockieEl = $("export-privkey-jazzicon");
|
|
||||||
blockieEl.innerHTML = "";
|
|
||||||
const bImg = document.createElement("img");
|
|
||||||
bImg.src = makeBlockie(addr.address);
|
|
||||||
bImg.width = 48;
|
|
||||||
bImg.height = 48;
|
|
||||||
bImg.style.imageRendering = "pixelated";
|
|
||||||
bImg.style.borderRadius = "50%";
|
|
||||||
blockieEl.appendChild(bImg);
|
|
||||||
$("export-privkey-title").textContent =
|
|
||||||
wallet.name + " \u2014 Address " + (state.selectedAddress + 1);
|
|
||||||
$("export-privkey-dot").innerHTML = addressDotHtml(addr.address);
|
|
||||||
$("export-privkey-address").textContent = addr.address;
|
|
||||||
$("export-privkey-address").dataset.full = addr.address;
|
|
||||||
$("export-privkey-password").value = "";
|
|
||||||
$("export-privkey-flash").classList.add("hidden");
|
|
||||||
$("export-privkey-flash").textContent = "";
|
|
||||||
$("export-privkey-password-section").classList.remove("hidden");
|
|
||||||
$("export-privkey-result").classList.add("hidden");
|
|
||||||
$("export-privkey-value").textContent = "";
|
|
||||||
showView("export-privkey");
|
|
||||||
});
|
|
||||||
|
|
||||||
$("btn-export-privkey-confirm").addEventListener("click", async () => {
|
|
||||||
const password = $("export-privkey-password").value;
|
|
||||||
if (!password) {
|
|
||||||
$("export-privkey-flash").textContent = "Password is required.";
|
|
||||||
$("export-privkey-flash").classList.remove("hidden");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const wallet = state.wallets[state.selectedWallet];
|
|
||||||
try {
|
|
||||||
const secret = await decryptWithPassword(
|
|
||||||
wallet.encryptedSecret,
|
|
||||||
password,
|
|
||||||
);
|
|
||||||
const signer = getSignerForAddress(
|
|
||||||
wallet,
|
|
||||||
state.selectedAddress,
|
|
||||||
secret,
|
|
||||||
);
|
|
||||||
const privateKey = signer.privateKey;
|
|
||||||
$("export-privkey-password-section").classList.add("hidden");
|
|
||||||
$("export-privkey-value").textContent = privateKey;
|
|
||||||
$("export-privkey-result").classList.remove("hidden");
|
|
||||||
$("export-privkey-flash").classList.add("hidden");
|
|
||||||
} catch {
|
|
||||||
$("export-privkey-flash").textContent = "Wrong password.";
|
|
||||||
$("export-privkey-flash").classList.remove("hidden");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$("export-privkey-value").addEventListener("click", () => {
|
|
||||||
const key = $("export-privkey-value").textContent;
|
|
||||||
if (key) {
|
|
||||||
navigator.clipboard.writeText(key);
|
|
||||||
showFlash("Copied!");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$("export-privkey-address").addEventListener("click", () => {
|
|
||||||
const full = $("export-privkey-address").dataset.full;
|
|
||||||
if (full) {
|
|
||||||
navigator.clipboard.writeText(full);
|
|
||||||
showFlash("Copied!");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$("btn-export-privkey-back").addEventListener("click", () => {
|
|
||||||
$("export-privkey-value").textContent = "";
|
|
||||||
$("export-privkey-password").value = "";
|
|
||||||
show();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = { init, show };
|
module.exports = { init, show };
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ const {
|
|||||||
showError,
|
showError,
|
||||||
hideError,
|
hideError,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
|
||||||
addressTitle,
|
addressTitle,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
@@ -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");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ const VIEWS = [
|
|||||||
"approve-site",
|
"approve-site",
|
||||||
"approve-tx",
|
"approve-tx",
|
||||||
"approve-sign",
|
"approve-sign",
|
||||||
"export-privkey",
|
|
||||||
];
|
];
|
||||||
|
|
||||||
function $(id) {
|
function $(id) {
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ const {
|
|||||||
$,
|
$,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
showFlash,
|
||||||
formatAddressHtml,
|
addressDotHtml,
|
||||||
addressTitle,
|
escapeHtml,
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, currentAddress } = require("../../shared/state");
|
const { state, currentAddress } = require("../../shared/state");
|
||||||
const QRCode = require("qrcode");
|
const QRCode = require("qrcode");
|
||||||
@@ -18,12 +18,17 @@ const EXT_ICON =
|
|||||||
function show() {
|
function show() {
|
||||||
const addr = currentAddress();
|
const addr = currentAddress();
|
||||||
const address = addr ? addr.address : "";
|
const address = addr ? addr.address : "";
|
||||||
const title = address ? addressTitle(address, state.wallets) : null;
|
$("receive-address-dot").innerHTML = address ? addressDotHtml(address) : "";
|
||||||
|
$("receive-address-full").textContent = address;
|
||||||
|
$("receive-address-full").dataset.full = address;
|
||||||
const ensName = addr ? addr.ensName || null : null;
|
const ensName = addr ? addr.ensName || null : null;
|
||||||
$("receive-address-block").innerHTML = address
|
const ensEl = $("receive-ens");
|
||||||
? formatAddressHtml(address, ensName, null, title)
|
if (ensName) {
|
||||||
: "";
|
ensEl.innerHTML = addressDotHtml(address) + escapeHtml(ensName);
|
||||||
$("receive-address-block").dataset.full = address;
|
ensEl.classList.remove("hidden");
|
||||||
|
} else {
|
||||||
|
ensEl.classList.add("hidden");
|
||||||
|
}
|
||||||
const link = address ? `https://etherscan.io/address/${address}` : "";
|
const link = address ? `https://etherscan.io/address/${address}` : "";
|
||||||
$("receive-etherscan-link").innerHTML = link
|
$("receive-etherscan-link").innerHTML = link
|
||||||
? `<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>`
|
||||||
@@ -60,8 +65,8 @@ function show() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function init(ctx) {
|
function init(ctx) {
|
||||||
$("receive-address-block").addEventListener("click", () => {
|
$("receive-address-full").addEventListener("click", () => {
|
||||||
const addr = $("receive-address-block").dataset.full;
|
const addr = $("receive-address-full").dataset.full;
|
||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
@@ -69,7 +74,7 @@ function init(ctx) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
$("btn-receive-copy").addEventListener("click", () => {
|
$("btn-receive-copy").addEventListener("click", () => {
|
||||||
const addr = $("receive-address-block").dataset.full;
|
const addr = $("receive-address-full").dataset.full;
|
||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
|||||||
Reference in New Issue
Block a user