@xyo-network/react-wallet 2.55.5 → 2.55.6

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

@@ -1,21 +1,31 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { CircularProgress } from '@mui/material';
+import { CircularProgress, MenuItem } 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';
+import { useWalletContext } from '../../contexts';
+import { useAccount } from '../../hooks';
 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) => (_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 })) }));
+    const { activeAccountIndex = 0, setActiveAccountIndex, derivedWallet } = useWalletContext();
+    const disabled = !derivedWallet || activeAccountIndex === undefined;
+    return (_jsx(_Fragment, { children: derivedWallet ? (_jsx(SelectEx, { disabled: disabled, renderValue: (selected) => {
+                const Item = () => {
+                    const [account] = useAccount({ path: selected.toString(), wallet: derivedWallet });
+                    const customName = account ? addressNames[account.address] : undefined;
+                    const favorite = account && account.address in addressNames;
+                    return (_jsx(AddressRenderRowBox, { address: account?.address, iconOnly: iconOnly, iconSize: iconSize, icons: icons, name: customName, favorite: favorite, showFavorite: showFavorite }));
+                };
+                return _jsx(Item, {});
+            }, value: activeAccountIndex, onChange: (event) => setActiveAccountIndex?.(parseInt(`${event.target.value}`)), size: size, variant: "outlined", ...props, children: arrayRange(maxAccounts).map((index) => {
+                const Item = () => {
+                    const [account] = useAccount({ path: index.toString(), wallet: derivedWallet });
+                    const customName = account ? addressNames[account.address] : undefined;
+                    const favorite = account && account.address in addressNames;
+                    return (_jsx(MenuItem, { value: index, children: _jsx(AddressRenderRowBox, { address: account?.address, favorite: favorite, iconOnly: iconOnly, iconSize: iconSize, icons: icons, name: customName, showFavorite: showFavorite }) }, account?.address));
+                };
+                return _jsx(Item, {}, 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":";AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAe,MAAM,eAAe,CAAA;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,mBAAmB,EAAgC,MAAM,mCAAmC,CAAA;AAErG,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AASxC,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE;IAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAuC,CAAC,EACtE,YAAY,GAAG,EAAE,EACjB,QAAQ,EACR,QAAQ,GAAG,EAAE,EACb,KAAK,EACL,WAAW,GAAG,CAAC,EACf,YAAY,GAAG,KAAK,EACpB,IAAI,EACJ,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,kBAAkB,GAAG,CAAC,EAAE,qBAAqB,EAAE,aAAa,EAAE,GAAG,gBAAgB,EAAE,CAAA;IAC3F,MAAM,QAAQ,GAAG,CAAC,aAAa,IAAI,kBAAkB,KAAK,SAAS,CAAA;IAEnE,OAAO,CACL,4BACG,aAAa,CAAC,CAAC,CAAC,CACf,KAAC,QAAQ,IACP,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACxB,MAAM,IAAI,GAAa,GAAG,EAAE;oBAC1B,MAAM,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAA;oBAClF,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;oBACtE,MAAM,QAAQ,GAAG,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,YAAY,CAAA;oBAC3D,OAAO,CACL,KAAC,mBAAmB,IAClB,OAAO,EAAE,OAAO,EAAE,OAAO,EACzB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,YAAY,GAC1B,CACH,CAAA;gBACH,CAAC,CAAA;gBACD,OAAO,KAAC,IAAI,KAAG,CAAA;YACjB,CAAC,EACD,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,EAAE,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAC/E,IAAI,EAAE,IAAI,EACV,OAAO,EAAC,UAAU,KACd,KAAK,YAER,UAAU,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACrC,MAAM,IAAI,GAAa,GAAG,EAAE;oBAC1B,MAAM,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAA;oBAC/E,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;oBACtE,MAAM,QAAQ,GAAG,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,YAAY,CAAA;oBAC3D,OAAO,CACL,KAAC,QAAQ,IAAwB,KAAK,EAAE,KAAK,YAC3C,KAAC,mBAAmB,IAClB,OAAO,EAAE,OAAO,EAAE,OAAO,EACzB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,UAAU,EAChB,YAAY,EAAE,YAAY,GAC1B,IATW,OAAO,EAAE,OAAO,CAUpB,CACZ,CAAA;gBACH,CAAC,CAAA;gBAED,OAAO,KAAC,IAAI,MAAM,KAAK,CAAI,CAAA;YAC7B,CAAC,CAAC,GACO,CACZ,CAAC,CAAC,CAAC,CACF,KAAC,gBAAgB,IAAC,IAAI,EAAE,EAAE,GAAI,CAC/B,GACA,CACJ,CAAA;AACH,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 useAccountFromContext = (required = false) => {
+export const useContextAccount = (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,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"}
+{"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,iBAAiB,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAE,EAAE;IACpD,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,47 +1,40 @@
 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';
 import { WalletRootPath } from './lib';
-import { useWallet } from './use';
-const AccountWalletProvider = (props) => {
-    const { wallet, activeAccountIndex = 0 } = useWallet();
-    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();
+export const WalletProvider = ({ basePath = WalletRootPath, children, defaultActiveAccountIndex = 0, rootWallet, ...props }) => {
     const [activeAccountIndex, setActiveAccountIndex] = useState(defaultActiveAccountIndex);
     useEffect(() => {
         if (defaultActiveAccountIndex !== undefined) {
             setActiveAccountIndex(defaultActiveAccountIndex);
         }
     }, [defaultActiveAccountIndex]);
-    useAsyncEffect(
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    async () => {
+    const [derivedWallet] = usePromise(async () => {
         // ensure the wallet has the proper base
-        if (defaultWallet) {
-            if (!wallet?.path.includes(basePath)) {
+        if (rootWallet) {
+            if (!rootWallet?.path.includes(basePath)) {
                 try {
-                    const walletWithBasePath = (await defaultWallet?.derivePath(basePath));
-                    setWallet(walletWithBasePath);
+                    return await rootWallet?.derivePath(basePath);
                 }
                 catch (e) {
                     console.error('Error setting proper wallet base path', e);
                 }
             }
         }
-    }, [basePath, defaultWallet, wallet?.path]);
+        else {
+            return undefined;
+        }
+    }, [basePath, rootWallet]);
+    const [activeAccount] = usePromise(() => derivedWallet?.derivePath(activeAccountIndex.toString()), [derivedWallet, activeAccountIndex]);
     return (_jsx(WalletContext.Provider, { value: {
+            activeAccount,
             activeAccountIndex,
             basePath,
+            derivedWallet,
             provided: true,
+            rootWallet,
             setActiveAccountIndex,
-            setWallet,
-            wallet,
-        }, ...props, children: _jsx(AccountWalletProvider, { children: children }) }));
+        }, ...props, children: children }));
 };
 //# sourceMappingURL=Provider.js.map

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,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;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"}
+{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEtD,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,EACV,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,aAAa,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QAC5C,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,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,aAAa,EAAE,UAAU,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC,CAAA;IAEvI,OAAO,CACL,KAAC,aAAa,CAAC,QAAQ,IACrB,KAAK,EAAE;YACL,aAAa;YACb,kBAAkB;YAClB,QAAQ;YACR,aAAa;YACb,QAAQ,EAAE,IAAI;YACd,UAAU;YACV,qBAAqB;SACtB,KACG,KAAK,YAER,QAAQ,GACc,CAC1B,CAAA;AACH,CAAC,CAAA"}

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

@@ -1,6 +1,22 @@
-import { useContextEx } from '@xyo-network/react-shared';
+import { useContextEx, usePromise } from '@xyo-network/react-shared';
 import { WalletContext } from './Context';
-export const useWallet = (required = false) => {
-    return useContextEx(WalletContext, 'Wallet', required);
+export const useWalletContext = (required = true) => {
+    return useContextEx(WalletContext, 'WalletContext', required);
+};
+export const useContextWallet = (required = true) => {
+    const { derivedWallet } = useWalletContext(required);
+    return [derivedWallet];
+};
+export const useIndexedWalletFromContext = (index, required = true) => {
+    const [wallet] = useContextWallet(required);
+    const [account] = usePromise(() => wallet?.derivePath(index.toString()), [wallet, index]);
+    return [account];
+};
+export const useSelectedWalletAccount = (required = true) => {
+    const { activeAccountIndex } = useWalletContext(required);
+    //we pass in 0 as default since we can not call the hook optionally,
+    //we resolve this false result by checking whether activeAccountIndex is defined before returning it
+    const [account] = useIndexedWalletFromContext(activeAccountIndex ?? 0);
+    return [activeAccountIndex !== undefined ? account : undefined];
 };
 //# sourceMappingURL=use.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/use.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAE,EAAE;IAC5C,OAAO,YAAY,CAAC,aAAa,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACxD,CAAC,CAAA"}
+{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/use.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAGpE,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,QAAQ,GAAG,IAAI,EAAE,EAAE;IAClD,OAAO,YAAY,CAAC,aAAa,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,QAAQ,GAAG,IAAI,EAAgC,EAAE;IAChF,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IACpD,OAAO,CAAC,aAAa,CAAC,CAAA;AACxB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,KAAa,EAAE,QAAQ,GAAG,IAAI,EAAgC,EAAE;IAC1G,MAAM,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;IACzF,OAAO,CAAC,OAAO,CAAC,CAAA;AAClB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,QAAQ,GAAG,IAAI,EAAgC,EAAE;IACxF,MAAM,EAAE,kBAAkB,EAAE,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IACzD,oEAAoE;IACpE,oGAAoG;IACpG,MAAM,CAAC,OAAO,CAAC,GAAG,2BAA2B,CAAC,kBAAkB,IAAI,CAAC,CAAC,CAAA;IACtE,OAAO,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;AACjE,CAAC,CAAA"}

package/dist/esm/hooks/index.js

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

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

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

package/dist/esm/hooks/useAccount.js

@@ -1,35 +1,39 @@
-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 } = {}) => {
+import { useContextAccount } from '../contexts';
+export const useAccount = ({ wallet, account, path, required = false } = {}) => {
+    let validationError = undefined;
+    if (wallet && account) {
+        validationError = Error('useAccount can not have both a wallet and an account in the parameters');
+    }
+    if (path && account) {
+        validationError = Error('useAccount can not have both a path and an account in the parameters');
+    }
     const [error, setError] = useState();
-    const [contextAccount] = useAccountFromContext(!account && required);
+    const [contextAccount] = useContextAccount(!(account || wallet) && required);
     const [activeAccount] = usePromise(async () => {
         try {
-            const newAccount = await (() => {
-                if (account) {
-                    return account;
+            if (!validationError) {
+                if (wallet) {
+                    if (path) {
+                        return await wallet?.derivePath?.(path);
+                    }
+                    else {
+                        return wallet;
+                    }
                 }
-                else if (mnemonic) {
-                    return HDWallet.fromMnemonic(mnemonic);
+                else {
+                    return contextAccount;
                 }
-                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];
+    }, [path, wallet, contextAccount, validationError]);
+    if (validationError && !error) {
+        setError(validationError);
+    }
+    return [error ? undefined : 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;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"}
+{"version":3,"file":"useAccount.js","sourceRoot":"","sources":["../../../src/hooks/useAccount.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAS/C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,GAAG,KAAK,KAAwB,EAAE,EAAoD,EAAE;IAClJ,IAAI,eAAe,GAAsB,SAAS,CAAA;IAClD,IAAI,MAAM,IAAI,OAAO,EAAE;QACrB,eAAe,GAAG,KAAK,CAAC,wEAAwE,CAAC,CAAA;KAClG;IAED,IAAI,IAAI,IAAI,OAAO,EAAE;QACnB,eAAe,GAAG,KAAK,CAAC,sEAAsE,CAAC,CAAA;KAChG;IACD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,cAAc,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,QAAQ,CAAC,CAAA;IAC5E,MAAM,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QAC5C,IAAI;YACF,IAAI,CAAC,eAAe,EAAE;gBACpB,IAAI,MAAM,EAAE;oBACV,IAAI,IAAI,EAAE;wBACR,OAAO,MAAM,MAAM,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,CAAA;qBACxC;yBAAM;wBACL,OAAO,MAAM,CAAA;qBACd;iBACF;qBAAM;oBACL,OAAO,cAAc,CAAA;iBACtB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC,CAAA;IACnD,IAAI,eAAe,IAAI,CAAC,KAAK,EAAE;QAC7B,QAAQ,CAAC,eAAe,CAAC,CAAA;KAC1B;IACD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;AACnD,CAAC,CAAA"}

package/dist/esm/hooks/useWallet.js

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWallet.js","sourceRoot":"","sources":["../../../src/hooks/useWallet.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,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAU9C,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,KAAK,EAAE,IAAI,KAAuB,EAAE,EAGjG,EAAE;IACF,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,cAAc,CAAC,GAAG,gBAAgB,CAAC,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAA;IAC9D,MAAM,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QAC5C,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,EAAE;gBAC7B,IAAI,MAAM,EAAE;oBACV,OAAO,MAAM,CAAA;iBACd;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;YAEJ,IAAI,IAAI,EAAE;gBACR,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;gBAC5B,OAAO,UAAU,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,CAAA;aACtC;iBAAM;gBACL,OAAO,UAAU,IAAI,MAAM,CAAA;aAC5B;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;IAClD,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;AAC/B,CAAC,CAAA"}

package/dist/esm/hooks/useWallets.js

@@ -0,0 +1,8 @@
+import { usePromise } from '@xyo-network/react-shared';
+import { useWallet } from './useWallet';
+export const useWallets = ({ wallet, paths }) => {
+    const [foundWallet] = useWallet({ wallet });
+    const [wallets, error] = usePromise(() => (foundWallet ? Promise.all(paths.map((path) => foundWallet.derivePath(path))) : undefined), [foundWallet, paths]);
+    return [wallets, error];
+};
+//# sourceMappingURL=useWallets.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWallets.js","sourceRoot":"","sources":["../../../src/hooks/useWallets.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAGtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAOvC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,EAAqB,EAAqD,EAAE;IACpH,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,EAAE,KAAK,CAAC,CAAA;AACzB,CAAC,CAAA"}

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

@@ -1,21 +1,11 @@
 /// <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,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"}
+{"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;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,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAuElE,CAAA"}

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

@@ -1,2 +1,2 @@
-export declare const useAccountFromContext: (required?: boolean) => (import("@xyo-network/wallet-model").WalletInstance | undefined)[];
+export declare const useContextAccount: (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,qBAAqB,4FAGjC,CAAA"}
+{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/use.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB,4FAG7B,CAAA"}

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

@@ -4,7 +4,7 @@ import { WalletInstance } from '@xyo-network/wallet-model';
 export interface WalletProviderProps {
     basePath?: string;
     defaultActiveAccountIndex?: number;
-    defaultWallet?: WalletInstance;
+    rootWallet?: 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":";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,CAiDtE,CAAA"}
+{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAEnD,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,CAAA;CAC5B;AAED,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAgDtE,CAAA"}

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

@@ -1,12 +1,18 @@
-import { HDWallet } from '@xyo-network/account';
 import { ContextExState } from '@xyo-network/react-shared';
-import { Dispatch, SetStateAction } from 'react';
+import { WalletInstance } from '@xyo-network/wallet-model';
+import { Dispatch } from 'react';
 export interface WalletContextState extends ContextExState {
+    /** Currently selected account */
+    activeAccount?: WalletInstance;
+    /** Currently selected index */
     activeAccountIndex?: number;
     /** Base path from which the wallet was derived */
     basePath?: string;
+    /** The derived wallet being used */
+    derivedWallet?: WalletInstance;
+    /** The root wallet being used */
+    rootWallet?: WalletInstance;
+    /** Set currently selected index */
     setActiveAccountIndex?: Dispatch<number>;
-    setWallet?: Dispatch<SetStateAction<HDWallet | undefined>>;
-    wallet?: HDWallet;
 }
 //# sourceMappingURL=State.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/State.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAEhD,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,qBAAqB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,SAAS,CAAC,EAAE,QAAQ,CAAC,cAAc,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAA;IAC1D,MAAM,CAAC,EAAE,QAAQ,CAAA;CAClB"}
+{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/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,kBAAmB,SAAQ,cAAc;IACxD,iCAAiC;IACjC,aAAa,CAAC,EAAE,cAAc,CAAA;IAC9B,+BAA+B;IAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,oCAAoC;IACpC,aAAa,CAAC,EAAE,cAAc,CAAA;IAC9B,iCAAiC;IACjC,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B,mCAAmC;IACnC,qBAAqB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;CACzC"}

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

@@ -1,2 +1,6 @@
-export declare const useWallet: (required?: boolean) => Omit<import("./State").WalletContextState & import("@xyo-network/react-shared").ContextExState, "provided">;
+import { WalletInstance } from '@xyo-network/wallet-model';
+export declare const useWalletContext: (required?: boolean) => Omit<import("./State").WalletContextState & import("@xyo-network/react-shared").ContextExState, "provided">;
+export declare const useContextWallet: (required?: boolean) => [WalletInstance | undefined];
+export declare const useIndexedWalletFromContext: (index: number, required?: boolean) => [WalletInstance | undefined];
+export declare const useSelectedWalletAccount: (required?: boolean) => [WalletInstance | undefined];
 //# sourceMappingURL=use.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/use.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,SAAS,qIAErB,CAAA"}
+{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/use.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAI1D,eAAO,MAAM,gBAAgB,qIAE5B,CAAA;AAED,eAAO,MAAM,gBAAgB,0BAAsB,CAAC,cAAc,GAAG,SAAS,CAG7E,CAAA;AAED,eAAO,MAAM,2BAA2B,UAAW,MAAM,yBAAoB,CAAC,cAAc,GAAG,SAAS,CAIvG,CAAA;AAED,eAAO,MAAM,wBAAwB,0BAAsB,CAAC,cAAc,GAAG,SAAS,CAMrF,CAAA"}

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

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

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

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

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

@@ -1,11 +1,10 @@
-import { DataLike } from '@xyo-network/core';
+import { AccountInstance } from '@xyo-network/account-model';
 import { WalletInstance } from '@xyo-network/wallet-model';
 export interface AccountHookParams {
-    account?: WalletInstance;
-    mnemonic?: string;
+    account?: AccountInstance;
     path?: string;
     required?: boolean;
-    seed?: DataLike;
+    wallet?: WalletInstance;
 }
-export declare const useAccount: ({ mnemonic, account, path, required, seed }?: AccountHookParams) => [WalletInstance | undefined, Error | undefined];
+export declare const useAccount: ({ wallet, account, path, required }?: AccountHookParams) => [AccountInstance | 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;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"}
+{"version":3,"file":"useAccount.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAccount.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK1D,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,cAAc,CAAA;CACxB;AAED,eAAO,MAAM,UAAU,yCAAiD,iBAAiB,KAAQ,CAAC,eAAe,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAgC/I,CAAA"}

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

@@ -0,0 +1,14 @@
+import { DataLike } from '@xyo-network/core';
+import { WalletInstance } from '@xyo-network/wallet-model';
+export interface WalletHookParams {
+    mnemonic?: string;
+    path?: string;
+    required?: boolean;
+    seed?: DataLike;
+    wallet?: WalletInstance;
+}
+export declare const useWallet: ({ mnemonic, wallet, path, required, seed }?: WalletHookParams) => [
+    WalletInstance | undefined,
+    Error | undefined
+];
+//# sourceMappingURL=useWallet.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWallet.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK1D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,MAAM,CAAC,EAAE,cAAc,CAAA;CACxB;AAED,eAAO,MAAM,SAAS,gDAAwD,gBAAgB,KAAQ;IACpG,cAAc,GAAG,SAAS;IAC1B,KAAK,GAAG,SAAS;CA4BlB,CAAA"}

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

@@ -0,0 +1,7 @@
+import { WalletInstance } from '@xyo-network/wallet-model';
+export interface WalletsHookParams {
+    paths: string[];
+    wallet?: WalletInstance;
+}
+export declare const useWallets: ({ wallet, paths }: WalletsHookParams) => [WalletInstance[] | undefined, Error | undefined];
+//# sourceMappingURL=useWallets.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWallets.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWallets.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAI1D,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,CAAC,EAAE,cAAc,CAAA;CACxB;AAED,eAAO,MAAM,UAAU,sBAAuB,iBAAiB,KAAG,CAAC,cAAc,EAAE,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAOjH,CAAA"}

package/package.json

@@ -12,18 +12,18 @@
   "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",
+    "@xylabs/react-button": "^2.17.4",
+    "@xylabs/react-crypto": "^2.17.4",
+    "@xylabs/react-flexbox": "^2.17.4",
+    "@xylabs/react-number-status": "^2.17.4",
+    "@xylabs/react-select": "^2.17.4",
+    "@xylabs/react-shared": "^2.17.4",
     "@xyo-network/account": "^2.63.2",
+    "@xyo-network/account-model": "^2.63.2",
     "@xyo-network/core": "^2.63.2",
-    "@xyo-network/react-address-render": "^2.55.5",
-    "@xyo-network/react-network": "^2.55.5",
-    "@xyo-network/react-shared": "^2.55.5",
+    "@xyo-network/react-address-render": "^2.55.6",
+    "@xyo-network/react-network": "^2.55.6",
+    "@xyo-network/react-shared": "^2.55.6",
     "@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.5",
+    "@xyo-network/react-storybook": "^2.55.6",
     "typescript": "^5.1.3"
   },
   "browser": "dist/esm/index.js",
@@ -85,5 +85,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.55.5"
+  "version": "2.55.6"
 }

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

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