Compare commits
12 Commits
fix/consis
...
fix/87-con
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db1b5c1c69 | ||
| 699e080e3e | |||
|
|
8f2bf9618e | ||
| 069981baa0 | |||
|
|
886cd38a9b | ||
| 438d915f73 | |||
|
|
78f961f416 | ||
| 6a214f1c58 | |||
| ad2ce3d8ff | |||
| b826279d8f | |||
|
|
20ced62e1a | ||
|
|
9b69a60cca |
@@ -106,7 +106,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
id="add-wallet-error"
|
id="add-wallet-error"
|
||||||
class="text-xs min-h-[1.25rem] mb-2"
|
class="text-xs mb-2 min-h-[1.25rem] hidden"
|
||||||
></div>
|
></div>
|
||||||
<button
|
<button
|
||||||
id="btn-add-wallet-confirm"
|
id="btn-add-wallet-confirm"
|
||||||
@@ -168,7 +168,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
id="import-key-error"
|
id="import-key-error"
|
||||||
class="text-xs min-h-[1.25rem] mb-2"
|
class="text-xs mb-2 min-h-[1.25rem] hidden"
|
||||||
></div>
|
></div>
|
||||||
<button
|
<button
|
||||||
id="btn-import-key-confirm"
|
id="btn-import-key-confirm"
|
||||||
@@ -374,7 +374,7 @@
|
|||||||
</p>
|
</p>
|
||||||
<div
|
<div
|
||||||
id="export-privkey-error"
|
id="export-privkey-error"
|
||||||
class="text-xs min-h-[1.25rem] mb-2"
|
class="text-xs mb-2 min-h-[1.25rem] 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>
|
||||||
@@ -589,11 +589,23 @@
|
|||||||
id="confirm-errors"
|
id="confirm-errors"
|
||||||
class="mb-2 border border-border border-dashed p-2 hidden"
|
class="mb-2 border border-border border-dashed p-2 hidden"
|
||||||
></div>
|
></div>
|
||||||
|
<div class="mb-2">
|
||||||
|
<label class="block mb-1 text-xs">Password</label>
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
id="confirm-tx-password"
|
||||||
|
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
id="confirm-tx-password-error"
|
||||||
|
class="text-xs mb-2 min-h-[1.25rem]"
|
||||||
|
></div>
|
||||||
<button
|
<button
|
||||||
id="btn-confirm-send"
|
id="btn-confirm-send"
|
||||||
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"
|
||||||
>
|
>
|
||||||
Send
|
Sign & Send
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -672,42 +684,6 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- ============ PASSWORD MODAL ============ -->
|
|
||||||
<div
|
|
||||||
id="password-modal"
|
|
||||||
class="hidden fixed inset-0 bg-bg flex items-center justify-center z-50"
|
|
||||||
>
|
|
||||||
<div class="border border-border p-4 bg-bg w-80">
|
|
||||||
<h2 class="font-bold mb-2">Enter Password</h2>
|
|
||||||
<p class="text-xs text-muted mb-2">
|
|
||||||
Your password is needed to authorize this transaction.
|
|
||||||
</p>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
id="modal-password"
|
|
||||||
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg mb-2"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
id="modal-password-error"
|
|
||||||
class="text-xs mb-2 border border-border border-dashed p-1 hidden"
|
|
||||||
></div>
|
|
||||||
<div class="flex gap-2">
|
|
||||||
<button
|
|
||||||
id="btn-modal-confirm"
|
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
|
|
||||||
>
|
|
||||||
Confirm
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
id="btn-modal-cancel"
|
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- ============ RECEIVE ============ -->
|
<!-- ============ RECEIVE ============ -->
|
||||||
<div id="view-receive" class="view hidden">
|
<div id="view-receive" class="view hidden">
|
||||||
<button
|
<button
|
||||||
@@ -948,7 +924,7 @@
|
|||||||
</p>
|
</p>
|
||||||
<div
|
<div
|
||||||
id="delete-wallet-error"
|
id="delete-wallet-error"
|
||||||
class="text-xs min-h-[1.25rem] mb-2"
|
class="text-xs mb-2 min-h-[1.25rem] 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>
|
||||||
@@ -1149,7 +1125,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
id="approve-tx-error"
|
id="approve-tx-error"
|
||||||
class="text-xs min-h-[1.25rem] mb-2"
|
class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem] hidden"
|
||||||
></div>
|
></div>
|
||||||
<div class="flex justify-between">
|
<div class="flex justify-between">
|
||||||
<button
|
<button
|
||||||
@@ -1215,7 +1191,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
id="approve-sign-error"
|
id="approve-sign-error"
|
||||||
class="text-xs min-h-[1.25rem] mb-2"
|
class="text-xs mb-2 border border-border border-dashed p-1 min-h-[1.25rem] hidden"
|
||||||
></div>
|
></div>
|
||||||
<div class="flex justify-between">
|
<div class="flex justify-between">
|
||||||
<button
|
<button
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ const RESTORABLE_VIEWS = new Set([
|
|||||||
"receive",
|
"receive",
|
||||||
"settings",
|
"settings",
|
||||||
"settings-addtoken",
|
"settings-addtoken",
|
||||||
|
"confirm-tx",
|
||||||
"transaction",
|
"transaction",
|
||||||
"success-tx",
|
"success-tx",
|
||||||
"error-tx",
|
"error-tx",
|
||||||
@@ -127,6 +128,13 @@ function restoreView() {
|
|||||||
case "settings-addtoken":
|
case "settings-addtoken":
|
||||||
settingsAddToken.show();
|
settingsAddToken.show();
|
||||||
break;
|
break;
|
||||||
|
case "confirm-tx":
|
||||||
|
if (state.viewData && state.viewData.pendingTx) {
|
||||||
|
confirmTx.restore();
|
||||||
|
} else {
|
||||||
|
fallbackView();
|
||||||
|
}
|
||||||
|
break;
|
||||||
case "transaction":
|
case "transaction":
|
||||||
if (state.viewData && state.viewData.tx) {
|
if (state.viewData && state.viewData.tx) {
|
||||||
transactionDetail.render();
|
transactionDetail.render();
|
||||||
|
|||||||
@@ -83,6 +83,7 @@ function init(ctx) {
|
|||||||
);
|
);
|
||||||
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 = {
|
||||||
|
|||||||
@@ -325,6 +325,9 @@ function init(_ctx) {
|
|||||||
showError("export-privkey-error", "Password is required.");
|
showError("export-privkey-error", "Password is required.");
|
||||||
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(
|
||||||
@@ -343,6 +346,9 @@ function init(_ctx) {
|
|||||||
hideError("export-privkey-error");
|
hideError("export-privkey-error");
|
||||||
} catch {
|
} catch {
|
||||||
showError("export-privkey-error", "Wrong password.");
|
showError("export-privkey-error", "Wrong password.");
|
||||||
|
} finally {
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.classList.remove("text-muted");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -256,6 +256,9 @@ function showTxApproval(details) {
|
|||||||
$("approve-tx-data-section").classList.add("hidden");
|
$("approve-tx-data-section").classList.add("hidden");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$("approve-tx-password").value = "";
|
||||||
|
$("approve-tx-error").classList.add("hidden");
|
||||||
|
|
||||||
showView("approve-tx");
|
showView("approve-tx");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// Transaction confirmation view + password modal.
|
// Transaction confirmation view with inline password.
|
||||||
// Shows transaction details, warnings, errors. On proceed, opens
|
// Shows transaction details, warnings, errors. On Sign & Send,
|
||||||
// password modal, decrypts secret, signs and broadcasts.
|
// reads inline password, decrypts secret, signs and broadcasts.
|
||||||
|
|
||||||
const {
|
const {
|
||||||
parseEther,
|
parseEther,
|
||||||
@@ -39,6 +39,13 @@ const EXT_ICON =
|
|||||||
|
|
||||||
let pendingTx = null;
|
let pendingTx = null;
|
||||||
|
|
||||||
|
function restore() {
|
||||||
|
const d = state.viewData;
|
||||||
|
if (d && d.pendingTx) {
|
||||||
|
show(d.pendingTx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function etherscanTokenLink(address) {
|
function etherscanTokenLink(address) {
|
||||||
return `https://etherscan.io/token/${address}`;
|
return `https://etherscan.io/token/${address}`;
|
||||||
}
|
}
|
||||||
@@ -226,9 +233,14 @@ function show(txInfo) {
|
|||||||
sendBtn.classList.remove("text-muted");
|
sendBtn.classList.remove("text-muted");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Reset password field and error
|
||||||
|
$("confirm-tx-password").value = "";
|
||||||
|
hideError("confirm-tx-password-error");
|
||||||
|
|
||||||
// Gas estimate — show placeholder then fetch async
|
// Gas estimate — show placeholder then fetch async
|
||||||
$("confirm-fee").classList.remove("hidden");
|
$("confirm-fee").classList.remove("hidden");
|
||||||
$("confirm-fee-amount").textContent = "Estimating...";
|
$("confirm-fee-amount").textContent = "Estimating...";
|
||||||
|
state.viewData = { pendingTx: txInfo };
|
||||||
showView("confirm-tx");
|
showView("confirm-tx");
|
||||||
|
|
||||||
estimateGas(txInfo);
|
estimateGas(txInfo);
|
||||||
@@ -274,39 +286,20 @@ async function estimateGas(txInfo) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function showPasswordModal() {
|
|
||||||
$("modal-password").value = "";
|
|
||||||
hideError("modal-password-error");
|
|
||||||
$("password-modal").classList.remove("hidden");
|
|
||||||
}
|
|
||||||
|
|
||||||
function hidePasswordModal() {
|
|
||||||
$("password-modal").classList.add("hidden");
|
|
||||||
}
|
|
||||||
|
|
||||||
function init(ctx) {
|
function init(ctx) {
|
||||||
$("btn-confirm-send").addEventListener("click", () => {
|
$("btn-confirm-send").addEventListener("click", async () => {
|
||||||
showPasswordModal();
|
const password = $("confirm-tx-password").value;
|
||||||
});
|
|
||||||
|
|
||||||
$("btn-confirm-back").addEventListener("click", () => {
|
|
||||||
showView("send");
|
|
||||||
});
|
|
||||||
|
|
||||||
$("btn-modal-cancel").addEventListener("click", () => {
|
|
||||||
hidePasswordModal();
|
|
||||||
});
|
|
||||||
|
|
||||||
$("btn-modal-confirm").addEventListener("click", async () => {
|
|
||||||
const password = $("modal-password").value;
|
|
||||||
if (!password) {
|
if (!password) {
|
||||||
showError("modal-password-error", "Please enter your password.");
|
showError(
|
||||||
|
"confirm-tx-password-error",
|
||||||
|
"Please enter your password.",
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const wallet = state.wallets[state.selectedWallet];
|
const wallet = state.wallets[state.selectedWallet];
|
||||||
let decryptedSecret;
|
let decryptedSecret;
|
||||||
hideError("modal-password-error");
|
hideError("confirm-tx-password-error");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
decryptedSecret = await decryptWithPassword(
|
decryptedSecret = await decryptWithPassword(
|
||||||
@@ -314,11 +307,12 @@ function init(ctx) {
|
|||||||
password,
|
password,
|
||||||
);
|
);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
showError("modal-password-error", "Wrong password.");
|
showError("confirm-tx-password-error", "Wrong password.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
hidePasswordModal();
|
$("btn-confirm-send").disabled = true;
|
||||||
|
$("btn-confirm-send").classList.add("text-muted");
|
||||||
|
|
||||||
let tx;
|
let tx;
|
||||||
try {
|
try {
|
||||||
@@ -355,8 +349,15 @@ function init(ctx) {
|
|||||||
decryptedSecret = null;
|
decryptedSecret = null;
|
||||||
const hash = tx ? tx.hash : null;
|
const hash = tx ? tx.hash : null;
|
||||||
txStatus.showError(pendingTx, hash, e.shortMessage || e.message);
|
txStatus.showError(pendingTx, hash, e.shortMessage || e.message);
|
||||||
|
} finally {
|
||||||
|
$("btn-confirm-send").disabled = false;
|
||||||
|
$("btn-confirm-send").classList.remove("text-muted");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$("btn-confirm-back").addEventListener("click", () => {
|
||||||
|
showView("send");
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = { init, show };
|
module.exports = { init, show, restore };
|
||||||
|
|||||||
@@ -38,6 +38,10 @@ 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];
|
||||||
|
|
||||||
@@ -46,6 +50,8 @@ function init(_ctx) {
|
|||||||
await decryptWithPassword(wallet.encryptedSecret, pw);
|
await decryptWithPassword(wallet.encryptedSecret, pw);
|
||||||
} catch (_e) {
|
} catch (_e) {
|
||||||
showError("delete-wallet-error", "Wrong password.");
|
showError("delete-wallet-error", "Wrong password.");
|
||||||
|
btn.disabled = false;
|
||||||
|
btn.classList.remove("text-muted");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ function init(ctx) {
|
|||||||
showError("import-key-error", "Passwords do not match.");
|
showError("import-key-error", "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({
|
||||||
|
|||||||
Reference in New Issue
Block a user