@xyo-network/react-wallet 2.54.1 → 2.55.1

package/dist/esm/components/WalletAccountDetails/WalletAccountDetails.js

@@ -4,11 +4,11 @@ import { EthAccountButton } from '@xylabs/react-crypto';
 import { FlexCol, FlexRow } from '@xylabs/react-flexbox';
 import { NumberStatus } from '@xylabs/react-number-status';
 import { useNetwork } from '@xyo-network/react-network';
-import { useAccount } from '../../contexts';
-export const WalletAccountDetails = ({ exploreUrl = 'https://explore.xyo.network', account: accountProp, ...props }) => {
-    const [account = accountProp] = useAccount();
+import { useAccount } from '../../hooks';
+export const WalletAccountDetails = ({ exploreUrl = 'https://explore.xyo.network', account, ...props }) => {
+    const [accountToUse] = useAccount({ account });
     const { network } = useNetwork();
-    const exploreAddressUrl = `${exploreUrl}/recent?account=${account?.addressValue.hex}&network=${network?.name ?? 'main'}`;
-    return (_jsxs(FlexCol, { ...props, children: [_jsx(EthAccountButton, { address: EthAddress.fromString(account?.addressValue.hex) }), _jsxs(FlexRow, { gap: 1, children: [_jsx(NumberStatus, { rounded: true, title: "Tokens", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.tokens`, target: "_blank" }), _jsx(NumberStatus, { rounded: true, title: "NFTs", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.nfts`, target: "_blank" }), _jsx(NumberStatus, { rounded: true, title: "Signatures", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.signatures`, target: "_blank" }), _jsx(NumberStatus, { rounded: true, title: "Signins", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.signins`, target: "_blank" })] })] }));
+    const exploreAddressUrl = `${exploreUrl}/recent?account=${accountToUse?.address}&network=${network?.name ?? 'main'}`;
+    return (_jsxs(FlexCol, { ...props, children: [_jsx(EthAccountButton, { address: EthAddress.fromString(accountToUse?.address) }), _jsxs(FlexRow, { gap: 1, children: [_jsx(NumberStatus, { rounded: true, title: "Tokens", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.tokens`, target: "_blank" }), _jsx(NumberStatus, { rounded: true, title: "NFTs", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.nfts`, target: "_blank" }), _jsx(NumberStatus, { rounded: true, title: "Signatures", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.signatures`, target: "_blank" }), _jsx(NumberStatus, { rounded: true, title: "Signins", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.signins`, target: "_blank" })] })] }));
 };
 //# sourceMappingURL=WalletAccountDetails.js.map

package/dist/esm/components/WalletAccountDetails/WalletAccountDetails.js.map

@@ -1 +1 @@
-{"version":3,"file":"WalletAccountDetails.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountDetails/WalletAccountDetails.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAgB,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAO3C,MAAM,CAAC,MAAM,oBAAoB,GAAwC,CAAC,EACxE,UAAU,GAAG,6BAA6B,EAC1C,OAAO,EAAE,WAAW,EACpB,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC,GAAG,UAAU,EAAE,CAAA;IAC5C,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAChC,MAAM,iBAAiB,GAAG,GAAG,UAAU,mBAAmB,OAAO,EAAE,YAAY,CAAC,GAAG,YAAY,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,CAAA;IAExH,OAAO,CACL,MAAC,OAAO,OAAK,KAAK,aAChB,KAAC,gBAAgB,IAAC,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,GAAI,EAC/E,MAAC,OAAO,IAAC,GAAG,EAAE,CAAC,aACb,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,QAAQ,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,oCAAoC,EAAE,MAAM,EAAC,QAAQ,GAAG,EAC/H,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,MAAM,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,kCAAkC,EAAE,MAAM,EAAC,QAAQ,GAAG,EAC3H,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,YAAY,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,wCAAwC,EAAE,MAAM,EAAC,QAAQ,GAAG,EACvI,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,SAAS,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,qCAAqC,EAAE,MAAM,EAAC,QAAQ,GAAG,IACzH,IACF,CACX,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"WalletAccountDetails.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountDetails/WalletAccountDetails.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAgB,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGvD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAOxC,MAAM,CAAC,MAAM,oBAAoB,GAAwC,CAAC,EAAE,UAAU,GAAG,6BAA6B,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC7I,MAAM,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9C,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAChC,MAAM,iBAAiB,GAAG,GAAG,UAAU,mBAAmB,YAAY,EAAE,OAAO,YAAY,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,CAAA;IAEpH,OAAO,CACL,MAAC,OAAO,OAAK,KAAK,aAChB,KAAC,gBAAgB,IAAC,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,GAAI,EAC3E,MAAC,OAAO,IAAC,GAAG,EAAE,CAAC,aACb,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,QAAQ,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,oCAAoC,EAAE,MAAM,EAAC,QAAQ,GAAG,EAC/H,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,MAAM,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,kCAAkC,EAAE,MAAM,EAAC,QAAQ,GAAG,EAC3H,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,YAAY,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,wCAAwC,EAAE,MAAM,EAAC,QAAQ,GAAG,EACvI,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,SAAS,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,qCAAqC,EAAE,MAAM,EAAC,QAAQ,GAAG,IACzH,IACF,CACX,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/components/WalletAccountSelect/Select.js

@@ -1,24 +1,21 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { CircularProgress, MenuItem } from '@mui/material';
+import { CircularProgress } from '@mui/material';
 import { SelectEx } from '@xylabs/react-select';
 import { AddressRenderRowBox } from '@xyo-network/react-address-render';
+import { usePromise } from '@xyo-network/react-shared';
 import { useWallet } from '../../contexts';
 const arrayRange = (length, start = 0) => {
     return Array.from(Array(length).keys()).map((x) => x + start);
 };
+export const RenderValue = ({ iconOnly, iconSize, showFavorite, icons, addressNames, selected, wallet }) => {
+    const [account] = usePromise(() => wallet.derivePath(selected.toString()));
+    const customName = account ? addressNames[account?.address] : undefined;
+    const favorite = account ? account?.address in addressNames : undefined;
+    return (_jsx(AddressRenderRowBox, { address: account?.address, iconOnly: iconOnly, iconSize: iconSize, icons: icons, name: customName, favorite: favorite, showFavorite: showFavorite }));
+};
 export const WalletAccountSelect = ({ addressNames = {}, iconOnly, iconSize = 24, icons, maxAccounts = 1, showFavorite = false, size, ...props }) => {
     const { activeAccountIndex = 0, setActiveAccountIndex, wallet } = useWallet();
     const disabled = !wallet || activeAccountIndex === undefined;
-    return (_jsx(_Fragment, { children: wallet ? (_jsx(SelectEx, { disabled: disabled, renderValue: (selected) => {
-                const account = wallet.derivePath(selected.toString());
-                const customName = addressNames[account?.addressValue.hex];
-                const favorite = account?.addressValue.hex in addressNames;
-                return (_jsx(AddressRenderRowBox, { address: account?.addressValue.hex, iconOnly: iconOnly, iconSize: iconSize, icons: icons, name: customName, favorite: favorite, showFavorite: showFavorite }));
-            }, value: activeAccountIndex, onChange: (event) => setActiveAccountIndex?.(parseInt(`${event.target.value}`)), size: size, variant: "outlined", ...props, children: arrayRange(maxAccounts).map((index) => {
-                const account = wallet.derivePath(index.toString());
-                const customName = addressNames[account?.addressValue.hex];
-                const favorite = account?.addressValue.hex in addressNames;
-                return (_jsx(MenuItem, { value: index, children: _jsx(AddressRenderRowBox, { address: account?.addressValue.hex, favorite: favorite, iconOnly: iconOnly, iconSize: iconSize, icons: icons, name: customName, showFavorite: showFavorite }) }, account?.addressValue.hex));
-            }) })) : (_jsx(CircularProgress, { size: 24 })) }));
+    return (_jsx(_Fragment, { children: wallet ? (_jsx(SelectEx, { disabled: disabled, renderValue: (selected) => (_jsx(RenderValue, { wallet: wallet, selected: selected, addressNames: addressNames, iconOnly: iconOnly, iconSize: iconSize, icons: icons, showFavorite: showFavorite })), value: activeAccountIndex, onChange: (event) => setActiveAccountIndex?.(parseInt(`${event.target.value}`)), size: size, variant: "outlined", ...props, children: arrayRange(maxAccounts).map((index) => (_jsx(RenderValue, { wallet: wallet, selected: index, addressNames: addressNames, iconOnly: iconOnly, iconSize: iconSize, icons: icons, showFavorite: showFavorite }, index))) })) : (_jsx(CircularProgress, { size: 24 })) }));
 };
 //# sourceMappingURL=Select.js.map

package/dist/esm/components/WalletAccountSelect/Select.js.map

@@ -1 +1 @@
-{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountSelect/Select.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountSelect/Select.tsx"],"names":[],"mappings":"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"}

package/dist/esm/contexts/Account/MemoryProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Account/MemoryProvider.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAM1C,MAAM,CAAC,MAAM,qBAAqB,GAAuD,CAAC,EAAE,cAAc,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACxH,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAA8B,cAAc,CAAC,CAAA;IAEnF,OAAO,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,KAAM,KAAK,GAAI,CAAA;AACxG,CAAC,CAAA"}
+{"version":3,"file":"MemoryProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Account/MemoryProvider.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAM1C,MAAM,CAAC,MAAM,qBAAqB,GAAuD,CAAC,EAAE,cAAc,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACxH,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAA6B,cAAc,CAAC,CAAA;IAElF,OAAO,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,KAAM,KAAK,GAAI,CAAA;AACxG,CAAC,CAAA"}

package/dist/esm/contexts/Account/use.js

@@ -1,6 +1,6 @@
 import { useContextEx } from '@xyo-network/react-shared';
 import { AccountContext } from './Context';
-export const useAccount = (required = false) => {
+export const useAccountFromContext = (required = false) => {
     const { account } = useContextEx(AccountContext, 'Account', required);
     return [account];
 };

package/dist/esm/contexts/Account/use.js.map

@@ -1 +1 @@
-{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../src/contexts/Account/use.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAE1C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAE,EAAE;IAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC,cAAc,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;IACrE,OAAO,CAAC,OAAO,CAAC,CAAA;AAClB,CAAC,CAAA"}
+{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../src/contexts/Account/use.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAE1C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAE,EAAE;IACxD,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC,cAAc,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;IACrE,OAAO,CAAC,OAAO,CAAC,CAAA;AAClB,CAAC,CAAA"}

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

@@ -1,4 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useAsyncEffect } from '@xylabs/react-async-effect';
+import { usePromise } from '@xyo-network/react-shared';
 import { useEffect, useState } from 'react';
 import { AccountContext } from '../Account';
 import { WalletContext } from './Context';
@@ -6,7 +8,8 @@ import { WalletRootPath } from './lib';
 import { useWallet } from './use';
 const AccountWalletProvider = (props) => {
     const { wallet, activeAccountIndex = 0 } = useWallet();
-    return _jsx(AccountContext.Provider, { value: { account: wallet?.derivePath(activeAccountIndex.toString()), provided: true }, ...props });
+    const [account] = usePromise(() => wallet?.derivePath(activeAccountIndex.toString()));
+    return _jsx(AccountContext.Provider, { value: { account, provided: true }, ...props });
 };
 export const WalletProvider = ({ basePath = WalletRootPath, children, defaultActiveAccountIndex = 0, defaultWallet, ...props }) => {
     const [wallet, setWallet] = useState();
@@ -16,12 +19,14 @@ export const WalletProvider = ({ basePath = WalletRootPath, children, defaultAct
             setActiveAccountIndex(defaultActiveAccountIndex);
         }
     }, [defaultActiveAccountIndex]);
-    useEffect(() => {
+    useAsyncEffect(
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    async () => {
         // ensure the wallet has the proper base
         if (defaultWallet) {
             if (!wallet?.path.includes(basePath)) {
                 try {
-                    const walletWithBasePath = defaultWallet?.derivePath(basePath);
+                    const walletWithBasePath = (await defaultWallet?.derivePath(basePath));
                     setWallet(walletWithBasePath);
                 }
                 catch (e) {

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

@@ -1 +1 @@
-{"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,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAQjC,MAAM,qBAAqB,GAA2B,CAAC,KAAK,EAAE,EAAE;IAC9D,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,CAAC,EAAE,GAAG,SAAS,EAAE,CAAA;IAEtD,OAAO,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAM,KAAK,GAAI,CAAA;AACtI,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAgD,CAAC,EAC1E,QAAQ,GAAG,cAAc,EACzB,QAAQ,EACR,yBAAyB,GAAG,CAAC,EAC7B,aAAa,EACb,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAwB,CAAA;IAC5D,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,SAAS,CAAC,GAAG,EAAE;QACb,wCAAwC;QACxC,IAAI,aAAa,EAAE;YACjB,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACpC,IAAI;oBACF,MAAM,kBAAkB,GAAG,aAAa,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAA;oBAC9D,SAAS,CAAC,kBAAkB,CAAC,CAAA;iBAC9B;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAA;iBAC1D;aACF;SACF;aAAM;YACL,MAAM,KAAK,CAAC,4CAA4C,CAAC,CAAA;SAC1D;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;IAE3C,OAAO,CACL,KAAC,aAAa,CAAC,QAAQ,IACrB,KAAK,EAAE;YACL,kBAAkB;YAClB,QAAQ;YACR,QAAQ,EAAE,IAAI;YACd,qBAAqB;YACrB,SAAS;YACT,MAAM;SACP,KACG,KAAK,YAET,KAAC,qBAAqB,cAAE,QAAQ,GAAyB,GAClC,CAC1B,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEtD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAQjC,MAAM,qBAAqB,GAA2B,CAAC,KAAK,EAAE,EAAE;IAC9D,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,CAAC,EAAE,GAAG,SAAS,EAAE,CAAA;IAEtD,MAAM,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;IAErF,OAAO,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAM,KAAK,GAAI,CAAA;AACnF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAgD,CAAC,EAC1E,QAAQ,GAAG,cAAc,EACzB,QAAQ,EACR,yBAAyB,GAAG,CAAC,EAC7B,aAAa,EACb,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAwB,CAAA;IAC5D,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,cAAc;IACZ,uDAAuD;IACvD,KAAK,IAAI,EAAE;QACT,wCAAwC;QACxC,IAAI,aAAa,EAAE;YACjB,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACpC,IAAI;oBACF,MAAM,kBAAkB,GAAG,CAAC,MAAM,aAAa,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAa,CAAA;oBAClF,SAAS,CAAC,kBAAkB,CAAC,CAAA;iBAC9B;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAA;iBAC1D;aACF;SACF;aAAM;YACL,MAAM,KAAK,CAAC,4CAA4C,CAAC,CAAA;SAC1D;IACH,CAAC,EACD,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,CACxC,CAAA;IAED,OAAO,CACL,KAAC,aAAa,CAAC,QAAQ,IACrB,KAAK,EAAE;YACL,kBAAkB;YAClB,QAAQ;YACR,QAAQ,EAAE,IAAI;YACd,qBAAqB;YACrB,SAAS;YACT,MAAM;SACP,KACG,KAAK,YAET,KAAC,qBAAqB,cAAE,QAAQ,GAAyB,GAClC,CAC1B,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/hooks/index.js

@@ -0,0 +1,3 @@
+export * from './useAccount';
+export * from './useAccounts';
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA"}

package/dist/esm/hooks/useAccount.js

@@ -0,0 +1,9 @@
+import { HDWallet } from '@xyo-network/account';
+import { usePromise } from '@xyo-network/react-shared';
+import { useAccountFromContext } from '../contexts';
+export const useAccount = ({ mnemonic, account, path, required, seed } = {}) => {
+    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));
+};
+//# sourceMappingURL=useAccount.js.map

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

@@ -0,0 +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"}

package/dist/esm/hooks/useAccounts.js

@@ -0,0 +1,8 @@
+import { usePromise } from '@xyo-network/react-shared';
+import { useAccountFromContext } from '../contexts';
+export const useAccounts = ({ account, paths, required } = {}) => {
+    const [contextAccount] = useAccountFromContext(!account && required);
+    const activeAccount = account ?? contextAccount;
+    return usePromise(async () => (paths ? await Promise.all(paths.map((path) => activeAccount?.derivePath?.(path))) : activeAccount));
+};
+//# sourceMappingURL=useAccounts.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useAccounts.js","sourceRoot":"","sources":["../../../src/hooks/useAccounts.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAGtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAQnD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,KAAyB,EAAE,EAAE,EAAE;IACnF,MAAM,CAAC,cAAc,CAAC,GAAG,qBAAqB,CAAC,CAAC,OAAO,IAAI,QAAQ,CAAC,CAAA;IACpE,MAAM,aAAa,GAAG,OAAO,IAAI,cAAc,CAAA;IAC/C,OAAO,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAA;AACpI,CAAC,CAAA"}

package/dist/esm/index.js

@@ -1,3 +1,4 @@
 export * from './components';
 export * from './contexts';
+export * from './hooks';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA"}

package/dist/types/components/WalletAccountDetails/WalletAccountDetails.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import { FlexBoxProps } from '@xylabs/react-flexbox';
-import { Account } from '@xyo-network/account';
+import { WalletInstance } from '@xyo-network/wallet-model';
 export interface WalletAccountDetailsProps extends FlexBoxProps {
-    account?: Account;
+    account?: WalletInstance;
     exploreUrl?: string;
 }
 export declare const WalletAccountDetails: React.FC<WalletAccountDetailsProps>;

package/dist/types/components/WalletAccountDetails/WalletAccountDetails.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WalletAccountDetails.d.ts","sourceRoot":"","sources":["../../../../src/components/WalletAccountDetails/WalletAccountDetails.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAoB,MAAM,uBAAuB,CAAA;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAK9C,MAAM,WAAW,yBAA0B,SAAQ,YAAY;IAC7D,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAoBpE,CAAA"}
+{"version":3,"file":"WalletAccountDetails.d.ts","sourceRoot":"","sources":["../../../../src/components/WalletAccountDetails/WalletAccountDetails.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAoB,MAAM,uBAAuB,CAAA;AAGtE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAI1D,MAAM,WAAW,yBAA0B,SAAQ,YAAY;IAC7D,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAgBpE,CAAA"}

package/dist/types/components/WalletAccountSelect/Select.d.ts

@@ -1,11 +1,21 @@
 /// <reference types="react" />
 import { SelectProps } from '@mui/material';
+import { HDWallet } from '@xyo-network/account';
 import { AddressRenderRowBoxPropsBase } from '@xyo-network/react-address-render';
 type SharedAddressRenderRowBoxProps = Pick<AddressRenderRowBoxPropsBase, 'iconOnly' | 'iconSize' | 'icons' | 'showFavorite'>;
 export interface WalletAccountSelectProps extends SharedAddressRenderRowBoxProps, SelectProps<number> {
     addressNames?: Record<string, string | undefined>;
     maxAccounts?: number;
 }
+export declare const RenderValue: React.FC<{
+    addressNames: Record<string, string | undefined>;
+    iconOnly?: boolean;
+    iconSize: number;
+    icons?: boolean;
+    selected: number;
+    showFavorite?: boolean;
+    wallet: HDWallet;
+}>;
 export declare const WalletAccountSelect: React.FC<WalletAccountSelectProps>;
 export {};
 //# sourceMappingURL=Select.d.ts.map

package/dist/types/components/WalletAccountSelect/Select.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Select.d.ts","sourceRoot":"","sources":["../../../../src/components/WalletAccountSelect/Select.tsx"],"names":[],"mappings":";AAAA,OAAO,EAA8B,WAAW,EAAE,MAAM,eAAe,CAAA;AAEvE,OAAO,EAAuB,4BAA4B,EAAE,MAAM,mCAAmC,CAAA;AAIrG,KAAK,8BAA8B,GAAG,IAAI,CAAC,4BAA4B,EAAE,UAAU,GAAG,UAAU,GAAG,OAAO,GAAG,cAAc,CAAC,CAAA;AAE5H,MAAM,WAAW,wBAAyB,SAAQ,8BAA8B,EAAE,WAAW,CAAC,MAAM,CAAC;IACnG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IACjD,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAMD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAgElE,CAAA"}
+{"version":3,"file":"Select.d.ts","sourceRoot":"","sources":["../../../../src/components/WalletAccountSelect/Select.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAoB,WAAW,EAAE,MAAM,eAAe,CAAA;AAE7D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAuB,4BAA4B,EAAE,MAAM,mCAAmC,CAAA;AAKrG,KAAK,8BAA8B,GAAG,IAAI,CAAC,4BAA4B,EAAE,UAAU,GAAG,UAAU,GAAG,OAAO,GAAG,cAAc,CAAC,CAAA;AAE5H,MAAM,WAAW,wBAAyB,SAAQ,8BAA8B,EAAE,WAAW,CAAC,MAAM,CAAC;IACnG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IACjD,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAMD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IAChD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAeA,CAAA;AAED,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAqDlE,CAAA"}

package/dist/types/contexts/Account/MemoryProvider.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import { WithChildren } from '@xylabs/react-shared';
-import { AccountInstance } from '@xyo-network/account-model';
+import { WalletInstance } from '@xyo-network/wallet-model';
 export interface AccountMemoryProviderProps {
-    defaultAccount?: AccountInstance;
+    defaultAccount?: WalletInstance;
 }
 export declare const AccountMemoryProvider: React.FC<WithChildren<AccountMemoryProviderProps>>;
 //# sourceMappingURL=MemoryProvider.d.ts.map

package/dist/types/contexts/Account/MemoryProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/MemoryProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAK5D,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,EAAE,eAAe,CAAA;CACjC;AAED,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAIpF,CAAA"}
+{"version":3,"file":"MemoryProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/MemoryProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK1D,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,EAAE,cAAc,CAAA;CAChC;AAED,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAIpF,CAAA"}

package/dist/types/contexts/Account/State.d.ts

@@ -1,8 +1,8 @@
-import { AccountInstance } from '@xyo-network/account-model';
 import { ContextExState } from '@xyo-network/react-shared';
+import { WalletInstance } from '@xyo-network/wallet-model';
 import { Dispatch } from 'react';
 export interface AccountContextState extends ContextExState {
-    account?: AccountInstance;
-    setAccount?: Dispatch<AccountInstance>;
+    account?: WalletInstance;
+    setAccount?: Dispatch<WalletInstance>;
 }
 //# sourceMappingURL=State.d.ts.map

package/dist/types/contexts/Account/State.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/State.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,MAAM,WAAW,mBAAoB,SAAQ,cAAc;IACzD,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,UAAU,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAA;CACvC"}
+{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/State.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,MAAM,WAAW,mBAAoB,SAAQ,cAAc;IACzD,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,UAAU,CAAC,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAA;CACtC"}

package/dist/types/contexts/Account/use.d.ts

@@ -1,2 +1,2 @@
-export declare const useAccount: (required?: boolean) => (import("@xyo-network/account-model").AccountInstance | undefined)[];
+export declare const useAccountFromContext: (required?: boolean) => (import("@xyo-network/wallet-model").WalletInstance | undefined)[];
 //# sourceMappingURL=use.d.ts.map

package/dist/types/contexts/Account/use.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/use.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,UAAU,8FAGtB,CAAA"}
+{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/use.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,qBAAqB,4FAGjC,CAAA"}

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

@@ -1,10 +1,10 @@
 /// <reference types="react" />
 import { WithChildren } from '@xylabs/react-shared';
-import { HDWallet } from '@xyo-network/account';
+import { WalletInstance } from '@xyo-network/wallet-model';
 export interface WalletProviderProps {
     basePath?: string;
     defaultActiveAccountIndex?: number;
-    defaultWallet?: HDWallet;
+    defaultWallet?: WalletInstance;
 }
 export declare const WalletProvider: React.FC<WithChildren<WalletProviderProps>>;
 //# sourceMappingURL=Provider.d.ts.map

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":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAQ/C,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC,aAAa,CAAC,EAAE,QAAQ,CAAA;CACzB;AAQD,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CA+CtE,CAAA"}
+{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGnD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAQ1D,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC,aAAa,CAAC,EAAE,cAAc,CAAA;CAC/B;AAUD,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAmDtE,CAAA"}

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

@@ -0,0 +1,3 @@
+export * from './useAccount';
+export * from './useAccounts';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA"}

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

@@ -0,0 +1,11 @@
+import { DataLike } from '@xyo-network/core';
+import { WalletInstance } from '@xyo-network/wallet-model';
+export interface AccountHookParams {
+    account?: WalletInstance;
+    mnemonic?: string;
+    path?: string;
+    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];
+//# sourceMappingURL=useAccount.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,8 @@
+import { WalletInstance } from '@xyo-network/wallet-model';
+export interface AccountsHookParams {
+    account?: WalletInstance;
+    paths?: string[];
+    required?: boolean;
+}
+export declare const useAccounts: ({ account, paths, required }?: AccountsHookParams) => [WalletInstance | (WalletInstance | undefined)[] | undefined, Error | undefined, import("@xyo-network/react-shared").State | undefined];
+//# sourceMappingURL=useAccounts.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useAccounts.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAccounts.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAI1D,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,eAAO,MAAM,WAAW,kCAAkC,kBAAkB,4IAI3E,CAAA"}

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
 export * from './components';
 export * from './contexts';
+export * from './hooks';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA"}

package/package.json

@@ -12,17 +12,19 @@
   "dependencies": {
     "@scure/bip39": "^1.2.0",
     "@xylabs/eth-address": "^2.9.1",
+    "@xylabs/react-async-effect": "^2.17.3",
     "@xylabs/react-button": "^2.17.3",
     "@xylabs/react-crypto": "^2.17.3",
     "@xylabs/react-flexbox": "^2.17.3",
     "@xylabs/react-number-status": "^2.17.3",
     "@xylabs/react-select": "^2.17.3",
     "@xylabs/react-shared": "^2.17.3",
-    "@xyo-network/account": "^2.62.1",
-    "@xyo-network/account-model": "^2.62.1",
-    "@xyo-network/react-address-render": "^2.54.1",
-    "@xyo-network/react-network": "^2.54.1",
-    "@xyo-network/react-shared": "^2.54.1"
+    "@xyo-network/account": "^2.63.1",
+    "@xyo-network/core": "^2.63.1",
+    "@xyo-network/react-address-render": "^2.55.1",
+    "@xyo-network/react-network": "^2.55.1",
+    "@xyo-network/react-shared": "^2.55.1",
+    "@xyo-network/wallet-model": "^2.63.1"
   },
   "peerDependencies": {
     "@mui/icons-material": "^5",
@@ -35,10 +37,10 @@
   },
   "description": "Common React library for all XYO projects that use React",
   "devDependencies": {
-    "@storybook/react": "^7.0.21",
-    "@xylabs/ts-scripts-yarn3": "^2.17.14",
-    "@xylabs/tsconfig-react": "^2.17.14",
-    "@xyo-network/react-storybook": "^2.54.1",
+    "@storybook/react": "^7.0.23",
+    "@xylabs/ts-scripts-yarn3": "^2.17.17",
+    "@xylabs/tsconfig-react": "^2.17.17",
+    "@xyo-network/react-storybook": "^2.55.1",
     "typescript": "^5.1.3"
   },
   "browser": "dist/esm/index.js",
@@ -83,5 +85,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.54.1"
+  "version": "2.55.1"
 }

package/src/components/WalletAccountDetails/WalletAccountDetails.tsx

@@ -2,28 +2,24 @@ import { EthAddress } from '@xylabs/eth-address'
 import { EthAccountButton } from '@xylabs/react-crypto'
 import { FlexBoxProps, FlexCol, FlexRow } from '@xylabs/react-flexbox'
 import { NumberStatus } from '@xylabs/react-number-status'
-import { Account } from '@xyo-network/account'
 import { useNetwork } from '@xyo-network/react-network'
+import { WalletInstance } from '@xyo-network/wallet-model'
 
-import { useAccount } from '../../contexts'
+import { useAccount } from '../../hooks'
 
 export interface WalletAccountDetailsProps extends FlexBoxProps {
-  account?: Account
+  account?: WalletInstance
   exploreUrl?: string
 }
 
-export const WalletAccountDetails: React.FC<WalletAccountDetailsProps> = ({
-  exploreUrl = 'https://explore.xyo.network',
-  account: accountProp,
-  ...props
-}) => {
-  const [account = accountProp] = useAccount()
+export const WalletAccountDetails: React.FC<WalletAccountDetailsProps> = ({ exploreUrl = 'https://explore.xyo.network', account, ...props }) => {
+  const [accountToUse] = useAccount({ account })
   const { network } = useNetwork()
-  const exploreAddressUrl = `${exploreUrl}/recent?account=${account?.addressValue.hex}&network=${network?.name ?? 'main'}`
+  const exploreAddressUrl = `${exploreUrl}/recent?account=${accountToUse?.address}&network=${network?.name ?? 'main'}`
 
   return (
     <FlexCol {...props}>
-      <EthAccountButton address={EthAddress.fromString(account?.addressValue.hex)} />
+      <EthAccountButton address={EthAddress.fromString(accountToUse?.address)} />
       <FlexRow gap={1}>
         <NumberStatus rounded title="Tokens" value={0} to={`${exploreAddressUrl}&schema=network.xyo.account.tokens`} target="_blank" />
         <NumberStatus rounded title="NFTs" value={0} to={`${exploreAddressUrl}&schema=network.xyo.account.nfts`} target="_blank" />

package/src/components/WalletAccountDetails/WalletAccountDetailsWithProvider.stories.tsx

@@ -1,9 +1,9 @@
 import { Meta, StoryFn } from '@storybook/react'
-import { HDWallet } from '@xyo-network/account'
 import { DefaultSeedPhrase } from '@xyo-network/react-storybook'
 import { BrowserRouter } from 'react-router-dom'
 
 import { WalletProvider } from '../../contexts'
+import { useAccount } from '../../hooks'
 import { WalletAccountDetails } from './WalletAccountDetails'
 
 const StorybookEntry = {
@@ -18,9 +18,10 @@ const StorybookEntry = {
 } as Meta<typeof WalletAccountDetails>
 
 const Template: StoryFn<typeof WalletAccountDetails> = (args) => {
+  const [account] = useAccount({ mnemonic: DefaultSeedPhrase })
   return (
     <BrowserRouter>
-      <WalletProvider defaultWallet={HDWallet.fromMnemonic(DefaultSeedPhrase)}>
+      <WalletProvider defaultWallet={account}>
         <WalletAccountDetails {...args}></WalletAccountDetails>
       </WalletProvider>
     </BrowserRouter>

package/src/components/WalletAccountSelect/Select.tsx

@@ -1,6 +1,8 @@
-import { CircularProgress, MenuItem, SelectProps } from '@mui/material'
+import { CircularProgress, SelectProps } from '@mui/material'
 import { SelectEx } from '@xylabs/react-select'
+import { HDWallet } from '@xyo-network/account'
 import { AddressRenderRowBox, AddressRenderRowBoxPropsBase } from '@xyo-network/react-address-render'
+import { usePromise } from '@xyo-network/react-shared'
 
 import { useWallet } from '../../contexts'
 
@@ -15,6 +17,31 @@ const arrayRange = (length: number, start = 0) => {
   return Array.from(Array(length).keys()).map((x) => x + start)
 }
 
+export const RenderValue: React.FC<{
+  addressNames: Record<string, string | undefined>
+  iconOnly?: boolean
+  iconSize: number
+  icons?: boolean
+  selected: number
+  showFavorite?: boolean
+  wallet: HDWallet
+}> = ({ iconOnly, iconSize, showFavorite, icons, addressNames, selected, wallet }) => {
+  const [account] = usePromise<HDWallet>(() => wallet.derivePath(selected.toString()) as Promise<HDWallet>)
+  const customName = account ? addressNames[account?.address] : undefined
+  const favorite = account ? account?.address in addressNames : undefined
+  return (
+    <AddressRenderRowBox
+      address={account?.address}
+      iconOnly={iconOnly}
+      iconSize={iconSize}
+      icons={icons}
+      name={customName}
+      favorite={favorite}
+      showFavorite={showFavorite}
+    />
+  )
+}
+
 export const WalletAccountSelect: React.FC<WalletAccountSelectProps> = ({
   addressNames = {},
   iconOnly,
@@ -33,46 +60,35 @@ export const WalletAccountSelect: React.FC<WalletAccountSelectProps> = ({
       {wallet ? (
         <SelectEx
           disabled={disabled}
-          renderValue={(selected) => {
-            const account = wallet.derivePath(selected.toString())
-            const customName = addressNames[account?.addressValue.hex]
-            const favorite = account?.addressValue.hex in addressNames
-            return (
-              <AddressRenderRowBox
-                address={account?.addressValue.hex}
-                iconOnly={iconOnly}
-                iconSize={iconSize}
-                icons={icons}
-                name={customName}
-                favorite={favorite}
-                showFavorite={showFavorite}
-              />
-            )
-          }}
+          renderValue={(selected) => (
+            <RenderValue
+              wallet={wallet}
+              selected={selected}
+              addressNames={addressNames}
+              iconOnly={iconOnly}
+              iconSize={iconSize}
+              icons={icons}
+              showFavorite={showFavorite}
+            />
+          )}
           value={activeAccountIndex}
           onChange={(event) => setActiveAccountIndex?.(parseInt(`${event.target.value}`))}
           size={size}
           variant="outlined"
           {...props}
         >
-          {arrayRange(maxAccounts).map((index) => {
-            const account = wallet.derivePath(index.toString())
-            const customName = addressNames[account?.addressValue.hex]
-            const favorite = account?.addressValue.hex in addressNames
-            return (
-              <MenuItem key={account?.addressValue.hex} value={index}>
-                <AddressRenderRowBox
-                  address={account?.addressValue.hex}
-                  favorite={favorite}
-                  iconOnly={iconOnly}
-                  iconSize={iconSize}
-                  icons={icons}
-                  name={customName}
-                  showFavorite={showFavorite}
-                />
-              </MenuItem>
-            )
-          })}
+          {arrayRange(maxAccounts).map((index) => (
+            <RenderValue
+              key={index}
+              wallet={wallet}
+              selected={index}
+              addressNames={addressNames}
+              iconOnly={iconOnly}
+              iconSize={iconSize}
+              icons={icons}
+              showFavorite={showFavorite}
+            />
+          ))}
         </SelectEx>
       ) : (
         <CircularProgress size={24} />