September 8, 2026 Production Release

src/components/modals/GrantExecutionPermissionModal.tsx

@@ -148,6 +148,7 @@ export function GrantExecutionPermissionModal({
     getKnownAsset,
     listTrackedAssets,
     request.request.chainId,
+    request.request.to,
     tokenAddress,
   ]);
 
@@ -160,7 +161,16 @@ export function GrantExecutionPermissionModal({
 
   useEffect(() => {
     userEditedAmount.current = false;
-  }, [permission.data, request.request.chainId, request.request.to]);
+    setMemo(readInitialMemo(permission.data));
+    setDurationText(readDuration(permission.data));
+    setStartText(readStart(permission.data));
+    setTokenAddress(initialToken ?? "");
+  }, [
+    initialToken,
+    permission.data,
+    request.request.chainId,
+    request.request.to,
+  ]);
 
   useEffect(() => {
     if (!tokenAddress || userEditedAmount.current) return;
@@ -171,7 +181,13 @@ export function GrantExecutionPermissionModal({
     } catch {
       setAmountText("");
     }
-  }, [permission.data, selected.decimals, tokenAddress]);
+  }, [
+    permission.data,
+    request.request.chainId,
+    request.request.to,
+    selected.decimals,
+    tokenAddress,
+  ]);
 
   const amountError = useMemo(() => {
     const trimmed = amountText.trim();

src/components/modals/GrantLiFiApprovePermissionModal.tsx

@@ -54,6 +54,11 @@ export function GrantLiFiApprovePermissionModal({
   const [tokenAddress, setTokenAddress] = useState(initialToken);
   const [memo, setMemo] = useState("");
 
+  useEffect(() => {
+    setMemo("");
+    setTokenAddress(initialToken);
+  }, [data, initialToken, request.request.chainId, request.request.to]);
+
   useEffect(() => {
     let cancelled = false;
     void listTrackedAssets().then((assets) => {
@@ -97,6 +102,7 @@ export function GrantLiFiApprovePermissionModal({
     initialToken,
     listTrackedAssets,
     request.request.chainId,
+    request.request.to,
     tokenAddress,
   ]);
 

src/components/modals/GrantLiFiSwapPermissionModal.tsx

@@ -149,6 +149,7 @@ export function GrantLiFiSwapPermissionModal({
     initialToken,
     listTrackedAssets,
     request.request.chainId,
+    request.request.to,
     tokenAddress,
   ]);
 
@@ -168,7 +169,9 @@ export function GrantLiFiSwapPermissionModal({
 
   useEffect(() => {
     userEditedAmount.current = false;
-  }, [data, request.request.chainId, request.request.to]);
+    setMemo("");
+    setTokenAddress(initialToken);
+  }, [data, initialToken, request.request.chainId, request.request.to]);
 
   useEffect(() => {
     if (!tokenAddress || userEditedAmount.current) return;
@@ -179,7 +182,13 @@ export function GrantLiFiSwapPermissionModal({
     } catch {
       setAmountText("");
     }
-  }, [data, selected.decimals, tokenAddress]);
+  }, [
+    data,
+    request.request.chainId,
+    request.request.to,
+    selected.decimals,
+    tokenAddress,
+  ]);
 
   const amountError = useMemo(() => {
     const trimmed = amountText.trim();

src/wallet/WalletProvider.tsx

@@ -697,7 +697,12 @@ export function WalletProvider({ children }: { children: ReactNode }) {
           resolve,
         }));
       } finally {
-        await display.hide();
+        // Change Account lands on OnboardingPanel — keep the wallet open.
+        if (choice === "changeAccount") {
+          display.release();
+        } else {
+          await display.hide();
+        }
       }
       if (choice === "export") {
         await openExportPrivateKey();
@@ -712,6 +717,8 @@ export function WalletProvider({ children }: { children: ReactNode }) {
         session.setAddresses(
           EVMAccountAddress("0x0"),
           SolanaAccountAddress("—"),
+          null,
+          null,
         );
         session.setCredentialCount(0);
         session.setTrackedAssetCount(0);

src/wallet/sessionStore.ts

@@ -43,6 +43,7 @@ export interface IWalletSessionState {
   setAddresses: (
     evm: EVMAccountAddress,
     solana: SolanaAccountAddress,
+    /** Omit to leave unchanged; pass `null` to clear (e.g. Change Account). */
     bitcoinMainnet?: BitcoinSegwitAccountAddress | null,
     bitcoinTestnet?: BitcoinSegwitAccountAddress | null,
   ) => void;
@@ -122,14 +123,21 @@ export const useWalletSessionStore = create<IWalletSessionState>((set) => ({
   setAddresses: (
     evmAddress,
     solanaAddress,
-    bitcoinMainnet = null,
-    bitcoinTestnet = null,
+    bitcoinMainnet,
+    bitcoinTestnet,
   ) =>
     set((state) => ({
       evmAddress,
       solanaAddress,
-      bitcoinMainnetAddress: bitcoinMainnet ?? state.bitcoinMainnetAddress,
-      bitcoinTestnetAddress: bitcoinTestnet ?? state.bitcoinTestnetAddress,
+      // `undefined` = leave unchanged; `null` = clear (Change Account).
+      bitcoinMainnetAddress:
+        bitcoinMainnet === undefined
+          ? state.bitcoinMainnetAddress
+          : bitcoinMainnet,
+      bitcoinTestnetAddress:
+        bitcoinTestnet === undefined
+          ? state.bitcoinTestnetAddress
+          : bitcoinTestnet,
     })),
   setBitcoinAddress: (chainId, address) =>
     set(

src/wallet/useWalletAuth.ts

@@ -85,11 +85,22 @@ export function useWalletAuth({
   const refreshAddresses = useCallback(async () => {
     const signer = signerRef.current;
     if (!signer) return;
+    const previousEvm = useWalletSessionStore.getState().evmAddress;
     const [evm, solana] = await Promise.all([
       signer.evm.getAccountAddress(),
       signer.solana.getAccountAddress(),
     ]);
 
+    // Account switch (or unlock after Change Account): drop stale BTC before
+    // hydrate/derive — session BTC is not credential-scoped.
+    if (
+      String(evm).toLowerCase() !== String(previousEvm).toLowerCase()
+    ) {
+      useWalletSessionStore
+        .getState()
+        .setAddresses(evm, solana, null, null);
+    }
+
     hydrateBitcoinAddressesFromCachedSecp(signer);
 
     let btcMainnet =