@kheopskit/core 4.0.0 → 5.0.1

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
 
@@ -8,7 +8,7 @@
 
 
 
-var _chunkTMAPQWW2js = require('./chunk-TMAPQWW2.js');
+var _chunkB4L6GAYDjs = require('./chunk-B4L6GAYD.js');
 require('./chunk-D3EQMFZ2.js');
 
 
@@ -20,14 +20,20 @@ require('./chunk-D3EQMFZ2.js');
 
 
 
-var _chunkNU46D4MZjs = require('./chunk-NU46D4MZ.js');
+var _chunkXQWJM3KCjs = require('./chunk-XQWJM3KC.js');
 
 
 
 
-var _chunkSIUWQBT4js = require('./chunk-SIUWQBT4.js');
 
-// src/api/kheopskit.ts
+
+
+
+
+var _chunk4ENHC7G4js = require('./chunk-4ENHC7G4.js');
+
+// src/api/appKit.ts
+
 
 
 
@@ -38,6 +44,177 @@ var _chunkSIUWQBT4js = require('./chunk-SIUWQBT4.js');
 
 
 var _rxjs = require('rxjs');
+var loadAppKit = async () => {
+  try {
+    const { createAppKit } = await Promise.resolve().then(() => _interopRequireWildcard(require("@reown/appkit/core")));
+    return createAppKit;
+  } catch (cause) {
+    console.error(
+      "[kheopskit] WalletConnect is configured but @reown/appkit could not be loaded. Install it with `pnpm add @reown/appkit` (or remove config.walletConnect). WalletConnect wallets are disabled; injected wallets still work.",
+      cause
+    );
+    return null;
+  }
+};
+var WALLET_CONNECT_ICON = "data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjQwMCIgdmlld0JveD0iMCAwIDQwMCA0MDAiIHdpZHRoPSI0MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxjbGlwUGF0aCBpZD0iYSI+PHBhdGggZD0ibTAgMGg0MDB2NDAwaC00MDB6Ii8+PC9jbGlwUGF0aD48ZyBjbGlwLXBhdGg9InVybCgjYSkiPjxjaXJjbGUgY3g9IjIwMCIgY3k9IjIwMCIgZmlsbD0iIzMzOTZmZiIgcj0iMTk5LjUiIHN0cm9rZT0iIzY2YjFmZiIvPjxwYXRoIGQ9Im0xMjIuNTE5IDE0OC45NjVjNDIuNzkxLTQxLjcyOSAxMTIuMTcxLTQxLjcyOSAxNTQuOTYyIDBsNS4xNSA1LjAyMmMyLjE0IDIuMDg2IDIuMTQgNS40NjkgMCA3LjU1NWwtMTcuNjE3IDE3LjE4Yy0xLjA3IDEuMDQzLTIuODA0IDEuMDQzLTMuODc0IDBsLTcuMDg3LTYuOTExYy0yOS44NTMtMjkuMTExLTc4LjI1My0yOS4xMTEtMTA4LjEwNiAwbC03LjU5IDcuNDAxYy0xLjA3IDEuMDQzLTIuODA0IDEuMDQzLTMuODc0IDBsLTE3LjYxNy0xNy4xOGMtMi4xNC0yLjA4Ni0yLjE0LTUuNDY5IDAtNy41NTV6bTE5MS4zOTcgMzUuNTI5IDE1LjY3OSAxNS4yOWMyLjE0IDIuMDg2IDIuMTQgNS40NjkgMCA3LjU1NWwtNzAuNyA2OC45NDRjLTIuMTM5IDIuMDg3LTUuNjA4IDIuMDg3LTcuNzQ4IDBsLTUwLjE3OC00OC45MzFjLS41MzUtLjUyMi0xLjQwMi0uNTIyLTEuOTM3IDBsLTUwLjE3OCA0OC45MzFjLTIuMTM5IDIuMDg3LTUuNjA4IDIuMDg3LTcuNzQ4IDBsLTcwLjcwMTUtNjguOTQ1Yy0yLjEzOTYtMi4wODYtMi4xMzk2LTUuNDY5IDAtNy41NTVsMTUuNjc5NS0xNS4yOWMyLjEzOTYtMi4wODYgNS42MDg1LTIuMDg2IDcuNzQ4MSAwbDUwLjE3ODkgNDguOTMyYy41MzUuNTIyIDEuNDAyLjUyMiAxLjkzNyAwbDUwLjE3Ny00OC45MzJjMi4xMzktMi4wODcgNS42MDgtMi4wODcgNy43NDggMGw1MC4xNzkgNDguOTMyYy41MzUuNTIyIDEuNDAyLjUyMiAxLjkzNyAwbDUwLjE3OS00OC45MzFjMi4xMzktMi4wODcgNS42MDgtMi4wODcgNy43NDggMHoiIGZpbGw9IiNmZmYiLz48L2c+PC9zdmc+";
+var APPKIT_SYMBOL = /* @__PURE__ */ Symbol.for("kheopskit.cachedAppKit");
+var APPKIT_PROJECT_ID_SYMBOL = /* @__PURE__ */ Symbol.for("kheopskit.cachedAppKitProjectId");
+var getCachedAppKit = () => globalThis[APPKIT_SYMBOL];
+var getCachedAppKitProjectId = () => globalThis[APPKIT_PROJECT_ID_SYMBOL];
+var setCachedAppKit = (value, projectId) => {
+  globalThis[APPKIT_SYMBOL] = value;
+  globalThis[APPKIT_PROJECT_ID_SYMBOL] = projectId;
+};
+var resetAppKitCache = () => {
+  setCachedAppKit(void 0);
+};
+var dropAccountsCache = (platform) => {
+  _chunk4ENHC7G4js.clearCachedObservablesByPrefix.call(void 0, 
+    `accounts:${_chunk4ENHC7G4js.WALLET_CONNECT_WALLET_ID}:${platform}:`
+  );
+};
+var getWalletConnectWallet$ = (config) => {
+  if (!config.walletConnect) return _rxjs.of.call(void 0, null);
+  if (typeof window === "undefined") return _rxjs.of.call(void 0, null);
+  const walletConnect = config.walletConnect;
+  const cachedProjectId = getCachedAppKitProjectId();
+  if (cachedProjectId !== void 0 && cachedProjectId !== walletConnect.projectId) {
+    console.warn(
+      "[kheopskit] WalletConnect is already initialised with projectId %s; AppKit is a process-wide singleton, so the first configuration wins and projectId %s is ignored. Call resetAppKitCache() before re-initialising if the WalletConnect config must change.",
+      cachedProjectId,
+      walletConnect.projectId
+    );
+  }
+  let cachedAppKit = getCachedAppKit();
+  if (!cachedAppKit) {
+    cachedAppKit = _rxjs.from.call(void 0, loadAppKit()).pipe(
+      _rxjs.switchMap.call(void 0, (createAppKit) => {
+        if (!createAppKit) return _rxjs.of.call(void 0, null);
+        return new (0, _rxjs.Observable)((subscriber) => {
+          const appKit = createAppKit({
+            projectId: walletConnect.projectId,
+            metadata: walletConnect.metadata,
+            // Loosely typed in WalletConnectConfig to keep @reown/appkit's
+            // types out of core; forwarded to AppKit verbatim.
+            networks: walletConnect.networks,
+            themeMode: walletConnect.themeMode,
+            themeVariables: walletConnect.themeVariables,
+            universalProviderConfigOverride: {
+              methods: {
+                polkadot: ["polkadot_signTransaction", "polkadot_signMessage"],
+                solana: [
+                  "solana_signTransaction",
+                  "solana_signMessage",
+                  "solana_signAndSendTransaction"
+                ]
+              }
+            },
+            allWallets: "HIDE",
+            debug: config.debug,
+            allowUnsupportedChain: true
+          });
+          const appKitInstance = appKit;
+          const status$ = new (0, _rxjs.BehaviorSubject)({
+            isPolkadotConnected: false,
+            isEthereumConnected: false,
+            isSolanaConnected: false
+          });
+          const unsubProviders = appKit.subscribeProviders((providers) => {
+            status$.next({
+              isPolkadotConnected: !!providers.polkadot,
+              isEthereumConnected: !!providers.eip155,
+              isSolanaConnected: !!providers.solana
+            });
+          });
+          const namespaceOf = {
+            polkadot: "polkadot",
+            ethereum: "eip155",
+            solana: "solana"
+          };
+          const allPlatforms = [
+            "polkadot",
+            "ethereum",
+            "solana"
+          ];
+          const enabledPlatforms = allPlatforms.filter(
+            (p) => appKit.chainNamespaces.includes(namespaceOf[p])
+          );
+          let prevConnected = {
+            polkadot: false,
+            ethereum: false,
+            solana: false
+          };
+          const sub = status$.pipe(
+            _rxjs.map.call(void 0, (s) => ({
+              polkadot: s.isPolkadotConnected,
+              ethereum: s.isEthereumConnected,
+              solana: s.isSolanaConnected
+            })),
+            _rxjs.distinctUntilChanged.call(void 0, 
+              (a, b) => a.polkadot === b.polkadot && a.ethereum === b.ethereum && a.solana === b.solana
+            ),
+            _rxjs.tap.call(void 0, (connected) => {
+              for (const platform of allPlatforms)
+                if (prevConnected[platform] && !connected[platform])
+                  dropAccountsCache(platform);
+              prevConnected = connected;
+            }),
+            _rxjs.map.call(void 0, (connected) => {
+              const platforms = enabledPlatforms.filter((p) => connected[p]);
+              const isConnected = platforms.length > 0;
+              const walletInfo = appKit.getWalletInfo();
+              return {
+                id: _chunk4ENHC7G4js.WALLET_CONNECT_WALLET_ID,
+                type: "walletconnect",
+                platforms,
+                appKit: appKitInstance,
+                name: _nullishCoalesce(_optionalChain([walletInfo, 'optionalAccess', _ => _.name]), () => ( "WalletConnect")),
+                icon: _nullishCoalesce(_optionalChain([walletInfo, 'optionalAccess', _2 => _2.icon]), () => ( WALLET_CONNECT_ICON)),
+                // One shared session: connecting opens the modal; the wallet
+                // approves namespaces in that single pairing. Disconnect is
+                // session-wide; re-pair to change the approved set.
+                connect: async () => {
+                  if (!isConnected) await appKit.open();
+                },
+                disconnect: async () => {
+                  if (isConnected) await appKit.disconnect();
+                },
+                isConnected
+              };
+            })
+          ).subscribe(subscriber);
+          return () => {
+            sub.unsubscribe();
+            unsubProviders();
+          };
+        });
+      }),
+      // refCount:false keeps the AppKit instance alive for the process lifetime
+      // once created: createAppKit runs at most once (Reown AppKit cannot be
+      // instantiated twice). With refCount:true the producer would re-run
+      // createAppKit whenever every subscriber drained and a new one
+      // re-subscribed — e.g. a React unmount/remount or StrictMode's
+      // mount→unmount→remount — throwing on the duplicate Lit web components and
+      // WalletConnect modal singleton. The replayed connector value also keeps
+      // the wallet list stable across such teardown/rebuild cycles.
+      _rxjs.shareReplay.call(void 0, { refCount: false, bufferSize: 1 })
+    );
+    setCachedAppKit(cachedAppKit, walletConnect.projectId);
+  }
+  return cachedAppKit;
+};
+
+// src/api/kheopskit.ts
+
+
+
+
+
+
+
+
+
+
 
 // src/utils/createHydrationBuffer.ts
 
