@manahippo/aptos-wallet-adapter 0.3.5 → 0.3.6

package/dist/WalletProviders/WalletProvider.d.ts

@@ -4,6 +4,7 @@ import { WalletAdapter } from '../WalletAdapters/BaseAdapter';
 export interface WalletProviderProps {
     children: ReactNode;
     wallets: WalletAdapter[];
+    autoConnect?: boolean;
     onError?: (error: WalletError) => void;
     localStorageKey?: string;
 }

package/dist/WalletProviders/WalletProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,SAAS,EAA4C,MAAM,OAAO,CAAC;AAEhF,OAAO,EACL,WAAW,EAIZ,MAAM,UAAU,CAAC;AAClB,OAAO,EAEL,aAAa,EAGd,MAAM,+BAA+B,CAAC;AAGvC,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAcD,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CAuOlD,CAAC"}
+{"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,SAAS,EAA4C,MAAM,OAAO,CAAC;AAEhF,OAAO,EACL,WAAW,EAIZ,MAAM,UAAU,CAAC;AAClB,OAAO,EAEL,aAAa,EAGd,MAAM,+BAA+B,CAAC;AAGvC,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAcD,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CAgRlD,CAAC"}

package/dist/WalletProviders/WalletProvider.js

@@ -22,9 +22,8 @@ const initialState = {
     account: null,
     connected: false
 };
