@xyo-network/react-archivist 2.45.0-rc.2 → 2.45.0-rc.21

package/dist/esm/components/Details/Details.js

@@ -13,7 +13,7 @@ const testQueryCommitBoundWitness = new QueryBoundWitnessBuilder({ inlinePayload
 const testQueryClear = { schema: ArchivistClearQuerySchema };
 const testQueryClearBoundWitness = new QueryBoundWitnessBuilder({ inlinePayloads: true }).query(testQueryClear).build();
 export const ArchivistDetails = ({ address, ...props }) => {
-    const archivist = useArchivist(address);
+    const [archivist] = useArchivist(address);
     const [payloads, setPayloads] = useState();
     const [refresh, setRefresh] = useState(0);
     const [wrapper, setWrapper] = useState();

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

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

package/dist/esm/hooks/useArchivist.js

@@ -1,23 +1,4 @@
-/* eslint-disable react-hooks/rules-of-hooks */
-import { useAsyncEffect } from '@xylabs/react-shared';
 import { ArchivistWrapper } from '@xyo-network/archivist';
-import { useNode } from '@xyo-network/react-node';
-import { useState } from 'react';
-const createUseModuleHook = (wrapFunc) => {
-    function use(nameOrAddress, wrap = false) {
-        const node = useNode(nameOrAddress, true);
-        const [module, setModule] = useState();
-        useAsyncEffect(
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        async (mounted) => {
-            const module = await node?.resolve(nameOrAddress);
-            if (mounted()) {
-                setModule(module);
-            }
-        }, [node, nameOrAddress]);
-        return wrap ? wrapFunc(module, typeof wrap === 'boolean' ? undefined : wrap) : module;
-    }
-    return use;
-};
-export const useArchivist = createUseModuleHook(ArchivistWrapper.wrap);
+import { WrappedModuleHookFactory } from '@xyo-network/react-node';
+export const useArchivist = WrappedModuleHookFactory(ArchivistWrapper);
 //# sourceMappingURL=useArchivist.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivist.js","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAmB,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAE1E,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAIhC,MAAM,mBAAmB,GAAG,CAK1B,QAAmB,EACnB,EAAE;IAKF,SAAS,GAAG,CAAC,aAAsB,EAAE,OAA0B,KAAK;QAClE,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;QACzC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAW,CAAA;QAC/C,cAAc;QACZ,uDAAuD;QACvD,KAAK,EAAE,OAAO,EAAE,EAAE;YAChB,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,OAAO,CAAU,aAAa,CAAC,CAAA;YAC1D,IAAI,OAAO,EAAE,EAAE;gBACb,SAAS,CAAC,MAAM,CAAC,CAAA;aAClB;QACH,CAAC,EACD,CAAC,IAAI,EAAE,aAAa,CAAC,CACtB,CAAA;QAED,OAAO,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;IACvF,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,mBAAmB,CAAoC,gBAAgB,CAAC,IAAI,CAAC,CAAA"}
+{"version":3,"file":"useArchivist.js","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,YAAY,GAAG,wBAAwB,CAAC,gBAAgB,CAAC,CAAA"}

package/dist/esm/hooks/useArchivistGet.js

@@ -1,16 +1,24 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
-import { useDataState } from '@xyo-network/react-shared';
-import { useArchivistStates } from './useArchivistStates';
-export const useArchivistGet = (hashes) => {
-    const [savedHashes, setSavedHashes] = useDataState(hashes);
-    setSavedHashes(hashes);
-    const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = useArchivistStates();
+import { useCallback, useState } from 'react';
+import { useArchivist } from './useArchivist';
+export const useArchivistGet = (hashes, archivist) => {
+    const requestedArchivistNameOrAddress = typeof archivist === 'string' ? archivist : undefined;
+    const passedArchivist = typeof archivist === 'object' ? archivist : undefined;
+    const [payloads, setPayloads] = useState();
+    const [foundArchivist, foundArchivistError] = useArchivist(requestedArchivistNameOrAddress);
+    const [error, setError] = useState();
+    const [refresh, setRefresh] = useState(0);
+    const onRefresh = useCallback(() => {
+        setRefresh(refresh + 1);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
         try {
-            if (archivist && savedHashes) {
-                const result = (await archivist.get(savedHashes ?? [])) ?? [];
+            const archivistToUse = passedArchivist ?? foundArchivist;
+            if (archivistToUse && hashes) {
+                const result = (await archivistToUse.get(hashes ?? [])) ?? [];
                 if (mounted()) {
                     setError(undefined);
                     setPayloads(result);
@@ -20,7 +28,7 @@ export const useArchivistGet = (hashes) => {
         catch (ex) {
             setError(ex);
         }
-    }, [archivist, savedHashes, refreshCount, setError, setPayloads]);
-    return [payloads, error, refresh];
+    }, [passedArchivist, foundArchivist, hashes, refresh, setError, setPayloads]);
+    return [payloads, error ?? foundArchivistError, onRefresh];
 };
 //# sourceMappingURL=useArchivistGet.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAmB,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE1E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAoC,MAAiB,EAAoC,EAAE;IACxH,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;IAC1D,cAAc,CAAC,MAAM,CAAC,CAAA;IAEtB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,kBAAkB,EAAK,CAAA;IAE5G,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,IAAI,WAAW,EAAE;gBAC5B,MAAM,MAAM,GAAG,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC7D,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAa,CAAC,CAAA;iBAC3B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC9D,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}
+{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAG7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAAiB,EACjB,SAA8B,EACI,EAAE;IACpC,MAAM,+BAA+B,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7F,MAAM,eAAe,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7E,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAO,CAAA;IAC/C,MAAM,CAAC,cAAc,EAAE,mBAAmB,CAAC,GAAG,YAAY,CAAC,+BAA+B,CAAC,CAAA;IAC3F,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAEzC,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;QACjC,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;QACvB,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,MAAM,cAAc,GAAG,eAAe,IAAI,cAAc,CAAA;YACxD,IAAI,cAAc,IAAI,MAAM,EAAE;gBAC5B,MAAM,MAAM,GAAI,CAAC,MAAM,cAAc,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAS,IAAI,EAAE,CAAA;gBACtE,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAa,CAAC,CAAA;iBAC3B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,eAAe,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC1E,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,mBAAmB,EAAE,SAAS,CAAC,CAAA;AAC5D,CAAC,CAAA"}

package/dist/esm/hooks/useArchivistStates.js

@@ -2,7 +2,7 @@ import { ArchivistWrapper } from '@xyo-network/archivist';
 import { useEffect, useState } from 'react';
 import { useArchivist } from './useArchivist';
 export const useArchivistStates = () => {
-    const archivistFromHook = useArchivist();
+    const [archivistFromHook] = useArchivist();
     const [payloads, setPayloads] = useState();
     const [error, setError] = useState();
     const [refreshCount, setRefreshCount] = useState(1);

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistStates.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistStates.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAEzD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAI7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAsC,EAAE;IACxE,MAAM,iBAAiB,GAAG,YAAY,EAAE,CAAA;IACxC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAO,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IACnD,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAA;IAEzE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,EAAoB,CAAA;IAE9D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,iBAAiB,EAAE;YACrB,YAAY,CAAC,IAAI,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAA;SACtD;IACH,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAEvB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAA;AACtG,CAAC,CAAA"}
+{"version":3,"file":"useArchivistStates.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistStates.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAEzD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAI7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAsC,EAAE;IACxE,MAAM,CAAC,iBAAiB,CAAC,GAAG,YAAY,EAAE,CAAA;IAC1C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAO,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IACnD,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAA;IAEzE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,EAAoB,CAAA;IAE9D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,iBAAiB,EAAE;YACrB,YAAY,CAAC,IAAI,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAA;SACtD;IACH,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAEvB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAA;AACtG,CAAC,CAAA"}

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

@@ -1,9 +1,3 @@
-import { Account } from '@xyo-network/account';
-import { ArchivistModule, ArchivistWrapper } from '@xyo-network/archivist';
-export declare const useArchivist: {
-    (name?: string): ArchivistModule | undefined;
-    (name: string | undefined, wrap: true | Account): ArchivistWrapper | undefined;
-    (address: string): ArchivistModule | undefined;
-    (address: string, wrap: true | Account): ArchivistWrapper | undefined;
-};
+import { ArchivistWrapper } from '@xyo-network/archivist';
+export declare const useArchivist: (nameOrAddress?: string | undefined, account?: import("@xyo-network/account-model").AccountInstance | undefined) => [ArchivistWrapper | undefined, Error | undefined];
 //# sourceMappingURL=useArchivist.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivist.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAqC1E,eAAO,MAAM,YAAY;YAvBH,MAAM;WACP,MAAM,GAAG,SAAS,QAAQ,IAAI,GAAG,OAAO;cACrC,MAAM;cACN,MAAM,QAAQ,IAAI,GAAG,OAAO;CAoBqD,CAAA"}
+{"version":3,"file":"useArchivist.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,eAAO,MAAM,YAAY,uKAA6C,CAAA"}

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

@@ -1,7 +1,8 @@
+import { Archivist } from '@xyo-network/archivist';
 import { RefreshCallback } from './useArchivistStates';
 export declare const useArchivistGet: <T extends import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     schema: string;
 } = import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     schema: string;
-}>(hashes?: string[]) => [(T[] | undefined)?, (Error | undefined)?, (RefreshCallback | undefined)?];
+}>(hashes?: string[], archivist?: Archivist | string) => [(T[] | undefined)?, (Error | undefined)?, (RefreshCallback | undefined)?];
 //# sourceMappingURL=useArchivistGet.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAsB,MAAM,sBAAsB,CAAA;AAE1E,eAAO,MAAM,eAAe;;;;YAAgD,MAAM,EAAE,+EAwBnF,CAAA"}
+{"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAKlD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,eAAO,MAAM,eAAe;;;;YACjB,MAAM,EAAE,cACL,SAAS,GAAG,MAAM,+EAiC/B,CAAA"}

package/package.json

@@ -10,14 +10,14 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
+    "@xylabs/eth-address": "^2.7.4",
     "@xylabs/react-button": "^2.16.8",
+    "@xylabs/react-crypto": "^2.16.8",
     "@xylabs/react-flexbox": "^2.16.8",
     "@xylabs/react-shared": "^2.16.8",
-    "@xyo-network/node": "^2.51.1",
-    "@xyo-network/react-module": "^2.45.0-rc.2",
-    "@xyo-network/react-node": "^2.45.0-rc.2",
-    "@xyo-network/react-shared": "^2.45.0-rc.2",
-    "lodash": "^4.17.21"
+    "@xyo-network/react-module": "^2.45.0-rc.21",
+    "@xyo-network/react-node": "^2.45.0-rc.21",
+    "@xyo-network/react-shared": "^2.45.0-rc.21"
   },
   "peerDependencies": {
     "@mui/icons-material": "^5",
@@ -32,14 +32,13 @@
   "description": "Common React library for all XYO projects that use React",
   "devDependencies": {
     "@storybook/react": "^6.5.16",
-    "@types/lodash": "^4.14.191",
-    "@xylabs/ts-scripts-yarn3": "^2.16.0",
-    "@xylabs/tsconfig-react": "^2.16.0",
-    "@xyo-network/archivist": "^2.51.1",
-    "@xyo-network/archivist-wrapper": "^2.51.1",
-    "@xyo-network/module": "^2.51.1",
-    "@xyo-network/payload-model": "^2.51.1",
-    "@xyo-network/react-storybook": "^2.45.0-rc.2",
+    "@xylabs/ts-scripts-yarn3": "^2.16.1",
+    "@xylabs/tsconfig-react": "^2.16.1",
+    "@xyo-network/archivist": "^2.51.4",
+    "@xyo-network/archivist-wrapper": "^2.51.4",
+    "@xyo-network/module": "^2.51.4",
+    "@xyo-network/payload-model": "^2.51.4",
+    "@xyo-network/react-storybook": "^2.45.0-rc.21",
     "require-from-string": "^2.0.2",
     "typescript": "^4.9.5"
   },
@@ -85,6 +84,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.45.0-rc.2",
+  "version": "2.45.0-rc.21",
   "stableVersion": "2.44.1"
 }

package/src/components/Details/Details.stories.tsx

@@ -20,13 +20,13 @@ const StorybookEntry = {
 } as ComponentMeta<typeof ArchivistDetails>
 
 const TemplateInner: ComponentStory<typeof ArchivistDetails> = (args) => {
-  const archivist = useArchivist()
+  const [archivist] = useArchivist()
 
   return <ArchivistDetails address={archivist?.address} {...args}></ArchivistDetails>
 }
 
 const TemplateInnerWithData: ComponentStory<typeof ArchivistDetails> = (args) => {
-  const archivist = useArchivist()
+  const [archivist] = useArchivist()
   const [archivistWithData, setArchivistWithData] = useState<ArchivistModule>()
 
   useAsyncEffect(

package/src/components/Details/Details.tsx

@@ -21,7 +21,7 @@ export interface ArchivistDetails extends FlexBoxProps {
 }
 
 export const ArchivistDetails: React.FC<ArchivistDetails> = ({ address, ...props }) => {
-  const archivist = useArchivist(address)
+  const [archivist] = useArchivist(address)
   const [payloads, setPayloads] = useState<XyoPayload[]>()
   const [refresh, setRefresh] = useState(0)
   const [wrapper, setWrapper] = useState<ArchivistWrapper>()

package/src/hooks/useArchivist.tsx

@@ -1,41 +1,4 @@
-/* eslint-disable react-hooks/rules-of-hooks */
-import { useAsyncEffect } from '@xylabs/react-shared'
-import { Account } from '@xyo-network/account'
-import { ArchivistModule, ArchivistWrapper } from '@xyo-network/archivist'
-import { Module, ModuleWrapper } from '@xyo-network/module'
-import { useNode } from '@xyo-network/react-node'
-import { useState } from 'react'
+import { ArchivistWrapper } from '@xyo-network/archivist'
+import { WrappedModuleHookFactory } from '@xyo-network/react-node'
 
-type WrapFunc<TModule extends Module = Module, TWrapper extends ModuleWrapper = ModuleWrapper> = (module?: TModule, account?: Account) => TWrapper
-
-const createUseModuleHook = <
-  TModule extends Module = Module,
-  TWrapper extends ModuleWrapper = ModuleWrapper,
-  TWrapFunc extends WrapFunc<TModule, TWrapper> = WrapFunc<TModule, TWrapper>,
->(
-  wrapFunc: TWrapFunc,
-) => {
-  function use(name?: string): TModule | undefined
-  function use(name: string | undefined, wrap: true | Account): TWrapper | undefined
-  function use(address: string): TModule | undefined
-  function use(address: string, wrap: true | Account): TWrapper | undefined
-  function use(nameOrAddress?: string, wrap: boolean | Account = false): TWrapper | TModule | undefined {
-    const node = useNode(nameOrAddress, true)
-    const [module, setModule] = useState<TModule>()
-    useAsyncEffect(
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      async (mounted) => {
-        const module = await node?.resolve<TModule>(nameOrAddress)
-        if (mounted()) {
-          setModule(module)
-        }
-      },
-      [node, nameOrAddress],
-    )
-
-    return wrap ? wrapFunc(module, typeof wrap === 'boolean' ? undefined : wrap) : module
-  }
-  return use
-}
-
-export const useArchivist = createUseModuleHook<ArchivistModule, ArchivistWrapper>(ArchivistWrapper.wrap)
+export const useArchivist = WrappedModuleHookFactory(ArchivistWrapper)

package/src/hooks/useArchivistGet.tsx

@@ -1,21 +1,34 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
+import { Archivist } from '@xyo-network/archivist'
 import { XyoPayload } from '@xyo-network/payload-model'
-import { useDataState } from '@xyo-network/react-shared'
+import { useCallback, useState } from 'react'
 
-import { RefreshCallback, useArchivistStates } from './useArchivistStates'
+import { useArchivist } from './useArchivist'
+import { RefreshCallback } from './useArchivistStates'
 
-export const useArchivistGet = <T extends XyoPayload = XyoPayload>(hashes?: string[]): [T[]?, Error?, RefreshCallback?] => {
-  const [savedHashes, setSavedHashes] = useDataState(hashes)
-  setSavedHashes(hashes)
+export const useArchivistGet = <T extends XyoPayload = XyoPayload>(
+  hashes?: string[],
+  archivist?: Archivist | string,
+): [T[]?, Error?, RefreshCallback?] => {
+  const requestedArchivistNameOrAddress = typeof archivist === 'string' ? archivist : undefined
+  const passedArchivist = typeof archivist === 'object' ? archivist : undefined
+  const [payloads, setPayloads] = useState<T[]>()
+  const [foundArchivist, foundArchivistError] = useArchivist(requestedArchivistNameOrAddress)
+  const [error, setError] = useState<Error>()
+  const [refresh, setRefresh] = useState(0)
 
-  const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = useArchivistStates<T>()
+  const onRefresh = useCallback(() => {
+    setRefresh(refresh + 1)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
       try {
-        if (archivist && savedHashes) {
-          const result = (await archivist.get(savedHashes ?? [])) ?? []
+        const archivistToUse = passedArchivist ?? foundArchivist
+        if (archivistToUse && hashes) {
+          const result = ((await archivistToUse.get(hashes ?? [])) as T[]) ?? []
           if (mounted()) {
             setError(undefined)
             setPayloads(result as T[])
@@ -25,7 +38,7 @@ export const useArchivistGet = <T extends XyoPayload = XyoPayload>(hashes?: stri
         setError(ex as Error)
       }
     },
-    [archivist, savedHashes, refreshCount, setError, setPayloads],
+    [passedArchivist, foundArchivist, hashes, refresh, setError, setPayloads],
   )
-  return [payloads, error, refresh]
+  return [payloads, error ?? foundArchivistError, onRefresh]
 }

package/src/hooks/useArchivistStates.tsx

@@ -7,7 +7,7 @@ import { useArchivist } from './useArchivist'
 export type RefreshCallback = () => void
 
 export const useArchivistStates = <T extends XyoPayload = XyoPayload>() => {
-  const archivistFromHook = useArchivist()
+  const [archivistFromHook] = useArchivist()
   const [payloads, setPayloads] = useState<T[]>()
   const [error, setError] = useState<Error>()
   const [refreshCount, setRefreshCount] = useState(1)