@@ -169,12 +346,16 @@ var getAccounts$ = (config, wallets) => {
     const sources = config.platforms.map(
       (plugin) => plugin.getAccounts$(
         wallets.pipe(
-          _rxjs.map.call(void 0, (ws) => ws.filter((w) => w.platform === plugin.platform))
+          _rxjs.map.call(void 0, 
+            (ws) => ws.filter(
+              (w) => _chunk4ENHC7G4js.isWalletConnectWallet.call(void 0, w) || w.platform === plugin.platform
+            )
+          )
         )
       )
     );
     const accounts$ = sources.length ? _rxjs.combineLatest.call(void 0, sources).pipe(
-      _rxjs.map.call(void 0, (accounts) => accounts.flat().sort(_chunkTMAPQWW2js.sortAccounts))
+      _rxjs.map.call(void 0, (accounts) => accounts.flat().sort(_chunkB4L6GAYDjs.sortAccounts))
     ) : _rxjs.of.call(void 0, []);
     const sub = accounts$.subscribe(subscriber);
     return () => {
@@ -194,7 +375,7 @@ var getAccounts$ = (config, wallets) => {
 
 
 
-var getWallets$ = (config, store2 = _chunkNU46D4MZjs.store) => {
+var getWallets$ = (config, store2 = _chunkXQWJM3KCjs.store) => {
   const autoReconnectWalletIds$ = store2.observable.pipe(
     _rxjs.map.call(void 0, (s) => _nullishCoalesce(s.autoReconnect, () => ( []))),
     _rxjs.take.call(void 0, 1),
@@ -205,26 +386,40 @@ var getWallets$ = (config, store2 = _chunkNU46D4MZjs.store) => {
     const observables = config.platforms.map(
       (plugin) => plugin.getWallets$(ctx)
     );
-    const wallets$ = observables.length ? _rxjs.combineLatest.call(void 0, observables).pipe(
-      _rxjs.map.call(void 0, (wallets) => wallets.flat().sort(_chunkTMAPQWW2js.sortWallets))
+    const platformWallets$ = observables.length ? _rxjs.combineLatest.call(void 0, observables).pipe(_rxjs.map.call(void 0, (wallets) => wallets.flat())) : _rxjs.of.call(void 0, []);
+    const wallets$ = _rxjs.combineLatest.call(void 0, [
+      platformWallets$,
+      getWalletConnectWallet$(config)
+    ]).pipe(
+      _rxjs.map.call(void 0, ([platformWallets, walletConnect]) => {
+        const all = walletConnect ? [...platformWallets, walletConnect] : platformWallets;
+        return all.sort(_chunkB4L6GAYDjs.sortWallets);
+      })
       // Note: No startWith([]) here - the hydration buffer handles initial state
-    ) : _rxjs.of.call(void 0, []);
+    );
     const reconnectingWallets = /* @__PURE__ */ new Set();
     const reconnectedWallets = /* @__PURE__ */ new Set();
+    const MAX_RECONNECT_ATTEMPTS = 3;
+    const failedAttempts = /* @__PURE__ */ new Map();
     const subAutoReconnect = _rxjs.combineLatest.call(void 0, [wallets$, autoReconnectWalletIds$]).pipe(
-      _rxjs.filter.call(void 0, ([, walletIds]) => config.autoReconnect && !!_optionalChain([walletIds, 'optionalAccess', _ => _.length])),
+      _rxjs.filter.call(void 0, ([, walletIds]) => config.autoReconnect && !!_optionalChain([walletIds, 'optionalAccess', _3 => _3.length])),
       _rxjs.mergeMap.call(void 0, 
-        ([wallets, walletIds]) => wallets.filter((wallet) => _optionalChain([walletIds, 'optionalAccess', _2 => _2.includes, 'call', _3 => _3(wallet.id)]))
+        ([wallets, walletIds]) => wallets.filter((wallet) => _optionalChain([walletIds, 'optionalAccess', _4 => _4.includes, 'call', _5 => _5(wallet.id)]))
       )
     ).subscribe(async (wallet) => {
-      if (wallet.isConnected || reconnectingWallets.has(wallet.id) || reconnectedWallets.has(wallet.id)) {
+      if (wallet.isConnected || reconnectingWallets.has(wallet.id) || reconnectedWallets.has(wallet.id) || (_nullishCoalesce(failedAttempts.get(wallet.id), () => ( 0))) >= MAX_RECONNECT_ATTEMPTS) {
         return;
       }
       reconnectingWallets.add(wallet.id);
       try {
         await wallet.connect();
         reconnectedWallets.add(wallet.id);
+        failedAttempts.delete(wallet.id);
       } catch (err) {
+        failedAttempts.set(
+          wallet.id,
+          (_nullishCoalesce(failedAttempts.get(wallet.id), () => ( 0))) + 1
+        );
         console.error("Failed to reconnect wallet %s", wallet.id, { err });
       } finally {
         reconnectingWallets.delete(wallet.id);
@@ -239,9 +434,10 @@ var getWallets$ = (config, store2 = _chunkNU46D4MZjs.store) => {
 };
 
 // src/api/kheopskit.ts
-var getKheopskit$ = (config, ssrCookies, existingStore) => {
-  const kc = _chunkNU46D4MZjs.resolveConfig.call(void 0, config);
-  const store2 = _nullishCoalesce(existingStore, () => ( _chunkNU46D4MZjs.createKheopskitStore.call(void 0, { ssrCookies, storageKey: kc.storageKey })));
+var getKheopskit$ = (config, options = {}) => {
+  const { ssrCookies, store: existingStore } = options;
+  const kc = _chunkXQWJM3KCjs.resolveConfig.call(void 0, config);
+  const store2 = _nullishCoalesce(existingStore, () => ( _chunkXQWJM3KCjs.createKheopskitStore.call(void 0, { ssrCookies, storageKey: kc.storageKey })));
   if (kc.debug) console.debug("[kheopskit] config", kc);
   if (kc.debug && typeof window === "undefined" && ssrCookies === void 0) {
     console.warn(
@@ -250,16 +446,16 @@ var getKheopskit$ = (config, ssrCookies, existingStore) => {
   }
   const cachedState = store2.getCachedState();
   const cachedWallets = cachedState.wallets.map((w) => {
-    const wallet = _chunkTMAPQWW2js.hydrateWallet.call(void 0, w);
+    const wallet = _chunkB4L6GAYDjs.hydrateWallet.call(void 0, w);
     if (!wallet.icon) {
-      const cachedIcon = _chunkTMAPQWW2js.getCachedIcon.call(void 0, wallet.id);
+      const cachedIcon = _chunkB4L6GAYDjs.getCachedIcon.call(void 0, wallet.id);
       if (cachedIcon) {
         return { ...wallet, icon: cachedIcon };
       }
     }
     return wallet;
   });
-  const cachedAccounts = cachedState.accounts.filter((cached) => _chunkTMAPQWW2js.acceptsCachedAccount.call(void 0, cached, kc.platforms)).map(_chunkTMAPQWW2js.hydrateAccount);
+  const cachedAccounts = cachedState.accounts.filter((cached) => _chunkB4L6GAYDjs.acceptsCachedAccount.call(void 0, cached, kc.platforms)).map(_chunkB4L6GAYDjs.hydrateAccount);
   if (kc.debug && cachedWallets.length > 0) {
     console.debug("[kheopskit] hydrating from cache:", {
       wallets: cachedWallets.length,
@@ -288,7 +484,7 @@ var getKheopskit$ = (config, ssrCookies, existingStore) => {
       (live, cached) => ({
         ...cached,
         // Priority: cached icon > localStorage cache > live icon
-        icon: cached.icon || _chunkTMAPQWW2js.getCachedIcon.call(void 0, cached.id) || live.icon,
+        icon: cached.icon || _chunkB4L6GAYDjs.getCachedIcon.call(void 0, cached.id) || live.icon,
         // Use live wallet's connect/disconnect functions
         connect: live.connect,
         disconnect: live.disconnect
@@ -296,7 +492,7 @@ var getKheopskit$ = (config, ssrCookies, existingStore) => {
       // Transform cached-only items: add icon from localStorage cache
       (cached) => ({
         ...cached,
-        icon: cached.icon || _chunkTMAPQWW2js.getCachedIcon.call(void 0, cached.id) || ""
+        icon: cached.icon || _chunkB4L6GAYDjs.getCachedIcon.call(void 0, cached.id) || ""
       })
     );
     const bufferedAccounts$ = createAccountHydrationBuffer(
@@ -333,8 +529,8 @@ var getKheopskit$ = (config, ssrCookies, existingStore) => {
         }
         return {
           config: kc,
-          wallets: [...wallets.items].sort(_chunkTMAPQWW2js.sortWallets),
-          accounts: [...accounts.items].sort(_chunkTMAPQWW2js.sortAccounts),
+          wallets: [...wallets.items].sort(_chunkB4L6GAYDjs.sortWallets),
+          accounts: [...accounts.items].sort(_chunkB4L6GAYDjs.sortAccounts),
           isHydrating: wallets.isHydrating || accounts.isHydrating
         };
       })
@@ -349,13 +545,16 @@ var getKheopskit$ = (config, ssrCookies, existingStore) => {
       ),
       // Debounce to avoid excessive writes
       _rxjs.debounceTime.call(void 0, 1e3),
-      // Only persist if state actually changed
+      // Only persist if the serialized snapshot would actually change.
+      // Compare the persisted fields (not just ids): an Ethereum chain switch
+      // keeps the same account id but changes the cached chainId, so an
+      // id-only comparator would skip persisting it.
       _rxjs.distinctUntilChanged.call(void 0, (prev, curr) => {
-        const prevWalletIds = prev.wallets.items.map((w) => w.id);
-        const currWalletIds = curr.wallets.items.map((w) => w.id);
-        const prevAccountIds = prev.accounts.items.map((a) => a.id);
-        const currAccountIds = curr.accounts.items.map((a) => a.id);
-        return arraysEqual(prevWalletIds, currWalletIds) && arraysEqual(prevAccountIds, currAccountIds);
+        const prevWalletKeys = prev.wallets.items.map(walletPersistKey);
+        const currWalletKeys = curr.wallets.items.map(walletPersistKey);
+        const prevAccountKeys = prev.accounts.items.map(accountChangeKey);
+        const currAccountKeys = curr.accounts.items.map(accountChangeKey);
+        return arraysEqual(prevWalletKeys, currWalletKeys) && arraysEqual(prevAccountKeys, currAccountKeys);
       })
     ).subscribe(({ wallets, accounts }) => {
       const connectedWalletIds = new Set(
@@ -371,8 +570,8 @@ var getKheopskit$ = (config, ssrCookies, existingStore) => {
         });
       }
       store2.setCachedState(
-        wallets.items.map(_chunkTMAPQWW2js.serializeWallet),
-        relevantAccounts.map(_chunkTMAPQWW2js.serializeAccount)
+        wallets.items.map(_chunkB4L6GAYDjs.serializeWallet),
+        relevantAccounts.map(_chunkB4L6GAYDjs.serializeAccount)
       );
       const icons = {};
       for (const wallet of wallets.items) {
@@ -380,7 +579,7 @@ var getKheopskit$ = (config, ssrCookies, existingStore) => {
           icons[wallet.id] = wallet.icon;
         }
       }
-      _chunkTMAPQWW2js.setCachedIcons.call(void 0, icons);
+      _chunkB4L6GAYDjs.setCachedIcons.call(void 0, icons);
     });
     return () => {
       subscription.unsubscribe();
@@ -397,24 +596,27 @@ var getKheopskit$ = (config, ssrCookies, existingStore) => {
   );
 };
 var arraysEqual = (a, b) => a.length === b.length && a.every((v, i) => v === b[i]);
-var statesEqual = (a, b) => a.isHydrating === b.isHydrating && a.wallets.length === b.wallets.length && a.accounts.length === b.accounts.length && a.wallets.every(
-  (w, i) => w.id === _optionalChain([b, 'access', _4 => _4.wallets, 'access', _5 => _5[i], 'optionalAccess', _6 => _6.id]) && w.isConnected === _optionalChain([b, 'access', _7 => _7.wallets, 'access', _8 => _8[i], 'optionalAccess', _9 => _9.isConnected])
-) && a.accounts.every((acc, i) => {
-  const other = b.accounts[i];
-  if (acc.id !== _optionalChain([other, 'optionalAccess', _10 => _10.id])) return false;
-  switch (acc.platform) {
+var accountChangeKey = (account) => {
+  switch (account.platform) {
     case "ethereum":
-      return acc.chainId === other.chainId;
+      return `${account.id}|${_nullishCoalesce(account.chainId, () => ( ""))}`;
     case "polkadot":
-      return acc.type === other.type;
+      return `${account.id}|${_nullishCoalesce(account.type, () => ( ""))}`;
     case "solana":
-      return arraysEqual(
-        _nullishCoalesce(acc.chains, () => ( [])),
-        _nullishCoalesce(other.chains, () => ( []))
-      );
+      return `${account.id}|${(_nullishCoalesce(account.chains, () => ( []))).join(",")}`;
     default:
-      return true;
+      return account.id;
   }
+};
+var walletPlatforms = (wallet) => _chunk4ENHC7G4js.isWalletConnectWallet.call(void 0, wallet) ? wallet.platforms.join(",") : "";
+var walletPersistKey = (wallet) => `${wallet.id}|${wallet.isConnected ? 1 : 0}|${wallet.name}`;
+var walletUiKey = (wallet) => `${walletPersistKey(wallet)}|${wallet.icon}|${walletPlatforms(wallet)}`;
+var statesEqual = (a, b) => a.isHydrating === b.isHydrating && a.wallets.length === b.wallets.length && a.accounts.length === b.accounts.length && a.wallets.every((w, i) => {
+  const other = b.wallets[i];
+  return !!other && walletUiKey(w) === walletUiKey(other);
+}) && a.accounts.every((acc, i) => {
+  const other = b.accounts[i];
+  return !!other && accountChangeKey(acc) === accountChangeKey(other);
 });
 
 
@@ -429,5 +631,9 @@ var statesEqual = (a, b) => a.isHydrating === b.isHydrating && a.wallets.length
 
 
 
-exports.DEFAULT_STORAGE_KEY = _chunkNU46D4MZjs.DEFAULT_STORAGE_KEY; exports.KheopskitError = _chunkNU46D4MZjs.KheopskitError; exports.clearAllCachedObservables = _chunkSIUWQBT4js.clearAllCachedObservables; exports.createKheopskitStore = _chunkNU46D4MZjs.createKheopskitStore; exports.getDefaultStore = _chunkNU46D4MZjs.getDefaultStore; exports.getKheopskit$ = getKheopskit$; exports.getWalletAccountId = _chunkNU46D4MZjs.getWalletAccountId; exports.getWalletId = _chunkSIUWQBT4js.getWalletId; exports.isValidAddress = _chunkNU46D4MZjs.isValidAddress; exports.parseWalletId = _chunkSIUWQBT4js.parseWalletId; exports.resetAppKitCache = _chunkNU46D4MZjs.resetAppKitCache; exports.resolveConfig = _chunkNU46D4MZjs.resolveConfig;
+
+
+
+
+exports.DEFAULT_STORAGE_KEY = _chunkXQWJM3KCjs.DEFAULT_STORAGE_KEY; exports.KheopskitError = _chunkXQWJM3KCjs.KheopskitError; exports.clearAllCachedObservables = _chunk4ENHC7G4js.clearAllCachedObservables; exports.createKheopskitStore = _chunkXQWJM3KCjs.createKheopskitStore; exports.getDefaultStore = _chunkXQWJM3KCjs.getDefaultStore; exports.getKheopskit$ = getKheopskit$; exports.getWalletAccountId = _chunkXQWJM3KCjs.getWalletAccountId; exports.getWalletId = _chunk4ENHC7G4js.getWalletId; exports.isInjectedWallet = _chunk4ENHC7G4js.isInjectedWallet; exports.isValidAddress = _chunkXQWJM3KCjs.isValidAddress; exports.isValidWalletId = _chunk4ENHC7G4js.isValidWalletId; exports.isWalletConnectWallet = _chunk4ENHC7G4js.isWalletConnectWallet; exports.parseWalletAccountId = _chunkXQWJM3KCjs.parseWalletAccountId; exports.parseWalletId = _chunk4ENHC7G4js.parseWalletId; exports.resetAppKitCache = resetAppKitCache; exports.resolveConfig = _chunkXQWJM3KCjs.resolveConfig;
 //# sourceMappingURL=index.js.map