@lifi/widget 3.6.0-alpha.2 → 3.6.0-alpha.3

package/_esm/components/TokenRate/TokenRate.js

@@ -3,12 +3,12 @@ import { formatUnits } from 'viem';
 import { create } from 'zustand';
 import { convertToSubscriptFormat, precisionFormatter, } from '../../utils/format.js';
 import { TokenRateTypography } from './TokenRate.style.js';
-const useTokenRateStore = create((set) => ({
+const useTokenRate = create((set) => ({
     isForward: true,
     toggleIsForward: () => set((state) => ({ isForward: !state.isForward })),
 }));
 export const TokenRate = ({ route }) => {
-    const { isForward, toggleIsForward } = useTokenRateStore();
+    const { isForward, toggleIsForward } = useTokenRate();
     const toggleRate = (e) => {
         e.stopPropagation();
         toggleIsForward();

package/_esm/components/TokenRate/TokenRate.js.map

@@ -1 +1 @@
-{"version":3,"file":"TokenRate.js","sourceRoot":"","sources":["../../../components/TokenRate/TokenRate.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EACL,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAW3D,MAAM,iBAAiB,GAAG,MAAM,CAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACzD,SAAS,EAAE,IAAI;IACf,eAAe,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;CACzE,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,SAAS,GAA6B,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;IAC/D,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,iBAAiB,EAAE,CAAC;IAE3D,MAAM,UAAU,GAAuC,CAAC,CAAC,EAAE,EAAE;QAC3D,CAAC,CAAC,eAAe,EAAE,CAAC;QACpB,eAAe,EAAE,CAAC;IACpB,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpC,MAAM,SAAS,GAAG;QAChB,GAAG,KAAK,CAAC,SAAS;QAClB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;KACjC,CAAC;IACF,MAAM,OAAO,GAAG;QACd,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO;YAC9B,QAAQ,EAAE,MAAM,CAAC,OAAO;YACxB,KAAK,CAAC,OAAO,CAAC;QAChB,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ;YACnC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC;YACrC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;KAC3B,CAAC;IAEF,MAAM,UAAU,GACd,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,MAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC1D,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,MAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjE,MAAM,UAAU,GACd,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,MAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC9D,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,MAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE7D,MAAM,QAAQ,GAAG,SAAS;QACxB,CAAC,CAAC,KAAK,SAAS,CAAC,MAAM,MAAM,wBAAwB,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,MAAM,EAAE;QACrF,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,MAAM,wBAAwB,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;IAExF,MAAM,SAAS,GAAG,SAAS;QACzB,CAAC,CAAC,KAAK,SAAS,CAAC,MAAM,MAAM,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,MAAM,EAAE;QACtF,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,MAAM,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;IAEzF,OAAO,CACL,KAAC,mBAAmB,IAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAE,SAAS,YACrE,QAAQ,GACW,CACvB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"TokenRate.js","sourceRoot":"","sources":["../../../components/TokenRate/TokenRate.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EACL,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAW3D,MAAM,YAAY,GAAG,MAAM,CAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACpD,SAAS,EAAE,IAAI;IACf,eAAe,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;CACzE,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,SAAS,GAA6B,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;IAC/D,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,YAAY,EAAE,CAAC;IAEtD,MAAM,UAAU,GAAuC,CAAC,CAAC,EAAE,EAAE;QAC3D,CAAC,CAAC,eAAe,EAAE,CAAC;QACpB,eAAe,EAAE,CAAC;IACpB,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpC,MAAM,SAAS,GAAG;QAChB,GAAG,KAAK,CAAC,SAAS;QAClB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;KACjC,CAAC;IACF,MAAM,OAAO,GAAG;QACd,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO;YAC9B,QAAQ,EAAE,MAAM,CAAC,OAAO;YACxB,KAAK,CAAC,OAAO,CAAC;QAChB,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ;YACnC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC;YACrC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;KAC3B,CAAC;IAEF,MAAM,UAAU,GACd,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,MAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC1D,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,MAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjE,MAAM,UAAU,GACd,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,MAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC9D,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,MAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE7D,MAAM,QAAQ,GAAG,SAAS;QACxB,CAAC,CAAC,KAAK,SAAS,CAAC,MAAM,MAAM,wBAAwB,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,MAAM,EAAE;QACrF,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,MAAM,wBAAwB,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;IAExF,MAAM,SAAS,GAAG,SAAS;QACzB,CAAC,CAAC,KAAK,SAAS,CAAC,MAAM,MAAM,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,MAAM,EAAE;QACtF,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,MAAM,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;IAEzF,OAAO,CACL,KAAC,mBAAmB,IAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAE,SAAS,YACrE,QAAQ,GACW,CACvB,CAAC;AACJ,CAAC,CAAC"}

package/_esm/config/version.d.ts

@@ -1,2 +1,2 @@
 export declare const name = "@lifi/widget";
-export declare const version = "3.6.0-alpha.2";
+export declare const version = "3.6.0-alpha.3";

package/_esm/config/version.js

@@ -1,3 +1,3 @@
 export const name = '@lifi/widget';
-export const version = '3.6.0-alpha.2';
+export const version = '3.6.0-alpha.3';
 //# sourceMappingURL=version.js.map

package/_esm/hooks/useAccount.d.ts

@@ -1,4 +1,5 @@
 import { ChainType } from '@lifi/sdk';
+import type { CreateConnectorFnExtended } from '@lifi/wallet-management';
 import type { WalletAdapter } from '@solana/wallet-adapter-base';
 import type { Chain } from 'viem';
 import type { Connector } from 'wagmi';
@@ -30,8 +31,13 @@ export interface AccountResult {
 interface UseAccountArgs {
     chainType?: ChainType;
 }
+export type LastConnectedAccount = WalletAdapter | Connector | CreateConnectorFnExtended | null;
+interface LastConnectedAccountStore {
+    lastConnectedAccount: LastConnectedAccount;
+    setLastConnectedAccount: (account: LastConnectedAccount) => void;
+}
+export declare const useLastConnectedAccount: import("zustand").UseBoundStore<import("zustand").StoreApi<LastConnectedAccountStore>>;
 /**
- *
  * @param args When we provide args we want to return either account with corresponding chainType or default disconnected one
  * @returns - Account result
  */

package/_esm/hooks/useAccount.js

@@ -3,6 +3,7 @@ import { useConfig as useBigmiConfig } from '@lifi/wallet-management';
 import { useWallet } from '@solana/wallet-adapter-react';
 import { useMemo } from 'react';
 import { useAccount as useAccountInternal } from 'wagmi';
+import { create } from 'zustand';
 const defaultAccount = {
     chainType: ChainType.EVM,
     isConnected: false,
@@ -11,8 +12,11 @@ const defaultAccount = {
     isDisconnected: true,
     status: 'disconnected',
 };
+export const useLastConnectedAccount = create((set) => ({
+    lastConnectedAccount: null,
+    setLastConnectedAccount: (account) => set({ lastConnectedAccount: account }),
+}));
 /**
- *
  * @param args When we provide args we want to return either account with corresponding chainType or default disconnected one
  * @returns - Account result
  */
@@ -21,9 +25,7 @@ export const useAccount = (args) => {
     const bigmiAccount = useAccountInternal({ config: bigmiConfig });
     const wagmiAccount = useAccountInternal();
     const { wallet } = useWallet();
-    // We create a simple variable from the args object
-    // to avoid re-render useMemo on every object reference change.
-    const hasChainTypeArgs = Boolean(args);
+    const { lastConnectedAccount } = useLastConnectedAccount();
     return useMemo(() => {
         const svm = wallet?.adapter.publicKey
             ? {
@@ -48,14 +50,44 @@ export const useAccount = (args) => {
         const evm = { ...wagmiAccount, chainType: ChainType.EVM };
         const utxo = { ...bigmiAccount, chainType: ChainType.UTXO };
         const accounts = [evm, svm, utxo];
-        const connectedAccounts = [evm, svm, utxo].filter((account) => account.isConnected && account.address);
+        const connectedAccounts = accounts.filter((account) => account.isConnected && account.address);
+        // If a chainType argument is provided, attempt to find a connected account with the matching chainType.
+        // If no matching account is found, fallback to the default account.
+        // If no chainType argument, selectedAccount should be used.
+        const selectedChainTypeAccount = args?.chainType
+            ? connectedAccounts.find((account) => account.chainType === args?.chainType) || defaultAccount
+            : undefined;
+        // If lastConnectedAccount exists, attempt to find a connected account with a matching connector ID or name.
+        // If no matching account is found, fallback to the first connected account.
+        // If lastConnectedAccount is not present, simply select the first connected account.
+        const selectedAccount = lastConnectedAccount
+            ? connectedAccounts.find((account) => {
+                const connectorIdMatch = lastConnectedAccount?.id ===
+                    account.connector?.id;
+                const connectorNameMatch = !lastConnectedAccount?.id &&
+                    lastConnectedAccount?.name ===
+                        account.connector?.name;
+                return connectorIdMatch || connectorNameMatch;
+            }) || connectedAccounts[0]
+            : connectedAccounts[0];
         return {
-            account: accounts.find((account) => (!hasChainTypeArgs || account.chainType === args?.chainType) &&
-                account.isConnected &&
-                account.address) ?? defaultAccount,
+            account: selectedChainTypeAccount || selectedAccount || defaultAccount,
             // We need to return only connected account list
             accounts: connectedAccounts,
         };
-    }, [wallet, wagmiAccount, bigmiAccount, hasChainTypeArgs, args?.chainType]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [
+        wallet,
+        wagmiAccount.connector?.uid,
+        wagmiAccount.connector?.id,
+        wagmiAccount.status,
+        wagmiAccount.address,
+        bigmiAccount.connector?.uid,
+        bigmiAccount.connector?.id,
+        bigmiAccount.status,
+        bigmiAccount.address,
+        args?.chainType,
+        lastConnectedAccount,
+    ]);
 };
 //# sourceMappingURL=useAccount.js.map

package/_esm/hooks/useAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAccount.js","sourceRoot":"","sources":["../../hooks/useAccount.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useAccount.js","sourceRoot":"","sources":["../../hooks/useAccount.ts"],"names":[],"mappings":"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"}

package/_esm/hooks/useWallets.d.ts

@@ -2,5 +2,5 @@ import type { CreateConnectorFnExtended } from '@lifi/wallet-management';
 import type { Wallet } from '@solana/wallet-adapter-react';
 import type { Connector } from 'wagmi';
 import type { WidgetChains, WidgetWalletConfig } from '../types/widget.js';
-export declare const useWallets: (walletConfig?: WidgetWalletConfig, chains?: WidgetChains) => (Connector | Wallet | CreateConnectorFnExtended)[];
+export declare const useWallets: (walletConfig?: WidgetWalletConfig, chains?: WidgetChains) => (Connector | CreateConnectorFnExtended | Wallet)[];
 export declare const walletComparator: (a: CreateConnectorFnExtended | Connector | Wallet, b: CreateConnectorFnExtended | Connector | Wallet) => number;

package/_esm/pages/SelectWalletPage/EVMListItemButton.js

@@ -6,6 +6,7 @@ import { useConfig } from 'wagmi';
 import { connect, disconnect, getAccount } from 'wagmi/actions';
 import { ListItemButton } from '../../components/ListItemButton.js';
 import { ListItemText } from '../../components/ListItemText.js';
+import { useLastConnectedAccount } from '../../hooks/useAccount.js';
 import { useNavigateBack } from '../../hooks/useNavigateBack.js';
 import { useWidgetEvents } from '../../hooks/useWidgetEvents.js';
 import { WidgetEvent } from '../../types/events.js';
@@ -13,6 +14,7 @@ export const EVMListItemButton = ({ connector, onNotInstalled, }) => {
     const { navigateBack } = useNavigateBack();
     const emitter = useWidgetEvents();
     const config = useConfig();
+    const { setLastConnectedAccount } = useLastConnectedAccount();
     const handleEVMConnect = async () => {
         const identityCheckPassed = await isWalletInstalledAsync(connector.id);
         if (!identityCheckPassed) {
@@ -24,6 +26,7 @@ export const EVMListItemButton = ({ connector, onNotInstalled, }) => {
             await disconnect(config, { connector: connectedAccount.connector });
         }
         const data = await connect(config, { connector });
+        setLastConnectedAccount(connector);
         emitter.emit(WidgetEvent.WalletConnected, {
             address: data.accounts[0],
             chainId: data.chainId,

package/_esm/pages/SelectWalletPage/EVMListItemButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"EVMListItemButton.js","sourceRoot":"","sources":["../../../pages/SelectWalletPage/EVMListItemButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EACL,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,SAAS,EACT,cAAc,GACS,EAAE,EAAE;IAC3B,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAClC,MAAM,mBAAmB,GAAG,MAAM,sBAAsB,CACrD,SAAuB,CAAC,EAAE,CAC5B,CAAC;QACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,cAAc,CAAC,SAAsB,CAAC,CAAC;YACvC,OAAO;QACT,CAAC;QACD,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;YAC/B,MAAM,UAAU,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAClD,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE;YACxC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,SAAS,CAAC,GAAG;SACzB,CAAC,CAAC;QACH,YAAY,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,aAAa,GAChB,SAAuC,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,CAAC;IAEzE,OAAO,CACL,MAAC,cAAc,IAAoB,OAAO,EAAE,gBAAgB,aAC1D,KAAC,cAAc,cACb,KAAC,MAAM,IACL,GAAG,EAAE,gBAAgB,CAAC,SAAsB,CAAC,EAC7C,GAAG,EAAE,aAAa,YAEjB,aAAa,EAAE,CAAC,CAAC,CAAC,GACZ,GACM,EACjB,KAAC,YAAY,IAAC,OAAO,EAAE,aAAa,GAAI,KATrB,SAAS,CAAC,EAAE,CAUhB,CAClB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"EVMListItemButton.js","sourceRoot":"","sources":["../../../pages/SelectWalletPage/EVMListItemButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EACL,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,SAAS,EACT,cAAc,GACS,EAAE,EAAE;IAC3B,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,uBAAuB,EAAE,GAAG,uBAAuB,EAAE,CAAC;IAE9D,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAClC,MAAM,mBAAmB,GAAG,MAAM,sBAAsB,CACrD,SAAuB,CAAC,EAAE,CAC5B,CAAC;QACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,cAAc,CAAC,SAAsB,CAAC,CAAC;YACvC,OAAO;QACT,CAAC;QACD,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;YAC/B,MAAM,UAAU,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAClD,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE;YACxC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,SAAS,CAAC,GAAG;SACzB,CAAC,CAAC;QACH,YAAY,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,aAAa,GAChB,SAAuC,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,CAAC;IAEzE,OAAO,CACL,MAAC,cAAc,IAAoB,OAAO,EAAE,gBAAgB,aAC1D,KAAC,cAAc,cACb,KAAC,MAAM,IACL,GAAG,EAAE,gBAAgB,CAAC,SAAsB,CAAC,EAC7C,GAAG,EAAE,aAAa,YAEjB,aAAa,EAAE,CAAC,CAAC,CAAC,GACZ,GACM,EACjB,KAAC,YAAY,IAAC,OAAO,EAAE,aAAa,GAAI,KATrB,SAAS,CAAC,EAAE,CAUhB,CAClB,CAAC;AACJ,CAAC,CAAC"}

package/_esm/pages/SelectWalletPage/SVMListItemButton.js

@@ -4,6 +4,7 @@ import { Avatar, ListItemAvatar } from '@mui/material';
 import { useWallet } from '@solana/wallet-adapter-react';
 import { ListItemButton } from '../../components/ListItemButton.js';
 import { ListItemText } from '../../components/ListItemText.js';
+import { useLastConnectedAccount } from '../../hooks/useAccount.js';
 import { useNavigateBack } from '../../hooks/useNavigateBack.js';
 import { useWidgetEvents } from '../../hooks/useWidgetEvents.js';
 import { WidgetEvent } from '../../types/events.js';
@@ -11,6 +12,7 @@ export const SVMListItemButton = ({ wallet }) => {
     const { navigateBack } = useNavigateBack();
     const emitter = useWidgetEvents();
     const { select, disconnect, connected } = useWallet();
+    const { setLastConnectedAccount } = useLastConnectedAccount();
     const connect = async () => {
         if (connected) {
             await disconnect();
@@ -19,6 +21,7 @@ export const SVMListItemButton = ({ wallet }) => {
         // We use autoConnect on wallet selection
         // await solanaConnect();
         wallet.adapter.once('connect', (publicKey) => {
+            setLastConnectedAccount(wallet.adapter);
             emitter.emit(WidgetEvent.WalletConnected, {
                 address: publicKey?.toString(),
                 chainId: ChainId.SOL,

package/_esm/pages/SelectWalletPage/SVMListItemButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"SVMListItemButton.js","sourceRoot":"","sources":["../../../pages/SelectWalletPage/SVMListItemButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAMpD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAE,MAAM,EAA0B,EAAE,EAAE;IACtE,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;IAClC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAEtD,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;QACzB,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,UAAU,EAAE,CAAC;QACrB,CAAC;QACD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5B,yCAAyC;QACzC,yBAAyB;QACzB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;YAC3C,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE;gBACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE;gBAC9B,OAAO,EAAE,OAAO,CAAC,GAAG;gBACpB,SAAS,EAAE,SAAS,CAAC,GAAG;aACzB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,YAAY,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,OAAO,CACL,MAAC,cAAc,IAA2B,OAAO,EAAE,OAAO,aACxD,KAAC,cAAc,cACb,KAAC,MAAM,IAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,YACvD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAChB,GACM,EACjB,KAAC,YAAY,IAAC,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,WAAW,GAAI,KANzC,MAAM,CAAC,OAAO,CAAC,IAAI,CAOvB,CAClB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"SVMListItemButton.js","sourceRoot":"","sources":["../../../pages/SelectWalletPage/SVMListItemButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAMpD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAE,MAAM,EAA0B,EAAE,EAAE;IACtE,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;IAClC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IACtD,MAAM,EAAE,uBAAuB,EAAE,GAAG,uBAAuB,EAAE,CAAC;IAE9D,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;QACzB,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,UAAU,EAAE,CAAC;QACrB,CAAC;QACD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5B,yCAAyC;QACzC,yBAAyB;QACzB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;YAC3C,uBAAuB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACxC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE;gBACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE;gBAC9B,OAAO,EAAE,OAAO,CAAC,GAAG;gBACpB,SAAS,EAAE,SAAS,CAAC,GAAG;aACzB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,YAAY,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,OAAO,CACL,MAAC,cAAc,IAA2B,OAAO,EAAE,OAAO,aACxD,KAAC,cAAc,cACb,KAAC,MAAM,IAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,YACvD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAChB,GACM,EACjB,KAAC,YAAY,IAAC,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,WAAW,GAAI,KANzC,MAAM,CAAC,OAAO,CAAC,IAAI,CAOvB,CAClB,CAAC;AACJ,CAAC,CAAC"}

package/_esm/pages/SelectWalletPage/UTXOListItemButton.js

@@ -5,6 +5,7 @@ import { Avatar, ListItemAvatar } from '@mui/material';
 import { connect, disconnect, getAccount } from 'wagmi/actions';
 import { ListItemButton } from '../../components/ListItemButton.js';
 import { ListItemText } from '../../components/ListItemText.js';
+import { useLastConnectedAccount } from '../../hooks/useAccount.js';
 import { useNavigateBack } from '../../hooks/useNavigateBack.js';
 import { useWidgetEvents } from '../../hooks/useWidgetEvents.js';
 import { WidgetEvent } from '../../types/events.js';
@@ -12,6 +13,7 @@ export const UTXOListItemButton = ({ connector, onNotInstalled, }) => {
     const { navigateBack } = useNavigateBack();
     const emitter = useWidgetEvents();
     const config = useConfig();
+    const { setLastConnectedAccount } = useLastConnectedAccount();
     const handleUTXOConnect = async () => {
         const identityCheckPassed = await isWalletInstalledAsync(connector.id);
         if (!identityCheckPassed) {
@@ -23,6 +25,7 @@ export const UTXOListItemButton = ({ connector, onNotInstalled, }) => {
             await disconnect(config, { connector: connectedAccount.connector });
         }
         const data = await connect(config, { connector });
+        setLastConnectedAccount(connector);
         emitter.emit(WidgetEvent.WalletConnected, {
             address: data.accounts[0],
             chainId: data.chainId,

package/_esm/pages/SelectWalletPage/UTXOListItemButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"UTXOListItemButton.js","sourceRoot":"","sources":["../../../pages/SelectWalletPage/UTXOListItemButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,SAAS,GACV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EACjC,SAAS,EACT,cAAc,GACU,EAAE,EAAE;IAC5B,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;QACnC,MAAM,mBAAmB,GAAG,MAAM,sBAAsB,CACrD,SAAuB,CAAC,EAAE,CAC5B,CAAC;QACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,cAAc,CAAC,SAAsB,CAAC,CAAC;YACvC,OAAO;QACT,CAAC;QACD,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;YAC/B,MAAM,UAAU,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAClD,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE;YACxC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,SAAS,CAAC,IAAI;SAC1B,CAAC,CAAC;QACH,YAAY,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,aAAa,GAChB,SAAuC,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,CAAC;IAEzE,OAAO,CACL,MAAC,cAAc,IAAoB,OAAO,EAAE,iBAAiB,aAC3D,KAAC,cAAc,cACb,KAAC,MAAM,IACL,GAAG,EAAE,gBAAgB,CAAC,SAAsB,CAAC,EAC7C,GAAG,EAAE,aAAa,YAEjB,aAAa,EAAE,CAAC,CAAC,CAAC,GACZ,GACM,EACjB,KAAC,YAAY,IAAC,OAAO,EAAE,GAAG,aAAa,YAAY,GAAI,KATpC,SAAS,CAAC,EAAE,CAUhB,CAClB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"UTXOListItemButton.js","sourceRoot":"","sources":["../../../pages/SelectWalletPage/UTXOListItemButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,SAAS,GACV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EACjC,SAAS,EACT,cAAc,GACU,EAAE,EAAE;IAC5B,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,uBAAuB,EAAE,GAAG,uBAAuB,EAAE,CAAC;IAE9D,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;QACnC,MAAM,mBAAmB,GAAG,MAAM,sBAAsB,CACrD,SAAuB,CAAC,EAAE,CAC5B,CAAC;QACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,cAAc,CAAC,SAAsB,CAAC,CAAC;YACvC,OAAO;QACT,CAAC;QACD,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;YAC/B,MAAM,UAAU,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAClD,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE;YACxC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,SAAS,CAAC,IAAI;SAC1B,CAAC,CAAC;QACH,YAAY,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,aAAa,GAChB,SAAuC,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,CAAC;IAEzE,OAAO,CACL,MAAC,cAAc,IAAoB,OAAO,EAAE,iBAAiB,aAC3D,KAAC,cAAc,cACb,KAAC,MAAM,IACL,GAAG,EAAE,gBAAgB,CAAC,SAAsB,CAAC,EAC7C,GAAG,EAAE,aAAa,YAEjB,aAAa,EAAE,CAAC,CAAC,CAAC,GACZ,GACM,EACjB,KAAC,YAAY,IAAC,OAAO,EAAE,GAAG,aAAa,YAAY,GAAI,KATpC,SAAS,CAAC,EAAE,CAUhB,CAClB,CAAC;AACJ,CAAC,CAAC"}

package/components/TokenRate/TokenRate.tsx

@@ -18,13 +18,13 @@ interface TokenRateState {
   toggleIsForward(): void;
 }
 
-const useTokenRateStore = create<TokenRateState>((set) => ({
+const useTokenRate = create<TokenRateState>((set) => ({
   isForward: true,
   toggleIsForward: () => set((state) => ({ isForward: !state.isForward })),
 }));
 
 export const TokenRate: React.FC<TokenRateProps> = ({ route }) => {
-  const { isForward, toggleIsForward } = useTokenRateStore();
+  const { isForward, toggleIsForward } = useTokenRate();
 
   const toggleRate: MouseEventHandler<HTMLSpanElement> = (e) => {
     e.stopPropagation();

package/config/version.ts

@@ -1,2 +1,2 @@
 export const name = '@lifi/widget';
-export const version = '3.6.0-alpha.2';
+export const version = '3.6.0-alpha.3';

package/hooks/useAccount.ts

@@ -1,4 +1,5 @@
 import { ChainId, ChainType } from '@lifi/sdk';
+import type { CreateConnectorFnExtended } from '@lifi/wallet-management';
 import { useConfig as useBigmiConfig } from '@lifi/wallet-management';
 import type { WalletAdapter } from '@solana/wallet-adapter-base';
 import { useWallet } from '@solana/wallet-adapter-react';
@@ -6,6 +7,7 @@ import { useMemo } from 'react';
 import type { Chain } from 'viem';
 import type { Connector } from 'wagmi';
 import { useAccount as useAccountInternal } from 'wagmi';
+import { create } from 'zustand';
 
 export interface AccountBase<CT extends ChainType, ConnectorType = undefined> {
   address?: string;
@@ -49,8 +51,26 @@ const defaultAccount: AccountBase<ChainType> = {
   status: 'disconnected',
 };
 
+export type LastConnectedAccount =
+  | WalletAdapter
+  | Connector
+  | CreateConnectorFnExtended
+  | null;
+
+interface LastConnectedAccountStore {
+  lastConnectedAccount: LastConnectedAccount;
+  setLastConnectedAccount: (account: LastConnectedAccount) => void;
+}
+
+export const useLastConnectedAccount = create<LastConnectedAccountStore>(
+  (set) => ({
+    lastConnectedAccount: null,
+    setLastConnectedAccount: (account) =>
+      set({ lastConnectedAccount: account }),
+  }),
+);
+
 /**
- *
  * @param args When we provide args we want to return either account with corresponding chainType or default disconnected one
  * @returns - Account result
  */
@@ -58,12 +78,8 @@ export const useAccount = (args?: UseAccountArgs): AccountResult => {
   const bigmiConfig = useBigmiConfig();
   const bigmiAccount = useAccountInternal({ config: bigmiConfig });
   const wagmiAccount = useAccountInternal();
-
   const { wallet } = useWallet();
-
-  // We create a simple variable from the args object
-  // to avoid re-render useMemo on every object reference change.
-  const hasChainTypeArgs = Boolean(args);
+  const { lastConnectedAccount } = useLastConnectedAccount();
 
   return useMemo(() => {
     const svm: Account = wallet?.adapter.publicKey
@@ -89,19 +105,52 @@ export const useAccount = (args?: UseAccountArgs): AccountResult => {
     const evm: Account = { ...wagmiAccount, chainType: ChainType.EVM };
     const utxo: Account = { ...bigmiAccount, chainType: ChainType.UTXO };
     const accounts = [evm, svm, utxo];
-    const connectedAccounts = [evm, svm, utxo].filter(
+    const connectedAccounts = accounts.filter(
       (account) => account.isConnected && account.address,
     );
+
+    // If a chainType argument is provided, attempt to find a connected account with the matching chainType.
+    // If no matching account is found, fallback to the default account.
+    // If no chainType argument, selectedAccount should be used.
+    const selectedChainTypeAccount = args?.chainType
+      ? connectedAccounts.find(
+          (account) => account.chainType === args?.chainType,
+        ) || defaultAccount
+      : undefined;
+
+    // If lastConnectedAccount exists, attempt to find a connected account with a matching connector ID or name.
+    // If no matching account is found, fallback to the first connected account.
+    // If lastConnectedAccount is not present, simply select the first connected account.
+    const selectedAccount = lastConnectedAccount
+      ? connectedAccounts.find((account) => {
+          const connectorIdMatch =
+            (lastConnectedAccount as Connector)?.id ===
+            (account.connector as Connector)?.id;
+          const connectorNameMatch =
+            !(lastConnectedAccount as Connector)?.id &&
+            (lastConnectedAccount as WalletAdapter)?.name ===
+              account.connector?.name;
+          return connectorIdMatch || connectorNameMatch;
+        }) || connectedAccounts[0]
+      : connectedAccounts[0];
+
     return {
-      account:
-        accounts.find(
-          (account) =>
-            (!hasChainTypeArgs || account.chainType === args?.chainType) &&
-            account.isConnected &&
-            account.address,
-        ) ?? defaultAccount,
+      account: selectedChainTypeAccount || selectedAccount || defaultAccount,
       // We need to return only connected account list
       accounts: connectedAccounts,
     };
-  }, [wallet, wagmiAccount, bigmiAccount, hasChainTypeArgs, args?.chainType]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    wallet,
+    wagmiAccount.connector?.uid,
+    wagmiAccount.connector?.id,
+    wagmiAccount.status,
+    wagmiAccount.address,
+    bigmiAccount.connector?.uid,
+    bigmiAccount.connector?.id,
+    bigmiAccount.status,
+    bigmiAccount.address,
+    args?.chainType,
+    lastConnectedAccount,
+  ]);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifi/widget",
-  "version": "3.6.0-alpha.2",
+  "version": "3.6.0-alpha.3",
   "description": "LI.FI Widget for cross-chain bridging and swapping. It will drive your multi-chain strategy and attract new users from everywhere.",
   "type": "module",
   "main": "./_esm/index.js",
@@ -34,15 +34,15 @@
   "dependencies": {
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@lifi/sdk": "^3.3.0-alpha.1",
-    "@lifi/wallet-management": "^3.2.0-alpha.2",
+    "@lifi/sdk": "^3.3.0-alpha.2",
+    "@lifi/wallet-management": "^3.2.0-alpha.3",
     "@mui/icons-material": "^5.16.7",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.7",
     "@solana/wallet-adapter-base": "^0.9.23",
     "@solana/wallet-adapter-react": "^0.15.35",
     "@solana/web3.js": "^1.95.3",
-    "@tanstack/react-query": "^5.55.4",
+    "@tanstack/react-query": "^5.56.0",
     "@tanstack/react-virtual": "^3.10.7",
     "i18next": "^23.15.1",
     "microdiff": "^1.4.0",
@@ -53,8 +53,8 @@
     "react-intersection-observer": "^9.13.1",
     "react-router-dom": "^6.26.2",
     "uuid": "^10.0.0",
-    "viem": "^2.21.5",
-    "wagmi": "^2.12.10",
+    "viem": "^2.21.6",
+    "wagmi": "^2.12.11",
     "zustand": "^4.5.5"
   },
   "peerDependencies": {

package/pages/SelectWalletPage/EVMListItemButton.tsx

@@ -10,6 +10,7 @@ import { useConfig } from 'wagmi';
 import { connect, disconnect, getAccount } from 'wagmi/actions';
 import { ListItemButton } from '../../components/ListItemButton.js';
 import { ListItemText } from '../../components/ListItemText.js';
+import { useLastConnectedAccount } from '../../hooks/useAccount.js';
 import { useNavigateBack } from '../../hooks/useNavigateBack.js';
 import { useWidgetEvents } from '../../hooks/useWidgetEvents.js';
 import { WidgetEvent } from '../../types/events.js';
@@ -26,6 +27,7 @@ export const EVMListItemButton = ({
   const { navigateBack } = useNavigateBack();
   const emitter = useWidgetEvents();
   const config = useConfig();
+  const { setLastConnectedAccount } = useLastConnectedAccount();
 
   const handleEVMConnect = async () => {
     const identityCheckPassed = await isWalletInstalledAsync(
@@ -40,6 +42,7 @@ export const EVMListItemButton = ({
       await disconnect(config, { connector: connectedAccount.connector });
     }
     const data = await connect(config, { connector });
+    setLastConnectedAccount(connector);
     emitter.emit(WidgetEvent.WalletConnected, {
       address: data.accounts[0],
       chainId: data.chainId,

package/pages/SelectWalletPage/SVMListItemButton.tsx

@@ -4,6 +4,7 @@ import type { Wallet } from '@solana/wallet-adapter-react';
 import { useWallet } from '@solana/wallet-adapter-react';
 import { ListItemButton } from '../../components/ListItemButton.js';
 import { ListItemText } from '../../components/ListItemText.js';
+import { useLastConnectedAccount } from '../../hooks/useAccount.js';
 import { useNavigateBack } from '../../hooks/useNavigateBack.js';
 import { useWidgetEvents } from '../../hooks/useWidgetEvents.js';
 import { WidgetEvent } from '../../types/events.js';
@@ -16,6 +17,7 @@ export const SVMListItemButton = ({ wallet }: SVMListItemButtonProps) => {
   const { navigateBack } = useNavigateBack();
   const emitter = useWidgetEvents();
   const { select, disconnect, connected } = useWallet();
+  const { setLastConnectedAccount } = useLastConnectedAccount();
 
   const connect = async () => {
     if (connected) {
@@ -25,6 +27,7 @@ export const SVMListItemButton = ({ wallet }: SVMListItemButtonProps) => {
     // We use autoConnect on wallet selection
     // await solanaConnect();
     wallet.adapter.once('connect', (publicKey) => {
+      setLastConnectedAccount(wallet.adapter);
       emitter.emit(WidgetEvent.WalletConnected, {
         address: publicKey?.toString(),
         chainId: ChainId.SOL,

package/pages/SelectWalletPage/UTXOListItemButton.tsx

@@ -10,6 +10,7 @@ import type { Connector } from 'wagmi';
 import { connect, disconnect, getAccount } from 'wagmi/actions';
 import { ListItemButton } from '../../components/ListItemButton.js';
 import { ListItemText } from '../../components/ListItemText.js';
+import { useLastConnectedAccount } from '../../hooks/useAccount.js';
 import { useNavigateBack } from '../../hooks/useNavigateBack.js';
 import { useWidgetEvents } from '../../hooks/useWidgetEvents.js';
 import { WidgetEvent } from '../../types/events.js';
@@ -26,6 +27,7 @@ export const UTXOListItemButton = ({
   const { navigateBack } = useNavigateBack();
   const emitter = useWidgetEvents();
   const config = useConfig();
+  const { setLastConnectedAccount } = useLastConnectedAccount();
 
   const handleUTXOConnect = async () => {
     const identityCheckPassed = await isWalletInstalledAsync(
@@ -40,6 +42,7 @@ export const UTXOListItemButton = ({
       await disconnect(config, { connector: connectedAccount.connector });
     }
     const data = await connect(config, { connector });
+    setLastConnectedAccount(connector);
     emitter.emit(WidgetEvent.WalletConnected, {
       address: data.accounts[0],
       chainId: data.chainId,