@xyo-network/react-chain-network 1.20.1 → 1.20.2

package/src/hooks/provider/useActiveNetworkRunner.ts

@@ -2,6 +2,7 @@ import { useHttpRpcRunner } from '@xyo-network/react-chain-provider'
 
 import { useChainNetwork } from '../../context/index.ts'
 
+/* @deprecated use useRunnerFromGateway in @xyo-network/react-chain-provider */
 export const useActiveNetworkRunner = () => {
   const { activeNetwork } = useChainNetwork()
   const runner = useHttpRpcRunner(activeNetwork?.url)

package/src/hooks/provider/useViewerInPage.ts

@@ -1,22 +1,25 @@
 import {
   isDefined, isNull, isUndefined,
 } from '@xylabs/sdk-js'
-import { useHttpRpcViewer, useViewerFromWallet } from '@xyo-network/react-chain-provider'
-import type { NetworkBootstrap } from '@xyo-network/xl1-sdk'
+import {
+  useHttpRpcViewer, useProvidedGateway, useViewerFromWallet,
+} from '@xyo-network/react-chain-provider'
+import type { NetworkBootstrap, NetworkId } from '@xyo-network/xl1-sdk'
 
 import type { ChainNetworkSettings } from '../../context/index.ts'
 import { useChainNetwork } from '../../context/index.ts'
 
-const shouldProxy = (networkSettings: ChainNetworkSettings, networkBootstrap: NetworkBootstrap | undefined) => {
-  return isDefined(networkBootstrap)
-    && isDefined(networkSettings[networkBootstrap.id])
-    && networkSettings[networkBootstrap.id].proxy
+const shouldProxy = (networkSettings: ChainNetworkSettings, networkId: NetworkId | undefined) => {
+  return isDefined(networkId)
+    && isDefined(networkSettings[networkId])
+    && networkSettings[networkId].proxy
 }
 
 /**
  * Get the viewer for the active network, first from the wallet or fallback to HTTP RPC
  * @returns - XyoViewer for the active network
  */
+/* @deprecated - use useViewerInPageV2 instead */
 export const useViewerInPage = (networkOverride?: NetworkBootstrap) => {
   let networkBootstrap: NetworkBootstrap | undefined
   const { activeNetwork, networkSettings } = useChainNetwork()
@@ -28,7 +31,7 @@ export const useViewerInPage = (networkOverride?: NetworkBootstrap) => {
   // If the wallet viewer is undefined, don't return it yet, useViewerFromWallet is still checking
   if (isUndefined(walletRpcViewer)) return
 
-  if (shouldProxy(networkSettings, networkBootstrap)) {
+  if (shouldProxy(networkSettings, networkBootstrap?.id)) {
     if (isNull(walletRpcViewer)) {
       console.warn(`Network ${networkBootstrap?.id} is set to proxy but no wallet viewer is available, falling back to HTTP RPC viewer`)
       return httpRpcViewer
@@ -40,3 +43,28 @@ export const useViewerInPage = (networkOverride?: NetworkBootstrap) => {
 
   return httpRpcViewer
 }
+
+export const useViewerInPageV2 = () => {
+  const { networkSettings, activeNetwork } = useChainNetwork()
+  const { gateways } = useProvidedGateway()
+
+  const { inPageGateway, walletGateway } = gateways
+
+  const inPageViewer = inPageGateway?.connection?.viewer
+  const walletViewer = walletGateway?.connection?.viewer
+
+  // If the wallet viewer is undefined, don't return it yet, useViewerFromWallet is still checking
+  if (isUndefined(walletGateway)) return
+
+  if (shouldProxy(networkSettings, activeNetwork?.id)) {
+    if (isNull(walletGateway)) {
+      console.warn(`Network ${activeNetwork?.id} is set to proxy but no wallet viewer is available, falling back to HTTP RPC viewer`)
+      return inPageViewer
+    }
+    // If the network setting is to proxy and the wallet viewer is available,
+    // try to use the wallet viewer
+    return walletViewer
+  }
+
+  return inPageViewer
+}

package/src/hooks/provider/useViewerInWallet.ts

@@ -6,6 +6,7 @@ import { useChainNetwork } from '../../context/index.ts'
  * Get the viewer directly from the active network
  * @returns - The viewer for the active network
  */
+/** @deprecated use useViewerFromGateway in \@xyo-network/react-chain-provider */
 export const useViewerInWallet = () => {
   const { activeNetwork } = useChainNetwork()
   const walletViewer = useHttpRpcViewer(activeNetwork?.url)

package/src/hooks/status/usePollNetworkStatus.ts

@@ -22,7 +22,7 @@ export const usePollNetworkStatus = () => {
           setNetworkStatus(response)
           setNetworkStatusError(undefined)
         } catch (error) {
-          console.error('Error fetching network status:', error)
+          console.info('Error fetching network status:', error)
           setNetworkStatus(undefined)
           setNetworkStatusError(error as Error)
         }

package/dist/browser/components/broadcast/details/SummaryStack.stories.d.ts

@@ -1,8 +0,0 @@
-import type { Meta } from '@storybook/react-vite';
-declare const _default: Meta;
-export default _default;
-declare const Default: import("storybook/internal/csf").AnnotatedStoryFn<import("@storybook/react").ReactRenderer, import("./SummaryStack.tsx").BroadcastRpcCallDetailsSummaryStackProps>;
-declare const WithHashParam: import("storybook/internal/csf").AnnotatedStoryFn<import("@storybook/react").ReactRenderer, import("./SummaryStack.tsx").BroadcastRpcCallDetailsSummaryStackProps>;
-declare const WithUnknownParam: import("storybook/internal/csf").AnnotatedStoryFn<import("@storybook/react").ReactRenderer, import("./SummaryStack.tsx").BroadcastRpcCallDetailsSummaryStackProps>;
-export { Default, WithHashParam, WithUnknownParam, };
-//# sourceMappingURL=SummaryStack.stories.d.ts.map

package/dist/browser/components/broadcast/details/SummaryStack.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SummaryStack.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/broadcast/details/SummaryStack.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAW,MAAM,uBAAuB,CAAA;wBAQrD,IAAI;AAHT,wBAGS;AAIT,QAAA,MAAM,OAAO,oKAAoB,CAAA;AAGjC,QAAA,MAAM,aAAa,oKAAoB,CAAA;AASvC,QAAA,MAAM,gBAAgB,oKAAoB,CAAA;AAS1C,OAAO,EACL,OAAO,EAAE,aAAa,EAAE,gBAAgB,GACzC,CAAA"}

package/dist/browser/components/status/Alert.stories.d.ts

@@ -1,10 +0,0 @@
-import type { Meta } from '@storybook/react-vite';
-declare const _default: Meta;
-export default _default;
-declare const Default: import("storybook/internal/csf").AnnotatedStoryFn<import("@storybook/react").ReactRenderer, import("./Alert.tsx").NetworkStatusAlertProps>;
-declare const WithOnlineStatus: import("storybook/internal/csf").AnnotatedStoryFn<import("@storybook/react").ReactRenderer, import("./Alert.tsx").NetworkStatusAlertProps>;
-declare const WithOfflineStatus: import("storybook/internal/csf").AnnotatedStoryFn<import("@storybook/react").ReactRenderer, import("./Alert.tsx").NetworkStatusAlertProps>;
-declare const WithDegradedStatus: import("storybook/internal/csf").AnnotatedStoryFn<import("@storybook/react").ReactRenderer, import("./Alert.tsx").NetworkStatusAlertProps>;
-declare const WithUnknownStatus: import("storybook/internal/csf").AnnotatedStoryFn<import("@storybook/react").ReactRenderer, import("./Alert.tsx").NetworkStatusAlertProps>;
-export { Default, WithDegradedStatus, WithOfflineStatus, WithOnlineStatus, WithUnknownStatus, };
-//# sourceMappingURL=Alert.stories.d.ts.map

package/dist/browser/components/status/Alert.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Alert.stories.d.ts","sourceRoot":"","sources":["../../../../src/components/status/Alert.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAW,MAAM,uBAAuB,CAAA;wBAoDrD,IAAI;AAHT,wBAGS;AAIT,QAAA,MAAM,OAAO,4IAAoB,CAAA;AAGjC,QAAA,MAAM,gBAAgB,4IAAoB,CAAA;AAG1C,QAAA,MAAM,iBAAiB,4IAAoB,CAAA;AAG3C,QAAA,MAAM,kBAAkB,4IAAoB,CAAA;AAG5C,QAAA,MAAM,iBAAiB,4IAAoB,CAAA;AAG3C,OAAO,EACL,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,iBAAiB,GACpF,CAAA"}

package/dist/browser/hooks/provider/UseViewerInPage.stories.d.ts

@@ -1,10 +0,0 @@
-import React from 'react';
-declare const _default: {
-    title: string;
-    component: React.FC<{}>;
-};
-export default _default;
-declare const Default: import("storybook/internal/csf").AnnotatedStoryFn<import("@storybook/react").ReactRenderer, {}>;
-declare const Proxy: import("storybook/internal/csf").AnnotatedStoryFn<import("@storybook/react").ReactRenderer, {}>;
-export { Default, Proxy };
-//# sourceMappingURL=UseViewerInPage.stories.d.ts.map

package/dist/browser/hooks/provider/UseViewerInPage.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"UseViewerInPage.stories.d.ts","sourceRoot":"","sources":["../../../../src/hooks/provider/UseViewerInPage.stories.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAgC,MAAM,OAAO,CAAA;;;;;AAqHpD,wBAGC;AAID,QAAA,MAAM,OAAO,iGAAoB,CAAA;AAGjC,QAAA,MAAM,KAAK,iGAAoB,CAAA;AAI/B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA"}