From 92bb1332b7d5dc3bb23c9ff55aec70dfeb7e494e Mon Sep 17 00:00:00 2001 From: JoeGruff Date: Tue, 31 Mar 2026 11:31:59 +0900 Subject: [PATCH] ui: Fix wallet disable/enable targeting wrong wallet. When ETH and Base are grouped under the same ticker, selectedWalletID was set once to ETH by setSelectedTicker and never updated when operating on Base via network actions or settings. This caused toggleWalletStatus to target the wrong wallet - e.g. enabling ETH instead of disabling Base. Set selectedWalletID in showReconfig so the disable/enable buttons in settings target the wallet being configured. Also always set selectedWalletID in showNetworkActions when showing the Enable action, not just for the token-disabled case. --- client/webserver/site/src/js/wallets.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/webserver/site/src/js/wallets.ts b/client/webserver/site/src/js/wallets.ts index 39a6ec8f0f..abb20fb370 100644 --- a/client/webserver/site/src/js/wallets.ts +++ b/client/webserver/site/src/js/wallets.ts @@ -1224,8 +1224,8 @@ export default class WalletsPage extends BasePage { const tokenDisabled = w && w.disabled if (disabled || tokenDisabled) { // Target the token wallet if it's the one that's disabled, - // otherwise the parent. - if (tokenDisabled && !disabled) this.selectedWalletID = assetID + // otherwise the parent chain. + this.selectedWalletID = (tokenDisabled && !disabled) ? assetID : configAssetID Doc.show(page.actEnable) } else { if (hasWallet) Doc.show(page.actTxHistory) @@ -2264,6 +2264,7 @@ export default class WalletsPage extends BasePage { /* Show the form used to change wallet configuration settings. */ async showReconfig (assetID: number, cfg?: reconfigSettings) { + this.selectedWalletID = assetID const page = this.page Doc.hide( page.changeWalletType, page.changeTypeHideIcon, page.reconfigErr,