All checks were successful
check / check (push) Successful in 25s
## Summary Fixes the view stack pop bug where pressing Back in Settings (or any view) always returned to Main instead of the previous view. Closes [issue #134](#134) ## Problem The popup UI had no navigation stack. Every back button was hardcoded to a specific destination (usually Main). The reported path: > Main → Address → Transaction → Settings (gear icon) → Back ...would go to Main instead of returning to the Transaction view. ## Solution Implemented a proper view navigation stack (like iOS) as already described in the README: - **`viewStack`** array added to persisted state — survives popup close/reopen - **`pushCurrentView()`** — pushes the current view name onto the stack before any forward navigation - **`goBack()`** — pops the stack and shows the previous view; falls back to Main if the stack is empty; re-renders the wallet list when returning to Main - **`clearViewStack()`** — resets the stack for root transitions (e.g., after adding/deleting a wallet) ### What Changed 1. **helpers.js** — Added navigation stack functions (`pushCurrentView`, `goBack`, `clearViewStack`, `setRenderMain`) 2. **state.js** — Added `viewStack` to persisted state 3. **index.js** — All `ctx.show*()` wrappers now push before navigating forward; gear button uses stack for toggle behavior 4. **All view back buttons** — Replaced hardcoded destinations with `goBack()` (settings, addressDetail, addressToken, transactionDetail, send, receive, addToken, confirmTx, addWallet, settingsAddToken, deleteWallet, export-privkey) 5. **Direct `showView()` forward navigations** — Added `pushCurrentView()` calls before `showView("send")` in addressDetail, addressToken, and home; before `showView("export-privkey")` in addressDetail; before `deleteWallet.show()` in settings 6. **Reset-to-root transitions** — `clearViewStack()` called after adding a wallet (all 3 import types), after deleting the last wallet, and after transaction completion (Done button) ### Navigation Paths Verified - **Main → Settings → Back** → returns to Main ✓ - **Main → Address → Settings → Back** → returns to Address ✓ - **Main → Address → Transaction → Settings → Back** → returns to Transaction ✓ (the reported bug) - **Main → Address → Token → Send → ConfirmTx → Back → Back → Back → Back** → unwinds correctly through each view back to Main ✓ - **Main → Address → Token → Transaction → Settings → Back** → returns to Transaction ✓ - **Settings → Add Wallet → (add) → Main** → stack cleared, fresh root ✓ - **Settings → Delete Wallet → Back** → returns to Settings ✓ - **Settings → Delete Wallet → (confirm)** → stack reset to [main], settings shown ✓ - **Address → Send → ConfirmTx → (broadcast) → SuccessTx → Done** → stack reset, returns to address context ✓ - **Popup close/reopen** → viewStack persisted, back navigation still works ✓ Co-authored-by: user <user@Mac.lan guest wan> Reviewed-on: #146 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
156 lines
5.3 KiB
JavaScript
156 lines
5.3 KiB
JavaScript
// State management and extension storage persistence.
|
|
|
|
const { DEFAULT_RPC_URL, DEFAULT_BLOCKSCOUT_URL } = require("./constants");
|
|
const { networkById } = require("./networks");
|
|
|
|
const storageApi =
|
|
typeof browser !== "undefined"
|
|
? browser.storage.local
|
|
: chrome.storage.local;
|
|
|
|
const DEFAULT_STATE = {
|
|
hasWallet: false,
|
|
wallets: [],
|
|
trackedTokens: [],
|
|
networkId: "mainnet",
|
|
rpcUrl: DEFAULT_RPC_URL,
|
|
blockscoutUrl: DEFAULT_BLOCKSCOUT_URL,
|
|
lastBalanceRefresh: 0,
|
|
activeAddress: null,
|
|
allowedSites: {},
|
|
deniedSites: {},
|
|
rememberSiteChoice: true,
|
|
showZeroBalanceTokens: true,
|
|
hideLowHolderTokens: true,
|
|
hideFraudContracts: true,
|
|
hideDustTransactions: true,
|
|
dustThresholdGwei: 100000,
|
|
utcTimestamps: false,
|
|
fraudContracts: [],
|
|
tokenHolderCache: {},
|
|
theme: "system",
|
|
};
|
|
|
|
const state = {
|
|
...DEFAULT_STATE,
|
|
currentView: null,
|
|
selectedWallet: null,
|
|
selectedAddress: null,
|
|
selectedToken: null,
|
|
viewData: {},
|
|
viewStack: [],
|
|
};
|
|
|
|
// Return the network configuration for the currently selected network.
|
|
function currentNetwork() {
|
|
return networkById(state.networkId);
|
|
}
|
|
|
|
async function saveState() {
|
|
const persisted = {
|
|
hasWallet: state.hasWallet,
|
|
wallets: state.wallets,
|
|
trackedTokens: state.trackedTokens,
|
|
networkId: state.networkId,
|
|
rpcUrl: state.rpcUrl,
|
|
blockscoutUrl: state.blockscoutUrl,
|
|
lastBalanceRefresh: state.lastBalanceRefresh,
|
|
activeAddress: state.activeAddress,
|
|
allowedSites: state.allowedSites,
|
|
deniedSites: state.deniedSites,
|
|
rememberSiteChoice: state.rememberSiteChoice,
|
|
showZeroBalanceTokens: state.showZeroBalanceTokens,
|
|
hideLowHolderTokens: state.hideLowHolderTokens,
|
|
hideFraudContracts: state.hideFraudContracts,
|
|
hideDustTransactions: state.hideDustTransactions,
|
|
dustThresholdGwei: state.dustThresholdGwei,
|
|
utcTimestamps: state.utcTimestamps,
|
|
fraudContracts: state.fraudContracts,
|
|
tokenHolderCache: state.tokenHolderCache,
|
|
theme: state.theme,
|
|
currentView: state.currentView,
|
|
selectedWallet: state.selectedWallet,
|
|
selectedAddress: state.selectedAddress,
|
|
selectedToken: state.selectedToken,
|
|
viewData: state.viewData,
|
|
viewStack: state.viewStack,
|
|
};
|
|
await storageApi.set({ autistmask: persisted });
|
|
}
|
|
|
|
async function loadState() {
|
|
const result = await storageApi.get("autistmask");
|
|
if (result.autistmask) {
|
|
const saved = result.autistmask;
|
|
state.hasWallet = saved.hasWallet;
|
|
state.wallets = saved.wallets || [];
|
|
state.trackedTokens = saved.trackedTokens || [];
|
|
state.networkId = saved.networkId || DEFAULT_STATE.networkId;
|
|
state.rpcUrl = saved.rpcUrl || DEFAULT_STATE.rpcUrl;
|
|
state.blockscoutUrl =
|
|
saved.blockscoutUrl || DEFAULT_STATE.blockscoutUrl;
|
|
state.lastBalanceRefresh = saved.lastBalanceRefresh || 0;
|
|
state.activeAddress = saved.activeAddress || null;
|
|
state.allowedSites =
|
|
saved.allowedSites && !Array.isArray(saved.allowedSites)
|
|
? saved.allowedSites
|
|
: {};
|
|
state.deniedSites =
|
|
saved.deniedSites && !Array.isArray(saved.deniedSites)
|
|
? saved.deniedSites
|
|
: {};
|
|
state.rememberSiteChoice =
|
|
saved.rememberSiteChoice !== undefined
|
|
? saved.rememberSiteChoice
|
|
: true;
|
|
state.showZeroBalanceTokens =
|
|
saved.showZeroBalanceTokens !== undefined
|
|
? saved.showZeroBalanceTokens
|
|
: true;
|
|
state.hideLowHolderTokens =
|
|
saved.hideLowHolderTokens !== undefined
|
|
? saved.hideLowHolderTokens
|
|
: true;
|
|
state.hideFraudContracts =
|
|
saved.hideFraudContracts !== undefined
|
|
? saved.hideFraudContracts
|
|
: true;
|
|
state.hideDustTransactions =
|
|
saved.hideDustTransactions !== undefined
|
|
? saved.hideDustTransactions
|
|
: true;
|
|
state.dustThresholdGwei =
|
|
saved.dustThresholdGwei !== undefined
|
|
? saved.dustThresholdGwei
|
|
: 100000;
|
|
state.utcTimestamps =
|
|
saved.utcTimestamps !== undefined ? saved.utcTimestamps : false;
|
|
state.fraudContracts = saved.fraudContracts || [];
|
|
state.tokenHolderCache = saved.tokenHolderCache || {};
|
|
state.theme = saved.theme || "system";
|
|
state.currentView = saved.currentView || null;
|
|
state.selectedWallet =
|
|
saved.selectedWallet !== undefined ? saved.selectedWallet : null;
|
|
state.selectedAddress =
|
|
saved.selectedAddress !== undefined ? saved.selectedAddress : null;
|
|
state.selectedToken = saved.selectedToken || null;
|
|
state.viewData = saved.viewData || {};
|
|
state.viewStack = Array.isArray(saved.viewStack) ? saved.viewStack : [];
|
|
}
|
|
}
|
|
|
|
function currentAddress() {
|
|
if (state.selectedWallet === null || state.selectedAddress === null) {
|
|
return null;
|
|
}
|
|
return state.wallets[state.selectedWallet].addresses[state.selectedAddress];
|
|
}
|
|
|
|
module.exports = {
|
|
state,
|
|
saveState,
|
|
loadState,
|
|
currentAddress,
|
|
currentNetwork,
|
|
};
|