-const WalletProvider = ({ children, wallets: adapters, onError, localStorageKey = 'walletName' }) => {
-    const { useLocalStorageState } = (0, useLocalStorage_1.useLocalStorage)();
-    const [, setName] = useLocalStorageState(localStorageKey, null);
+const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onError, localStorageKey = 'walletName' }) => {
+    const [name, setName] = (0, useLocalStorage_1.useLocalStorage)(localStorageKey, null);
     const [{ wallet, adapter, account, connected }, setState] = (0, react_1.useState)(initialState);
     const readyState = (adapter === null || adapter === void 0 ? void 0 : adapter.readyState) || BaseAdapter_1.WalletReadyState.Unsupported;
     const [connecting, setConnecting] = (0, react_1.useState)(false);
@@ -39,41 +38,58 @@ const WalletProvider = ({ children, wallets: adapters, onError, localStorageKey
     })));
     // When the wallets change, start to listen for changes to their `readyState`
     (0, react_1.useEffect)(() => {
-        function handleReadyStateChange(isReadyState) {
+        // When the adapters change, wrap them to conform to the `Wallet` interface
+        setWallets((currentWallets) => adapters.map((wAdapter, index) => {
+            const currentWallet = currentWallets[index];
+            // If the wallet hasn't changed, return the same instance
+            return currentWallet &&
+                currentWallet.adapter === wAdapter &&
+                currentWallet.readyState === wAdapter.readyState
+                ? currentWallet
+                : {
+                    adapter: wAdapter,
+                    readyState: wAdapter.readyState
+                };
+        }));
+        function handleReadyStateChange(wReadyState) {
             setWallets((prevWallets) => {
-                const walletIndex = prevWallets.findIndex((wAdapter) => wAdapter.adapter.name === this.name);
-                if (walletIndex === -1)
+                const index = prevWallets.findIndex(({ adapter: wAdapter }) => wAdapter === this);
+                if (index === -1)
                     return prevWallets;
+                const { adapter: wAdapter } = prevWallets[index];
                 return [
-                    ...prevWallets.slice(0, walletIndex),
-                    Object.assign(Object.assign({}, prevWallets[walletIndex]), { isReadyState }),
-                    ...prevWallets.slice(walletIndex + 1)
+                    ...prevWallets.slice(0, index),
+                    { adapter: wAdapter, readyState: wReadyState },
+                    ...prevWallets.slice(index + 1)
                 ];
             });
         }
-        for (const wAdapter of adapters) {
-            wAdapter.on('readyStateChange', handleReadyStateChange, wAdapter);
-        }
-        return () => {
-            for (const wAdapter of adapters) {
-                wAdapter.off('readyStateChange', handleReadyStateChange, wAdapter);
-            }
-        };
+        adapters.forEach((wAdapter) => wAdapter.on('readyStateChange', handleReadyStateChange, wAdapter));
+        return () => adapters.forEach((wAdapter) => wAdapter.off('readyStateChange', handleReadyStateChange, wAdapter));
     }, [adapters]);
     // When the selected wallet changes, initialize the state
-    // useEffect(() => {
-    //   const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === name);
-    //   if (selectedWallet) {
-    //     setState({
-    //       wallet: selectedWallet,
-    //       adapter: selectedWallet.adapter,
-    //       connected: selectedWallet.adapter.connected,
-    //       publicKey: selectedWallet.adapter.publicKey
-    //     });
-    //   } else {
-    //     setState(initialState);
-    //   }
-    // }, [name, wallets]);
+    (0, react_1.useEffect)(() => {
+        const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === name);
+        if (selectedWallet) {
+            setState({
+                wallet: selectedWallet,
+                adapter: selectedWallet.adapter,
+                connected: selectedWallet.adapter.connected,
+                account: selectedWallet.adapter.publicAccount
+            });
+        }
+        else {
+            setState(initialState);
+        }
+    }, [name, wallets]);
+    // If the window is closing or reloading, ignore disconnect and error events from the adapter
+    (0, react_1.useEffect)(() => {
+        function listener() {
+            isUnloading.current = true;
+        }
+        window.addEventListener('beforeunload', listener);
+        return () => window.removeEventListener('beforeunload', listener);
+    }, [isUnloading]);
     // Handle the adapter's connect event
     const handleConnect = (0, react_1.useCallback)(() => {
         if (!adapter)
@@ -85,8 +101,7 @@ const WalletProvider = ({ children, wallets: adapters, onError, localStorageKey
         // Clear the selected wallet unless the window is unloading
         if (!isUnloading.current)
             setName(null);
-        setState(initialState);
-    }, [isUnloading]);
+    }, [isUnloading, setName]);
     // Handle the adapter's error event, and local errors
     const handleError = (0, react_1.useCallback)((error) => {
         // Call onError unless the window is unloading
@@ -113,51 +128,71 @@ const WalletProvider = ({ children, wallets: adapters, onError, localStorageKey
             adapter === null || adapter === void 0 ? void 0 : adapter.disconnect();
         };
     }, [adapter]);
+    // If autoConnect is enabled, try to connect when the adapter changes and is ready
+    (0, react_1.useEffect)(() => {
+        if (isConnecting.current ||
+            connected ||
+            !autoConnect ||
+            !adapter ||
+            !(readyState === BaseAdapter_1.WalletReadyState.Installed || readyState === BaseAdapter_1.WalletReadyState.Loadable))
+            return;
+        (function () {
+            return __awaiter(this, void 0, void 0, function* () {
+                isConnecting.current = true;
+                setConnecting(true);
+                try {
+                    yield adapter.connect();
+                }
+                catch (error) {
+                    // Clear the selected wallet
+                    setName(null);
+                    // Don't throw error, but handleError will still be called
+                }
+                finally {
+                    setConnecting(false);
+                    isConnecting.current = false;
+                }
+            });
+        })();
+    }, [isConnecting, connected, autoConnect, adapter, readyState, setName]);
     // Connect the adapter to the wallet
     const connect = (0, react_1.useCallback)((walletName) => __awaiter(void 0, void 0, void 0, function* () {
-        if (isConnecting.current || connecting || disconnecting || connected)
+        if (isConnecting.current || isDisconnecting.current || connected)
             return;
-        const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === walletName);
-        let walletToConnect = initialState;
-        if (selectedWallet) {
-            walletToConnect = {
-                wallet: selectedWallet,
-                adapter: selectedWallet.adapter,
-                connected: selectedWallet.adapter.connected,
-                account: selectedWallet.adapter.publicAccount
-            };
+        if (!name) {
+            setName(walletName);
         }
-        setState(walletToConnect);
-        if (!walletToConnect.adapter)
-            throw handleError(new errors_1.WalletNotSelectedError());
-        if (!(walletToConnect.adapter.readyState === BaseAdapter_1.WalletReadyState.Installed ||
-            walletToConnect.adapter.readyState === BaseAdapter_1.WalletReadyState.Loadable)) {
-            // Clear the selected wallet
-            setName(null);
-            if (typeof window !== 'undefined' && walletToConnect.adapter.url) {
-                window.open(walletToConnect.adapter.url, '_blank');
+        else {
+            if (!adapter)
+                throw handleError(new errors_1.WalletNotSelectedError());
+            if (!(readyState === BaseAdapter_1.WalletReadyState.Installed || readyState === BaseAdapter_1.WalletReadyState.Loadable)) {
+                // Clear the selected wallet
+                setName(null);
+                if (typeof window !== 'undefined') {
+                    window.open(adapter.url, '_blank');
+                }
+                throw handleError(new errors_1.WalletNotReadyError());
+            }
+            isConnecting.current = true;
+            setConnecting(true);
+            try {
+                yield adapter.connect();
+            }
+            catch (error) {
+                // Clear the selected wallet
+                setName(null);
+                // Rethrow the error, and handleError will also be called
+                throw error;
+            }
+            finally {
+                setConnecting(false);
+                isConnecting.current = false;
             }
-            throw handleError(new errors_1.WalletNotReadyError());
-        }
-        isConnecting.current = true;
-        setConnecting(true);
-        try {
-            yield walletToConnect.adapter.connect();
-        }
-        catch (error) {
-            // Clear the selected wallet
-            setName(null);
-            // Rethrow the error, and handleError will also be called
-            throw error;
-        }
-        finally {
-            setConnecting(false);
-            isConnecting.current = false;
         }
-    }), [isConnecting, connecting, disconnecting, connected, readyState, handleError, wallets]);
+    }), [isConnecting, isDisconnecting, connected, adapter, readyState, handleError, setName, name]);
     // Disconnect the adapter from the wallet
     const disconnect = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
