@xyo-network/react-payload 2.26.8 → 2.26.11

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

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import ContentCopyIcon from '@mui/icons-material/ContentCopy';
 import { IconButton, Typography, useTheme } from '@mui/material';
-import { QuickTipButton } from '@xylabs/react-common';
 import { FlexCol, FlexGrowRow, FlexRow } from '@xylabs/react-flexbox';
+import { QuickTipButton } from '@xylabs/react-quick-tip-button';
 import { XyoPayloadWrapper } from '@xyo-network/payload';
 export const PayloadHashSourceDetails = ({ noTitle = false, payload, ...props }) => {
     const theme = useTheme();

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

@@ -1 +1 @@
-{"version":3,"file":"HashSourceDetails.js","sourceRoot":"","sources":["../../../../src/components/Details/HashSourceDetails.tsx"],"names":[],"mappings":";AAAA,OAAO,eAAe,MAAM,iCAAiC,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAgB,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACnF,OAAO,EAAc,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAOpE,MAAM,CAAC,MAAM,wBAAwB,GAA4C,CAAC,EAAE,OAAO,GAAG,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC1H,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAEtE,OAAO,CACL,MAAC,OAAO,IAAC,UAAU,EAAC,SAAS,KAAK,KAAK,aACpC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAChB,MAAC,OAAO,IAAC,MAAM,EAAE,CAAC,EAAE,cAAc,EAAC,YAAY,aAC7C,KAAC,UAAU,8BAAyB,EACpC,KAAC,cAAc,IAAC,KAAK,EAAC,aAAa,qEAAsE,IACjG,CACX,EACD,MAAC,OAAO,eACN,KAAC,WAAW,IAAC,UAAU,QAAC,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,EAAC,OAAO,YAC3F,KAAC,UAAU,IAAC,OAAO,EAAE,CAAC,EAAE,UAAU,EAAC,WAAW,EAAC,OAAO,EAAC,OAAO,EAAC,EAAE,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,YACtH,cAAc,EAAE,WAAW,IAAI,EAAE,GACvB,GACD,EACd,KAAC,UAAU,cACT,KAAC,eAAe,KAAG,GACR,IACL,EACT,OAAO,CAAC,CAAC,CAAC,CACT,KAAC,OAAO,IAAC,MAAM,EAAE,CAAC,EAAE,cAAc,EAAC,YAAY,YAC7C,KAAC,UAAU,IAAC,OAAO,EAAC,OAAO,sHAAmH,GACtI,CACX,CAAC,CAAC,CAAC,IAAI,IACA,CACX,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"HashSourceDetails.js","sourceRoot":"","sources":["../../../../src/components/Details/HashSourceDetails.tsx"],"names":[],"mappings":";AAAA,OAAO,eAAe,MAAM,iCAAiC,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAChE,OAAO,EAAgB,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EAAc,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAOpE,MAAM,CAAC,MAAM,wBAAwB,GAA4C,CAAC,EAAE,OAAO,GAAG,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC1H,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAEtE,OAAO,CACL,MAAC,OAAO,IAAC,UAAU,EAAC,SAAS,KAAK,KAAK,aACpC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAChB,MAAC,OAAO,IAAC,MAAM,EAAE,CAAC,EAAE,cAAc,EAAC,YAAY,aAC7C,KAAC,UAAU,8BAAyB,EACpC,KAAC,cAAc,IAAC,KAAK,EAAC,aAAa,qEAAsE,IACjG,CACX,EACD,MAAC,OAAO,eACN,KAAC,WAAW,IAAC,UAAU,QAAC,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,EAAC,OAAO,YAC3F,KAAC,UAAU,IAAC,OAAO,EAAE,CAAC,EAAE,UAAU,EAAC,WAAW,EAAC,OAAO,EAAC,OAAO,EAAC,EAAE,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,YACtH,cAAc,EAAE,WAAW,IAAI,EAAE,GACvB,GACD,EACd,KAAC,UAAU,cACT,KAAC,eAAe,KAAG,GACR,IACL,EACT,OAAO,CAAC,CAAC,CAAC,CACT,KAAC,OAAO,IAAC,MAAM,EAAE,CAAC,EAAE,cAAc,EAAC,YAAY,YAC7C,KAAC,UAAU,IAAC,OAAO,EAAC,OAAO,sHAAmH,GACtI,CACX,CAAC,CAAC,CAAC,IAAI,IACA,CACX,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/hooks/useHuriHash.d.ts

@@ -1,5 +1,8 @@
 import { XyoApiError } from '@xyo-network/api';
 import { Huri, XyoPayload } from '@xyo-network/payload';
 import { FetchHuriHashOptions } from './lib';
-declare const useHuriHash: (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean, XyoApiError | undefined];
+/**
+ * Resolve a hash or a huri regardless of network
+ */
+declare const useHuriHash: (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined];
 export { useHuriHash };

package/dist/esm/hooks/useHuriHash.js

@@ -2,6 +2,9 @@ import { Huri } from '@xyo-network/payload';
 import { useCallback } from 'react';
 import { usePayload } from './usePayload';
 import { useResolveHuri } from './useResolveHuri';
+/**
+ * Resolve a hash or a huri regardless of network
+ */
 const useHuriHash = (huriOrHash, huriUri, options) => {
     const hash = useCallback((huriOrHash) => {
         if (huriOrHash) {
@@ -13,9 +16,12 @@ const useHuriHash = (huriOrHash, huriUri, options) => {
             }
         }
     }, []);
-    const [payload, notFound, apiError] = usePayload(hash(huriOrHash));
-    const [huriPayload, huriPayloadNotFound, huriApiError] = useResolveHuri(huriUri, notFound, options);
-    return [payload ?? huriPayload, huriPayloadNotFound, apiError ?? huriApiError];
+    const foundHash = hash(huriOrHash);
+    // Optimistically try to grab the has from the current network and archive
+    const [payload, notFound, apiError] = usePayload(foundHash);
+    // If payload isn't found, fallback to the huriUri
+    const [huriPayload, huriPayloadNotFound, huriApiError, networkNotFound] = useResolveHuri(huriUri, notFound, options);
+    return [payload ?? huriPayload, huriPayloadNotFound, apiError ?? huriApiError, networkNotFound];
 };
 export { useHuriHash };
 //# sourceMappingURL=useHuriHash.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useHuriHash.js","sourceRoot":"","sources":["../../../src/hooks/useHuriHash.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,MAAM,WAAW,GAAG,CAAC,UAA0B,EAAE,OAAgB,EAAE,OAA8B,EAA8D,EAAE;IAC/J,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,UAA0B,EAAE,EAAE;QACtD,IAAI,UAAU,EAAE;YACd,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,UAAU,CAAA;aAClB;YACD,IAAI,UAAU,YAAY,IAAI,EAAE;gBAC9B,OAAO,UAAU,CAAC,IAAI,CAAA;aACvB;SACF;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAA;IAClE,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAEnG,OAAO,CAAC,OAAO,IAAI,WAAW,EAAE,mBAAmB,EAAE,QAAQ,IAAI,YAAY,CAAC,CAAA;AAChF,CAAC,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"useHuriHash.js","sourceRoot":"","sources":["../../../src/hooks/useHuriHash.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD;;GAEG;AACH,MAAM,WAAW,GAAG,CAClB,UAA0B,EAC1B,OAAgB,EAChB,OAA8B,EAC+D,EAAE;IAC/F,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,UAA0B,EAAE,EAAE;QACtD,IAAI,UAAU,EAAE;YACd,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,UAAU,CAAA;aAClB;YACD,IAAI,UAAU,YAAY,IAAI,EAAE;gBAC9B,OAAO,UAAU,CAAC,IAAI,CAAA;aACvB;SACF;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,CAAA;IAElC,0EAA0E;IAC1E,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IAE3D,kDAAkD;IAClD,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAEpH,OAAO,CAAC,OAAO,IAAI,WAAW,EAAE,mBAAmB,EAAE,QAAQ,IAAI,YAAY,EAAE,eAAe,CAAC,CAAA;AACjG,CAAC,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/dist/esm/hooks/usePayload.d.ts

@@ -1,3 +1,3 @@
 import { XyoApiError } from '@xyo-network/api';
 import { XyoPayload } from '@xyo-network/payload';
-export declare const usePayload: (hash?: string) => [XyoPayload | undefined, boolean, XyoApiError | undefined];
+export declare const usePayload: (hash?: string) => [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined];

package/dist/esm/hooks/usePayload.js

@@ -5,22 +5,22 @@ import { useState } from 'react';
 export const usePayload = (hash) => {
     const { api } = useArchivistApi();
     const { archive } = useArchive();
-    const [notFound, setNotFound] = useState(false);
+    const [notFound, setNotFound] = useState();
     const [apiError, setApiError] = useState();
     const [payload, setPayload] = useState();
     const reset = () => {
         setPayload(undefined);
         setApiError(undefined);
-        setNotFound(false);
+        setNotFound(undefined);
     };
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
         if (api && hash && hash.length > 0) {
             try {
+                reset();
                 const result = await api?.archive(archive).payload.hash(hash).get();
                 if (mounted()) {
-                    reset();
                     if (result?.length) {
                         setPayload(result[0]);
                     }

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

@@ -1 +1 @@
-{"version":3,"file":"usePayload.js","sourceRoot":"","sources":["../../../src/hooks/usePayload.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAa,EAA8D,EAAE;IACtG,MAAM,EAAE,GAAG,EAAE,GAAG,eAAe,EAAE,CAAA;IACjC,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAChC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAe,CAAA;IACvD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAc,CAAA;IAEpD,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,UAAU,CAAC,SAAS,CAAC,CAAA;QACrB,WAAW,CAAC,SAAS,CAAC,CAAA;QACtB,WAAW,CAAC,KAAK,CAAC,CAAA;IACpB,CAAC,CAAA;IAED,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAA;gBACnE,IAAI,OAAO,EAAE,EAAE;oBACb,KAAK,EAAE,CAAA;oBACP,IAAI,MAAM,EAAE,MAAM,EAAE;wBAClB,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;qBACtB;yBAAM,IAAI,MAAM,EAAE;wBACjB,WAAW,CAAC,IAAI,CAAC,CAAA;wBACjB,UAAU,CAAC,SAAS,CAAC,CAAA;qBACtB;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,KAAK,EAAE,CAAA;gBACP,WAAW,CAAC,CAAgB,CAAC,CAAA;gBAC7B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACjB;SACF;IACH,CAAC,EACD,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CACrB,CAAA;IACD,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACtC,CAAC,CAAA"}
+{"version":3,"file":"usePayload.js","sourceRoot":"","sources":["../../../src/hooks/usePayload.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAa,EAA0E,EAAE;IAClH,MAAM,EAAE,GAAG,EAAE,GAAG,eAAe,EAAE,CAAA;IACjC,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAChC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAW,CAAA;IACnD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAe,CAAA;IACvD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAc,CAAA;IAEpD,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,UAAU,CAAC,SAAS,CAAC,CAAA;QACrB,WAAW,CAAC,SAAS,CAAC,CAAA;QACtB,WAAW,CAAC,SAAS,CAAC,CAAA;IACxB,CAAC,CAAA;IAED,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,IAAI;gBACF,KAAK,EAAE,CAAA;gBACP,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAA;gBACnE,IAAI,OAAO,EAAE,EAAE;oBACb,IAAI,MAAM,EAAE,MAAM,EAAE;wBAClB,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;qBACtB;yBAAM,IAAI,MAAM,EAAE;wBACjB,WAAW,CAAC,IAAI,CAAC,CAAA;wBACjB,UAAU,CAAC,SAAS,CAAC,CAAA;qBACtB;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,KAAK,EAAE,CAAA;gBACP,WAAW,CAAC,CAAgB,CAAC,CAAA;gBAC7B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACjB;SACF;IACH,CAAC,EACD,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CACrB,CAAA;IACD,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACtC,CAAC,CAAA"}

package/dist/esm/hooks/useResolveHuri.d.ts

@@ -1,5 +1,5 @@
 import { XyoApiError } from '@xyo-network/api';
 import { XyoPayload } from '@xyo-network/payload';
 import { FetchHuriHashOptions } from './lib';
-declare const useResolveHuri: (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean, XyoApiError | undefined];
+declare const useResolveHuri: (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined];
 export { useResolveHuri };

package/dist/esm/hooks/useResolveHuri.js

@@ -1,34 +1,37 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
 import { Huri } from '@xyo-network/payload';
 import { useNetwork } from '@xyo-network/react-network';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { findHuriNetwork } from './lib';
 const useResolveHuri = (huriUri, dependentNotFound, options) => {
     const { network, networks, setNetwork } = useNetwork();
-    const [huriNetwork, setHuriNetwork] = useState();
     const [huriPayload, setHuriPayload] = useState();
-    const [huriPayloadNotFound, setHuriPayloadNotFound] = useState(false);
+    const [huriPayloadNotFound, setHuriPayloadNotFound] = useState();
+    const [huriNetworkNotFound, setHuriNetworkNotFound] = useState();
     const [huriApiError, setHuriApiError] = useState();
     const { changeActiveNetwork } = options ?? {};
+    useEffect(() => {
+        // Initially, sync local not found with dependent's status
+        setHuriPayloadNotFound(dependentNotFound);
+    }, [dependentNotFound]);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-        if ((dependentNotFound === undefined || dependentNotFound) && huriUri && network !== huriNetwork) {
+        // if dependent value is resolved, don't do anything, if not resolved, try to resolve huriUri
+        if ((dependentNotFound === undefined || dependentNotFound) && huriUri) {
             const huriInstance = new Huri(huriUri);
             const foundHuriNetwork = findHuriNetwork(huriInstance, networks);
-            // Update when we found a huri network and it doesn't match the current one
             if (foundHuriNetwork && mounted()) {
-                setHuriNetwork(huriNetwork);
                 if (network !== foundHuriNetwork && changeActiveNetwork) {
                     setNetwork?.(foundHuriNetwork);
                     return;
                 }
-                // If no matching network try to resolve the huri itself
                 try {
                     const huriPayload = await huriInstance.fetch();
                     if (mounted()) {
                         if (huriPayload) {
                             setHuriPayload(huriPayload);
+                            setHuriPayloadNotFound(false);
                         }
                         else {
                             setHuriPayloadNotFound(true);
@@ -41,9 +44,12 @@ const useResolveHuri = (huriUri, dependentNotFound, options) => {
                     }
                 }
             }
+            else {
+                setHuriNetworkNotFound(true);
+            }
         }
-    }, [huriNetwork, huriUri, network, networks, dependentNotFound, setNetwork, changeActiveNetwork]);
-    return [huriPayload, huriPayloadNotFound, huriApiError];
+    }, [huriUri, network, networks, dependentNotFound, setNetwork, changeActiveNetwork]);
+    return [huriPayload, huriPayloadNotFound, huriApiError, huriNetworkNotFound];
 };
 export { useResolveHuri };
 //# sourceMappingURL=useResolveHuri.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useResolveHuri.js","sourceRoot":"","sources":["../../../src/hooks/useResolveHuri.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAwB,eAAe,EAAE,MAAM,OAAO,CAAA;AAE7D,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAE,iBAA2B,EAAE,OAA8B,EAA8D,EAAE;IACnK,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAqB,CAAA;IACnE,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAc,CAAA;IAC5D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACrE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAe,CAAA;IAE/D,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAE7C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,CAAC,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,OAAO,IAAI,OAAO,KAAK,WAAW,EAAE;YAChG,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtC,MAAM,gBAAgB,GAAG,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAEhE,2EAA2E;YAC3E,IAAI,gBAAgB,IAAI,OAAO,EAAE,EAAE;gBACjC,cAAc,CAAC,WAAW,CAAC,CAAA;gBAC3B,IAAI,OAAO,KAAK,gBAAgB,IAAI,mBAAmB,EAAE;oBACvD,UAAU,EAAE,CAAC,gBAAgB,CAAC,CAAA;oBAC9B,OAAM;iBACP;gBAED,wDAAwD;gBACxD,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;oBAC9C,IAAI,OAAO,EAAE,EAAE;wBACb,IAAI,WAAW,EAAE;4BACf,cAAc,CAAC,WAAW,CAAC,CAAA;yBAC5B;6BAAM;4BACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;yBAC7B;qBACF;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,OAAO,EAAE,EAAE;wBACb,eAAe,CAAC,CAAgB,CAAC,CAAA;qBAClC;iBACF;aACF;SACF;IACH,CAAC,EACD,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAC9F,CAAA;IAED,OAAO,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAAA;AACzD,CAAC,CAAA;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}
+{"version":3,"file":"useResolveHuri.js","sourceRoot":"","sources":["../../../src/hooks/useResolveHuri.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAwB,eAAe,EAAE,MAAM,OAAO,CAAA;AAE7D,MAAM,cAAc,GAAG,CACrB,OAAgB,EAChB,iBAA2B,EAC3B,OAA8B,EAC+D,EAAE;IAC/F,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAc,CAAA;IAC5D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAW,CAAA;IACzE,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAW,CAAA;IACzE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAe,CAAA;IAE/D,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAE7C,SAAS,CAAC,GAAG,EAAE;QACb,0DAA0D;QAC1D,sBAAsB,CAAC,iBAAiB,CAAC,CAAA;IAC3C,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAEvB,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,6FAA6F;QAC7F,IAAI,CAAC,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,OAAO,EAAE;YACrE,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtC,MAAM,gBAAgB,GAAG,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAEhE,IAAI,gBAAgB,IAAI,OAAO,EAAE,EAAE;gBACjC,IAAI,OAAO,KAAK,gBAAgB,IAAI,mBAAmB,EAAE;oBACvD,UAAU,EAAE,CAAC,gBAAgB,CAAC,CAAA;oBAC9B,OAAM;iBACP;gBAED,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;oBAC9C,IAAI,OAAO,EAAE,EAAE;wBACb,IAAI,WAAW,EAAE;4BACf,cAAc,CAAC,WAAW,CAAC,CAAA;4BAC3B,sBAAsB,CAAC,KAAK,CAAC,CAAA;yBAC9B;6BAAM;4BACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;yBAC7B;qBACF;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,OAAO,EAAE,EAAE;wBACb,eAAe,CAAC,CAAgB,CAAC,CAAA;qBAClC;iBACF;aACF;iBAAM;gBACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;aAC7B;SACF;IACH,CAAC,EACD,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CACjF,CAAA;IAED,OAAO,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAA;AAC9E,CAAC,CAAA;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/package.json

@@ -13,23 +13,22 @@
     "@emotion/react": "^11.9.3",
     "@emotion/styled": "^11.9.3",
     "@mui/icons-material": "^5.8.4",
-    "@mui/material": "^5.8.6",
-    "@xylabs/react-button": "^2.14.4",
-    "@xylabs/react-common": "^2.14.4",
-    "@xylabs/react-flexbox": "^2.14.4",
-    "@xylabs/react-shared": "^2.14.4",
-    "@xyo-network/api": "^2.21.13",
-    "@xyo-network/core": "^2.21.13",
-    "@xyo-network/network": "^2.21.13",
-    "@xyo-network/payload": "^2.21.13",
-    "@xyo-network/react-archive": "^2.26.8",
-    "@xyo-network/react-archivist-api": "^2.26.8",
-    "@xyo-network/react-auth-service": "^2.26.8",
-    "@xyo-network/react-network": "^2.26.8",
-    "@xyo-network/react-property": "^2.26.8",
-    "@xyo-network/react-schema": "^2.26.8",
-    "@xyo-network/react-shared": "^2.26.8",
-    "@xyo-network/utils": "^2.21.13",
+    "@mui/material": "^5.8.7",
+    "@xylabs/react-button": "^2.14.5",
+    "@xylabs/react-flexbox": "^2.14.5",
+    "@xylabs/react-quick-tip-button": "^2.14.5",
+    "@xylabs/react-shared": "^2.14.5",
+    "@xyo-network/api": "^2.21.14",
+    "@xyo-network/network": "^2.21.14",
+    "@xyo-network/payload": "^2.21.14",
+    "@xyo-network/react-archive": "^2.26.11",
+    "@xyo-network/react-archivist-api": "^2.26.11",
+    "@xyo-network/react-auth-service": "^2.26.11",
+    "@xyo-network/react-network": "^2.26.11",
+    "@xyo-network/react-property": "^2.26.11",
+    "@xyo-network/react-schema": "^2.26.11",
+    "@xyo-network/react-shared": "^2.26.11",
+    "@xyo-network/utils": "^2.21.14",
     "luxon": "^2.4.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -40,8 +39,8 @@
   },
   "description": "Common React library for all XYO projects that use React",
   "devDependencies": {
-    "@babel/core": "^7.18.5",
-    "@babel/preset-env": "^7.18.2",
+    "@babel/core": "^7.18.6",
+    "@babel/preset-env": "^7.18.6",
     "@storybook/react": "^6.5.9",
     "@types/luxon": "^2.3.2",
     "@xylabs/tsconfig": "^1.0.14"
@@ -95,6 +94,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.26.8",
+  "version": "2.26.11",
   "packageManager": "yarn@3.1.1"
 }

package/src/components/Details/HashSourceDetails.tsx

@@ -1,7 +1,7 @@
 import ContentCopyIcon from '@mui/icons-material/ContentCopy'
 import { IconButton, Typography, useTheme } from '@mui/material'
-import { QuickTipButton } from '@xylabs/react-common'
 import { FlexBoxProps, FlexCol, FlexGrowRow, FlexRow } from '@xylabs/react-flexbox'
+import { QuickTipButton } from '@xylabs/react-quick-tip-button'
 import { XyoPayload, XyoPayloadWrapper } from '@xyo-network/payload'
 
 export interface PayloadHashSourceDetailsProps extends FlexBoxProps {

package/src/hooks/useHuriHash.stories.tsx

@@ -1,39 +1,63 @@
 /* eslint-disable import/no-internal-modules */
-import { Typography } from '@mui/material'
+import { Alert, Typography } from '@mui/material'
 import { ComponentStory, Meta } from '@storybook/react'
-import { FlexCol } from '@xylabs/react-flexbox'
+import { ButtonEx } from '@xylabs/react-button'
+import { FlexCol, FlexRow } from '@xylabs/react-flexbox'
 import { Huri } from '@xyo-network/payload'
+import { ArchivistApiProvider } from '@xyo-network/react-archivist-api'
+import { NetworkMemoryProvider } from '@xyo-network/react-network'
 import { XyoSchemaCache } from '@xyo-network/utils'
-import { lazy, Suspense } from 'react'
+import { lazy, Suspense, useState } from 'react'
 
-import { ArchivistApiProvider } from '../../../archivist-api/src'
+import { FetchHuriHashOptions } from './lib'
 import { useHuriHash } from './useHuriHash'
 
 const JsonView = lazy(() => import(/* webpackChunkName: "jsonView" */ 'react-json-view'))
 
 interface UseHuriHashComponentProps {
   huriOrHash: string | Huri
+  huriUri?: string
+  options?: FetchHuriHashOptions
+  reTestable?: boolean
 }
 
 const apiDomain = 'https://beta.api.archivist.xyo.network'
 const hash = '5605fabad11b10bb5fb86b309ca0970894eda8f22362dda1a489817723bca992'
 XyoSchemaCache.instance.proxy = `${apiDomain}/domain`
 
-const Wrapper: React.FC<UseHuriHashComponentProps> = ({ huriOrHash }) => (
-  <ArchivistApiProvider apiDomain={apiDomain}>
-    <UseHuriHashComponent huriOrHash={huriOrHash} />
-  </ArchivistApiProvider>
+const mainApiDomain = 'https://api.archivist.xyo.network'
+const mainHash = 'd3a3936e31ba1d835c528784ab77c1eaaeedd6e16b7aad68a88241ce539853cb'
+
+const Wrapper: React.FC<UseHuriHashComponentProps> = (props) => (
+  <NetworkMemoryProvider>
+    <ArchivistApiProvider apiDomain={apiDomain}>
+      <UseHuriHashComponent {...props} />
+    </ArchivistApiProvider>
+  </NetworkMemoryProvider>
 )
 
-const UseHuriHashComponent: React.FC<UseHuriHashComponentProps> = ({ huriOrHash }) => {
-  const [payload] = useHuriHash(huriOrHash)
+const UseHuriHashComponent: React.FC<UseHuriHashComponentProps> = ({ huriOrHash, huriUri, options, reTestable }) => {
+  const [trigger, setTrigger] = useState<string | Huri>(huriOrHash)
+  const [payload, notFound, , networkNotFound] = useHuriHash(trigger, huriUri, options)
 
   return (
     <>
       <Typography variant="body1" fontWeight="bold">
         Fetches the payload for a huriOrHash.
       </Typography>
+      {reTestable ? (
+        <FlexRow columnGap={2}>
+          <ButtonEx variant="contained" onClick={() => setTrigger(hash)}>
+            Fetch Valid Hash
+          </ButtonEx>
+          <ButtonEx variant="contained" onClick={() => setTrigger('foo')}>
+            Hash Not Found
+          </ButtonEx>
+        </FlexRow>
+      ) : null}
       <FlexCol my={3}>
+        {notFound ? <Alert severity="warning">Not Found</Alert> : null}
+        {networkNotFound ? <Alert severity="warning">Network Not Found</Alert> : null}
         <Suspense fallback={<FlexCol busy />}>
           <JsonView src={payload || {}} />
         </Suspense>
@@ -53,17 +77,31 @@ const StorybookEntry: Meta = {
   title: 'payload/useHuriHash',
 }
 
-const Template: ComponentStory<typeof UseHuriHashComponent> = ({ huriOrHash }) => {
-  return <Wrapper huriOrHash={huriOrHash} />
+const Template: ComponentStory<typeof UseHuriHashComponent> = (props) => {
+  return <Wrapper {...props} />
 }
 
 const Default = Template.bind({})
 Default.args = { huriOrHash: hash }
 
+const NotFound = Template.bind({})
+NotFound.args = { huriOrHash: 'foo', reTestable: true }
+
 const WithHuri = Template.bind({})
 WithHuri.args = { huriOrHash: new Huri(`${apiDomain}/${hash}`) }
 
-export { Default, WithHuri }
+const WithHuriUri = Template.bind({})
+WithHuriUri.args = { huriUri: `${mainApiDomain}/${mainHash}` }
+
+const WithHuriUriNetworkNotFound = Template.bind({})
+WithHuriUriNetworkNotFound.args = { huriUri: `http://badarchivisturl.com/${mainHash}` }
+
+// Note - story will work correctly once main net return 200 instead of 404 when payloads aren't found
+// Resolve huriUri when network is different from the current network
+const WithHuriUriNotFound = Template.bind({})
+WithHuriUriNotFound.args = { huriUri: `${mainApiDomain}/foo` }
+
+export { Default, NotFound, WithHuri, WithHuriUri, WithHuriUriNetworkNotFound, WithHuriUriNotFound }
 
 // eslint-disable-next-line import/no-default-export
 export default StorybookEntry

package/src/hooks/useHuriHash.tsx

@@ -6,7 +6,14 @@ import { FetchHuriHashOptions } from './lib'
 import { usePayload } from './usePayload'
 import { useResolveHuri } from './useResolveHuri'
 
-const useHuriHash = (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions): [XyoPayload | undefined, boolean, XyoApiError | undefined] => {
+/**
+ * Resolve a hash or a huri regardless of network
+ */
+const useHuriHash = (
+  huriOrHash?: string | Huri,
+  huriUri?: string,
+  options?: FetchHuriHashOptions
+): [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined] => {
   const hash = useCallback((huriOrHash?: string | Huri) => {
     if (huriOrHash) {
       if (typeof huriOrHash === 'string') {
@@ -18,10 +25,15 @@ const useHuriHash = (huriOrHash?: string | Huri, huriUri?: string, options?: Fet
     }
   }, [])
 
-  const [payload, notFound, apiError] = usePayload(hash(huriOrHash))
-  const [huriPayload, huriPayloadNotFound, huriApiError] = useResolveHuri(huriUri, notFound, options)
+  const foundHash = hash(huriOrHash)
 
-  return [payload ?? huriPayload, huriPayloadNotFound, apiError ?? huriApiError]
+  // Optimistically try to grab the has from the current network and archive
+  const [payload, notFound, apiError] = usePayload(foundHash)
+
+  // If payload isn't found, fallback to the huriUri
+  const [huriPayload, huriPayloadNotFound, huriApiError, networkNotFound] = useResolveHuri(huriUri, notFound, options)
+
+  return [payload ?? huriPayload, huriPayloadNotFound, apiError ?? huriApiError, networkNotFound]
 }
 
 export { useHuriHash }

package/src/hooks/usePayload.tsx

@@ -5,17 +5,17 @@ import { useArchive } from '@xyo-network/react-archive'
 import { useArchivistApi } from '@xyo-network/react-archivist-api'
 import { useState } from 'react'
 
-export const usePayload = (hash?: string): [XyoPayload | undefined, boolean, XyoApiError | undefined] => {
+export const usePayload = (hash?: string): [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined] => {
   const { api } = useArchivistApi()
   const { archive } = useArchive()
-  const [notFound, setNotFound] = useState(false)
+  const [notFound, setNotFound] = useState<boolean>()
   const [apiError, setApiError] = useState<XyoApiError>()
   const [payload, setPayload] = useState<XyoPayload>()
 
   const reset = () => {
     setPayload(undefined)
     setApiError(undefined)
-    setNotFound(false)
+    setNotFound(undefined)
   }
 
   useAsyncEffect(
@@ -23,9 +23,9 @@ export const usePayload = (hash?: string): [XyoPayload | undefined, boolean, Xyo
     async (mounted) => {
       if (api && hash && hash.length > 0) {
         try {
+          reset()
           const result = await api?.archive(archive).payload.hash(hash).get()
           if (mounted()) {
-            reset()
             if (result?.length) {
               setPayload(result[0])
             } else if (result) {

package/src/hooks/useResolveHuri.tsx

@@ -1,43 +1,50 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoApiError } from '@xyo-network/api'
-import { XyoNetworkPayload } from '@xyo-network/network'
 import { Huri, XyoPayload } from '@xyo-network/payload'
 import { useNetwork } from '@xyo-network/react-network'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 
 import { FetchHuriHashOptions, findHuriNetwork } from './lib'
 
-const useResolveHuri = (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions): [XyoPayload | undefined, boolean, XyoApiError | undefined] => {
+const useResolveHuri = (
+  huriUri?: string,
+  dependentNotFound?: boolean,
+  options?: FetchHuriHashOptions
+): [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined] => {
   const { network, networks, setNetwork } = useNetwork()
-  const [huriNetwork, setHuriNetwork] = useState<XyoNetworkPayload>()
   const [huriPayload, setHuriPayload] = useState<XyoPayload>()
-  const [huriPayloadNotFound, setHuriPayloadNotFound] = useState(false)
+  const [huriPayloadNotFound, setHuriPayloadNotFound] = useState<boolean>()
+  const [huriNetworkNotFound, setHuriNetworkNotFound] = useState<boolean>()
   const [huriApiError, setHuriApiError] = useState<XyoApiError>()
 
   const { changeActiveNetwork } = options ?? {}
 
+  useEffect(() => {
+    // Initially, sync local not found with dependent's status
+    setHuriPayloadNotFound(dependentNotFound)
+  }, [dependentNotFound])
+
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-      if ((dependentNotFound === undefined || dependentNotFound) && huriUri && network !== huriNetwork) {
+      // if dependent value is resolved, don't do anything, if not resolved, try to resolve huriUri
+      if ((dependentNotFound === undefined || dependentNotFound) && huriUri) {
         const huriInstance = new Huri(huriUri)
 
         const foundHuriNetwork = findHuriNetwork(huriInstance, networks)
 
-        // Update when we found a huri network and it doesn't match the current one
         if (foundHuriNetwork && mounted()) {
-          setHuriNetwork(huriNetwork)
           if (network !== foundHuriNetwork && changeActiveNetwork) {
             setNetwork?.(foundHuriNetwork)
             return
           }
 
-          // If no matching network try to resolve the huri itself
           try {
             const huriPayload = await huriInstance.fetch()
             if (mounted()) {
               if (huriPayload) {
                 setHuriPayload(huriPayload)
+                setHuriPayloadNotFound(false)
               } else {
                 setHuriPayloadNotFound(true)
               }
@@ -47,13 +54,15 @@ const useResolveHuri = (huriUri?: string, dependentNotFound?: boolean, options?:
               setHuriApiError(e as XyoApiError)
             }
           }
+        } else {
+          setHuriNetworkNotFound(true)
         }
       }
     },
-    [huriNetwork, huriUri, network, networks, dependentNotFound, setNetwork, changeActiveNetwork]
+    [huriUri, network, networks, dependentNotFound, setNetwork, changeActiveNetwork]
   )
 
-  return [huriPayload, huriPayloadNotFound, huriApiError]
+  return [huriPayload, huriPayloadNotFound, huriApiError, huriNetworkNotFound]
 }
 
 export { useResolveHuri }