@xyo-network/react-wallet 2.55.3 → 2.55.5

package/dist/esm/hooks/useAccount.js

@@ -1,9 +1,35 @@
 import { HDWallet } from '@xyo-network/account';
 import { usePromise } from '@xyo-network/react-shared';
+import { useState } from 'react';
 import { useAccountFromContext } from '../contexts';
 export const useAccount = ({ mnemonic, account, path, required, seed } = {}) => {
+    const [error, setError] = useState();
     const [contextAccount] = useAccountFromContext(!account && required);
-    const [activeAccount] = usePromise(async () => ((account ?? mnemonic) ? await HDWallet.fromMnemonic(mnemonic) : seed ? await HDWallet.fromSeed(seed) : contextAccount), [account, mnemonic, contextAccount, seed]);
-    return usePromise(async () => (path ? await activeAccount?.derivePath?.(path) : activeAccount));
+    const [activeAccount] = usePromise(async () => {
+        try {
+            const newAccount = await (() => {
+                if (account) {
+                    return account;
+                }
+                else if (mnemonic) {
+                    return HDWallet.fromMnemonic(mnemonic);
+                }
+                else if (seed) {
+                    return HDWallet.fromSeed(seed);
+                }
+                return contextAccount;
+            })();
+            if (path) {
+                return newAccount?.derivePath?.(path);
+            }
+            else {
+                return newAccount;
+            }
+        }
+        catch (ex) {
+            setError(ex);
+        }
+    }, [account, mnemonic, contextAccount, seed, path]);
+    return [activeAccount, error];
 };
 //# sourceMappingURL=useAccount.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useAccount.js","sourceRoot":"","sources":["../../../src/hooks/useAccount.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAGtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAUnD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAwB,EAAE,EAAE,EAAE;IAChG,MAAM,CAAC,cAAc,CAAC,GAAG,qBAAqB,CAAC,CAAC,OAAO,IAAI,QAAQ,CAAC,CAAA;IACpE,MAAM,CAAC,aAAa,CAAC,GAAG,UAAU,CAChC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAA,OAAO,IAAI,QAAQ,EAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,YAAY,CAAC,QAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,EAC3I,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,IAAI,CAAC,CAC1C,CAAA;IACD,OAAO,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,aAAa,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAA;AACjG,CAAC,CAAA"}
+{"version":3,"file":"useAccount.js","sourceRoot":"","sources":["../../../src/hooks/useAccount.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAUnD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAwB,EAAE,EAAmD,EAAE;IACjJ,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,cAAc,CAAC,GAAG,qBAAqB,CAAC,CAAC,OAAO,IAAI,QAAQ,CAAC,CAAA;IACpE,MAAM,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QAC5C,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,EAAE;gBAC7B,IAAI,OAAO,EAAE;oBACX,OAAO,OAAO,CAAA;iBACf;qBAAM,IAAI,QAAQ,EAAE;oBACnB,OAAO,QAAQ,CAAC,YAAY,CAAC,QAAkB,CAAC,CAAA;iBACjD;qBAAM,IAAI,IAAI,EAAE;oBACf,OAAO,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;iBAC/B;gBACD,OAAO,cAAc,CAAA;YACvB,CAAC,CAAC,EAAE,CAAA;YACJ,IAAI,IAAI,EAAE;gBACR,OAAO,UAAU,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,CAAA;aACtC;iBAAM;gBACL,OAAO,UAAU,CAAA;aAClB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IACnD,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;AAC/B,CAAC,CAAA"}

package/dist/types/hooks/useAccount.d.ts

@@ -7,5 +7,5 @@ export interface AccountHookParams {
     required?: boolean;
     seed?: DataLike;
 }
-export declare const useAccount: ({ mnemonic, account, path, required, seed }?: AccountHookParams) => [WalletInstance | undefined, Error | undefined, import("@xyo-network/react-shared").State | undefined];
+export declare const useAccount: ({ mnemonic, account, path, required, seed }?: AccountHookParams) => [WalletInstance | undefined, Error | undefined];
 //# sourceMappingURL=useAccount.d.ts.map

package/dist/types/hooks/useAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAccount.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAccount.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAI1D,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAA;CAChB;AAED,eAAO,MAAM,UAAU,iDAAiD,iBAAiB,2GAOxF,CAAA"}
+{"version":3,"file":"useAccount.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAccount.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK1D,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAA;CAChB;AAED,eAAO,MAAM,UAAU,iDAAiD,iBAAiB,KAAQ,CAAC,cAAc,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAyB9I,CAAA"}

package/package.json

@@ -21,9 +21,9 @@
     "@xylabs/react-shared": "^2.17.3",
     "@xyo-network/account": "^2.63.2",
     "@xyo-network/core": "^2.63.2",
-    "@xyo-network/react-address-render": "^2.55.3",
-    "@xyo-network/react-network": "^2.55.3",
-    "@xyo-network/react-shared": "^2.55.3",
+    "@xyo-network/react-address-render": "^2.55.5",
+    "@xyo-network/react-network": "^2.55.5",
+    "@xyo-network/react-shared": "^2.55.5",
     "@xyo-network/wallet-model": "^2.63.2"
   },
   "peerDependencies": {
@@ -40,7 +40,7 @@
     "@storybook/react": "^7.0.23",
     "@xylabs/ts-scripts-yarn3": "^2.17.17",
     "@xylabs/tsconfig-react": "^2.17.17",
-    "@xyo-network/react-storybook": "^2.55.3",
+    "@xyo-network/react-storybook": "^2.55.5",
     "typescript": "^5.1.3"
   },
   "browser": "dist/esm/index.js",
@@ -85,5 +85,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.55.3"
+  "version": "2.55.5"
 }

package/src/hooks/useAccount.tsx

@@ -2,6 +2,7 @@ import { HDWallet } from '@xyo-network/account'
 import { DataLike } from '@xyo-network/core'
 import { usePromise } from '@xyo-network/react-shared'
 import { WalletInstance } from '@xyo-network/wallet-model'
+import { useState } from 'react'
 
 import { useAccountFromContext } from '../contexts'
 
@@ -13,11 +14,29 @@ export interface AccountHookParams {
   seed?: DataLike
 }
 
-export const useAccount = ({ mnemonic, account, path, required, seed }: AccountHookParams = {}) => {
+export const useAccount = ({ mnemonic, account, path, required, seed }: AccountHookParams = {}): [WalletInstance | undefined, Error | undefined] => {
+  const [error, setError] = useState<Error>()
   const [contextAccount] = useAccountFromContext(!account && required)
-  const [activeAccount] = usePromise(
-    async () => (account ?? mnemonic ? await HDWallet.fromMnemonic(mnemonic as string) : seed ? await HDWallet.fromSeed(seed) : contextAccount),
-    [account, mnemonic, contextAccount, seed],
-  )
-  return usePromise(async () => (path ? await activeAccount?.derivePath?.(path) : activeAccount))
+  const [activeAccount] = usePromise(async () => {
+    try {
+      const newAccount = await (() => {
+        if (account) {
+          return account
+        } else if (mnemonic) {
+          return HDWallet.fromMnemonic(mnemonic as string)
+        } else if (seed) {
+          return HDWallet.fromSeed(seed)
+        }
+        return contextAccount
+      })()
+      if (path) {
+        return newAccount?.derivePath?.(path)
+      } else {
+        return newAccount
+      }
+    } catch (ex) {
+      setError(ex as Error)
+    }
+  }, [account, mnemonic, contextAccount, seed, path])
+  return [activeAccount, error]
 }