-        if (isDisconnecting.current || disconnecting)
+        if (isDisconnecting.current)
             return;
         if (!adapter)
             return setName(null);
@@ -176,7 +211,7 @@ const WalletProvider = ({ children, wallets: adapters, onError, localStorageKey
             setDisconnecting(false);
             isDisconnecting.current = false;
         }
-    }), [isDisconnecting, disconnecting, adapter]);
+    }), [isDisconnecting, setName, adapter]);
     // Send a transaction using the provided connection
     const signAndSubmitTransaction = (0, react_1.useCallback)((transaction, option) => __awaiter(void 0, void 0, void 0, function* () {
         if (!adapter)
@@ -207,6 +242,7 @@ const WalletProvider = ({ children, wallets: adapters, onError, localStorageKey
             connected,
             connecting,
             disconnecting,
+            autoConnect,
             select: setName,
             connect,
             disconnect,

package/dist/WalletProviders/WalletProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8DAA2D;AAC3D,iCAAgF;AAEhF,qCAKkB;AAClB,+DAKuC;AACvC,2CAAoD;AASpD,MAAM,YAAY,GAKd;IACF,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,KAAK;CACjB,CAAC;AAEK,MAAM,cAAc,GAA4B,CAAC,EACtD,QAAQ,EACR,OAAO,EAAE,QAAQ,EACjB,OAAO,EACP,eAAe,GAAG,YAAY,EAC/B,EAAE,EAAE;IACH,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAA,iCAAe,GAAE,CAAC;IACnD,MAAM,CAAC,EAAE,OAAO,CAAC,GAAG,oBAAoB,CAAoB,eAAe,EAAE,IAAI,CAAC,CAAC;IACnF,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,YAAY,CAAC,CAAC;IACnF,MAAM,UAAU,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,KAAI,8BAAgB,CAAC,WAAW,CAAC;IACvE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IACpD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IAElC,qDAAqD;IACrD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,GAAG,EAAE,CAC1C,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACtB,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAC,CAAC,CACJ,CAAC;IAEF,6EAA6E;IAC7E,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,SAAS,sBAAsB,CAAsB,YAA8B;YACjF,UAAU,CAAC,CAAC,WAAW,EAAE,EAAE;gBACzB,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CACvC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAClD,CAAC;gBACF,IAAI,WAAW,KAAK,CAAC,CAAC;oBAAE,OAAO,WAAW,CAAC;gBAE3C,OAAO;oBACL,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC;oDAC/B,WAAW,CAAC,WAAW,CAAC,KAAE,YAAY;oBAC3C,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC;iBACtC,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;QACD,KAAK,MAAM,QAAQ,IAAI,QAAQ,EAAE;YAC/B,QAAQ,CAAC,EAAE,CAAC,kBAAkB,EAAE,sBAAsB,EAAE,QAAQ,CAAC,CAAC;SACnE;QACD,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,QAAQ,IAAI,QAAQ,EAAE;gBAC/B,QAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,sBAAsB,EAAE,QAAQ,CAAC,CAAC;aACpE;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,yDAAyD;IACzD,oBAAoB;IACpB,uFAAuF;IACvF,0BAA0B;IAC1B,iBAAiB;IACjB,gCAAgC;IAChC,yCAAyC;IACzC,qDAAqD;IACrD,oDAAoD;IACpD,UAAU;IACV,aAAa;IACb,8BAA8B;IAC9B,MAAM;IACN,uBAAuB;IAEvB,qCAAqC;IACrC,MAAM,aAAa,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACrC,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iCACf,KAAK,KACR,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,aAAa,IAC9B,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,wCAAwC;IACxC,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACxC,2DAA2D;QAC3D,IAAI,CAAC,WAAW,CAAC,OAAO;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACxC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,qDAAqD;IACrD,MAAM,WAAW,GAAG,IAAA,mBAAW,EAC7B,CAAC,KAAkB,EAAE,EAAE;QACrB,8CAA8C;QAC9C,IAAI,CAAC,WAAW,CAAC,OAAO;YAAE,CAAC,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5D,OAAO,KAAK,CAAC;IACf,CAAC,EACD,CAAC,WAAW,EAAE,OAAO,CAAC,CACvB,CAAC;IAEF,8DAA8D;IAC9D,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,OAAO,EAAE;YACX,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;YACrC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;YAC3C,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YACjC,OAAO,GAAG,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;gBACtC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;gBAC5C,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YACpC,CAAC,CAAC;SACH;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC,CAAC;IAE5D,mDAAmD;IACnD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAE,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,oCAAoC;IACpC,MAAM,OAAO,GAAG,IAAA,mBAAW,EACzB,CAAO,UAAkB,EAAE,EAAE;QAC3B,IAAI,YAAY,CAAC,OAAO,IAAI,UAAU,IAAI,aAAa,IAAI,SAAS;YAAE,OAAO;QAC7E,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QACxF,IAAI,eAAe,GAAG,YAAY,CAAC;QACnC,IAAI,cAAc,EAAE;YAClB,eAAe,GAAG;gBAChB,MAAM,EAAE,cAAc;gBACtB,OAAO,EAAE,cAAc,CAAC,OAAO;gBAC/B,SAAS,EAAE,cAAc,CAAC,OAAO,CAAC,SAAS;gBAC3C,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,aAAa;aAC9C,CAAC;SACH;QACD,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC1B,IAAI,CAAC,eAAe,CAAC,OAAO;YAAE,MAAM,WAAW,CAAC,IAAI,+BAAsB,EAAE,CAAC,CAAC;QAE9E,IACE,CAAC,CACC,eAAe,CAAC,OAAO,CAAC,UAAU,KAAK,8BAAgB,CAAC,SAAS;YACjE,eAAe,CAAC,OAAO,CAAC,UAAU,KAAK,8BAAgB,CAAC,QAAQ,CACjE,EACD;YACA,4BAA4B;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAC;YAEd,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE;gBAChE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;aACpD;YAED,MAAM,WAAW,CAAC,IAAI,4BAAmB,EAAE,CAAC,CAAC;SAC9C;QAED,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;QAC5B,aAAa,CAAC,IAAI,CAAC,CAAC;QACpB,IAAI;YACF,MAAM,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACzC;QAAC,OAAO,KAAU,EAAE;YACnB,4BAA4B;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAC;YACd,yDAAyD;YACzD,MAAM,KAAK,CAAC;SACb;gBAAS;YACR,aAAa,CAAC,KAAK,CAAC,CAAC;YACrB,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;SAC9B;IACH,CAAC,CAAA,EACD,CAAC,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CACvF,CAAC;IAEF,yCAAyC;IACzC,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAS,EAAE;QACxC,IAAI,eAAe,CAAC,OAAO,IAAI,aAAa;YAAE,OAAO;QACrD,IAAI,CAAC,OAAO;YAAE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnC,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC;QAC/B,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI;YACF,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;SAC5B;QAAC,OAAO,KAAU,EAAE;YACnB,4BAA4B;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAC;YACd,yDAAyD;YACzD,MAAM,KAAK,CAAC;SACb;gBAAS;YACR,gBAAgB,CAAC,KAAK,CAAC,CAAC;YACxB,eAAe,CAAC,OAAO,GAAG,KAAK,CAAC;SACjC;IACH,CAAC,CAAA,EAAE,CAAC,eAAe,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;IAE9C,mDAAmD;IACnD,MAAM,wBAAwB,GAAG,IAAA,mBAAW,EAC1C,CAAO,WAA+B,EAAE,MAAY,EAAE,EAAE;QACtD,IAAI,CAAC,OAAO;YAAE,MAAM,WAAW,CAAC,IAAI,+BAAsB,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,SAAS;YAAE,MAAM,WAAW,CAAC,IAAI,gCAAuB,EAAE,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,wBAAwB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC7E,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAA,EACD,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,CAClC,CAAC;IAEF,MAAM,eAAe,GAAG,IAAA,mBAAW,EACjC,CAAO,WAA+B,EAAE,MAAY,EAAE,EAAE;QACtD,IAAI,CAAC,OAAO;YAAE,MAAM,WAAW,CAAC,IAAI,+BAAsB,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,SAAS;YAAE,MAAM,WAAW,CAAC,IAAI,gCAAuB,EAAE,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC,CAAA,EACD,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,CAClC,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,mBAAW,EAC7B,CAAO,OAAe,EAAE,EAAE;QACxB,IAAI,CAAC,OAAO;YAAE,MAAM,WAAW,CAAC,IAAI,+BAAsB,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,SAAS;YAAE,MAAM,WAAW,CAAC,IAAI,gCAAuB,EAAE,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC,CAAA,EACD,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,CAClC,CAAC;IAEF,OAAO,CACL,uBAAC,yBAAa,CAAC,QAAQ,kBACrB,KAAK,EAAE;YACL,OAAO;YACP,MAAM;YACN,OAAO;YACP,SAAS;YACT,UAAU;YACV,aAAa;YACb,MAAM,EAAE,OAAO;YACf,OAAO;YACP,UAAU;YACV,wBAAwB;YACxB,eAAe;YACf,WAAW;SACZ,gBACA,QAAQ,IACc,CAC1B,CAAC;AACJ,CAAC,CAAC;AAvOW,QAAA,cAAc,kBAuOzB"}
+{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"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"}

package/dist/WalletProviders/useWallet.d.ts

@@ -6,6 +6,7 @@ export interface Wallet {
     readyState: WalletReadyState;
 }
 export interface WalletContextState {
+    autoConnect: boolean;
     wallets: Wallet[];
     wallet: Wallet | null;
     account: AccountKeys | null;

package/dist/WalletProviders/useWallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE3E,OAAO,EACL,WAAW,EACX,aAAa,EACb,UAAU,EACV,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAkB;IAEjC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IACrC,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,wBAAwB,CACtB,WAAW,EAAE,kBAAkB,EAC/B,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IACtC,eAAe,CAAC,WAAW,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACrF,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/C;AASD,eAAO,MAAM,aAAa,6CAEzB,CAAC;AAEF,wBAAgB,SAAS,IAAI,kBAAkB,CAE9C"}
+{"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE3E,OAAO,EACL,WAAW,EACX,aAAa,EACb,UAAU,EACV,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IACrC,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,wBAAwB,CACtB,WAAW,EAAE,kBAAkB,EAC/B,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IACtC,eAAe,CAAC,WAAW,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACrF,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/C;AASD,eAAO,MAAM,aAAa,6CAEzB,CAAC;AAEF,wBAAgB,SAAS,IAAI,kBAAkB,CAE9C"}

package/dist/WalletProviders/useWallet.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useWallet = exports.WalletContext = void 0;
 const react_1 = require("react");
 const DEFAULT_CONTEXT = {
-    // autoConnect: false,
+    autoConnect: false,
     connecting: false,
     connected: false,
     disconnecting: false

package/dist/WalletProviders/useWallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWallet.js","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";;;AACA,iCAAkD;AAgClD,MAAM,eAAe,GAAG;IACtB,sBAAsB;IACtB,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,KAAK;IAChB,aAAa,EAAE,KAAK;CACC,CAAC;AAEX,QAAA,aAAa,GAAG,IAAA,qBAAa,EACxC,eAAqC,CACtC,CAAC;AAEF,SAAgB,SAAS;IACvB,OAAO,IAAA,kBAAU,EAAC,qBAAa,CAAC,CAAC;AACnC,CAAC;AAFD,8BAEC"}
+{"version":3,"file":"useWallet.js","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";;;AACA,iCAAkD;AAgClD,MAAM,eAAe,GAAG;IACtB,WAAW,EAAE,KAAK;IAClB,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,KAAK;IAChB,aAAa,EAAE,KAAK;CACC,CAAC;AAEX,QAAA,aAAa,GAAG,IAAA,qBAAa,EACxC,eAAqC,CACtC,CAAC;AAEF,SAAgB,SAAS;IACvB,OAAO,IAAA,kBAAU,EAAC,qBAAa,CAAC,CAAC;AACnC,CAAC;AAFD,8BAEC"}

package/dist/hooks/useLocalStorage.d.ts

@@ -1,4 +1,3 @@
-export declare const useLocalStorage: () => {
-    useLocalStorageState: <T>(key: string, defaultState: T, session?: boolean) => [T, (T: any) => void];
-};
+import type { Dispatch, SetStateAction } from 'react';
+export declare function useLocalStorage<T>(key: string, defaultState: T): [T, Dispatch<SetStateAction<T>>];
 //# sourceMappingURL=useLocalStorage.d.ts.map

package/dist/hooks/useLocalStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLocalStorage.d.ts","sourceRoot":"","sources":["../../src/hooks/useLocalStorage.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe;mCAGnB,MAAM,6BAED,OAAO,aACR,GAAG,KAAK,IAAI;CAmCxB,CAAC"}
+{"version":3,"file":"useLocalStorage.d.ts","sourceRoot":"","sources":["../../src/hooks/useLocalStorage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAGtD,wBAAgB,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAmCjG"}

package/dist/hooks/useLocalStorage.js

@@ -2,40 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLocalStorage = void 0;
 const react_1 = require("react");
-const useSSR_1 = require("./useSSR");
-const useLocalStorage = () => {
-    const { isClient } = (0, useSSR_1.useSSR)();
-    const useLocalStorageState = (key, defaultState, session) => {
-        let storage;
-        if (isClient) {
-            storage = session ? sessionStorage : localStorage;
+function useLocalStorage(key, defaultState) {
+    const state = (0, react_1.useState)(() => {
+        try {
+            const value = localStorage.getItem(key);
+            if (value)
+                return JSON.parse(value);
         }
-        const [state, setState] = (0, react_1.useState)(() => {
-            try {
-                let storedState = storage === null || storage === void 0 ? void 0 : storage.getItem(key);
-                if (storedState) {
-                    return JSON.parse(storedState || '');
-                }
+        catch (error) {
+            if (typeof window !== 'undefined') {
+                console.error(error);
             }
-            catch (error) {
-                if (typeof window !== 'undefined') {
-                    console.error(error);
-                }
-            }
-            return defaultState;
-        });
-        const setLocalStorageState = (0, react_1.useCallback)((newState) => {
-            setState(newState);
-            if (newState === null) {
-                storage === null || storage === void 0 ? void 0 : storage.removeItem(key);
+        }
+        return defaultState;
+    });
+    const value = state[0];
+    const isFirstRender = (0, react_1.useRef)(true);
+    (0, react_1.useEffect)(() => {
+        if (isFirstRender.current) {
+            isFirstRender.current = false;
+            return;
+        }
+        try {
+            if (value === null) {
+                localStorage.removeItem(key);
             }
             else {
-                storage === null || storage === void 0 ? void 0 : storage.setItem(key, JSON.stringify(newState));
+                localStorage.setItem(key, JSON.stringify(value));
             }
-        }, [key, storage]);
-        return [state, setLocalStorageState];
-    };
-    return { useLocalStorageState };
-};
+        }
+        catch (error) {
+            if (typeof window !== 'undefined') {
+                console.error(error);
+            }
+        }
+    }, [value, key]);
+    return state;
+}
 exports.useLocalStorage = useLocalStorage;
 //# sourceMappingURL=useLocalStorage.js.map

package/dist/hooks/useLocalStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLocalStorage.js","sourceRoot":"","sources":["../../src/hooks/useLocalStorage.ts"],"names":[],"mappings":";;;AAAA,iCAA8C;AAC9C,qCAAkC;AAE3B,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,eAAM,GAAE,CAAC;IAC9B,MAAM,oBAAoB,GAAG,CAC3B,GAAW,EACX,YAAe,EACf,OAAiB,EACM,EAAE;QACzB,IAAI,OAA4B,CAAC;QACjC,IAAI,QAAQ,EAAE;YACZ,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC;SACnD;QACD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,GAAG,EAAE;YACtC,IAAI;gBACF,IAAI,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,GAAG,CAAC,CAAC;gBACxC,IAAI,WAAW,EAAE;oBACf,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;iBACtC;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;oBACjC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBACtB;aACF;YACD,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EACtC,CAAC,QAAa,EAAE,EAAE;YAChB,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACnB,IAAI,QAAQ,KAAK,IAAI,EAAE;gBACrB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC,GAAG,CAAC,CAAC;aAC1B;iBAAM;gBACL,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;aACjD;QACH,CAAC,EACD,CAAC,GAAG,EAAE,OAAO,CAAC,CACf,CAAC;QAEF,OAAO,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAClC,CAAC,CAAC;AAzCW,QAAA,eAAe,mBAyC1B"}
+{"version":3,"file":"useLocalStorage.js","sourceRoot":"","sources":["../../src/hooks/useLocalStorage.ts"],"names":[],"mappings":";;;AACA,iCAAoD;AAEpD,SAAgB,eAAe,CAAI,GAAW,EAAE,YAAe;IAC7D,MAAM,KAAK,GAAG,IAAA,gBAAQ,EAAI,GAAG,EAAE;QAC7B,IAAI;YACF,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,KAAK;gBAAE,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAM,CAAC;SAC1C;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;gBACjC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACtB;SACF;QAED,OAAO,YAAY,CAAC;IACtB,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAEvB,MAAM,aAAa,GAAG,IAAA,cAAM,EAAC,IAAI,CAAC,CAAC;IACnC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,aAAa,CAAC,OAAO,EAAE;YACzB,aAAa,CAAC,OAAO,GAAG,KAAK,CAAC;YAC9B,OAAO;SACR;QACD,IAAI;YACF,IAAI,KAAK,KAAK,IAAI,EAAE;gBAClB,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aAC9B;iBAAM;gBACL,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;aAClD;SACF;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;gBACjC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACtB;SACF;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAEjB,OAAO,KAAK,CAAC;AACf,CAAC;AAnCD,0CAmCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manahippo/aptos-wallet-adapter",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [

package/src/WalletProviders/WalletProvider.tsx

@@ -18,6 +18,7 @@ import { Wallet, WalletContext } from './useWallet';
 export interface WalletProviderProps {
   children: ReactNode;
   wallets: WalletAdapter[];
+  autoConnect?: boolean;
   onError?: (error: WalletError) => void;
   localStorageKey?: string;
 }
@@ -37,11 +38,11 @@ const initialState: {
 export const WalletProvider: FC<WalletProviderProps> = ({
   children,
   wallets: adapters,
+  autoConnect = false,
   onError,
   localStorageKey = 'walletName'
 }) => {
-  const { useLocalStorageState } = useLocalStorage();
-  const [, setName] = useLocalStorageState<WalletName | null>(localStorageKey, null);
+  const [name, setName] = useLocalStorage<WalletName | null>(localStorageKey, null);
   const [{ wallet, adapter, account, connected }, setState] = useState(initialState);
   const readyState = adapter?.readyState || WalletReadyState.Unsupported;
   const [connecting, setConnecting] = useState(false);
@@ -60,44 +61,69 @@ export const WalletProvider: FC<WalletProviderProps> = ({
 
   // When the wallets change, start to listen for changes to their `readyState`
   useEffect(() => {
-    function handleReadyStateChange(this: WalletAdapter, isReadyState: WalletReadyState) {
+    // When the adapters change, wrap them to conform to the `Wallet` interface
+    setWallets((currentWallets) =>
+      adapters.map((wAdapter, index) => {
+        const currentWallet = currentWallets[index];
+        // If the wallet hasn't changed, return the same instance
+        return currentWallet &&
+          currentWallet.adapter === wAdapter &&
+          currentWallet.readyState === wAdapter.readyState
+          ? currentWallet
+          : {
+              adapter: wAdapter,
+              readyState: wAdapter.readyState
+            };
+      })
+    );
+
+    function handleReadyStateChange(this: any, wReadyState: WalletReadyState) {
       setWallets((prevWallets) => {
-        const walletIndex = prevWallets.findIndex(
-          (wAdapter) => wAdapter.adapter.name === this.name
-        );
-        if (walletIndex === -1) return prevWallets;
+        const index = prevWallets.findIndex(({ adapter: wAdapter }) => wAdapter === this);
+        if (index === -1) return prevWallets;
 
+        const { adapter: wAdapter } = prevWallets[index]!;
         return [
-          ...prevWallets.slice(0, walletIndex),
-          { ...prevWallets[walletIndex], isReadyState },
-          ...prevWallets.slice(walletIndex + 1)
+          ...prevWallets.slice(0, index),
+          { adapter: wAdapter, readyState: wReadyState },
+          ...prevWallets.slice(index + 1)
         ];
       });
     }
-    for (const wAdapter of adapters) {
-      wAdapter.on('readyStateChange', handleReadyStateChange, wAdapter);
-    }
-    return () => {
-      for (const wAdapter of adapters) {
-        wAdapter.off('readyStateChange', handleReadyStateChange, wAdapter);
-      }
-    };
+
+    adapters.forEach((wAdapter) =>
+      wAdapter.on('readyStateChange', handleReadyStateChange, wAdapter)
+    );
+    return () =>
+      adapters.forEach((wAdapter) =>
+        wAdapter.off('readyStateChange', handleReadyStateChange, wAdapter)
+      );
   }, [adapters]);
 
   // When the selected wallet changes, initialize the state
-  // useEffect(() => {
-  //   const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === name);
-  //   if (selectedWallet) {
-  //     setState({
-  //       wallet: selectedWallet,
-  //       adapter: selectedWallet.adapter,
-  //       connected: selectedWallet.adapter.connected,
-  //       publicKey: selectedWallet.adapter.publicKey
-  //     });
-  //   } else {
-  //     setState(initialState);
-  //   }
-  // }, [name, wallets]);
+  useEffect(() => {
+    const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === name);
+    if (selectedWallet) {
+      setState({
+        wallet: selectedWallet,
+        adapter: selectedWallet.adapter,
+        connected: selectedWallet.adapter.connected,
+        account: selectedWallet.adapter.publicAccount
+      });
+    } else {
+      setState(initialState);
+    }
+  }, [name, wallets]);
+
+  // If the window is closing or reloading, ignore disconnect and error events from the adapter
+  useEffect(() => {
+    function listener() {
+      isUnloading.current = true;
+    }
+
+    window.addEventListener('beforeunload', listener);
+    return () => window.removeEventListener('beforeunload', listener);
+  }, [isUnloading]);
 
   // Handle the adapter's connect event
   const handleConnect = useCallback(() => {
@@ -113,8 +139,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
   const handleDisconnect = useCallback(() => {
     // Clear the selected wallet unless the window is unloading
     if (!isUnloading.current) setName(null);
-    setState(initialState);
-  }, [isUnloading]);
+  }, [isUnloading, setName]);
 
   // Handle the adapter's error event, and local errors
   const handleError = useCallback(
@@ -147,59 +172,75 @@ export const WalletProvider: FC<WalletProviderProps> = ({
     };
   }, [adapter]);
 
-  // Connect the adapter to the wallet
-  const connect = useCallback(
-    async (walletName: string) => {
-      if (isConnecting.current || connecting || disconnecting || connected) return;
-      const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === walletName);
-      let walletToConnect = initialState;
-      if (selectedWallet) {
-        walletToConnect = {
-          wallet: selectedWallet,
-          adapter: selectedWallet.adapter,
-          connected: selectedWallet.adapter.connected,
-          account: selectedWallet.adapter.publicAccount
-        };
-      }
-      setState(walletToConnect);
-      if (!walletToConnect.adapter) throw handleError(new WalletNotSelectedError());
-
-      if (
-        !(
-          walletToConnect.adapter.readyState === WalletReadyState.Installed ||
-          walletToConnect.adapter.readyState === WalletReadyState.Loadable
-        )
-      ) {
-        // Clear the selected wallet
-        setName(null);
-
-        if (typeof window !== 'undefined' && walletToConnect.adapter.url) {
-          window.open(walletToConnect.adapter.url, '_blank');
-        }
-
-        throw handleError(new WalletNotReadyError());
-      }
+  // If autoConnect is enabled, try to connect when the adapter changes and is ready
+  useEffect(() => {
+    if (
+      isConnecting.current ||
+      connected ||
+      !autoConnect ||
+      !adapter ||
+      !(readyState === WalletReadyState.Installed || readyState === WalletReadyState.Loadable)
+    )
+      return;
 
+    (async function () {
       isConnecting.current = true;
       setConnecting(true);
       try {
-        await walletToConnect.adapter.connect();
+        await adapter.connect();
       } catch (error: any) {
         // Clear the selected wallet
         setName(null);
-        // Rethrow the error, and handleError will also be called
-        throw error;
+        // Don't throw error, but handleError will still be called
       } finally {
         setConnecting(false);
         isConnecting.current = false;
       }
+    })();
+  }, [isConnecting, connected, autoConnect, adapter, readyState, setName]);
+
+  // Connect the adapter to the wallet
+  const connect = useCallback(
+    async (walletName: WalletName) => {
+      if (isConnecting.current || isDisconnecting.current || connected) return;
+      if (!name) {
+        setName(walletName);
+      } else {
+        if (!adapter) throw handleError(new WalletNotSelectedError());
+
+        if (
+          !(readyState === WalletReadyState.Installed || readyState === WalletReadyState.Loadable)
+        ) {
+          // Clear the selected wallet
+          setName(null);
+
+          if (typeof window !== 'undefined') {
+            window.open(adapter.url, '_blank');
+          }
+
+          throw handleError(new WalletNotReadyError());
+        }
+        isConnecting.current = true;
+        setConnecting(true);
+        try {
+          await adapter.connect();
+        } catch (error: any) {
+          // Clear the selected wallet
+          setName(null);
+          // Rethrow the error, and handleError will also be called
+          throw error;
+        } finally {
+          setConnecting(false);
+          isConnecting.current = false;
+        }
+      }
     },
-    [isConnecting, connecting, disconnecting, connected, readyState, handleError, wallets]
+    [isConnecting, isDisconnecting, connected, adapter, readyState, handleError, setName, name]
   );
 
   // Disconnect the adapter from the wallet
   const disconnect = useCallback(async () => {
-    if (isDisconnecting.current || disconnecting) return;
+    if (isDisconnecting.current) return;
     if (!adapter) return setName(null);
 
     isDisconnecting.current = true;
@@ -215,7 +256,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
       setDisconnecting(false);
       isDisconnecting.current = false;
     }
-  }, [isDisconnecting, disconnecting, adapter]);
+  }, [isDisconnecting, setName, adapter]);
 
   // Send a transaction using the provided connection
   const signAndSubmitTransaction = useCallback(
@@ -255,6 +296,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
         connected,
         connecting,
         disconnecting,
+        autoConnect,
         select: setName,
         connect,
         disconnect,

package/src/WalletProviders/useWallet.ts

@@ -13,7 +13,7 @@ export interface Wallet {
 }
 
 export interface WalletContextState {
-  // autoConnect: boolean;
+  autoConnect: boolean;
   wallets: Wallet[];
   wallet: Wallet | null;
   account: AccountKeys | null;
@@ -32,7 +32,7 @@ export interface WalletContextState {
 }
 
 const DEFAULT_CONTEXT = {
-  // autoConnect: false,
+  autoConnect: false,
   connecting: false,
   connected: false,
   disconnecting: false

package/src/hooks/useLocalStorage.ts

@@ -1,45 +1,39 @@
-import { useCallback, useState } from 'react';
-import { useSSR } from './useSSR';
+import type { Dispatch, SetStateAction } from 'react';
+import { useEffect, useRef, useState } from 'react';
 
-export const useLocalStorage = () => {
-  const { isClient } = useSSR();
-  const useLocalStorageState = <T>(
-    key: string,
-    defaultState: T,
-    session?: boolean
-  ): [T, (T: any) => void] => {
-    let storage: undefined | Storage;
-    if (isClient) {
-      storage = session ? sessionStorage : localStorage;
-    }
-    const [state, setState] = useState(() => {
-      try {
-        let storedState = storage?.getItem(key);
-        if (storedState) {
-          return JSON.parse(storedState || '');
-        }
-      } catch (error) {
-        if (typeof window !== 'undefined') {
-          console.error(error);
-        }
+export function useLocalStorage<T>(key: string, defaultState: T): [T, Dispatch<SetStateAction<T>>] {
+  const state = useState<T>(() => {
+    try {
+      const value = localStorage.getItem(key);
+      if (value) return JSON.parse(value) as T;
+    } catch (error: any) {
+      if (typeof window !== 'undefined') {
+        console.error(error);
       }
-      return defaultState;
-    });
+    }
 
-    const setLocalStorageState = useCallback(
-      (newState: any) => {
-        setState(newState);
-        if (newState === null) {
-          storage?.removeItem(key);
-        } else {
-          storage?.setItem(key, JSON.stringify(newState));
-        }
-      },
-      [key, storage]
-    );
+    return defaultState;
+  });
+  const value = state[0];
 
-    return [state, setLocalStorageState];
-  };
+  const isFirstRender = useRef(true);
+  useEffect(() => {
+    if (isFirstRender.current) {
+      isFirstRender.current = false;
+      return;
+    }
+    try {
+      if (value === null) {
+        localStorage.removeItem(key);
+      } else {
+        localStorage.setItem(key, JSON.stringify(value));
+      }
+    } catch (error: any) {
+      if (typeof window !== 'undefined') {
+        console.error(error);
+      }
+    }
+  }, [value, key]);
 
-  return { useLocalStorageState };
-};
+  return state;
+}