Compare commits
1 Commits
main
...
5395fc6ede
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5395fc6ede |
@@ -2,22 +2,10 @@
|
|||||||
// Loads state, initializes views, triggers first render.
|
// Loads state, initializes views, triggers first render.
|
||||||
|
|
||||||
const { DEBUG } = require("../shared/constants");
|
const { DEBUG } = require("../shared/constants");
|
||||||
const {
|
const { state, saveState, loadState } = require("../shared/state");
|
||||||
state,
|
|
||||||
saveState,
|
|
||||||
loadState,
|
|
||||||
currentNetwork,
|
|
||||||
} = require("../shared/state");
|
|
||||||
const { refreshPrices } = require("../shared/prices");
|
const { refreshPrices } = require("../shared/prices");
|
||||||
const { refreshBalances } = require("../shared/balances");
|
const { refreshBalances } = require("../shared/balances");
|
||||||
const {
|
const { $, showView } = require("./views/helpers");
|
||||||
$,
|
|
||||||
showView,
|
|
||||||
setRenderMain,
|
|
||||||
pushCurrentView,
|
|
||||||
goBack,
|
|
||||||
clearViewStack,
|
|
||||||
} = require("./views/helpers");
|
|
||||||
const { applyTheme } = require("./theme");
|
const { applyTheme } = require("./theme");
|
||||||
|
|
||||||
const home = require("./views/home");
|
const home = require("./views/home");
|
||||||
@@ -65,42 +53,15 @@ async function doRefreshAndRender() {
|
|||||||
const ctx = {
|
const ctx = {
|
||||||
renderWalletList,
|
renderWalletList,
|
||||||
doRefreshAndRender,
|
doRefreshAndRender,
|
||||||
showAddWalletView: () => {
|
showAddWalletView: () => addWallet.show(),
|
||||||
pushCurrentView();
|
showAddressDetail: () => addressDetail.show(),
|
||||||
addWallet.show();
|
showAddressToken: () => addressToken.show(),
|
||||||
},
|
showAddTokenView: () => addToken.show(),
|
||||||
showAddressDetail: () => {
|
showConfirmTx: (txInfo) => confirmTx.show(txInfo),
|
||||||
pushCurrentView();
|
showReceive: () => receive.show(),
|
||||||
addressDetail.show();
|
showTransactionDetail: (tx) => transactionDetail.show(tx),
|
||||||
},
|
showSettingsView: () => settings.show(),
|
||||||
showAddressToken: () => {
|
showSettingsAddTokenView: () => settingsAddToken.show(),
|
||||||
pushCurrentView();
|
|
||||||
addressToken.show();
|
|
||||||
},
|
|
||||||
showAddTokenView: () => {
|
|
||||||
pushCurrentView();
|
|
||||||
addToken.show();
|
|
||||||
},
|
|
||||||
showConfirmTx: (txInfo) => {
|
|
||||||
pushCurrentView();
|
|
||||||
confirmTx.show(txInfo);
|
|
||||||
},
|
|
||||||
showReceive: () => {
|
|
||||||
pushCurrentView();
|
|
||||||
receive.show();
|
|
||||||
},
|
|
||||||
showTransactionDetail: (tx) => {
|
|
||||||
pushCurrentView();
|
|
||||||
transactionDetail.show(tx);
|
|
||||||
},
|
|
||||||
showSettingsView: () => {
|
|
||||||
pushCurrentView();
|
|
||||||
settings.show();
|
|
||||||
},
|
|
||||||
showSettingsAddTokenView: () => {
|
|
||||||
pushCurrentView();
|
|
||||||
settingsAddToken.show();
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Views that can be fully re-rendered from persisted state.
|
// Views that can be fully re-rendered from persisted state.
|
||||||
@@ -206,25 +167,18 @@ function fallbackView() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function init() {
|
async function init() {
|
||||||
await loadState();
|
if (DEBUG) {
|
||||||
applyTheme(state.theme);
|
|
||||||
|
|
||||||
const net = currentNetwork();
|
|
||||||
if (DEBUG || net.isTestnet) {
|
|
||||||
const banner = document.createElement("div");
|
const banner = document.createElement("div");
|
||||||
banner.id = "debug-banner";
|
banner.id = "debug-banner";
|
||||||
if (DEBUG && net.isTestnet) {
|
banner.textContent = "DEBUG / INSECURE";
|
||||||
banner.textContent = "DEBUG / INSECURE [TESTNET]";
|
|
||||||
} else if (net.isTestnet) {
|
|
||||||
banner.textContent = "[TESTNET]";
|
|
||||||
} else {
|
|
||||||
banner.textContent = "DEBUG / INSECURE";
|
|
||||||
}
|
|
||||||
banner.style.cssText =
|
banner.style.cssText =
|
||||||
"background:#c00;color:#fff;text-align:center;font-size:10px;padding:1px 0;font-family:monospace;position:sticky;top:0;z-index:9999;";
|
"background:#c00;color:#fff;text-align:center;font-size:10px;padding:1px 0;font-family:monospace;position:sticky;top:0;z-index:9999;";
|
||||||
document.body.prepend(banner);
|
document.body.prepend(banner);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await loadState();
|
||||||
|
applyTheme(state.theme);
|
||||||
|
|
||||||
// Auto-default active address
|
// Auto-default active address
|
||||||
if (
|
if (
|
||||||
state.activeAddress === null &&
|
state.activeAddress === null &&
|
||||||
@@ -254,15 +208,13 @@ async function init() {
|
|||||||
.getElementById("view-settings")
|
.getElementById("view-settings")
|
||||||
.classList.contains("hidden")
|
.classList.contains("hidden")
|
||||||
) {
|
) {
|
||||||
goBack();
|
renderWalletList();
|
||||||
|
showView("main");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
pushCurrentView();
|
|
||||||
settings.show();
|
settings.show();
|
||||||
});
|
});
|
||||||
|
|
||||||
setRenderMain(renderWalletList);
|
|
||||||
|
|
||||||
welcome.init(ctx);
|
welcome.init(ctx);
|
||||||
addWallet.init(ctx);
|
addWallet.init(ctx);
|
||||||
home.init(ctx);
|
home.init(ctx);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const { $, showFlash, goBack } = require("./helpers");
|
const { $, showView, showFlash } = require("./helpers");
|
||||||
const { getTopTokens } = require("../../shared/tokenList");
|
const { getTopTokens } = require("../../shared/tokenList");
|
||||||
const { state, saveState } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const { lookupTokenInfo } = require("../../shared/balances");
|
const { lookupTokenInfo } = require("../../shared/balances");
|
||||||
@@ -59,12 +59,7 @@ function init(ctx) {
|
|||||||
});
|
});
|
||||||
await saveState();
|
await saveState();
|
||||||
ctx.doRefreshAndRender();
|
ctx.doRefreshAndRender();
|
||||||
// Pop the stack (back to address detail) and re-render it
|
ctx.showAddressDetail();
|
||||||
// so the newly added token is visible immediately.
|
|
||||||
if (state.viewStack.length > 0) {
|
|
||||||
state.viewStack.pop();
|
|
||||||
}
|
|
||||||
require("./addressDetail").show();
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
const detail = e.shortMessage || e.message || String(e);
|
const detail = e.shortMessage || e.message || String(e);
|
||||||
log.errorf("Token lookup failed for", contractAddr, detail);
|
log.errorf("Token lookup failed for", contractAddr, detail);
|
||||||
@@ -74,9 +69,7 @@ function init(ctx) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$("btn-add-token-back").addEventListener("click", () => {
|
$("btn-add-token-back").addEventListener("click", ctx.showAddressDetail);
|
||||||
goBack();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = { init, show };
|
module.exports = { init, show };
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const { $, showView, showFlash, goBack, clearViewStack } = require("./helpers");
|
const { $, showView, showFlash } = require("./helpers");
|
||||||
const {
|
const {
|
||||||
generateMnemonic,
|
generateMnemonic,
|
||||||
hdWalletFromMnemonic,
|
hdWalletFromMnemonic,
|
||||||
@@ -143,7 +143,6 @@ async function importMnemonic(ctx) {
|
|||||||
state.wallets.push(wallet);
|
state.wallets.push(wallet);
|
||||||
state.hasWallet = true;
|
state.hasWallet = true;
|
||||||
await saveState();
|
await saveState();
|
||||||
clearViewStack();
|
|
||||||
ctx.renderWalletList();
|
ctx.renderWalletList();
|
||||||
showView("main");
|
showView("main");
|
||||||
|
|
||||||
@@ -199,7 +198,6 @@ async function importPrivateKey(ctx) {
|
|||||||
});
|
});
|
||||||
state.hasWallet = true;
|
state.hasWallet = true;
|
||||||
await saveState();
|
await saveState();
|
||||||
clearViewStack();
|
|
||||||
ctx.renderWalletList();
|
ctx.renderWalletList();
|
||||||
showView("main");
|
showView("main");
|
||||||
|
|
||||||
@@ -251,7 +249,6 @@ async function importXprvKey(ctx) {
|
|||||||
state.wallets.push(wallet);
|
state.wallets.push(wallet);
|
||||||
state.hasWallet = true;
|
state.hasWallet = true;
|
||||||
await saveState();
|
await saveState();
|
||||||
clearViewStack();
|
|
||||||
ctx.renderWalletList();
|
ctx.renderWalletList();
|
||||||
showView("main");
|
showView("main");
|
||||||
|
|
||||||
@@ -300,7 +297,12 @@ function init(ctx) {
|
|||||||
|
|
||||||
// Back button
|
// Back button
|
||||||
$("btn-add-wallet-back").addEventListener("click", () => {
|
$("btn-add-wallet-back").addEventListener("click", () => {
|
||||||
goBack();
|
if (!state.hasWallet) {
|
||||||
|
showView("welcome");
|
||||||
|
} else {
|
||||||
|
ctx.renderWalletList();
|
||||||
|
showView("main");
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ const {
|
|||||||
truncateMiddle,
|
truncateMiddle,
|
||||||
renderAddressHtml,
|
renderAddressHtml,
|
||||||
attachCopyHandlers,
|
attachCopyHandlers,
|
||||||
goBack,
|
|
||||||
pushCurrentView,
|
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, currentAddress, saveState } = require("../../shared/state");
|
const { state, currentAddress, saveState } = require("../../shared/state");
|
||||||
const { formatUsd, getAddressValueUsd } = require("../../shared/prices");
|
const { formatUsd, getAddressValueUsd } = require("../../shared/prices");
|
||||||
@@ -249,7 +247,8 @@ function init(_ctx) {
|
|||||||
ctx = _ctx;
|
ctx = _ctx;
|
||||||
|
|
||||||
$("btn-address-back").addEventListener("click", () => {
|
$("btn-address-back").addEventListener("click", () => {
|
||||||
goBack();
|
ctx.renderWalletList();
|
||||||
|
showView("main");
|
||||||
});
|
});
|
||||||
|
|
||||||
$("btn-send").addEventListener("click", () => {
|
$("btn-send").addEventListener("click", () => {
|
||||||
@@ -267,7 +266,6 @@ function init(_ctx) {
|
|||||||
$("send-token-static").classList.add("hidden");
|
$("send-token-static").classList.add("hidden");
|
||||||
updateSendBalance();
|
updateSendBalance();
|
||||||
resetSendValidation();
|
resetSendValidation();
|
||||||
pushCurrentView();
|
|
||||||
showView("send");
|
showView("send");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -297,7 +295,6 @@ function init(_ctx) {
|
|||||||
$("btn-export-privkey").addEventListener("click", () => {
|
$("btn-export-privkey").addEventListener("click", () => {
|
||||||
moreDropdown.classList.add("hidden");
|
moreDropdown.classList.add("hidden");
|
||||||
moreBtn.classList.remove("bg-fg", "text-bg");
|
moreBtn.classList.remove("bg-fg", "text-bg");
|
||||||
pushCurrentView();
|
|
||||||
const wallet = state.wallets[state.selectedWallet];
|
const wallet = state.wallets[state.selectedWallet];
|
||||||
const addr = wallet.addresses[state.selectedAddress];
|
const addr = wallet.addresses[state.selectedAddress];
|
||||||
const blockieEl = $("export-privkey-jazzicon");
|
const blockieEl = $("export-privkey-jazzicon");
|
||||||
@@ -370,7 +367,7 @@ function init(_ctx) {
|
|||||||
$("btn-export-privkey-back").addEventListener("click", () => {
|
$("btn-export-privkey-back").addEventListener("click", () => {
|
||||||
$("export-privkey-value").textContent = "";
|
$("export-privkey-value").textContent = "";
|
||||||
$("export-privkey-password").value = "";
|
$("export-privkey-password").value = "";
|
||||||
goBack();
|
show();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,8 +13,6 @@ const {
|
|||||||
balanceLine,
|
balanceLine,
|
||||||
renderAddressHtml,
|
renderAddressHtml,
|
||||||
attachCopyHandlers,
|
attachCopyHandlers,
|
||||||
goBack,
|
|
||||||
pushCurrentView,
|
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, currentAddress, saveState } = require("../../shared/state");
|
const { state, currentAddress, saveState } = require("../../shared/state");
|
||||||
const { TOKEN_BY_ADDRESS, resolveSymbol } = require("../../shared/tokenList");
|
const { TOKEN_BY_ADDRESS, resolveSymbol } = require("../../shared/tokenList");
|
||||||
@@ -333,7 +331,7 @@ function init(_ctx) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
$("btn-address-token-back").addEventListener("click", () => {
|
$("btn-address-token-back").addEventListener("click", () => {
|
||||||
goBack();
|
ctx.showAddressDetail();
|
||||||
});
|
});
|
||||||
|
|
||||||
$("btn-address-token-send").addEventListener("click", () => {
|
$("btn-address-token-send").addEventListener("click", () => {
|
||||||
@@ -367,7 +365,6 @@ function init(_ctx) {
|
|||||||
attachCopyHandlers($("send-token-static"));
|
attachCopyHandlers($("send-token-static"));
|
||||||
updateSendBalance();
|
updateSendBalance();
|
||||||
resetSendValidation();
|
resetSendValidation();
|
||||||
pushCurrentView();
|
|
||||||
showView("send");
|
showView("send");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ const {
|
|||||||
escapeHtml,
|
escapeHtml,
|
||||||
renderAddressHtml,
|
renderAddressHtml,
|
||||||
attachCopyHandlers,
|
attachCopyHandlers,
|
||||||
goBack,
|
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, currentNetwork } = require("../../shared/state");
|
const { state, currentNetwork } = require("../../shared/state");
|
||||||
const { getSignerForAddress } = require("../../shared/wallet");
|
const { getSignerForAddress } = require("../../shared/wallet");
|
||||||
@@ -356,7 +355,7 @@ function init(ctx) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
$("btn-confirm-back").addEventListener("click", () => {
|
$("btn-confirm-back").addEventListener("click", () => {
|
||||||
goBack();
|
showView("send");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const { $, showView, showFlash, goBack, clearViewStack } = 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");
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ function init(_ctx) {
|
|||||||
|
|
||||||
$("btn-delete-wallet-back").addEventListener("click", () => {
|
$("btn-delete-wallet-back").addEventListener("click", () => {
|
||||||
deleteWalletIndex = null;
|
deleteWalletIndex = null;
|
||||||
goBack();
|
ctx.showSettingsView();
|
||||||
});
|
});
|
||||||
|
|
||||||
$("btn-delete-wallet-confirm").addEventListener("click", async () => {
|
$("btn-delete-wallet-confirm").addEventListener("click", async () => {
|
||||||
@@ -77,7 +77,6 @@ function init(_ctx) {
|
|||||||
state.selectedWallet = null;
|
state.selectedWallet = null;
|
||||||
state.selectedAddress = null;
|
state.selectedAddress = null;
|
||||||
state.activeAddress = null;
|
state.activeAddress = null;
|
||||||
clearViewStack();
|
|
||||||
await saveState();
|
await saveState();
|
||||||
showView("welcome");
|
showView("welcome");
|
||||||
} else {
|
} else {
|
||||||
@@ -87,14 +86,8 @@ function init(_ctx) {
|
|||||||
state.activeAddress =
|
state.activeAddress =
|
||||||
state.wallets[0].addresses[0]?.address || null;
|
state.wallets[0].addresses[0]?.address || null;
|
||||||
await saveState();
|
await saveState();
|
||||||
// Reset stack to [main] so Settings back goes home.
|
|
||||||
// Use require() lazily to avoid circular dependency
|
|
||||||
// (settings.js requires deleteWallet.js).
|
|
||||||
clearViewStack();
|
|
||||||
state.viewStack.push("main");
|
|
||||||
ctx.renderWalletList();
|
ctx.renderWalletList();
|
||||||
const settings = require("./settings");
|
ctx.showSettingsView();
|
||||||
settings.show();
|
|
||||||
showFlash("Wallet deleted.");
|
showFlash("Wallet deleted.");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -59,59 +59,14 @@ function showView(name) {
|
|||||||
clearFlash();
|
clearFlash();
|
||||||
state.currentView = name;
|
state.currentView = name;
|
||||||
saveState();
|
saveState();
|
||||||
const net = currentNetwork();
|
if (DEBUG) {
|
||||||
if (DEBUG || net.isTestnet) {
|
|
||||||
const banner = document.getElementById("debug-banner");
|
const banner = document.getElementById("debug-banner");
|
||||||
if (banner) {
|
if (banner) {
|
||||||
if (DEBUG && net.isTestnet) {
|
banner.textContent = "DEBUG / INSECURE (" + name + ")";
|
||||||
banner.textContent =
|
|
||||||
"DEBUG / INSECURE [TESTNET] (" + name + ")";
|
|
||||||
} else if (net.isTestnet) {
|
|
||||||
banner.textContent = "[TESTNET]";
|
|
||||||
} else {
|
|
||||||
banner.textContent = "DEBUG / INSECURE (" + name + ")";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Callback to re-render the main/home view when navigating back to it.
|
|
||||||
// Set once by index.js via setRenderMain().
|
|
||||||
let _renderMain = null;
|
|
||||||
|
|
||||||
function setRenderMain(fn) {
|
|
||||||
_renderMain = fn;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Push the current view onto the navigation stack so goBack() can
|
|
||||||
// return to it. Call this before any forward navigation.
|
|
||||||
function pushCurrentView() {
|
|
||||||
if (state.currentView) {
|
|
||||||
state.viewStack.push(state.currentView);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pop the navigation stack and show the previous view. If the stack
|
|
||||||
// is empty, fall back to the main (home) view.
|
|
||||||
function goBack() {
|
|
||||||
let target;
|
|
||||||
if (state.viewStack.length > 0) {
|
|
||||||
target = state.viewStack.pop();
|
|
||||||
} else {
|
|
||||||
target = "main";
|
|
||||||
}
|
|
||||||
if (target === "main" && _renderMain) {
|
|
||||||
_renderMain();
|
|
||||||
}
|
|
||||||
showView(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clear the entire navigation stack (used when resetting to root,
|
|
||||||
// e.g. after adding or deleting a wallet).
|
|
||||||
function clearViewStack() {
|
|
||||||
state.viewStack = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
let flashTimer = null;
|
let flashTimer = null;
|
||||||
|
|
||||||
function clearFlash() {
|
function clearFlash() {
|
||||||
@@ -417,10 +372,6 @@ module.exports = {
|
|||||||
showError,
|
showError,
|
||||||
hideError,
|
hideError,
|
||||||
showView,
|
showView,
|
||||||
setRenderMain,
|
|
||||||
pushCurrentView,
|
|
||||||
goBack,
|
|
||||||
clearViewStack,
|
|
||||||
showFlash,
|
showFlash,
|
||||||
flashCopyFeedback,
|
flashCopyFeedback,
|
||||||
balanceLine,
|
balanceLine,
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ const {
|
|||||||
truncateMiddle,
|
truncateMiddle,
|
||||||
renderAddressHtml,
|
renderAddressHtml,
|
||||||
attachCopyHandlers,
|
attachCopyHandlers,
|
||||||
pushCurrentView,
|
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, saveState, currentAddress } = require("../../shared/state");
|
const { state, saveState, currentAddress } = require("../../shared/state");
|
||||||
const {
|
const {
|
||||||
@@ -382,7 +381,6 @@ function init(ctx) {
|
|||||||
renderSendTokenSelect(addr);
|
renderSendTokenSelect(addr);
|
||||||
updateSendBalance();
|
updateSendBalance();
|
||||||
resetSendValidation();
|
resetSendValidation();
|
||||||
pushCurrentView();
|
|
||||||
showView("send");
|
showView("send");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ const {
|
|||||||
formatAddressHtml,
|
formatAddressHtml,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
attachCopyHandlers,
|
attachCopyHandlers,
|
||||||
goBack,
|
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, currentAddress, currentNetwork } = require("../../shared/state");
|
const { state, currentAddress, currentNetwork } = require("../../shared/state");
|
||||||
const QRCode = require("qrcode");
|
const QRCode = require("qrcode");
|
||||||
@@ -68,7 +67,11 @@ function init(ctx) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
$("btn-receive-back").addEventListener("click", () => {
|
$("btn-receive-back").addEventListener("click", () => {
|
||||||
goBack();
|
if (state.selectedToken) {
|
||||||
|
ctx.showAddressToken();
|
||||||
|
} else {
|
||||||
|
ctx.showAddressDetail();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ const {
|
|||||||
escapeHtml,
|
escapeHtml,
|
||||||
renderAddressHtml,
|
renderAddressHtml,
|
||||||
attachCopyHandlers,
|
attachCopyHandlers,
|
||||||
goBack,
|
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, currentAddress } = require("../../shared/state");
|
const { state, currentAddress } = require("../../shared/state");
|
||||||
let ctx;
|
let ctx;
|
||||||
@@ -251,7 +250,11 @@ function init(_ctx) {
|
|||||||
$("btn-send-back").addEventListener("click", () => {
|
$("btn-send-back").addEventListener("click", () => {
|
||||||
$("send-token").classList.remove("hidden");
|
$("send-token").classList.remove("hidden");
|
||||||
$("send-token-static").classList.add("hidden");
|
$("send-token-static").classList.add("hidden");
|
||||||
goBack();
|
if (state.selectedToken) {
|
||||||
|
ctx.showAddressToken();
|
||||||
|
} else {
|
||||||
|
ctx.showAddressDetail();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,4 @@
|
|||||||
const {
|
const { $, showView, showFlash, escapeHtml } = require("./helpers");
|
||||||
$,
|
|
||||||
showView,
|
|
||||||
showFlash,
|
|
||||||
escapeHtml,
|
|
||||||
goBack,
|
|
||||||
pushCurrentView,
|
|
||||||
} = require("./helpers");
|
|
||||||
const { applyTheme } = require("../theme");
|
const { applyTheme } = require("../theme");
|
||||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
const { state, saveState, currentNetwork } = require("../../shared/state");
|
||||||
const { NETWORKS, SUPPORTED_CHAIN_IDS } = require("../../shared/networks");
|
const { NETWORKS, SUPPORTED_CHAIN_IDS } = require("../../shared/networks");
|
||||||
@@ -93,7 +86,6 @@ function renderWalletListSettings() {
|
|||||||
container.querySelectorAll(".btn-delete-wallet").forEach((btn) => {
|
container.querySelectorAll(".btn-delete-wallet").forEach((btn) => {
|
||||||
btn.addEventListener("click", () => {
|
btn.addEventListener("click", () => {
|
||||||
const idx = parseInt(btn.dataset.idx, 10);
|
const idx = parseInt(btn.dataset.idx, 10);
|
||||||
pushCurrentView();
|
|
||||||
deleteWallet.show(idx);
|
deleteWallet.show(idx);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -290,7 +282,8 @@ function init(ctx) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
$("btn-settings-back").addEventListener("click", () => {
|
$("btn-settings-back").addEventListener("click", () => {
|
||||||
goBack();
|
ctx.renderWalletList();
|
||||||
|
showView("main");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const { $, showView, showFlash, goBack } = require("./helpers");
|
const { $, showView, showFlash } = require("./helpers");
|
||||||
const { getTopTokens } = require("../../shared/tokenList");
|
const { getTopTokens } = require("../../shared/tokenList");
|
||||||
const { state, saveState } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const { lookupTokenInfo } = require("../../shared/balances");
|
const { lookupTokenInfo } = require("../../shared/balances");
|
||||||
@@ -84,7 +84,7 @@ function init(_ctx) {
|
|||||||
ctx = _ctx;
|
ctx = _ctx;
|
||||||
|
|
||||||
$("btn-settings-addtoken-back").addEventListener("click", () => {
|
$("btn-settings-addtoken-back").addEventListener("click", () => {
|
||||||
goBack();
|
ctx.showSettingsView();
|
||||||
});
|
});
|
||||||
|
|
||||||
$("btn-settings-addtoken-select").addEventListener("click", async () => {
|
$("btn-settings-addtoken-select").addEventListener("click", async () => {
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ const {
|
|||||||
attachCopyHandlers,
|
attachCopyHandlers,
|
||||||
copyableHtml,
|
copyableHtml,
|
||||||
etherscanLinkHtml,
|
etherscanLinkHtml,
|
||||||
goBack,
|
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, currentNetwork } = require("../../shared/state");
|
const { state, currentNetwork } = require("../../shared/state");
|
||||||
const { formatEther, formatUnits } = require("ethers");
|
const { formatEther, formatUnits } = require("ethers");
|
||||||
@@ -351,7 +350,11 @@ async function loadFullTxDetails(txHash, toAddress, isContractCall) {
|
|||||||
function init(_ctx) {
|
function init(_ctx) {
|
||||||
ctx = _ctx;
|
ctx = _ctx;
|
||||||
$("btn-tx-back").addEventListener("click", () => {
|
$("btn-tx-back").addEventListener("click", () => {
|
||||||
goBack();
|
if (state.selectedToken) {
|
||||||
|
ctx.showAddressToken();
|
||||||
|
} else {
|
||||||
|
ctx.showAddressDetail();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ const {
|
|||||||
attachCopyHandlers,
|
attachCopyHandlers,
|
||||||
copyableHtml,
|
copyableHtml,
|
||||||
etherscanLinkHtml,
|
etherscanLinkHtml,
|
||||||
clearViewStack,
|
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
|
const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
|
||||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
const { state, saveState, currentNetwork } = require("../../shared/state");
|
||||||
@@ -222,16 +221,10 @@ function navigateBack() {
|
|||||||
window.close();
|
window.close();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// After a completed transaction, reset the navigation stack
|
|
||||||
// and go directly to the address view (token or detail).
|
|
||||||
// Use require() lazily to call show() without the ctx push wrapper.
|
|
||||||
clearViewStack();
|
|
||||||
state.viewStack.push("main");
|
|
||||||
if (state.selectedToken) {
|
if (state.selectedToken) {
|
||||||
state.viewStack.push("address");
|
ctx.showAddressToken();
|
||||||
require("./addressToken").show();
|
|
||||||
} else {
|
} else {
|
||||||
require("./addressDetail").show();
|
ctx.showAddressDetail();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ const state = {
|
|||||||
selectedAddress: null,
|
selectedAddress: null,
|
||||||
selectedToken: null,
|
selectedToken: null,
|
||||||
viewData: {},
|
viewData: {},
|
||||||
viewStack: [],
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Return the network configuration for the currently selected network.
|
// Return the network configuration for the currently selected network.
|
||||||
@@ -73,7 +72,6 @@ async function saveState() {
|
|||||||
selectedAddress: state.selectedAddress,
|
selectedAddress: state.selectedAddress,
|
||||||
selectedToken: state.selectedToken,
|
selectedToken: state.selectedToken,
|
||||||
viewData: state.viewData,
|
viewData: state.viewData,
|
||||||
viewStack: state.viewStack,
|
|
||||||
};
|
};
|
||||||
await storageApi.set({ autistmask: persisted });
|
await storageApi.set({ autistmask: persisted });
|
||||||
}
|
}
|
||||||
@@ -135,7 +133,6 @@ async function loadState() {
|
|||||||
saved.selectedAddress !== undefined ? saved.selectedAddress : null;
|
saved.selectedAddress !== undefined ? saved.selectedAddress : null;
|
||||||
state.selectedToken = saved.selectedToken || null;
|
state.selectedToken = saved.selectedToken || null;
|
||||||
state.viewData = saved.viewData || {};
|
state.viewData = saved.viewData || {};
|
||||||
state.viewStack = Array.isArray(saved.viewStack) ? saved.viewStack : [];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user