@sundaeswap/wallet-lite 0.0.26 → 0.0.28

package/package.json

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

package/src/classes/WalletObserver.class.ts

@@ -1,7 +1,9 @@
 import type { TransactionUnspentOutput } from "@cardano-sdk/core/dist/cjs/Serialization/index.js";
-import type {
-  Cip30WalletApi,
-  GetCollateral,
+import {
+  APIErrorCode,
+  type ApiError,
+  type Cip30WalletApi,
+  type GetCollateral,
 } from "@cardano-sdk/dapp-connector";
 import { AssetAmount, type IAssetAmountMetadata } from "@sundaeswap/asset";
 import merge from "lodash/merge.js";
@@ -238,7 +240,8 @@ export class WalletObserver<
     const selectedWallet =
       activeWallet || (this._activeWallet as TSupportedWalletExtensions);
 
-    while (!this.api) {
+    let shouldContinue = true;
+    while (!this.api && shouldContinue) {
       if (attempts === 10) {
         throw new Error(
           "Could not reconnect to the selected wallet. Please check your extension."
@@ -255,6 +258,14 @@ export class WalletObserver<
         this.api = api;
         this.network = await api.getNetworkId();
       } catch (e) {
+        if (
+          (e as Error)?.message === "user canceled connection" ||
+          (e as ApiError)?.code === APIErrorCode.Refused
+        ) {
+          shouldContinue = false;
+          return undefined;
+        }
+
         await new Promise((res) => setTimeout(res, 200));
         attempts++;
       }
@@ -389,7 +400,6 @@ export class WalletObserver<
   disconnect = (): void => {
     this._activeWallet = undefined;
     this.api = undefined;
-    this._cachedMetadata = new Map();
     window.localStorage.removeItem(WalletObserver.PERSISTENCE_CACHE_KEY);
     this.dispatch(EWalletObserverEvents.DISCONNECT);
   };

package/src/react-components/WalletObserverProvider/hooks/effects/useProviderEventListeners.ts

@@ -83,17 +83,8 @@ export const useProviderEventListeners = (
   useEffect(() => {
     window.addEventListener("focus", state.syncWallet);
 
-    observer.addEventListener(
-      EWalletObserverEvents.CONNECT_WALLET_END,
-      state.syncWallet
-    );
-
     return () => {
       window.addEventListener("focus", state.syncWallet);
-      observer.removeEventListener(
-        EWalletObserverEvents.CONNECT_WALLET_END,
-        state.syncWallet
-      );
     };
-  }, [observer, state.syncWallet]);
+  }, [state.syncWallet]);
 };

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

@@ -57,21 +57,6 @@ export const useWalletObserverState = (observer: WalletObserver) => {
     setIsCip45(false);
   }, [observer]);
 
-  const connectWallet = useCallback(
-    async (wallet: TSupportedWalletExtensions) => {
-      if (
-        observer.hasActiveConnection() &&
-        wallet !== observer.getActiveWallet()
-      ) {
-        setSwitching(true);
-      }
-
-      await observer.connectWallet(wallet);
-      setSwitching(false);
-    },
-    [observer, setSwitching]
-  );
-
   const syncWallet = useCallback(async () => {
     if (observer.isSyncing() || !observer.hasActiveConnection()) {
       return;
@@ -144,6 +129,21 @@ export const useWalletObserverState = (observer: WalletObserver) => {
     setIsCip45(newWallet.includes("p2p"));
   }, [observer, disconnect]);
 
+  const connectWallet = useCallback(
+    async (wallet: TSupportedWalletExtensions) => {
+      if (
+        observer.hasActiveConnection() &&
+        wallet !== observer.getActiveWallet()
+      ) {
+        setSwitching(true);
+      }
+
+      await observer.connectWallet(wallet).then(syncWallet);
+      setSwitching(false);
+    },
+    [observer, setSwitching]
+  );
+
   return {
     activeWallet,
     setActiveWallet,