@xyo-network/react-module 2.56.1 → 2.56.3

package/dist/esm/components/Card/Diviner/CardContent.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ModuleCardContent } from '../Module';
-export const DivinerCardContent = ({ children, module, ...props }) => {
-    return (_jsx(ModuleCardContent, { module: module, ...props, children: children }));
+export const DivinerCardContent = ({ children, ...props }) => {
+    return _jsx(ModuleCardContent, { ...props, children: children });
 };
 //# sourceMappingURL=CardContent.js.map

package/dist/esm/components/Card/Diviner/CardContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"CardContent.js","sourceRoot":"","sources":["../../../../../src/components/Card/Diviner/CardContent.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAE7C,MAAM,CAAC,MAAM,kBAAkB,GAAkE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAClI,OAAO,CACL,KAAC,iBAAiB,IAAC,MAAM,EAAE,MAAM,KAAM,KAAK,YACzC,QAAQ,GACS,CACrB,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"CardContent.js","sourceRoot":"","sources":["../../../../../src/components/Card/Diviner/CardContent.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAE7C,MAAM,CAAC,MAAM,kBAAkB,GAAkE,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC1H,OAAO,KAAC,iBAAiB,OAAK,KAAK,YAAG,QAAQ,GAAqB,CAAA;AACrE,CAAC,CAAA"}

package/dist/esm/components/Card/Module/CardActions.js

@@ -2,12 +2,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { CardActions, Chip } from '@mui/material';
 import { ButtonEx } from '@xylabs/react-button';
 import { FlexGrowRow } from '@xylabs/react-flexbox';
-import { ModuleWrapper } from '@xyo-network/module';
 import { useState } from 'react';
+import { useWrappedModule } from '../../../hooks';
 import { DiscoverDialog } from './components';
 export const ModuleCardActions = ({ children, module, sx, ...props }) => {
     const [discoverDialogOpen, setDiscoverDialogOpen] = useState(false);
-    const wrapper = module ? ModuleWrapper.wrap(module) : undefined;
+    const [wrapper] = useWrappedModule(module);
     const config = wrapper?.config;
     return (_jsxs(CardActions, { sx: { alignItems: 'stretch', flexDirection: 'column', ml: 1, ...sx }, ...props, children: [_jsxs(FlexGrowRow, { justifyContent: "space-between", alignItems: "center", children: [wrapper ? _jsx(Chip, { label: config?.schema, size: 'small' }) : null, _jsx(ButtonEx, { onClick: () => setDiscoverDialogOpen(true), size: 'small', variant: 'outlined', children: "Discover" }), _jsx(DiscoverDialog, { fullWidth: true, maxWidth: 'md', module: module, open: discoverDialogOpen, setOpen: setDiscoverDialogOpen, wrapper: wrapper })] }), children] }));
 };

package/dist/esm/components/Card/Module/CardActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"CardActions.js","sourceRoot":"","sources":["../../../../../src/components/Card/Module/CardActions.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAoB,IAAI,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAGhC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,CAAC,MAAM,iBAAiB,GAAmD,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACtH,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACnE,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC/D,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,CAAA;IAE9B,OAAO,CACL,MAAC,WAAW,IAAC,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,KAAM,KAAK,aAC1F,MAAC,WAAW,IAAC,cAAc,EAAC,eAAe,EAAC,UAAU,EAAC,QAAQ,aAC5D,OAAO,CAAC,CAAC,CAAC,KAAC,IAAI,IAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAI,CAAC,CAAC,CAAC,IAAI,EAChE,KAAC,QAAQ,IAAC,OAAO,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,yBAE7E,EACX,KAAC,cAAc,IAAC,SAAS,QAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,OAAO,GAAI,IAC5H,EACb,QAAQ,IACG,CACf,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"CardActions.js","sourceRoot":"","sources":["../../../../../src/components/Card/Module/CardActions.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAoB,IAAI,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,CAAC,MAAM,iBAAiB,GAAmD,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACtH,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEnE,MAAM,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAA;IAC1C,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,CAAA;IAE9B,OAAO,CACL,MAAC,WAAW,IAAC,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,KAAM,KAAK,aAC1F,MAAC,WAAW,IAAC,cAAc,EAAC,eAAe,EAAC,UAAU,EAAC,QAAQ,aAC5D,OAAO,CAAC,CAAC,CAAC,KAAC,IAAI,IAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAI,CAAC,CAAC,CAAC,IAAI,EAChE,KAAC,QAAQ,IAAC,OAAO,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,yBAE7E,EACX,KAAC,cAAc,IAAC,SAAS,QAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,OAAO,GAAI,IAC5H,EACb,QAAQ,IACG,CACf,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/hooks/WrappedModuleHookFactory.js

@@ -0,0 +1,33 @@
+import { useWrapperAccount } from '@xyo-network/react-wallet';
+import { useEffect, useState } from 'react';
+export const WrappedModuleHookFactory = {
+    create: (wrapperObject, name) => {
+        const useHook = (module, account, logger) => {
+            logger?.debug(`Render: ${name}`);
+            const wrapperAccount = useWrapperAccount();
+            const [wrapper, setWrapper] = useState();
+            const [error, setError] = useState();
+            useEffect(() => {
+                const walletToUse = account || wrapperAccount;
+                if (module && walletToUse) {
+                    try {
+                        const wrapper = wrapperObject.wrap(module, walletToUse);
+                        setWrapper(wrapper);
+                        setError(undefined);
+                    }
+                    catch (ex) {
+                        setWrapper(undefined);
+                        setError(ex);
+                    }
+                }
+                else {
+                    setWrapper(undefined);
+                    setError(undefined);
+                }
+            }, [module, account, wrapperAccount]);
+            return [wrapper, error];
+        };
+        return useHook;
+    },
+};
+//# sourceMappingURL=WrappedModuleHookFactory.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WrappedModuleHookFactory.js","sourceRoot":"","sources":["../../../src/hooks/WrappedModuleHookFactory.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,MAAM,EAAE,CAAuC,aAAyD,EAAE,IAAa,EAAE,EAAE;QACzH,MAAM,OAAO,GAAG,CACd,MAAiC,EACjC,OAAyB,EACzB,MAAe,EACkC,EAAE;YACnD,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;YAChC,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAA;YAE1C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAkB,CAAA;YACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;YAE3C,SAAS,CAAC,GAAG,EAAE;gBACb,MAAM,WAAW,GAAG,OAAO,IAAI,cAAc,CAAA;gBAC7C,IAAI,MAAM,IAAI,WAAW,EAAE;oBACzB,IAAI;wBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;wBACvD,UAAU,CAAC,OAAO,CAAC,CAAA;wBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;oBAAC,OAAO,EAAE,EAAE;wBACX,UAAU,CAAC,SAAS,CAAC,CAAA;wBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;qBACtB;iBACF;qBAAM;oBACL,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,SAAS,CAAC,CAAA;iBACpB;YACH,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAA;YAErC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACzB,CAAC,CAAA;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;CACF,CAAA"}

package/dist/esm/hooks/WrappedModulesHookFactory.js

@@ -0,0 +1,33 @@
+import { useWrapperAccount } from '@xyo-network/react-wallet';
+import { useEffect, useState } from 'react';
+export const WrappedModulesHookFactory = {
+    create: (wrapperObject, name) => {
+        const useHook = (modules, account, logger) => {
+            logger?.debug(`Render: ${name}`);
+            const wrapperAccount = useWrapperAccount();
+            const [wrappers, setWrappers] = useState();
+            const [error, setError] = useState();
+            useEffect(() => {
+                const walletToUse = account || wrapperAccount;
+                if (module && walletToUse) {
+                    try {
+                        const wrappers = modules?.map((module) => wrapperObject.wrap(module, walletToUse));
+                        setWrappers(wrappers);
+                        setError(undefined);
+                    }
+                    catch (ex) {
+                        setWrappers(undefined);
+                        setError(ex);
+                    }
+                }
+                else {
+                    setWrappers(undefined);
+                    setError(undefined);
+                }
+            }, [modules, account, wrapperAccount]);
+            return [wrappers, error];
+        };
+        return useHook;
+    },
+};
+//# sourceMappingURL=WrappedModulesHookFactory.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WrappedModulesHookFactory.js","sourceRoot":"","sources":["../../../src/hooks/WrappedModulesHookFactory.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,MAAM,EAAE,CAAuC,aAAyD,EAAE,IAAa,EAAE,EAAE;QACzH,MAAM,OAAO,GAAG,CACd,OAAoC,EACpC,OAAyB,EACzB,MAAe,EACoC,EAAE;YACrD,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;YAChC,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAA;YAE1C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAoB,CAAA;YAC5D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;YAE3C,SAAS,CAAC,GAAG,EAAE;gBACb,MAAM,WAAW,GAAG,OAAO,IAAI,cAAc,CAAA;gBAC7C,IAAI,MAAM,IAAI,WAAW,EAAE;oBACzB,IAAI;wBACF,MAAM,QAAQ,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAA;wBAClF,WAAW,CAAC,QAAQ,CAAC,CAAA;wBACrB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;oBAAC,OAAO,EAAE,EAAE;wBACX,WAAW,CAAC,SAAS,CAAC,CAAA;wBACtB,QAAQ,CAAC,EAAW,CAAC,CAAA;qBACtB;iBACF;qBAAM;oBACL,WAAW,CAAC,SAAS,CAAC,CAAA;oBACtB,QAAQ,CAAC,SAAS,CAAC,CAAA;iBACpB;YACH,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAA;YAEtC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QAC1B,CAAC,CAAA;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;CACF,CAAA"}

package/dist/esm/hooks/index.js

@@ -0,0 +1,6 @@
+export * from './useRefresh';
+export * from './useWrappedModule';
+export * from './useWrappedModules';
+export * from './WrappedModuleHookFactory';
+export * from './WrappedModulesHookFactory';
+//# 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,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,6BAA6B,CAAA"}

package/dist/esm/hooks/useRefresh.js

@@ -0,0 +1,14 @@
+import { useState } from 'react';
+export const useRefresh = () => {
+    const [enabled, setEnabled] = useState(1);
+    return [
+        !!enabled,
+        () => {
+            const enabledCount = enabled + 1;
+            setEnabled(enabledCount);
+            return !!enabledCount;
+        },
+        () => setEnabled(0),
+    ];
+};
+//# sourceMappingURL=useRefresh.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useRefresh.js","sourceRoot":"","sources":["../../../src/hooks/useRefresh.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAKhC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAgD,EAAE;IAC1E,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IACzC,OAAO;QACL,CAAC,CAAC,OAAO;QACT,GAAG,EAAE;YACH,MAAM,YAAY,GAAG,OAAO,GAAG,CAAC,CAAA;YAChC,UAAU,CAAC,YAAY,CAAC,CAAA;YACxB,OAAO,CAAC,CAAC,YAAY,CAAA;QACvB,CAAC;QACD,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;KACpB,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/hooks/useWrappedModule.js

@@ -0,0 +1,4 @@
+import { ModuleWrapper } from '@xyo-network/module';
+import { WrappedModuleHookFactory } from './WrappedModuleHookFactory';
+export const useWrappedModule = WrappedModuleHookFactory.create(ModuleWrapper, 'useWrappedModule');
+//# sourceMappingURL=useWrappedModule.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWrappedModule.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AAErE,MAAM,CAAC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,MAAM,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAA"}

package/dist/esm/hooks/useWrappedModules.js

@@ -0,0 +1,4 @@
+import { ModuleWrapper } from '@xyo-network/module';
+import { WrappedModulesHookFactory } from './WrappedModulesHookFactory';
+export const useWrappedModules = WrappedModulesHookFactory.create(ModuleWrapper, 'useWrappedModules');
+//# sourceMappingURL=useWrappedModules.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWrappedModules.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModules.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAEvE,MAAM,CAAC,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,MAAM,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAA"}

package/dist/esm/index.js

@@ -1,3 +1,4 @@
 export * from './components';
+export * from './hooks';
 export * from './ModuleRenderProps';
 //# 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,qBAAqB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,SAAS,CAAA;AACvB,cAAc,qBAAqB,CAAA"}

package/dist/types/ModuleRenderProps.d.ts

@@ -1,5 +1,7 @@
 import { Module } from '@xyo-network/module';
-export interface ModuleRenderProps<T extends Module = Module> {
+export type ModuleRenderProps<T extends Module = Module> = {
+    address?: string;
     module?: T;
-}
+    name?: string;
+};
 //# sourceMappingURL=ModuleRenderProps.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ModuleRenderProps.d.ts","sourceRoot":"","sources":["../../src/ModuleRenderProps.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;IAC1D,MAAM,CAAC,EAAE,CAAC,CAAA;CACX"}
+{"version":3,"file":"ModuleRenderProps.d.ts","sourceRoot":"","sources":["../../src/ModuleRenderProps.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;IACzD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,CAAC,CAAA;IACV,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA"}

package/dist/types/components/Card/Diviner/CardContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CardContent.d.ts","sourceRoot":"","sources":["../../../../../src/components/Card/Diviner/CardContent.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAG9D,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAM5F,CAAA"}
+{"version":3,"file":"CardContent.d.ts","sourceRoot":"","sources":["../../../../../src/components/Card/Diviner/CardContent.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAG9D,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAE5F,CAAA"}

package/dist/types/components/Card/Module/CardActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CardActions.d.ts","sourceRoot":"","sources":["../../../../../src/components/Card/Module/CardActions.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAe,gBAAgB,EAAQ,MAAM,eAAe,CAAA;AAMnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAG9D,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,GAAG,iBAAiB,CAiB5E,CAAA"}
+{"version":3,"file":"CardActions.d.ts","sourceRoot":"","sources":["../../../../../src/components/Card/Module/CardActions.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAe,gBAAgB,EAAQ,MAAM,eAAe,CAAA;AAMnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAG9D,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,GAAG,iBAAiB,CAkB5E,CAAA"}

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

@@ -0,0 +1,35 @@
+import { AccountInstance } from '@xyo-network/account-model';
+import { Logger } from '@xyo-network/core';
+import { ConstructableModuleWrapper, ModuleWrapper } from '@xyo-network/module';
+export declare const WrappedModuleHookFactory: {
+    create: <TModuleWrapper extends ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+        readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+        readonly name?: string | undefined;
+        readonly paging?: Record<string, {
+            size?: number | undefined;
+        }> | undefined;
+        readonly schema: string;
+        readonly security?: {
+            readonly allowAnonymous?: boolean | undefined;
+            readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+            readonly disallowed?: Record<string, string[]> | undefined;
+        } | undefined;
+        readonly storeQueries?: boolean | undefined;
+    } & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+        readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+        readonly name?: string | undefined;
+        readonly paging?: Record<string, {
+            size?: number | undefined;
+        }> | undefined;
+        readonly schema: "network.xyo.module.config";
+        readonly security?: {
+            readonly allowAnonymous?: boolean | undefined;
+            readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+            readonly disallowed?: Record<string, string[]> | undefined;
+        } | undefined;
+        readonly storeQueries?: boolean | undefined;
+    } & Omit<undefined, "schema">, "schema"> & {
+        schema: string;
+    }, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>>>(wrapperObject: ConstructableModuleWrapper<TModuleWrapper>, name?: string) => (module?: TModuleWrapper["module"] | undefined, account?: AccountInstance, logger?: Logger) => [TModuleWrapper | undefined, Error | undefined];
+};
+//# sourceMappingURL=WrappedModuleHookFactory.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WrappedModuleHookFactory.d.ts","sourceRoot":"","sources":["../../../src/hooks/WrappedModuleHookFactory.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAI/E,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iJAC8E,MAAM,+DAGzG,eAAe,WAChB,MAAM;CA6BpB,CAAA"}

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

@@ -0,0 +1,35 @@
+import { AccountInstance } from '@xyo-network/account-model';
+import { Logger } from '@xyo-network/core';
+import { ConstructableModuleWrapper, ModuleWrapper } from '@xyo-network/module';
+export declare const WrappedModulesHookFactory: {
+    create: <TModuleWrapper extends ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+        readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+        readonly name?: string | undefined;
+        readonly paging?: Record<string, {
+            size?: number | undefined;
+        }> | undefined;
+        readonly schema: string;
+        readonly security?: {
+            readonly allowAnonymous?: boolean | undefined;
+            readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+            readonly disallowed?: Record<string, string[]> | undefined;
+        } | undefined;
+        readonly storeQueries?: boolean | undefined;
+    } & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+        readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+        readonly name?: string | undefined;
+        readonly paging?: Record<string, {
+            size?: number | undefined;
+        }> | undefined;
+        readonly schema: "network.xyo.module.config";
+        readonly security?: {
+            readonly allowAnonymous?: boolean | undefined;
+            readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+            readonly disallowed?: Record<string, string[]> | undefined;
+        } | undefined;
+        readonly storeQueries?: boolean | undefined;
+    } & Omit<undefined, "schema">, "schema"> & {
+        schema: string;
+    }, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>>>(wrapperObject: ConstructableModuleWrapper<TModuleWrapper>, name?: string) => (modules?: TModuleWrapper["module"][] | undefined, account?: AccountInstance, logger?: Logger) => [TModuleWrapper[] | undefined, Error | undefined];
+};
+//# sourceMappingURL=WrappedModulesHookFactory.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WrappedModulesHookFactory.d.ts","sourceRoot":"","sources":["../../../src/hooks/WrappedModulesHookFactory.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAI/E,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iJAC6E,MAAM,kEAGzG,eAAe,WAChB,MAAM;CA6BpB,CAAA"}

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

@@ -0,0 +1,6 @@
+export * from './useRefresh';
+export * from './useWrappedModule';
+export * from './useWrappedModules';
+export * from './WrappedModuleHookFactory';
+export * from './WrappedModulesHookFactory';
+//# 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,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,6BAA6B,CAAA"}

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

@@ -0,0 +1,4 @@
+export type RefreshCallback = () => boolean;
+export type DisableCallback = () => void;
+export declare const useRefresh: () => [boolean, RefreshCallback, DisableCallback];
+//# sourceMappingURL=useRefresh.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useRefresh.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRefresh.tsx"],"names":[],"mappings":"AAEA,MAAM,MAAM,eAAe,GAAG,MAAM,OAAO,CAAA;AAC3C,MAAM,MAAM,eAAe,GAAG,MAAM,IAAI,CAAA;AAExC,eAAO,MAAM,UAAU,QAAO,CAAC,OAAO,EAAE,eAAe,EAAE,eAAe,CAWvE,CAAA"}

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

@@ -0,0 +1,59 @@
+import { ModuleWrapper } from '@xyo-network/module';
+export declare const useWrappedModule: (module?: import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+    readonly name?: string | undefined;
+    readonly paging?: Record<string, {
+        size?: number | undefined;
+    }> | undefined;
+    readonly schema: string;
+    readonly security?: {
+        readonly allowAnonymous?: boolean | undefined;
+        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        readonly disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    readonly storeQueries?: boolean | undefined;
+} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+    readonly name?: string | undefined;
+    readonly paging?: Record<string, {
+        size?: number | undefined;
+    }> | undefined;
+    readonly schema: "network.xyo.module.config";
+    readonly security?: {
+        readonly allowAnonymous?: boolean | undefined;
+        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        readonly disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    readonly storeQueries?: boolean | undefined;
+} & Omit<undefined, "schema">, "schema"> & {
+    schema: string;
+}, "schema">, undefined>, import("@xyo-network/module").ModuleEventData> | undefined, account?: import("@xyo-network/account-model").AccountInstance | undefined, logger?: import("@xyo-network/core").Logger | undefined) => [ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+    readonly name?: string | undefined;
+    readonly paging?: Record<string, {
+        size?: number | undefined;
+    }> | undefined;
+    readonly schema: string;
+    readonly security?: {
+        readonly allowAnonymous?: boolean | undefined;
+        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        readonly disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    readonly storeQueries?: boolean | undefined;
+} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+    readonly name?: string | undefined;
+    readonly paging?: Record<string, {
+        size?: number | undefined;
+    }> | undefined;
+    readonly schema: "network.xyo.module.config";
+    readonly security?: {
+        readonly allowAnonymous?: boolean | undefined;
+        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        readonly disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    readonly storeQueries?: boolean | undefined;
+} & Omit<undefined, "schema">, "schema"> & {
+    schema: string;
+}, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>> | undefined, Error | undefined];
+//# sourceMappingURL=useWrappedModule.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWrappedModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAInD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yGAAqE,CAAA"}

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

@@ -0,0 +1,59 @@
+import { ModuleWrapper } from '@xyo-network/module';
+export declare const useWrappedModules: (modules?: import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+    readonly name?: string | undefined;
+    readonly paging?: Record<string, {
+        size?: number | undefined;
+    }> | undefined;
+    readonly schema: string;
+    readonly security?: {
+        readonly allowAnonymous?: boolean | undefined;
+        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        readonly disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    readonly storeQueries?: boolean | undefined;
+} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+    readonly name?: string | undefined;
+    readonly paging?: Record<string, {
+        size?: number | undefined;
+    }> | undefined;
+    readonly schema: "network.xyo.module.config";
+    readonly security?: {
+        readonly allowAnonymous?: boolean | undefined;
+        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        readonly disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    readonly storeQueries?: boolean | undefined;
+} & Omit<undefined, "schema">, "schema"> & {
+    schema: string;
+}, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>[] | undefined, account?: import("@xyo-network/account-model").AccountInstance | undefined, logger?: import("@xyo-network/core").Logger | undefined) => [ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+    readonly name?: string | undefined;
+    readonly paging?: Record<string, {
+        size?: number | undefined;
+    }> | undefined;
+    readonly schema: string;
+    readonly security?: {
+        readonly allowAnonymous?: boolean | undefined;
+        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        readonly disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    readonly storeQueries?: boolean | undefined;
+} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
+    readonly name?: string | undefined;
+    readonly paging?: Record<string, {
+        size?: number | undefined;
+    }> | undefined;
+    readonly schema: "network.xyo.module.config";
+    readonly security?: {
+        readonly allowAnonymous?: boolean | undefined;
+        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        readonly disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    readonly storeQueries?: boolean | undefined;
+} & Omit<undefined, "schema">, "schema"> & {
+    schema: string;
+}, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>>[] | undefined, Error | undefined];
+//# sourceMappingURL=useWrappedModules.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWrappedModules.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWrappedModules.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAInD,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2GAAuE,CAAA"}

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
 export * from './components';
+export * from './hooks';
 export * from './ModuleRenderProps';
 //# 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,qBAAqB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,SAAS,CAAA;AACvB,cAAc,qBAAqB,CAAA"}

package/package.json

@@ -15,10 +15,13 @@
     "@xylabs/react-button": "^2.17.6",
     "@xylabs/react-crypto": "^2.17.6",
     "@xylabs/react-flexbox": "^2.17.6",
+    "@xyo-network/account-model": "^2.64.1",
+    "@xyo-network/core": "^2.64.1",
     "@xyo-network/diviner": "^2.64.1",
     "@xyo-network/module": "^2.64.1",
     "@xyo-network/payload-model": "^2.64.1",
-    "@xyo-network/react-shared": "^2.56.1"
+    "@xyo-network/react-shared": "^2.56.3",
+    "@xyo-network/react-wallet": "^2.56.3"
   },
   "devDependencies": {
     "@ethersproject/address": "^5.7.0",
@@ -30,8 +33,8 @@
     "@uniswap/sdk": "^3.0.3",
     "@uniswap/sdk-core": "^3.2.6",
     "@uniswap/v3-sdk": "^3.9.0",
-    "@xylabs/ts-scripts-yarn3": "^2.17.17",
-    "@xylabs/tsconfig-react": "^2.17.17",
+    "@xylabs/ts-scripts-yarn3": "^2.18.7",
+    "@xylabs/tsconfig-react": "^2.18.7",
     "@xyo-network/archivist": "^2.64.1",
     "@xyo-network/crypto-asset-plugin": "^2.64.1",
     "@xyo-network/diviner-address-history": "^2.64.1",
@@ -90,5 +93,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.56.1"
+  "version": "2.56.3"
 }

package/src/ModuleRenderProps.tsx

@@ -1,5 +1,7 @@
 import { Module } from '@xyo-network/module'
 
-export interface ModuleRenderProps<T extends Module = Module> {
+export type ModuleRenderProps<T extends Module = Module> = {
+  address?: string
   module?: T
+  name?: string
 }

package/src/components/Card/Diviner/CardContent.tsx

@@ -4,10 +4,6 @@ import { DivinerModule } from '@xyo-network/diviner'
 import { ModuleRenderProps } from '../../../ModuleRenderProps'
 import { ModuleCardContent } from '../Module'
 
-export const DivinerCardContent: React.FC<ModuleRenderProps<DivinerModule> & CardContentProps> = ({ children, module, ...props }) => {
-  return (
-    <ModuleCardContent module={module} {...props}>
-      {children}
-    </ModuleCardContent>
-  )
+export const DivinerCardContent: React.FC<ModuleRenderProps<DivinerModule> & CardContentProps> = ({ children, ...props }) => {
+  return <ModuleCardContent {...props}>{children}</ModuleCardContent>
 }

package/src/components/Card/Module/CardActions.tsx

@@ -1,15 +1,16 @@
 import { CardActions, CardActionsProps, Chip } from '@mui/material'
 import { ButtonEx } from '@xylabs/react-button'
 import { FlexGrowRow } from '@xylabs/react-flexbox'
-import { ModuleWrapper } from '@xyo-network/module'
 import { useState } from 'react'
 
+import { useWrappedModule } from '../../../hooks'
 import { ModuleRenderProps } from '../../../ModuleRenderProps'
 import { DiscoverDialog } from './components'
 
 export const ModuleCardActions: React.FC<CardActionsProps & ModuleRenderProps> = ({ children, module, sx, ...props }) => {
   const [discoverDialogOpen, setDiscoverDialogOpen] = useState(false)
-  const wrapper = module ? ModuleWrapper.wrap(module) : undefined
+
+  const [wrapper] = useWrappedModule(module)
   const config = wrapper?.config
 
   return (

package/src/hooks/WrappedModuleHookFactory.tsx

@@ -0,0 +1,41 @@
+import { AccountInstance } from '@xyo-network/account-model'
+import { Logger } from '@xyo-network/core'
+import { ConstructableModuleWrapper, ModuleWrapper } from '@xyo-network/module'
+import { useWrapperAccount } from '@xyo-network/react-wallet'
+import { useEffect, useState } from 'react'
+
+export const WrappedModuleHookFactory = {
+  create: <TModuleWrapper extends ModuleWrapper>(wrapperObject: ConstructableModuleWrapper<TModuleWrapper>, name?: string) => {
+    const useHook = (
+      module?: TModuleWrapper['module'],
+      account?: AccountInstance,
+      logger?: Logger,
+    ): [TModuleWrapper | undefined, Error | undefined] => {
+      logger?.debug(`Render: ${name}`)
+      const wrapperAccount = useWrapperAccount()
+
+      const [wrapper, setWrapper] = useState<TModuleWrapper>()
+      const [error, setError] = useState<Error>()
+
+      useEffect(() => {
+        const walletToUse = account || wrapperAccount
+        if (module && walletToUse) {
+          try {
+            const wrapper = wrapperObject.wrap(module, walletToUse)
+            setWrapper(wrapper)
+            setError(undefined)
+          } catch (ex) {
+            setWrapper(undefined)
+            setError(ex as Error)
+          }
+        } else {
+          setWrapper(undefined)
+          setError(undefined)
+        }
+      }, [module, account, wrapperAccount])
+
+      return [wrapper, error]
+    }
+    return useHook
+  },
+}

package/src/hooks/WrappedModulesHookFactory.tsx

@@ -0,0 +1,41 @@
+import { AccountInstance } from '@xyo-network/account-model'
+import { Logger } from '@xyo-network/core'
+import { ConstructableModuleWrapper, ModuleWrapper } from '@xyo-network/module'
+import { useWrapperAccount } from '@xyo-network/react-wallet'
+import { useEffect, useState } from 'react'
+
+export const WrappedModulesHookFactory = {
+  create: <TModuleWrapper extends ModuleWrapper>(wrapperObject: ConstructableModuleWrapper<TModuleWrapper>, name?: string) => {
+    const useHook = (
+      modules?: TModuleWrapper['module'][],
+      account?: AccountInstance,
+      logger?: Logger,
+    ): [TModuleWrapper[] | undefined, Error | undefined] => {
+      logger?.debug(`Render: ${name}`)
+      const wrapperAccount = useWrapperAccount()
+
+      const [wrappers, setWrappers] = useState<TModuleWrapper[]>()
+      const [error, setError] = useState<Error>()
+
+      useEffect(() => {
+        const walletToUse = account || wrapperAccount
+        if (module && walletToUse) {
+          try {
+            const wrappers = modules?.map((module) => wrapperObject.wrap(module, walletToUse))
+            setWrappers(wrappers)
+            setError(undefined)
+          } catch (ex) {
+            setWrappers(undefined)
+            setError(ex as Error)
+          }
+        } else {
+          setWrappers(undefined)
+          setError(undefined)
+        }
+      }, [modules, account, wrapperAccount])
+
+      return [wrappers, error]
+    }
+    return useHook
+  },
+}