@w3ux/react-connect-kit 3.2.12 → 3.2.15

package/ExtensionAccountsProvider/index.js

@@ -1,19 +1,18 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createSafeContext, useEffectIgnoreInitial } from '@w3ux/hooks';
-import { addUnsub, getAccountsFromExtensions, processExtensionAccounts, unsubAll, } from '@w3ux/observables-connect/accounts';
-import { connectExtensions, getActiveExtensionsLocal, } from '@w3ux/observables-connect/extensions';
-import { initialisedExtensions$ } from '@w3ux/observables-connect/extensions/observables';
-import { formatAccountSs58, localStorageOrDefault, setStateWithRef, } from '@w3ux/utils';
-import { useEffect, useRef, useState } from 'react';
+import { accounts$, addUnsub, getAccountsFromExtensions, processExtensionAccounts, resetAccounts, unsubAll, updateAccounts, } from '@w3ux/observables-connect/accounts';
+import { connectExtensions, getActiveExtensionsLocal, initialisedExtensions$, } from '@w3ux/observables-connect/extensions';
+import { formatAccountSs58, localStorageOrDefault } from '@w3ux/utils';
+import { useEffect, useState } from 'react';
+import { combineLatest } from 'rxjs';
 import { useExtensions } from '../ExtensionsProvider';
 import { connectActiveExtensionAccount, getActiveAccountLocal, getActiveExtensionAccount, } from './utils';
 export const [ExtensionAccountsContext, useExtensionAccounts] = createSafeContext();
 export const ExtensionAccountsProvider = ({ children, network, ss58, dappName, activeAccount, setActiveAccount, onExtensionEnabled, }) => {
     const { extensionsStatus, gettingExtensions, extensionHasFeature, extensionCanConnect, } = useExtensions();
     const [extensionAccounts, setExtensionAccounts] = useState([]);
-    const extensionAccountsRef = useRef(extensionAccounts);
-    const [extensionAccountsSynced, setExtensionAccountsSynced] = useState('unsynced');
     const [extensionsInitialised, setExtensionsInitialised] = useState([]);
+    const [extensionAccountsSynced, setExtensionAccountsSynced] = useState('unsynced');
     const maybeSetActiveAccount = (address) => {
         if (typeof setActiveAccount === 'function') {
             setActiveAccount(address ?? null);
@@ -39,15 +38,13 @@ export const ExtensionAccountsProvider = ({ children, network, ss58, dappName, a
             address: formatAccountSs58(acc.address, ss58),
         }))
             .find(({ address }) => address === getActiveAccountLocal(network, ss58));
-        updateExtensionAccounts({ add: initialAccounts, remove: [] });
+        updateAccounts({ add: initialAccounts, remove: [] });
         const handleAccounts = (extensionId, accounts, signer) => {
             const result = processExtensionAccounts({
                 source: extensionId,
                 network,
                 ss58,
-            }, extensionAccountsRef.current, signer, accounts);
-            const { newAccounts, meta: { accountsToRemove }, } = result;
-            updateExtensionAccounts({ add: newAccounts, remove: accountsToRemove });
+            }, signer, accounts);
             return result;
         };
         for (const [id, { extension }] of Array.from(connected.entries())) {
@@ -74,12 +71,7 @@ export const ExtensionAccountsProvider = ({ children, network, ss58, dappName, a
                     source: extensionId,
                     network,
                     ss58,
-                }, extensionAccountsRef.current, signer, accounts);
-                const { newAccounts, meta: { accountsToRemove }, } = result;
-                updateExtensionAccounts({
-                    add: newAccounts,
-                    remove: accountsToRemove,
-                });
+                }, signer, accounts);
                 return result;
             };
             maybeOnExtensionEnabled(id);
@@ -108,22 +100,10 @@ export const ExtensionAccountsProvider = ({ children, network, ss58, dappName, a
             }
         }
     };
