@xyo-network/react-wallet 2.60.3 → 2.60.5

package/dist/esm/contexts/Wallet/Provider.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { usePromise } from '@xylabs/react-promise';
 import { useEffect, useState } from 'react';
 import { WalletContext } from './Context';
 import { WalletRootPath } from './lib';
+import { usePromise } from './usePromise';
 export const WalletProvider = ({ basePath = WalletRootPath, children, defaultActiveAccountIndex = 0, rootWallet = null, ...props }) => {
     const [activeAccountIndex, setActiveAccountIndex] = useState(defaultActiveAccountIndex);
     useEffect(() => {
@@ -26,7 +26,7 @@ export const WalletProvider = ({ basePath = WalletRootPath, children, defaultAct
             return undefined;
         }
     }, [basePath, rootWallet]);
-    const [activeAccount = null] = usePromise(() => coinTypeWallet?.derivePath(activeAccountIndex.toString()), [coinTypeWallet, activeAccountIndex]);
+    const [activeAccount = null] = usePromise(async () => await coinTypeWallet?.derivePath(activeAccountIndex.toString()), [coinTypeWallet, activeAccountIndex]);
     return (_jsx(WalletContext.Provider, { value: {
             activeAccount,
             activeAccountIndex,

package/dist/esm/contexts/Wallet/Provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGlD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAQtC,MAAM,CAAC,MAAM,cAAc,GAAgD,CAAC,EAC1E,QAAQ,GAAG,cAAc,EACzB,QAAQ,EACR,yBAAyB,GAAG,CAAC,EAC7B,UAAU,GAAG,IAAI,EACjB,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAAA;IAEvF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,yBAAyB,KAAK,SAAS,EAAE;YAC3C,qBAAqB,CAAC,yBAAyB,CAAC,CAAA;SACjD;IACH,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAA;IAE/B,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QACpD,wCAAwC;QACxC,IAAI,UAAU,EAAE;YACd,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACxC,IAAI;oBACF,OAAO,MAAM,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAA;iBAC9C;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAA;iBAC1D;aACF;SACF;aAAM;YACL,OAAO,SAAS,CAAA;SACjB;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAA;IAE1B,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,cAAc,EAAE,UAAU,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC,CAAA;IAEhJ,OAAO,CACL,KAAC,aAAa,CAAC,QAAQ,IACrB,KAAK,EAAE;YACL,aAAa;YACb,kBAAkB;YAClB,QAAQ;YACR,cAAc;YACd,QAAQ,EAAE,IAAI;YACd,UAAU;YACV,qBAAqB;SACtB,KACG,KAAK,YAER,QAAQ,GACc,CAC1B,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAQzC,MAAM,CAAC,MAAM,cAAc,GAAgD,CAAC,EAC1E,QAAQ,GAAG,cAAc,EACzB,QAAQ,EACR,yBAAyB,GAAG,CAAC,EAC7B,UAAU,GAAG,IAAI,EACjB,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAAA;IAEvF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,yBAAyB,KAAK,SAAS,EAAE;YAC3C,qBAAqB,CAAC,yBAAyB,CAAC,CAAA;SACjD;IACH,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAA;IAE/B,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QACpD,wCAAwC;QACxC,IAAI,UAAU,EAAE;YACd,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACxC,IAAI;oBACF,OAAO,MAAM,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAA;iBAC9C;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAA;iBAC1D;aACF;SACF;aAAM;YACL,OAAO,SAAS,CAAA;SACjB;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAA;IAE1B,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,UAAU,CACvC,KAAK,IAAI,EAAE,CAAC,MAAM,cAAc,EAAE,UAAU,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,EAC3E,CAAC,cAAc,EAAE,kBAAkB,CAAC,CACrC,CAAA;IAED,OAAO,CACL,KAAC,aAAa,CAAC,QAAQ,IACrB,KAAK,EAAE;YACL,aAAa;YACb,kBAAkB;YAClB,QAAQ;YACR,cAAc;YACd,QAAQ,EAAE,IAAI;YACd,UAAU;YACV,qBAAqB;SACtB,KACG,KAAK,YAER,QAAQ,GACc,CAC1B,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/contexts/Wallet/usePromise.js

@@ -0,0 +1,80 @@
+// Inspired from https://github.com/bsonntag/react-use-promise
+import { Mutex } from 'async-mutex';
+import { useEffect, useMemo, useState } from 'react';
+export var State;
+(function (State) {
+    State["pending"] = "pending";
+    State["rejected"] = "rejected";
+    State["resolved"] = "resolved";
+})(State || (State = {}));
+/**
+ * usePromise -
+ */
+export const usePromise = (promise, dependencies, debug = undefined) => {
+    const [result, setResult] = useState();
+    const [error, setError] = useState();
+    const [state, setState] = useState(State.pending);
+    const mutex = useMemo(() => {
+        return new Mutex();
+    }, []);
+    if (debug)
+        console.log(`usePromise [${debug}]: started [${typeof promise}]`);
+    const promiseMemo = useMemo(() => {
+        try {
+            if (debug)
+                console.log(`usePromise [${debug}]: re-memo [${typeof promise}]`);
+            setState(State.pending);
+            return promise?.();
+        }
+        catch (e) {
+            if (debug)
+                console.log(`usePromise [${debug}]: useMemo rejection [${typeof promise}]`);
+            setResult(undefined);
+            setError(e);
+            setState(State.rejected);
+        }
+    }, dependencies);
+    if (debug)
+        console.log(`usePromise [${debug}] Main Function`);
+    useEffect(() => {
+        if (debug)
+            console.log(`usePromise [${debug}] useEffect`);
+        mutex
+            ?.acquire()
+            .then(() => {
+            promiseMemo
+                ?.then((payload) => {
+                if (debug)
+                    console.log(`usePromise [${debug}] then`);
+                setResult(payload);
+                setError(undefined);
+                setState(State.resolved);
+                mutex?.release();
+            })
+                .catch((e) => {
+                const error = e;
+                console.error(`usePromise: ${error.message}`);
+                setResult(undefined);
+                setError(error);
+                setState(State.rejected);
+                mutex?.release();
+            });
+        })
+            .catch((e) => {
+            const error = e;
+            console.error(`usePromise: ${error.message}`);
+            setResult(undefined);
+            setError(error);
+            setState(State.rejected);
+            mutex?.release();
+        });
+        return () => {
+            if (debug)
+                console.log(`usePromise [${debug}] useEffect callback`);
+        };
+    }, [...dependencies, promiseMemo]);
+    if (debug)
+        console.log(`usePromise [${debug}] returning ${JSON.stringify([result, error, state], null, 2)}`);
+    return [result, error, state];
+};
+//# sourceMappingURL=usePromise.js.map

package/dist/esm/contexts/Wallet/usePromise.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"usePromise.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/usePromise.ts"],"names":[],"mappings":"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"}

package/dist/esm/hooks/useWallets.js

@@ -4,7 +4,7 @@ import { useWallet } from './useWallet';
 export const useWallets = ({ wallet, paths }) => {
     const walletContextProvided = useWalletProvided();
     const [foundWallet] = useWallet({ wallet });
-    const [wallets, error] = usePromise(() => (foundWallet ? Promise.all(paths.map((path) => foundWallet.derivePath(path))) : undefined), [foundWallet, paths]);
+    const [wallets, error] = usePromise(async () => (foundWallet ? await Promise.all(paths.map((path) => foundWallet.derivePath(path))) : undefined), [foundWallet, paths]);
     return [wallets ?? (walletContextProvided ? null : wallets), error];
 };
 //# sourceMappingURL=useWallets.js.map

package/dist/esm/hooks/useWallets.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWallets.js","sourceRoot":"","sources":["../../../src/hooks/useWallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAOvC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,EAAqB,EAA4D,EAAE;IAC3H,MAAM,qBAAqB,GAAG,iBAAiB,EAAE,CAAA;IACjD,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAC3C,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,UAAU,CACjC,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAChG,CAAC,WAAW,EAAE,KAAK,CAAC,CACrB,CAAA;IACD,OAAO,CAAC,OAAO,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAA;AACrE,CAAC,CAAA"}
+{"version":3,"file":"useWallets.js","sourceRoot":"","sources":["../../../src/hooks/useWallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAOvC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,EAAqB,EAA4D,EAAE;IAC3H,MAAM,qBAAqB,GAAG,iBAAiB,EAAE,CAAA;IACjD,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAC3C,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,UAAU,CACjC,KAAK,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAC5G,CAAC,WAAW,EAAE,KAAK,CAAC,CACrB,CAAA;IACD,OAAO,CAAC,OAAO,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAA;AACrE,CAAC,CAAA"}

package/dist/types/contexts/Wallet/Provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAM1D,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,CAAA;CACnC;AAED,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAgDtE,CAAA"}
+{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAO1D,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,CAAA;CACnC;AAED,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAmDtE,CAAA"}

package/dist/types/contexts/Wallet/usePromise.d.ts

@@ -0,0 +1,11 @@
+import { DependencyList } from 'react';
+export declare enum State {
+    pending = "pending",
+    rejected = "rejected",
+    resolved = "resolved"
+}
+/**
+ * usePromise -
+ */
+export declare const usePromise: <TResult>(promise: () => Promise<TResult | undefined>, dependencies: DependencyList, debug?: string | undefined) => [TResult | undefined, Error | undefined, State | undefined];
+//# sourceMappingURL=usePromise.d.ts.map

package/dist/types/contexts/Wallet/usePromise.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"usePromise.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/usePromise.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAgC,MAAM,OAAO,CAAA;AAEpE,oBAAY,KAAK;IACf,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,QAAQ,aAAa;CACtB;AAED;;GAEG;AACH,eAAO,MAAM,UAAU,+FAGd,MAAM,GAAG,SAAS,gEA8D1B,CAAA"}

package/package.json

@@ -11,23 +11,23 @@
   },
   "dependencies": {
     "@xylabs/eth-address": "^2.9.3",
-    "@xylabs/react-button": "~2.17.8",
-    "@xylabs/react-crypto": "~2.17.8",
-    "@xylabs/react-flexbox": "~2.17.8",
-    "@xylabs/react-identicon": "~2.17.8",
-    "@xylabs/react-number-status": "~2.17.8",
-    "@xylabs/react-promise": "~2.17.8",
-    "@xylabs/react-quick-tip-button": "~2.17.8",
-    "@xylabs/react-select": "~2.17.8",
-    "@xylabs/react-shared": "~2.17.8",
-    "@xyo-network/account": "^2.70.6",
-    "@xyo-network/account-model": "^2.70.6",
-    "@xyo-network/bip39": "^2.70.6",
-    "@xyo-network/core": "^2.70.6",
-    "@xyo-network/react-address-render": "~2.60.3",
-    "@xyo-network/react-network": "~2.60.3",
-    "@xyo-network/react-shared": "~2.60.3",
-    "@xyo-network/wallet-model": "^2.70.6",
+    "@xylabs/react-button": "~2.17.11",
+    "@xylabs/react-crypto": "~2.17.11",
+    "@xylabs/react-flexbox": "~2.17.11",
+    "@xylabs/react-identicon": "~2.17.11",
+    "@xylabs/react-number-status": "~2.17.11",
+    "@xylabs/react-promise": "~2.17.11",
+    "@xylabs/react-quick-tip-button": "~2.17.11",
+    "@xylabs/react-select": "~2.17.11",
+    "@xylabs/react-shared": "~2.17.11",
+    "@xyo-network/account": "^2.70.11",
+    "@xyo-network/account-model": "^2.70.11",
+    "@xyo-network/bip39": "^2.70.11",
+    "@xyo-network/core": "^2.70.11",
+    "@xyo-network/react-address-render": "~2.60.5",
+    "@xyo-network/react-network": "~2.60.5",
+    "@xyo-network/react-shared": "~2.60.5",
+    "@xyo-network/wallet-model": "^2.70.11",
     "async-mutex": "^0.4.0"
   },
   "peerDependencies": {
@@ -41,10 +41,10 @@
   },
   "description": "Common React library for all XYO projects that use React",
   "devDependencies": {
-    "@storybook/react": "^7.2.0",
+    "@storybook/react": "^7.2.1",
     "@xylabs/ts-scripts-yarn3": "^2.19.0",
     "@xylabs/tsconfig-react": "^2.19.0",
-    "@xyo-network/react-storybook": "~2.60.3",
+    "@xyo-network/react-storybook": "~2.60.5",
     "typescript": "^5.1.6"
   },
   "browser": "dist/esm/index.js",
@@ -89,5 +89,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.60.3"
+  "version": "2.60.5"
 }

package/src/contexts/Wallet/Provider.tsx

@@ -1,10 +1,10 @@
-import { usePromise } from '@xylabs/react-promise'
 import { WithChildren } from '@xylabs/react-shared'
 import { WalletInstance } from '@xyo-network/wallet-model'
 import { useEffect, useState } from 'react'
 
 import { WalletContext } from './Context'
 import { WalletRootPath } from './lib'
+import { usePromise } from './usePromise'
 
 export interface WalletProviderProps {
   basePath?: string
@@ -42,7 +42,10 @@ export const WalletProvider: React.FC<WithChildren<WalletProviderProps>> = ({
     }
   }, [basePath, rootWallet])
 
-  const [activeAccount = null] = usePromise(() => coinTypeWallet?.derivePath(activeAccountIndex.toString()), [coinTypeWallet, activeAccountIndex])
+  const [activeAccount = null] = usePromise(
+    async () => await coinTypeWallet?.derivePath(activeAccountIndex.toString()),
+    [coinTypeWallet, activeAccountIndex],
+  )
 
   return (
     <WalletContext.Provider

package/src/contexts/Wallet/usePromise.ts

@@ -0,0 +1,80 @@
+// Inspired from https://github.com/bsonntag/react-use-promise
+
+import { Mutex } from 'async-mutex'
+import { DependencyList, useEffect, useMemo, useState } from 'react'
+
+export enum State {
+  pending = 'pending',
+  rejected = 'rejected',
+  resolved = 'resolved',
+}
+
+/**
+ * usePromise -
+ */
+export const usePromise = <TResult>(
+  promise: () => Promise<TResult | undefined>,
+  dependencies: DependencyList,
+  debug: string | undefined = undefined,
+): [TResult | undefined, Error | undefined, State | undefined] => {
+  const [result, setResult] = useState<TResult>()
+  const [error, setError] = useState<Error>()
+  const [state, setState] = useState<State>(State.pending)
+  const mutex = useMemo(() => {
+    return new Mutex()
+  }, [])
+
+  if (debug) console.log(`usePromise [${debug}]: started [${typeof promise}]`)
+
+  const promiseMemo: Promise<TResult | undefined> | undefined = useMemo(() => {
+    try {
+      if (debug) console.log(`usePromise [${debug}]: re-memo [${typeof promise}]`)
+      setState(State.pending)
+      return promise?.()
+    } catch (e) {
+      if (debug) console.log(`usePromise [${debug}]: useMemo rejection [${typeof promise}]`)
+      setResult(undefined)
+      setError(e as Error)
+      setState(State.rejected)
+    }
+  }, dependencies)
+
+  if (debug) console.log(`usePromise [${debug}] Main Function`)
+
+  useEffect(() => {
+    if (debug) console.log(`usePromise [${debug}] useEffect`)
+    mutex
+      ?.acquire()
+      .then(() => {
+        promiseMemo
+          ?.then((payload) => {
+            if (debug) console.log(`usePromise [${debug}] then`)
+            setResult(payload)
+            setError(undefined)
+            setState(State.resolved)
+            mutex?.release()
+          })
+          .catch((e) => {
+            const error = e as Error
+            console.error(`usePromise: ${error.message}`)
+            setResult(undefined)
+            setError(error)
+            setState(State.rejected)
+            mutex?.release()
+          })
+      })
+      .catch((e) => {
+        const error = e as Error
+        console.error(`usePromise: ${error.message}`)
+        setResult(undefined)
+        setError(error)
+        setState(State.rejected)
+        mutex?.release()
+      })
+    return () => {
+      if (debug) console.log(`usePromise [${debug}] useEffect callback`)
+    }
+  }, [...dependencies, promiseMemo])
+  if (debug) console.log(`usePromise [${debug}] returning ${JSON.stringify([result, error, state], null, 2)}`)
+  return [result, error, state]
+}

package/src/hooks/useWallets.ts

@@ -13,7 +13,7 @@ export const useWallets = ({ wallet, paths }: WalletsHookParams): [WalletInstanc
   const walletContextProvided = useWalletProvided()
   const [foundWallet] = useWallet({ wallet })
   const [wallets, error] = usePromise(
-    () => (foundWallet ? Promise.all(paths.map((path) => foundWallet.derivePath(path))) : undefined),
+    async () => (foundWallet ? await Promise.all(paths.map((path) => foundWallet.derivePath(path))) : undefined),
     [foundWallet, paths],
   )
   return [wallets ?? (walletContextProvided ? null : wallets), error]