@sundaeswap/wallet-lite 0.0.46 → 0.0.47

package/package.json

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

package/src/@types/observer.ts

@@ -89,6 +89,7 @@ export type TAssetAmountMap<
  */
 export interface IWalletObserverSeed {
   activeWallet: TSupportedWalletExtensions;
+  mainAddress: string;
 }
 
 /**

package/src/classes/WalletObserver.class.ts

@@ -316,12 +316,13 @@ export class WalletObserver<
       throw new Error("Wallet extension not found in the global context.");
     }
 
-    await this.syncApi(extension);
+    const api = await this.syncApi(extension);
 
     this.activeWallet = extension;
-    if (this._options.persistence) {
+    if (this._options.persistence && api) {
       const seed: IWalletObserverSeed = {
         activeWallet: extension,
+        mainAddress: (await this.getUsedAddresses())[0],
       };
 
       window.localStorage.setItem(

package/src/classes/__tests__/WalletObserver.test.ts

@@ -218,7 +218,9 @@ describe("WalletObserver", async () => {
       expect(syncResults.usedAddresses).toEqual(usedAddresses);
       expect(
         window.localStorage.getItem(WalletObserver.PERSISTENCE_CACHE_KEY),
-      ).toEqual('{"activeWallet":"eternl"}');
+      ).toEqual(
+        `{"activeWallet":"eternl","mainAddress":"${usedAddresses[0]}"}`,
+      );
     });
   });
 
@@ -237,7 +239,9 @@ describe("WalletObserver", async () => {
       expect(observer.activeWallet).toEqual("eternl");
       expect(
         window.localStorage.getItem(WalletObserver.PERSISTENCE_CACHE_KEY),
-      ).toEqual('{"activeWallet":"eternl"}');
+      ).toEqual(
+        `{"activeWallet":"eternl","mainAddress":"${usedAddresses[0]}"}`,
+      );
 
       await observer.sync();
 

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

@@ -1,4 +1,5 @@
 import { useEffect, useMemo, useState } from "react";
+import { IWalletObserverSeed } from "../../../../@types/observer.js";
 import { WalletObserver } from "../../../../classes/WalletObserver.class.js";
 import { useWalletObserverState } from "../useWalletObserverState.js";
 
@@ -18,13 +19,23 @@ export const useDerivedState = (
     });
   }, [observer, state.usedAddresses[0]]);
 
-  const memoizedDerivedState = useMemo(
-    () => ({
+  const memoizedDerivedState = useMemo(() => {
+    let mainAddress = state.usedAddresses[0];
+    const persistentCache = window.localStorage.getItem(
+      WalletObserver.PERSISTENCE_CACHE_KEY,
+    );
+    const usePersistence = observer.getOptions().persistence;
+
+    if (usePersistence && persistentCache && !mainAddress) {
+      const cache = JSON.parse(persistentCache) as IWalletObserverSeed;
+      mainAddress = cache.mainAddress;
+    }
+
+    return {
       stakeAddress,
-      mainAddress: state.usedAddresses[0],
-    }),
-    [state.usedAddresses[0], stakeAddress],
-  );
+      mainAddress,
+    };
+  }, [observer, state.usedAddresses[0], stakeAddress]);
 
   return memoizedDerivedState;
 };