-    const updateExtensionAccounts = ({ add, remove, }) => {
-        const newAccounts = [...extensionAccountsRef.current]
-            .concat(add)
-            .filter((a) => remove.find((s) => s.address === a.address) === undefined);
-        if (remove.length) {
-            if (activeAccount &&
-                remove.find(({ address }) => address === activeAccount) !== undefined) {
-                maybeSetActiveAccount(null);
-            }
-        }
-        setStateWithRef(newAccounts, setExtensionAccounts, extensionAccountsRef);
-    };
     const handleSyncExtensionAccounts = async () => {
         if (!gettingExtensions && extensionAccountsSynced === 'unsynced') {
             unsubAll();
-            setStateWithRef([], setExtensionAccounts, extensionAccountsRef);
+            resetAccounts();
             if (Object.keys(extensionsStatus).length) {
                 const localExtensions = localStorageOrDefault(`active_extensions`, [], true);
                 if (Object.keys(extensionsStatus).length && localExtensions.length) {
@@ -157,8 +137,9 @@ export const ExtensionAccountsProvider = ({ children, network, ss58, dappName, a
         }
     }, [gettingExtensions, extensionsInitialised]);
     useEffect(() => {
-        const sub = initialisedExtensions$.subscribe((initialised) => {
+        const sub = combineLatest([initialisedExtensions$, accounts$]).subscribe(([initialised, accounts]) => {
             setExtensionsInitialised(initialised);
+            setExtensionAccounts(accounts);
         });
         return () => {
             sub.unsubscribe();

package/ExtensionAccountsProvider/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/ExtensionAccountsProvider/index.tsx"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport { createSafeContext, useEffectIgnoreInitial } from '@w3ux/hooks'\nimport {\n  addUnsub,\n  getAccountsFromExtensions,\n  processExtensionAccounts,\n  unsubAll,\n} from '@w3ux/observables-connect/accounts'\nimport {\n  connectExtensions,\n  getActiveExtensionsLocal,\n} from '@w3ux/observables-connect/extensions'\nimport { initialisedExtensions$ } from '@w3ux/observables-connect/extensions/observables'\nimport type {\n  ExtensionAccount,\n  ImportedAccount,\n  ProcessExtensionAccountsResult,\n  Sync,\n} from '@w3ux/types'\nimport {\n  formatAccountSs58,\n  localStorageOrDefault,\n  setStateWithRef,\n} from '@w3ux/utils'\nimport { useEffect, useRef, useState } from 'react'\nimport { useExtensions } from '../ExtensionsProvider'\nimport type {\n  ExtensionAccountsContextInterface,\n  ExtensionAccountsProviderProps,\n} from './types'\nimport {\n  connectActiveExtensionAccount,\n  getActiveAccountLocal,\n  getActiveExtensionAccount,\n} from './utils'\n\nexport const [ExtensionAccountsContext, useExtensionAccounts] =\n  createSafeContext<ExtensionAccountsContextInterface>()\n\nexport const ExtensionAccountsProvider = ({\n  children,\n  network,\n  ss58,\n  dappName,\n  activeAccount,\n  setActiveAccount,\n  onExtensionEnabled,\n}: ExtensionAccountsProviderProps) => {\n  const {\n    extensionsStatus,\n    gettingExtensions,\n    extensionHasFeature,\n    extensionCanConnect,\n  } = useExtensions()\n\n  // Store connected extension accounts\n  const [extensionAccounts, setExtensionAccounts] = useState<ImportedAccount[]>(\n    []\n  )\n  const extensionAccountsRef = useRef(extensionAccounts)\n\n  // Store whether extension accounts have been synced\n  // TODO: Use observable to update this state\n  const [extensionAccountsSynced, setExtensionAccountsSynced] =\n    useState<Sync>('unsynced')\n\n  // Stores initialised extensions\n  const [extensionsInitialised, setExtensionsInitialised] = useState<string[]>(\n    []\n  )\n\n  // Helper for setting active account. Ignores if not a valid function\n  const maybeSetActiveAccount = (address: string) => {\n    if (typeof setActiveAccount === 'function') {\n      setActiveAccount(address ?? null)\n    }\n  }\n\n  // Helper for calling extension enabled callback. Ignores if not a valid function\n  const maybeOnExtensionEnabled = (id: string) => {\n    if (typeof onExtensionEnabled === 'function') {\n      onExtensionEnabled(id)\n    }\n  }\n\n  const connectToAccount = (account: ImportedAccount | null) => {\n    maybeSetActiveAccount(account?.address ?? null)\n  }\n\n  // Connects to extensions that already have been connected to and stored in localStorage. Loop\n  // through extensions and connect to accounts. If `activeAccount` exists locally, we wait until\n  // all extensions are looped before connecting to it; there is no guarantee it still exists - must\n  // explicitly find it\n  const connectActiveExtensions = async () => {\n    const { connected } = await connectExtensions(\n      dappName,\n      getActiveExtensionsLocal()\n    )\n    if (connected.size === 0) {\n      return\n    }\n\n    // Get full list of imported accounts\n    const initialAccounts = await getAccountsFromExtensions(connected, ss58)\n\n    // Get the active account if found in initial accounts. Format initial account addresses to the\n    // correct ss58 format before finding\n    const activeAccountInInitial = initialAccounts\n      .map((acc) => ({\n        ...acc,\n        address: formatAccountSs58(acc.address, ss58),\n      }))\n      .find(({ address }) => address === getActiveAccountLocal(network, ss58))\n\n    // Perform initial account state update\n    updateExtensionAccounts({ add: initialAccounts, remove: [] })\n\n    // Initiate account subscriptions for connected extensions\n    // --------------------------------------------------------\n\n    // Handler function for each extension accounts subscription\n    const handleAccounts = (\n      extensionId: string,\n      accounts: ExtensionAccount[],\n      signer: unknown\n    ) => {\n      const result = processExtensionAccounts(\n        {\n          source: extensionId,\n          network,\n          ss58,\n        },\n        extensionAccountsRef.current,\n        signer,\n        accounts\n      )\n\n      const {\n        newAccounts,\n        meta: { accountsToRemove },\n      } = result\n\n      // Update added and removed accounts\n      // TODO: Use account observables instead\n      updateExtensionAccounts({ add: newAccounts, remove: accountsToRemove })\n      return result\n    }\n\n    // Try to subscribe to accounts for each connected extension\n    for (const [id, { extension }] of Array.from(connected.entries())) {\n      // If enabled, subscribe to accounts.\n      if (extensionHasFeature(id, 'subscribeAccounts')) {\n        const unsub = extension.accounts.subscribe((accounts) => {\n          handleAccounts(id, accounts || [], extension.signer)\n        })\n        // Store unsub\n        addUnsub(id, unsub)\n      }\n    }\n\n    // Connect to active account if found in initial accounts\n    if (activeAccountInInitial) {\n      connectActiveExtensionAccount(activeAccountInInitial, connectToAccount)\n    }\n  }\n\n  // Connects to a single extension. If activeAccount is not found here, it is simply ignored\n  const connectExtensionAccounts = async (id: string): Promise<boolean> => {\n    if (extensionCanConnect(id)) {\n      const { connected } = await connectExtensions(dappName, [id])\n      if (connected.size === 0) {\n        return\n      }\n      const { extension } = connected.get(id)\n\n      // Handler for new accounts\n      const handleAccounts = (\n        extensionId: string,\n        accounts: ExtensionAccount[],\n        signer: unknown\n      ) => {\n        const result = processExtensionAccounts(\n          {\n            source: extensionId,\n            network,\n            ss58,\n          },\n          extensionAccountsRef.current,\n          signer,\n          accounts\n        )\n        const {\n          newAccounts,\n          meta: { accountsToRemove },\n        } = result\n\n        // Update extension accounts state\n        // TODO: Use account observables instead\n        updateExtensionAccounts({\n          add: newAccounts,\n          remove: accountsToRemove,\n        })\n        return result\n      }\n\n      // Call optional `onExtensionEnabled` callback\n      maybeOnExtensionEnabled(id)\n\n      // If account subscriptions are not supported, simply get the account(s) from the extension. Otherwise, subscribe to accounts\n      if (!extensionHasFeature(id, 'subscribeAccounts')) {\n        const accounts = await extension.accounts.get()\n        const result = handleAccounts(id, accounts, extension.signer)\n        checkActiveAccount(result)\n      } else {\n        const unsub = extension.accounts.subscribe((accounts) => {\n          const result = handleAccounts(id, accounts || [], extension.signer)\n          checkActiveAccount(result)\n        })\n        addUnsub(id, unsub)\n      }\n      return true\n    }\n    return false\n  }\n\n  // Set active account if found in new accounts\n  const checkActiveAccount = ({\n    newAccounts,\n    meta: { removedActiveAccount },\n  }: ProcessExtensionAccountsResult) => {\n    // Set active account for network if not yet set\n    if (!activeAccount) {\n      const activeExtensionAccount = getActiveExtensionAccount(\n        network,\n        ss58,\n        newAccounts\n      )\n      if (\n        activeExtensionAccount?.address !== removedActiveAccount &&\n        removedActiveAccount !== null\n      ) {\n        connectActiveExtensionAccount(activeExtensionAccount, connectToAccount)\n      }\n    }\n  }\n\n  // Add an extension account to context state\n  const updateExtensionAccounts = ({\n    add,\n    remove,\n  }: {\n    add: ExtensionAccount[]\n    remove: ExtensionAccount[]\n  }) => {\n    // Add new accounts and remove any removed accounts\n    const newAccounts = [...extensionAccountsRef.current]\n      .concat(add)\n      .filter((a) => remove.find((s) => s.address === a.address) === undefined)\n\n    if (remove.length) {\n      // Remove active account if it is being forgotten\n      if (\n        activeAccount &&\n        remove.find(({ address }) => address === activeAccount) !== undefined\n      ) {\n        maybeSetActiveAccount(null)\n      }\n    }\n    setStateWithRef(newAccounts, setExtensionAccounts, extensionAccountsRef)\n  }\n\n  const handleSyncExtensionAccounts = async () => {\n    // Wait for injectedWeb3 check to finish before starting account import process\n    if (!gettingExtensions && extensionAccountsSynced === 'unsynced') {\n      // Unsubscribe from all accounts and reset state\n      unsubAll()\n      setStateWithRef([], setExtensionAccounts, extensionAccountsRef)\n      // If extensions have been fetched, get accounts if extensions exist and local extensions\n      // exist (previously connected)\n      if (Object.keys(extensionsStatus).length) {\n        // get active extensions\n        const localExtensions = localStorageOrDefault(\n          `active_extensions`,\n          [],\n          true\n        )\n        if (Object.keys(extensionsStatus).length && localExtensions.length) {\n          setExtensionAccountsSynced('syncing')\n          await connectActiveExtensions()\n        }\n      }\n\n      // Syncing is complete. Also covers case where no extensions were found\n      setExtensionAccountsSynced('synced')\n    }\n  }\n\n  // Get extension accounts based on the provided ss58 prefix\n  const getExtensionAccounts = (ss58Prefix: number): ImportedAccount[] =>\n    extensionAccounts\n      .map((account) => {\n        const formattedAddress = formatAccountSs58(account.address, ss58Prefix)\n        if (!formattedAddress) {\n          return null\n        }\n        return {\n          ...account,\n          address: formattedAddress,\n        }\n      })\n      // Remove null entries resulting from invalid formatted addresses\n      .filter((account) => account !== null)\n\n  // Re-sync extensions accounts on `unsynced`\n  useEffect(() => {\n    handleSyncExtensionAccounts()\n\n    return () => unsubAll()\n  }, [extensionsStatus, gettingExtensions, extensionAccountsSynced])\n\n  // Once initialised extensions equal total extensions present in `injectedWeb3`, mark extensions\n  // as fetched\n  useEffectIgnoreInitial(() => {\n    if (\n      !gettingExtensions &&\n      extensionsInitialised.length === Object.keys(extensionsStatus).length\n    ) {\n      setExtensionAccountsSynced('synced')\n    }\n  }, [gettingExtensions, extensionsInitialised])\n\n  // Subscribes to observables and updates state\n  useEffect(() => {\n    const sub = initialisedExtensions$.subscribe((initialised) => {\n      setExtensionsInitialised(initialised)\n    })\n    return () => {\n      sub.unsubscribe()\n    }\n  }, [])\n\n  return (\n    <ExtensionAccountsContext.Provider\n      value={{\n        connectExtensionAccounts,\n        extensionAccountsSynced,\n        getExtensionAccounts,\n      }}\n    >\n      {children}\n    </ExtensionAccountsContext.Provider>\n  )\n}\n"]}
+{"version":3,"sources":["../src/ExtensionAccountsProvider/index.tsx"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport { createSafeContext, useEffectIgnoreInitial } from '@w3ux/hooks'\nimport {\n  accounts$,\n  addUnsub,\n  getAccountsFromExtensions,\n  processExtensionAccounts,\n  resetAccounts,\n  unsubAll,\n  updateAccounts,\n} from '@w3ux/observables-connect/accounts'\nimport {\n  connectExtensions,\n  getActiveExtensionsLocal,\n  initialisedExtensions$,\n} from '@w3ux/observables-connect/extensions'\nimport type {\n  ExtensionAccount,\n  ImportedAccount,\n  ProcessExtensionAccountsResult,\n  Sync,\n} from '@w3ux/types'\nimport { formatAccountSs58, localStorageOrDefault } from '@w3ux/utils'\nimport { useEffect, useState } from 'react'\nimport { combineLatest } from 'rxjs'\nimport { useExtensions } from '../ExtensionsProvider'\nimport type {\n  ExtensionAccountsContextInterface,\n  ExtensionAccountsProviderProps,\n} from './types'\nimport {\n  connectActiveExtensionAccount,\n  getActiveAccountLocal,\n  getActiveExtensionAccount,\n} from './utils'\n\nexport const [ExtensionAccountsContext, useExtensionAccounts] =\n  createSafeContext<ExtensionAccountsContextInterface>()\n\nexport const ExtensionAccountsProvider = ({\n  children,\n  network,\n  ss58,\n  dappName,\n  activeAccount,\n  setActiveAccount,\n  onExtensionEnabled,\n}: ExtensionAccountsProviderProps) => {\n  const {\n    extensionsStatus,\n    gettingExtensions,\n    extensionHasFeature,\n    extensionCanConnect,\n  } = useExtensions()\n\n  // Store connected extension accounts\n  const [extensionAccounts, setExtensionAccounts] = useState<ImportedAccount[]>(\n    []\n  )\n  // Stores initialised extensions\n  const [extensionsInitialised, setExtensionsInitialised] = useState<string[]>(\n    []\n  )\n\n  // Store whether extension accounts have been synced\n  // TODO: Use observable to update this state\n  const [extensionAccountsSynced, setExtensionAccountsSynced] =\n    useState<Sync>('unsynced')\n\n  // Helper for setting active account. Ignores if not a valid function\n  const maybeSetActiveAccount = (address: string) => {\n    if (typeof setActiveAccount === 'function') {\n      setActiveAccount(address ?? null)\n    }\n  }\n\n  // Helper for calling extension enabled callback. Ignores if not a valid function\n  const maybeOnExtensionEnabled = (id: string) => {\n    if (typeof onExtensionEnabled === 'function') {\n      onExtensionEnabled(id)\n    }\n  }\n\n  const connectToAccount = (account: ImportedAccount | null) => {\n    maybeSetActiveAccount(account?.address ?? null)\n  }\n\n  // Connects to extensions that already have been connected to and stored in localStorage. Loop\n  // through extensions and connect to accounts. If `activeAccount` exists locally, we wait until\n  // all extensions are looped before connecting to it; there is no guarantee it still exists - must\n  // explicitly find it\n  const connectActiveExtensions = async () => {\n    const { connected } = await connectExtensions(\n      dappName,\n      getActiveExtensionsLocal()\n    )\n    if (connected.size === 0) {\n      return\n    }\n\n    // Get full list of imported accounts\n    const initialAccounts = await getAccountsFromExtensions(connected, ss58)\n\n    // Get the active account if found in initial accounts. Format initial account addresses to the\n    // correct ss58 format before finding\n    const activeAccountInInitial = initialAccounts\n      .map((acc) => ({\n        ...acc,\n        address: formatAccountSs58(acc.address, ss58),\n      }))\n      .find(({ address }) => address === getActiveAccountLocal(network, ss58))\n\n    // Perform initial account state update\n    updateAccounts({ add: initialAccounts, remove: [] })\n\n    // Initiate account subscriptions for connected extensions\n    // --------------------------------------------------------\n\n    // Handler function for each extension accounts subscription\n    const handleAccounts = (\n      extensionId: string,\n      accounts: ExtensionAccount[],\n      signer: unknown\n    ) => {\n      const result = processExtensionAccounts(\n        {\n          source: extensionId,\n          network,\n          ss58,\n        },\n        signer,\n        accounts\n      )\n      return result\n    }\n\n    // Try to subscribe to accounts for each connected extension\n    for (const [id, { extension }] of Array.from(connected.entries())) {\n      // If enabled, subscribe to accounts.\n      if (extensionHasFeature(id, 'subscribeAccounts')) {\n        const unsub = extension.accounts.subscribe((accounts) => {\n          handleAccounts(id, accounts || [], extension.signer)\n        })\n        // Store unsub\n        addUnsub(id, unsub)\n      }\n    }\n\n    // Connect to active account if found in initial accounts\n    if (activeAccountInInitial) {\n      connectActiveExtensionAccount(activeAccountInInitial, connectToAccount)\n    }\n  }\n\n  // Connects to a single extension. If activeAccount is not found here, it is simply ignored\n  const connectExtensionAccounts = async (id: string): Promise<boolean> => {\n    if (extensionCanConnect(id)) {\n      const { connected } = await connectExtensions(dappName, [id])\n      if (connected.size === 0) {\n        return\n      }\n      const { extension } = connected.get(id)\n\n      // Handler for new accounts\n      const handleAccounts = (\n        extensionId: string,\n        accounts: ExtensionAccount[],\n        signer: unknown\n      ) => {\n        const result = processExtensionAccounts(\n          {\n            source: extensionId,\n            network,\n            ss58,\n          },\n          signer,\n          accounts\n        )\n        return result\n      }\n\n      // Call optional `onExtensionEnabled` callback\n      maybeOnExtensionEnabled(id)\n\n      // If account subscriptions are not supported, simply get the account(s) from the extension. Otherwise, subscribe to accounts\n      if (!extensionHasFeature(id, 'subscribeAccounts')) {\n        const accounts = await extension.accounts.get()\n        const result = handleAccounts(id, accounts, extension.signer)\n        checkActiveAccount(result)\n      } else {\n        const unsub = extension.accounts.subscribe((accounts) => {\n          const result = handleAccounts(id, accounts || [], extension.signer)\n          checkActiveAccount(result)\n        })\n        addUnsub(id, unsub)\n      }\n      return true\n    }\n    return false\n  }\n\n  // Set active account if found in new accounts\n  const checkActiveAccount = ({\n    newAccounts,\n    meta: { removedActiveAccount },\n  }: ProcessExtensionAccountsResult) => {\n    // Set active account for network if not yet set\n    if (!activeAccount) {\n      const activeExtensionAccount = getActiveExtensionAccount(\n        network,\n        ss58,\n        newAccounts\n      )\n      if (\n        activeExtensionAccount?.address !== removedActiveAccount &&\n        removedActiveAccount !== null\n      ) {\n        connectActiveExtensionAccount(activeExtensionAccount, connectToAccount)\n      }\n    }\n  }\n\n  const handleSyncExtensionAccounts = async () => {\n    // Wait for injectedWeb3 check to finish before starting account import process\n    if (!gettingExtensions && extensionAccountsSynced === 'unsynced') {\n      // Unsubscribe from all accounts and reset state\n      unsubAll()\n      resetAccounts()\n      // If extensions have been fetched, get accounts if extensions exist and local extensions\n      // exist (previously connected)\n      if (Object.keys(extensionsStatus).length) {\n        // get active extensions\n        const localExtensions = localStorageOrDefault(\n          `active_extensions`,\n          [],\n          true\n        )\n        if (Object.keys(extensionsStatus).length && localExtensions.length) {\n          setExtensionAccountsSynced('syncing')\n          await connectActiveExtensions()\n        }\n      }\n\n      // Syncing is complete. Also covers case where no extensions were found\n      setExtensionAccountsSynced('synced')\n    }\n  }\n\n  // Get extension accounts based on the provided ss58 prefix\n  const getExtensionAccounts = (ss58Prefix: number): ImportedAccount[] =>\n    extensionAccounts\n      .map((account) => {\n        const formattedAddress = formatAccountSs58(account.address, ss58Prefix)\n        if (!formattedAddress) {\n          return null\n        }\n        return {\n          ...account,\n          address: formattedAddress,\n        }\n      })\n      // Remove null entries resulting from invalid formatted addresses\n      .filter((account) => account !== null)\n\n  // Re-sync extensions accounts on `unsynced`\n  useEffect(() => {\n    handleSyncExtensionAccounts()\n\n    return () => unsubAll()\n  }, [extensionsStatus, gettingExtensions, extensionAccountsSynced])\n\n  // Once initialised extensions equal total extensions present in `injectedWeb3`, mark extensions\n  // as fetched\n  useEffectIgnoreInitial(() => {\n    if (\n      !gettingExtensions &&\n      extensionsInitialised.length === Object.keys(extensionsStatus).length\n    ) {\n      setExtensionAccountsSynced('synced')\n    }\n  }, [gettingExtensions, extensionsInitialised])\n\n  // Subscribes to observables and updates state\n  useEffect(() => {\n    const sub = combineLatest([initialisedExtensions$, accounts$]).subscribe(\n      ([initialised, accounts]) => {\n        setExtensionsInitialised(initialised)\n        setExtensionAccounts(accounts)\n      }\n    )\n    return () => {\n      sub.unsubscribe()\n    }\n  }, [])\n\n  return (\n    <ExtensionAccountsContext.Provider\n      value={{\n        connectExtensionAccounts,\n        extensionAccountsSynced,\n        getExtensionAccounts,\n      }}\n    >\n      {children}\n    </ExtensionAccountsContext.Provider>\n  )\n}\n"]}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@w3ux/react-connect-kit",
-  "version": "3.2.12",
+  "version": "3.2.15",
   "license": "GPL-3.0-only",
   "dependencies": {
     "@w3ux/extension-assets": "^2.2.0",
     "@w3ux/hooks": "^2.1.0",
-    "@w3ux/observables-connect": "0.9.22",
+    "@w3ux/observables-connect": "0.9.24",
     "@w3ux/utils": "^2.0.8"
   },
   "type": "module",