@0xsquid/react-hooks 7.1.1-xrpl-beta.2 → 7.1.1

package/dist/hooks/solana/useSolana.js

@@ -1,104 +1,80 @@
 import { ChainType } from "@0xsquid/squid-types";
-import { PhantomWalletAdapter } from "@solana/wallet-adapter-phantom";
 import { Connection } from "@solana/web3.js";
 import { useMutation } from "@tanstack/react-query";
-import { useCallback, useEffect, useMemo, useRef } from "react";
+import { useCallback, useEffect, useRef } from "react";
 import { SOLANA_RPC_URL } from "../../core/constants";
-import { getWalletWindowProvider } from "../../services/internal/walletService";
-import { useClient } from "../client/useClient";
 import { useWalletStore } from "../store/useWalletStore";
-export const useSolana = () => {
-    // Get current Solana wallet state from global store
-    const solanaWalletState = useWalletStore((state) => state.connectedWalletsByChainType[ChainType.SOLANA]);
-    const solanaAddress = solanaWalletState.address;
-    const isConnected = !!solanaAddress;
-    const solanaConnectedWallet = solanaWalletState.wallet;
-    const { clientWindow, isClient } = useClient();
-    const window = clientWindow;
-    const { setConnectedWallet, disconnectWallet } = useWalletStore();
-    // Safely access wallet provider from window object
-    const solanaWalletObject = useMemo(() => {
-        if (isClient && solanaConnectedWallet?.windowFlag) {
-            return getWalletWindowProvider(window, solanaConnectedWallet, ChainType.SOLANA);
-        }
-        return undefined;
-    }, [solanaConnectedWallet, isClient, window]);
+import { useSolanaWallets } from "./useSolanaWallets";
+export function useSolana() {
+    const disconnectWallet = useWalletStore((store) => store.disconnectWallet);
+    const setConnectedWallet = useWalletStore((store) => store.setConnectedWallet);
+    const { wallets } = useSolanaWallets();
+    const connectedSolanaWallet = useWalletStore((store) => store.connectedWalletsByChainType[ChainType.SOLANA]);
+    const recentSolanaWalletId = useWalletStore((store) => store.recentConnectorIds[ChainType.SOLANA]);
     const connectSolana = useMutation(async ({ wallet, }) => {
-        const selectedWallet = wallet ?? solanaConnectedWallet;
-        if (!selectedWallet) {
-            return undefined;
-        }
-        const walletObject = getWalletWindowProvider(window, selectedWallet, ChainType.SOLANA);
-        if (!walletObject) {
-            return undefined;
+        try {
+            // try to connect silently first
+            await wallet.connector.autoConnect();
         }
-        const response = await walletObject.connect();
-        const address = response.publicKey.toString();
-        if (address) {
-            setConnectedWallet(ChainType.SOLANA, {
-                wallet: selectedWallet,
-                address,
-            });
-            return address;
+        catch {
+            // if auto-connect fails (e.g. not authorized yet)
+            // fallback to connect via popup
+            await wallet.connector.connect();
         }
-        return undefined;
+        const address = wallet.connector.wallet.accounts[0].address;
+        return {
+            wallet,
+            address,
+        };
     });
-    // Clear wallet connection data
-    const clearData = useCallback(() => {
-        disconnectWallet(ChainType.SOLANA);
-    }, [disconnectWallet]);
-    // Handle wallet account changes (e.g., user switches accounts)
-    const handleAccountChange = useCallback((_publicKey) => {
-        let publicKey = _publicKey?.toString();
-        // Inconsistent behavior on different wallets
-        // Try to parse response to handle both PublicKey and { publicKey: PublicKey }
-        const parsedPublicKey = _publicKey?.publicKey;
-        if (typeof parsedPublicKey === "string") {
-            publicKey = parsedPublicKey;
-        }
-        if (publicKey && solanaConnectedWallet) {
-            setConnectedWallet(ChainType.SOLANA, {
-                wallet: solanaConnectedWallet,
-                address: publicKey,
-            });
-        }
-        else {
-            clearData();
+    const disconnectSolana = useCallback(async () => {
+        await connectedSolanaWallet.wallet?.connector.disconnect();
+    }, [connectedSolanaWallet.wallet?.connector]);
+    const autoConnectSolana = useCallback(async () => {
+        const recentSolanaWallet = wallets.find((w) => w.connectorId === recentSolanaWalletId);
+        if (!recentSolanaWallet) {
+            return;
         }
-    }, [clearData, setConnectedWallet, solanaConnectedWallet]);
-    // Set up event listeners for wallet account changes
+        await recentSolanaWallet.connector.autoConnect();
+        const [account] = recentSolanaWallet.connector.wallet.accounts;
+        setConnectedWallet(ChainType.SOLANA, {
+            wallet: recentSolanaWallet,
+            address: account.address,
+        });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [wallets.map((w) => w.connectorId), recentSolanaWalletId]);
     useEffect(() => {
-        if (solanaWalletObject) {
-            solanaWalletObject.on("connect", handleAccountChange);
-            return () => {
-                solanaWalletObject.off("connect", handleAccountChange);
-            };
+        const wallet = connectedSolanaWallet.wallet;
+        if (!wallet) {
+            return;
         }
-    }, [solanaWalletObject, handleAccountChange]);
-    const signer = useMemo(() => {
-        if (!solanaWalletObject || !solanaAddress) {
-            return undefined;
-        }
-        if (solanaConnectedWallet?.name.toLowerCase() === "phantom" ||
-            "isPhantom" in solanaWalletObject) {
-            const phantomAdapter = new PhantomWalletAdapter();
-            if (!phantomAdapter.connected && solanaAddress) {
-                phantomAdapter.connect().catch(console.error);
+        function onConnect(newAddress) {
+            if (wallet) {
+                setConnectedWallet(ChainType.SOLANA, {
+                    wallet,
+                    address: newAddress.toString(),
+                });
             }
-            return phantomAdapter;
         }
-        return solanaWalletObject;
-    }, [solanaWalletObject, solanaAddress, solanaConnectedWallet]);
+        function onDisconnect() {
+            disconnectWallet(ChainType.SOLANA);
+        }
+        wallet.connector.on("connect", onConnect);
+        wallet.connector.on("disconnect", onDisconnect);
+        return () => {
+            wallet.connector.off("connect", onConnect);
+            wallet.connector.off("disconnect", onDisconnect);
+        };
+    }, [disconnectWallet, setConnectedWallet, connectedSolanaWallet.wallet]);
     return {
         connectSolana,
-        isConnected,
-        clearData,
-        solanaWalletObject,
-        solanaAddress,
-        signer,
-        wallet: solanaConnectedWallet,
+        disconnectSolana,
+        autoConnectSolana,
+        isConnected: !!connectedSolanaWallet.wallet,
+        signer: connectedSolanaWallet.wallet?.connector,
+        wallets,
     };
-};
+}
 export const useSolanaConnection = () => {
     const connectionRef = useRef(new Connection(SOLANA_RPC_URL));
     return connectionRef.current;

package/dist/hooks/solana/useSolana.js.map

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

package/dist/hooks/solana/useSolanaWallets.d.ts

@@ -0,0 +1,4 @@
+import { SolanaWallet } from "../../core/types/wallet";
+export declare function useSolanaWallets(): {
+    wallets: SolanaWallet[];
+};

package/dist/hooks/solana/useSolanaWallets.js

@@ -0,0 +1,8 @@
+import { filterSolanaWallets } from "../../services/internal/solanaService";
+import { useStandardWallets } from "../wallet/useStandardWallets";
+export function useSolanaWallets() {
+    return useStandardWallets({
+        filterWallets: filterSolanaWallets,
+    });
+}
+//# sourceMappingURL=useSolanaWallets.js.map

package/dist/hooks/solana/useSolanaWallets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSolanaWallets.js","sourceRoot":"","sources":["../../../src/hooks/solana/useSolanaWallets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,UAAU,gBAAgB;IAC9B,OAAO,kBAAkB,CAAe;QACtC,aAAa,EAAE,mBAAmB;KACnC,CAAC,CAAC;AACL,CAAC"}

package/dist/hooks/store/useSendTransactionStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSendTransactionStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useSendTransactionStore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AA0BjC,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAC3C,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACb,SAAS,EAAE,SAAS;IACpB,YAAY,EAAE,EAAE;IAChB,kBAAkB,EAAE,SAAS;IAE7B,mBAAmB,CAAC,IAAI,EAAE,EAAE;QAC1B,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,MAAM,eAAe,GAAG,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;YAE9D,OAAO;gBACL,YAAY,EAAE,eAAe;gBAC7B,kBAAkB,EAChB,IAAI,KAAK,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB;aAC3D,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,EAAE;QACf,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;CACF,CAAC,CACH,CAAC"}
+{"version":3,"file":"useSendTransactionStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useSendTransactionStore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAyBjC,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAC3C,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACb,SAAS,EAAE,SAAS;IACpB,YAAY,EAAE,EAAE;IAChB,kBAAkB,EAAE,SAAS;IAC7B,mBAAmB,CAAC,IAAI,EAAE,EAAE;QAC1B,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,MAAM,eAAe,GAAG,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;YAE9D,OAAO;gBACL,YAAY,EAAE,eAAe;gBAC7B,kBAAkB,EAChB,IAAI,KAAK,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB;aAC3D,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IACD,cAAc,CAAC,EAAE;QACf,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;CACF,CAAC,CACH,CAAC"}

package/dist/hooks/store/useSquidStore.d.ts

@@ -24,8 +24,8 @@ interface TransactionState {
     fromPrice?: string;
     txLocalId?: string;
     transactions: Record<string, TransactionParams>;
+    currentTransaction?: TransactionParams;
     setTransactionState: (id: string | undefined, transaction: TransactionParams) => void;
-    getCurrentTransaction: () => TransactionParams | undefined;
     getTransaction: (id: string) => TransactionParams | undefined;
 }
 export declare const useTransactionStore: import("zustand").UseBoundStore<import("zustand").StoreApi<TransactionState>>;

package/dist/hooks/store/useSquidStore.js

@@ -16,20 +16,18 @@ export const useTransactionStore = create((set, get) => ({
     fromPrice: undefined,
     txLocalId: undefined,
     transactions: {},
+    currentTransaction: undefined,
     setTransactionState(txId, tx) {
+        if (!txId)
+            return;
         set((state) => {
-            if (!txId)
-                return state;
-            state.transactions[txId] = tx;
-            return state;
+            const newTransactions = { ...state.transactions, [txId]: tx };
+            return {
+                transactions: newTransactions,
+                currentTransaction: txId === state.txLocalId ? tx : state.currentTransaction,
+            };
         });
     },
-    getCurrentTransaction() {
-        const { txLocalId, transactions } = get();
-        if (!txLocalId)
-            return;
-        return transactions[txLocalId];
-    },
     getTransaction(id) {
         return get().transactions[id];
     },

package/dist/hooks/store/useSquidStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSquidStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useSquidStore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAsB3D,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAa,GAAG,EAAE,CAAC,CAAC;IACrD,KAAK,EAAE,SAAS;IAChB,eAAe,EAAE;QACf,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,SAAS;KACnB;CACF,CAAC,CAAC,CAAC;AAUJ,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAc,GAAG,EAAE,CAAC,CAAC;IACvD,MAAM,EAAE,mBAAmB;IAC3B,aAAa,EAAE,KAAK;CACrB,CAAC,CAAC,CAAC;AAiBJ,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACzE,SAAS,EAAE,SAAS;IACpB,SAAS,EAAE,SAAS;IACpB,YAAY,EAAE,EAAE;IAChB,mBAAmB,CAAC,IAAI,EAAE,EAAE;QAC1B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,IAAI,CAAC,IAAI;gBAAE,OAAO,KAAK,CAAC;YAExB,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAE9B,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IACD,qBAAqB;QACnB,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,GAAG,EAAE,CAAC;QAE1C,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,OAAO,YAAY,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;IACD,cAAc,CAAC,EAAE;QACf,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;CACF,CAAC,CAAC,CAAC;AAOJ,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,EAAyB,CACrE,OAAO,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACR,SAAS,EAAE,SAAS;IACpB,cAAc,EAAE,GAAG,EAAE,CACnB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACd,SAAS,EAAE,KAAK,CAAC,SAAS;YACxB,CAAC,CAAC;gBACE,GAAG,KAAK,CAAC,SAAS;gBAClB,kBAAkB,EAAE,SAAS;gBAC7B,eAAe,EAAE,SAAS;aAC3B;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;CACN,CAAC,EACF;IACE,IAAI,EAAE,wBAAwB;IAC9B,kBAAkB,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE;QAClC,2CAA2C;QAC3C,KAAK,EAAE,cAAc,EAAE,CAAC;IAC1B,CAAC;CACF,CACF,CACF,CAAC"}
+{"version":3,"file":"useSquidStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useSquidStore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAsB3D,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAa,GAAG,EAAE,CAAC,CAAC;IACrD,KAAK,EAAE,SAAS;IAChB,eAAe,EAAE;QACf,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,SAAS;KACnB;CACF,CAAC,CAAC,CAAC;AAUJ,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAc,GAAG,EAAE,CAAC,CAAC;IACvD,MAAM,EAAE,mBAAmB;IAC3B,aAAa,EAAE,KAAK;CACrB,CAAC,CAAC,CAAC;AAiBJ,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACzE,SAAS,EAAE,SAAS;IACpB,SAAS,EAAE,SAAS;IACpB,YAAY,EAAE,EAAE;IAChB,kBAAkB,EAAE,SAAS;IAC7B,mBAAmB,CAAC,IAAI,EAAE,EAAE;QAC1B,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,MAAM,eAAe,GAAG,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;YAE9D,OAAO;gBACL,YAAY,EAAE,eAAe;gBAC7B,kBAAkB,EAChB,IAAI,KAAK,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB;aAC3D,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IACD,cAAc,CAAC,EAAE;QACf,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;CACF,CAAC,CAAC,CAAC;AAOJ,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,EAAyB,CACrE,OAAO,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACR,SAAS,EAAE,SAAS;IACpB,cAAc,EAAE,GAAG,EAAE,CACnB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACd,SAAS,EAAE,KAAK,CAAC,SAAS;YACxB,CAAC,CAAC;gBACE,GAAG,KAAK,CAAC,SAAS;gBAClB,kBAAkB,EAAE,SAAS;gBAC7B,eAAe,EAAE,SAAS;aAC3B;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;CACN,CAAC,EACF;IACE,IAAI,EAAE,wBAAwB;IAC9B,kBAAkB,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE;QAClC,2CAA2C;QAC3C,KAAK,EAAE,cAAc,EAAE,CAAC;IAC1B,CAAC;CACF,CACF,CACF,CAAC"}

package/dist/hooks/store/useWalletStore.d.ts

@@ -4,7 +4,8 @@ import { ChainTypeToWalletState } from "../../core/types/wallet";
 export declare enum ConnectingWalletStatus {
     IDLE = 0,
     CONNECTING = 1,
-    REJECTED = 2
+    REJECTED = 2,
+    QR_GENERATION_FAILED = 3
 }
 export interface ConnectingWalletState {
     wallet: Wallet | undefined;
@@ -13,15 +14,31 @@ export interface ConnectingWalletState {
         matrix: boolean[][];
     };
 }
-interface WalletState {
+interface WalletStoreState {
     connectedWalletsByChainType: {
         [K in keyof ChainTypeToWalletState]: Partial<ChainTypeToWalletState[K]>;
     };
     connectingWalletState: ConnectingWalletState;
+    recentConnectorIds: Partial<Record<ChainType, string>>;
 }
-export declare const useWalletStore: import("zustand").UseBoundStore<import("zustand").StoreApi<WalletState & {
+type WalletStoreActions = {
     setConnectedWallet: <T extends ChainType>(chainType: ChainType, state: ChainTypeToWalletState[T]) => void;
     setConnectingWallet: (state: ConnectingWalletState) => void;
     disconnectWallet: (chainType: ChainType) => void;
-}>>;
+};
+export declare const useWalletStore: import("zustand").UseBoundStore<Omit<import("zustand").StoreApi<WalletStoreState & WalletStoreActions>, "persist"> & {
+    persist: {
+        setOptions: (options: Partial<import("zustand/middleware").PersistOptions<WalletStoreState & WalletStoreActions, {
+            recentConnectorIds: Partial<Record<ChainType, string>>;
+        }>>) => void;
+        clearStorage: () => void;
+        rehydrate: () => void | Promise<void>;
+        hasHydrated: () => boolean;
+        onHydrate: (fn: (state: WalletStoreState & WalletStoreActions) => void) => () => void;
+        onFinishHydration: (fn: (state: WalletStoreState & WalletStoreActions) => void) => () => void;
+        getOptions: () => Partial<import("zustand/middleware").PersistOptions<WalletStoreState & WalletStoreActions, {
+            recentConnectorIds: Partial<Record<ChainType, string>>;
+        }>>;
+    };
+}>;
 export {};

package/dist/hooks/store/useWalletStore.js

@@ -1,10 +1,13 @@
 import { ChainType } from "@0xsquid/squid-types";
 import { create } from "zustand";
+import { persist } from "zustand/middleware";
+import { isEmptyObject } from "../../services";
 export var ConnectingWalletStatus;
 (function (ConnectingWalletStatus) {
     ConnectingWalletStatus[ConnectingWalletStatus["IDLE"] = 0] = "IDLE";
     ConnectingWalletStatus[ConnectingWalletStatus["CONNECTING"] = 1] = "CONNECTING";
     ConnectingWalletStatus[ConnectingWalletStatus["REJECTED"] = 2] = "REJECTED";
+    ConnectingWalletStatus[ConnectingWalletStatus["QR_GENERATION_FAILED"] = 3] = "QR_GENERATION_FAILED";
 })(ConnectingWalletStatus || (ConnectingWalletStatus = {}));
 const initialWalletState = {
     // Initialize all chain types to an empty wallet object
@@ -16,8 +19,9 @@ const initialWalletState = {
         wallet: undefined,
         status: ConnectingWalletStatus.IDLE,
     },
+    recentConnectorIds: {},
 };
-export const useWalletStore = create((set) => ({
+export const useWalletStore = create()(persist((set) => ({
     ...initialWalletState,
     setConnectedWallet: (chainType, connectedWalletState) => set((state) => {
         return {
@@ -25,18 +29,33 @@ export const useWalletStore = create((set) => ({
                 ...state.connectedWalletsByChainType,
                 [chainType]: connectedWalletState,
             },
+            recentConnectorIds: {
+                ...state.recentConnectorIds,
+                [chainType]: connectedWalletState.wallet.connectorId,
+            },
         };
     }),
     setConnectingWallet: (state) => set({ connectingWalletState: state }),
     disconnectWallet: (chainType) => set((state) => {
-        if (!state.connectedWalletsByChainType[chainType])
+        if (isEmptyObject(state.connectedWalletsByChainType[chainType])) {
             return state;
+        }
+        const { [chainType]: _, ...recentConnectorIds } = state.recentConnectorIds;
         return {
             connectedWalletsByChainType: {
                 ...state.connectedWalletsByChainType,
                 [chainType]: {},
             },
+            recentConnectorIds,
         };
     }),
+}), {
+    name: "squid.wallet.store",
+    version: 0,
+    partialize({ recentConnectorIds }) {
+        return {
+            recentConnectorIds,
+        };
+    },
 }));
 //# sourceMappingURL=useWalletStore.js.map

package/dist/hooks/store/useWalletStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWalletStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useWalletStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIjC,MAAM,CAAN,IAAY,sBAIX;AAJD,WAAY,sBAAsB;IAChC,mEAAI,CAAA;IACJ,+EAAU,CAAA;IACV,2EAAQ,CAAA;AACV,CAAC,EAJW,sBAAsB,KAAtB,sBAAsB,QAIjC;AAiBD,MAAM,kBAAkB,GAAgB;IACtC,uDAAuD;IACvD,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAC1D,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,GAAG;QACN,CAAC,SAAS,CAAC,EAAE,EAAE;KAChB,CAAC,EACF,EAAgD,CACjD;IACD,qBAAqB,EAAE;QACrB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,sBAAsB,CAAC,IAAI;KACpC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CASlC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACV,GAAG,kBAAkB;IACrB,kBAAkB,EAAE,CAAC,SAAS,EAAE,oBAAoB,EAAE,EAAE,CACtD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,oBAAoB;aAClC;SACF,CAAC;IACJ,CAAC,CAAC;IACJ,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IACrE,gBAAgB,EAAE,CAAC,SAAS,EAAE,EAAE,CAC9B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC;YAAE,OAAO,KAAK,CAAC;QAEhE,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,EAAE;aAChB;SACF,CAAC;IACJ,CAAC,CAAC;CACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"useWalletStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useWalletStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,CAAN,IAAY,sBAKX;AALD,WAAY,sBAAsB;IAChC,mEAAI,CAAA;IACJ,+EAAU,CAAA;IACV,2EAAQ,CAAA;IACR,mGAAoB,CAAA;AACtB,CAAC,EALW,sBAAsB,KAAtB,sBAAsB,QAKjC;AA2BD,MAAM,kBAAkB,GAAqB;IAC3C,uDAAuD;IACvD,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAC1D,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,GAAG;QACN,CAAC,SAAS,CAAC,EAAE,EAAE;KAChB,CAAC,EACF,EAAqD,CACtD;IACD,qBAAqB,EAAE;QACrB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,sBAAsB,CAAC,IAAI;KACpC;IACD,kBAAkB,EAAE,EAAE;CACvB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,EAAyC,CAC3E,OAAO,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACR,GAAG,kBAAkB;IACrB,kBAAkB,EAAE,CAAC,SAAS,EAAE,oBAAoB,EAAE,EAAE,CACtD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,oBAAoB;aAClC;YACD,kBAAkB,EAAE;gBAClB,GAAG,KAAK,CAAC,kBAAkB;gBAC3B,CAAC,SAAS,CAAC,EAAE,oBAAoB,CAAC,MAAM,CAAC,WAAW;aACrD;SACF,CAAC;IACJ,CAAC,CAAC;IACJ,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IACrE,gBAAgB,EAAE,CAAC,SAAS,EAAE,EAAE,CAC9B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,IAAI,aAAa,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC,EAAE;YAC/D,OAAO,KAAK,CAAC;SACd;QAED,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,GAAG,kBAAkB,EAAE,GAC7C,KAAK,CAAC,kBAAkB,CAAC;QAE3B,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,EAAE;aAChB;YACD,kBAAkB;SACnB,CAAC;IACJ,CAAC,CAAC;CACL,CAAC,EACF;IACE,IAAI,EAAE,oBAAoB;IAC1B,OAAO,EAAE,CAAC;IACV,UAAU,CAAC,EAAE,kBAAkB,EAAE;QAC/B,OAAO;YACL,kBAAkB;SACnB,CAAC;IACJ,CAAC;CACF,CACF,CACF,CAAC"}

package/dist/hooks/sui/useSui.js

@@ -1,27 +1,81 @@
 import { ChainType } from "@0xsquid/squid-types";
 import { useMutation } from "@tanstack/react-query";
-import { useCallback } from "react";
+import { useCallback, useEffect } from "react";
 import { useWalletStore } from "../store/useWalletStore";
 import { useSuiWallets } from "./useSuiWallets";
 export function useSui() {
     const { wallets } = useSuiWallets();
     const connectedSuiWallet = useWalletStore((store) => store.connectedWalletsByChainType[ChainType.SUI]);
+    const recentSuiWalletId = useWalletStore((store) => store.recentConnectorIds[ChainType.SUI]);
+    const setConnectedWallet = useWalletStore((store) => store.setConnectedWallet);
+    const disconnectWallet = useWalletStore((store) => store.disconnectWallet);
     const connectSui = useMutation(async ({ wallet, }) => {
-        const { account } = await wallet.connector().connect();
+        let account;
+        try {
+            // try to connect silently first
+            account = await wallet.connector.connect({ silent: true });
+        }
+        catch {
+            // if auto-connect fails (e.g. not authorized yet)
+            // fallback to connect via popup
+            account = await wallet.connector.connect();
+        }
         return {
             wallet,
-            address: account.address,
-            account,
+            address: account.account.address,
+            account: account.account,
         };
     });
     const disconnectSui = useCallback(async () => {
-        await connectedSuiWallet.wallet?.connector().disconnect();
+        await connectedSuiWallet.wallet?.connector.disconnect();
     }, [connectedSuiWallet.wallet]);
+    const autoConnectSui = useCallback(async () => {
+        const recentSuiWallet = wallets.find((w) => w.connectorId === recentSuiWalletId);
+        if (!recentSuiWallet) {
+            return;
+        }
+        const { account } = await recentSuiWallet.connector.connect({
+            silent: true,
+        });
+        setConnectedWallet(ChainType.SUI, {
+            wallet: recentSuiWallet,
+            address: account.address,
+            account,
+        });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [wallets.map((w) => w.connectorId), recentSuiWalletId]);
+    useEffect(() => {
+        const wallet = connectedSuiWallet.wallet;
+        if (!wallet) {
+            return;
+        }
+        function onAccountsChanged({ accounts = [], }) {
+            if (!wallet) {
+                return;
+            }
+            const [account] = accounts;
+            if (account) {
+                setConnectedWallet(ChainType.SUI, {
+                    wallet: wallet,
+                    address: account.address,
+                    account: account,
+                });
+            }
+            else {
+                disconnectWallet(ChainType.SUI);
+            }
+        }
+        const removeListener = wallet.connector.on("change", onAccountsChanged);
+        return () => {
+            removeListener();
+        };
+    }, [disconnectWallet, setConnectedWallet, connectedSuiWallet.wallet]);
     return {
         connectSui,
         disconnectSui,
+        autoConnectSui,
         isConnected: !!connectedSuiWallet.wallet,
-        signer: connectedSuiWallet.wallet?.connector(),
+        signer: connectedSuiWallet.wallet?.connector,
         wallets,
     };
 }

package/dist/hooks/sui/useSui.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSui.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAGpC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,MAAM;IACpB,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,EAAE,CAAC;IACpC,MAAM,kBAAkB,GAAG,cAAc,CACvC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC,GAAG,CAAC,CAC5D,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAC5B,KAAK,EAAE,EACL,MAAM,GAGP,EAA+C,EAAE;QAChD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,CAAC;QAEvD,OAAO;YACL,MAAM;YACN,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,OAAO;SACR,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC3C,MAAM,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,UAAU,EAAE,CAAC;IAC5D,CAAC,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;IAEhC,OAAO;QACL,UAAU;QACV,aAAa;QACb,WAAW,EAAE,CAAC,CAAC,kBAAkB,CAAC,MAAM;QACxC,MAAM,EAAE,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE;QAC9C,OAAO;KACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useSui.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSui.ts"],"names":[],"mappings":"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"}

package/dist/hooks/sui/useSuiWallets.d.ts

@@ -1,7 +1,4 @@
 import { SuiWallet } from "../../core/types/wallet";
-/**
- * Returns the list of registered Sui wallets
- */
 export declare function useSuiWallets(): {
     wallets: SuiWallet[];
 };

package/dist/hooks/sui/useSuiWallets.js

@@ -1,42 +1,23 @@
 import { SlushWallet } from "@mysten/slush-wallet";
-import { getWallets as getWalletsApi, } from "@mysten/wallet-standard";
-import { useCallback, useEffect, useRef, useState } from "react";
 import { filterSuiWallets, slushWebWalletData, } from "../../services/internal/suiService";
-/**
- * Returns the list of registered Sui wallets
- */
+import { useStandardWallets } from "../wallet/useStandardWallets";
+function getExtraWallets() {
+    const slushWebWallet = new SlushWallet({
+        name: "Squid",
+        chain: "sui:mainnet",
+        metadata: {
+            enabled: true,
+            icon: slushWebWalletData.icon,
+            id: slushWebWalletData.id,
+            walletName: slushWebWalletData.name,
+        },
+    });
+    return [slushWebWallet];
+}
 export function useSuiWallets() {
-    const isInitializedRef = useRef(false);
-    const [wallets, setWallets] = useState([]);
-    const setRegisteredWallets = useCallback((standardWallets) => {
-        setWallets(filterSuiWallets(standardWallets));
-    }, []);
-    useEffect(() => {
-        const walletsApi = getWalletsApi();
-        const removeOnRegisterListener = walletsApi.on("register", (wallet) => {
-            setRegisteredWallets([wallet]);
-        });
-        if (!isInitializedRef.current) {
-            const slushWebWallet = new SlushWallet({
-                name: "Squid",
-                chain: "sui:mainnet",
-                metadata: {
-                    enabled: true,
-                    icon: slushWebWalletData.icon,
-                    id: slushWebWalletData.id,
-                    walletName: slushWebWalletData.name,
-                },
-            });
-            walletsApi.register(slushWebWallet);
-            setRegisteredWallets(walletsApi.get());
-            isInitializedRef.current = true;
-        }
-        return () => {
-            removeOnRegisterListener();
-        };
-    }, [setRegisteredWallets]);
-    return {
-        wallets,
-    };
+    return useStandardWallets({
+        filterWallets: filterSuiWallets,
+        getExtraWallets,
+    });
 }
 //# sourceMappingURL=useSuiWallets.js.map

package/dist/hooks/sui/useSuiWallets.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSuiWallets.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSuiWallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EACL,UAAU,IAAI,aAAa,GAE5B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjE,OAAO,EACL,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oCAAoC,CAAC;AAE5C;;GAEG;AACH,MAAM,UAAU,aAAa;IAG3B,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAc,EAAE,CAAC,CAAC;IAExD,MAAM,oBAAoB,GAAG,WAAW,CACtC,CAAC,eAA0C,EAAE,EAAE;QAC7C,UAAU,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChD,CAAC,EACD,EAAE,CACH,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;QAEnC,MAAM,wBAAwB,GAAG,UAAU,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;YACpE,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;YAC7B,MAAM,cAAc,GAAG,IAAI,WAAW,CAAC;gBACrC,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,aAAa;gBACpB,QAAQ,EAAE;oBACR,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,kBAAkB,CAAC,IAAI;oBAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE;oBACzB,UAAU,EAAE,kBAAkB,CAAC,IAAI;iBACpC;aACF,CAAC,CAAC;YAEH,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YACpC,oBAAoB,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;YACvC,gBAAgB,CAAC,OAAO,GAAG,IAAI,CAAC;SACjC;QAED,OAAO,GAAG,EAAE;YACV,wBAAwB,EAAE,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE3B,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useSuiWallets.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSuiWallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EACL,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,SAAS,eAAe;IACtB,MAAM,cAAc,GAAG,IAAI,WAAW,CAAC;QACrC,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,aAAa;QACpB,QAAQ,EAAE;YACR,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,kBAAkB,CAAC,IAAI;YAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE;YACzB,UAAU,EAAE,kBAAkB,CAAC,IAAI;SACpC;KACF,CAAC,CAAC;IAEH,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,aAAa;IAG3B,OAAO,kBAAkB,CAAY;QACnC,aAAa,EAAE,gBAAgB;QAC/B,eAAe;KAChB,CAAC,CAAC;AACL,CAAC"}

package/dist/hooks/transaction/useExecuteTransaction.js

@@ -624,7 +624,10 @@ export const useExecuteTransaction = (squidRoute) => {
         }
     }, {
         onMutate: (variables) => {
-            useTransactionStore.setState({ txLocalId: variables.id });
+            useTransactionStore.setState({
+                txLocalId: variables.id,
+                currentTransaction: undefined,
+            });
         },
         onError: (error, variables) => handleTransactionError(error, variables.id),
         onSuccess: (_data, variables) => {