@sundaeswap/wallet-lite 0.0.32 → 0.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sundaeswap/wallet-lite",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",

package/src/classes/WalletObserver.class.ts

@@ -111,18 +111,6 @@ export class WalletObserver<
     if (!this._options.persistence) {
       return;
     }
-
-    const savedWallet = window.localStorage.getItem(
-      WalletObserver.PERSISTENCE_CACHE_KEY
-    );
-
-    if (!savedWallet) {
-      return;
-    }
-
-    // Init connection
-    const seed: IWalletObserverSeed = JSON.parse(savedWallet);
-    this.connectWallet(seed.activeWallet);
   }
 
   /**
@@ -187,13 +175,13 @@ export class WalletObserver<
         network: newNetwork,
       };
 
-      this.dispatch(EWalletObserverEvents.SYNCING_WALLET_END, result);
-      this._performingSync = false;
-
       const end = performance.now();
       if (this._options.debug) {
         console.log(`sync: ${end - start}ms`);
       }
+
+      this.dispatch(EWalletObserverEvents.SYNCING_WALLET_END, result);
+      this._performingSync = false;
       return result;
     } catch (e) {
       this._performingSync = false;
@@ -230,8 +218,6 @@ export class WalletObserver<
    * @returns {Promise<Cip30WalletApi>} - A promise that resolves to the API instance.
    */
   syncApi = async (activeWallet?: TSupportedWalletExtensions): Promise<any> => {
-    let attempts = 0;
-    this.api = undefined;
     if (!activeWallet && !this.activeWallet) {
       throw new Error(
         "A wallet is required to be passed as a parameter, or to be defined in the class."
@@ -241,8 +227,10 @@ export class WalletObserver<
     const selectedWallet =
       activeWallet || (this.activeWallet as TSupportedWalletExtensions);
 
+    let attempts = 0;
     let shouldContinue = true;
-    while (!this.api && shouldContinue) {
+
+    while (shouldContinue) {
       if (attempts === 10) {
         throw new Error(
           "Could not reconnect to the selected wallet. Please check your extension."
@@ -258,6 +246,7 @@ export class WalletObserver<
 
         this.api = api;
         this.network = await api.getNetworkId();
+        shouldContinue = false;
       } catch (e) {
         if (
           (e as Error)?.message === "user canceled connection" ||

package/src/react-components/WalletObserverProvider/WalletObserverProvider.tsx

@@ -1,5 +1,7 @@
-import { FC, PropsWithChildren, useMemo } from "react";
+import { FC, PropsWithChildren, useEffect, useMemo } from "react";
 
+import { TSupportedWalletExtensions } from "../../@types/observer.js";
+import { WalletObserver } from "../../classes/WalletObserver.class.js";
 import {
   IWalletObserverProviderProps,
   IWalletObserverState,
@@ -49,6 +51,17 @@ const WalletObserverProvider: FC<
     [options, state, derivedState]
   );
 
+  useEffect(() => {
+    const wallet: TSupportedWalletExtensions | null =
+      window.localStorage.getItem(
+        WalletObserver.PERSISTENCE_CACHE_KEY
+      ) as TSupportedWalletExtensions;
+
+    if (wallet) {
+      state.connectWallet(JSON.parse(wallet).activeWallet);
+    }
+  }, []);
+
   return (
     <WalletObserverContext.Provider value={contextValue}>
       {children}

package/src/react-components/WalletObserverProvider/hooks/useWalletObserverState.ts

@@ -129,11 +129,12 @@ export const useWalletObserverState = (observer: WalletObserver) => {
   const connectWallet = useCallback(
     async (wallet: TSupportedWalletExtensions) => {
       if (observer.hasActiveConnection() && wallet !== observer.activeWallet) {
-        setSwitching(true);
+        setSwitching(() => true);
       }
 
-      await observer.connectWallet(wallet).then(syncWallet);
-      setSwitching(false);
+      await observer.connectWallet(wallet);
+      await syncWallet();
+      setSwitching(() => false);
     },
     [observer, setSwitching]
   );

package/src/react-components/hooks/useWalletLoadingState.ts

@@ -20,16 +20,16 @@ export const useWalletLoadingState = <
     }
 
     const setConnectingStart = () => {
-      setConnecting(true);
+      setConnecting(() => true);
     };
     const setConnectingEnd = () => {
-      setConnecting(false);
+      setConnecting(() => false);
     };
     const setSyncingStart = () => {
-      setSyncing(true);
+      setSyncing(() => true);
     };
     const setSyncingEnd = () => {
-      setSyncing(false);
+      setSyncing(() => false);
     };
 
     state.observer.addEventListener(
@@ -67,7 +67,7 @@ export const useWalletLoadingState = <
         setSyncingEnd
       );
     };
-  }, [state.observer, setConnecting, setSyncing]);
+  }, []);
 
   return {
     connectingWallet: connecting,