@bosonprotocol/react-kit 0.29.0-alpha.3 → 0.29.0-alpha.4

package/src/components/queryClient/QueryClientProviderCustom.tsx

@@ -0,0 +1,27 @@
+import {
+  QueryClient,
+  QueryClientProvider,
+  QueryClientProviderProps
+} from "react-query";
+
+import React from "react";
+
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      refetchOnWindowFocus: false
+    }
+  }
+});
+
+type QueryClientProviderCustomProps = Partial<QueryClientProviderProps>;
+
+export const QueryClientProviderCustom: React.FC<
+  QueryClientProviderCustomProps
+> = ({ ...props }) => {
+  return (
+    <QueryClientProvider client={queryClient} {...props}>
+      {props.children}
+    </QueryClientProvider>
+  );
+};

package/src/components/queryClient/withQueryClientProvider.tsx

@@ -0,0 +1,50 @@
+import {
+  QueryClient,
+  QueryClientProvider,
+  QueryClientProviderProps
+} from "react-query";
+
+import React from "react";
+
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      refetchOnWindowFocus: false
+    }
+  }
+});
+
+type QueryClientProviderCustomProps = Partial<QueryClientProviderProps>;
+
+export const QueryClientProviderCustom: React.FC<
+  QueryClientProviderCustomProps
+> = ({ ...props }) => {
+  return (
+    <QueryClientProvider client={queryClient} {...props}>
+      {props.children}
+    </QueryClientProvider>
+  );
+};
+
+export const withQueryClientProvider = <P extends object>(
+  WrappedComponent: React.ComponentType<P>
+) => {
+  // Define the props type for the wrapped component
+  type Props = P;
+
+  // Return a new component
+  const WithQueryClientProvider: React.FC<Props> = (props) => {
+    return (
+      <QueryClientProviderCustom>
+        <WrappedComponent {...props} />
+      </QueryClientProviderCustom>
+    );
+  };
+
+  // Set display name for debugging purposes
+  const displayName =
+    WrappedComponent.displayName || WrappedComponent.name || "Component";
+  WithQueryClientProvider.displayName = `withQueryClientProviderCustom(${displayName})`;
+
+  return WithQueryClientProvider;
+};

package/src/components/widgets/commit/CommitWidgetProviders.tsx

@@ -21,6 +21,7 @@ import store from "../../../state";
 import { ReduxCCDummyContext } from "../../../state/reduxContext";
 import { useIsWindowVisible } from "../../../hooks/uniswap/useIsWindowVisible";
 import { useProvider } from "../../../hooks/connection/connection";
+import { withQueryClientProvider } from "../../queryClient/withQueryClientProvider";
 
 export type CommitWidgetProvidersProps = IpfsProviderProps &
   Omit<ConfigProviderProps, "magicLinkKey" | "infuraKey"> &
@@ -30,13 +31,6 @@ export type CommitWidgetProvidersProps = IpfsProviderProps &
     withReduxProvider: boolean;
   };
 
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      refetchOnWindowFocus: false
-    }
-  }
-});
 const { infuraKey, magicLinkKey } = CONFIG;
 export const CommitWidgetReduxProvider = ({
   children
@@ -58,47 +52,43 @@ export const CommitWidgetReduxUpdaters = ({
   return <Updaters {...rest}>{children}</Updaters>;
 };
 
-export const CommitWidgetProviders: React.FC<CommitWidgetProvidersProps> = ({
-  children,
-  withReduxProvider,
-  ...props
-}) => {
-  const isWindowVisible = useIsWindowVisible();
-  const WithReduxProvider = useCallback(
-    ({ children: providersChildren }: { children: ReactNode }) => {
-      return withReduxProvider ? (
-        <CommitWidgetReduxProvider>
-          {providersChildren}
-        </CommitWidgetReduxProvider>
-      ) : (
-        <>{providersChildren}</>
-      );
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    },
-    [withReduxProvider]
-  );
-  const WithUpdaters = useCallback(
-    ({ children: updatersChildren }: { children: ReactNode }) => {
-      return withReduxProvider ? (
-        <UpdatersWrapper isWindowVisible={isWindowVisible}>
-          {updatersChildren}
-        </UpdatersWrapper>
-      ) : (
-        <>{updatersChildren}</>
-      );
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    },
-    [withReduxProvider, isWindowVisible]
-  );
-  return (
-    <WithReduxProvider>
-      <ConfigProvider
-        magicLinkKey={magicLinkKey}
-        infuraKey={infuraKey}
-        {...props}
-      >
-        <MagicProvider>
-          <QueryClientProvider client={queryClient}>
+export const CommitWidgetProviders: React.FC<CommitWidgetProvidersProps> =
+  withQueryClientProvider(({ children, withReduxProvider, ...props }) => {
+    const isWindowVisible = useIsWindowVisible();
+    const WithReduxProvider = useCallback(
+      ({ children: providersChildren }: { children: ReactNode }) => {
+        return withReduxProvider ? (
+          <CommitWidgetReduxProvider>
+            {providersChildren}
+          </CommitWidgetReduxProvider>
+        ) : (
+          <>{providersChildren}</>
+        );
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+      },
+      [withReduxProvider]
+    );
+    const WithUpdaters = useCallback(
+      ({ children: updatersChildren }: { children: ReactNode }) => {
+        return withReduxProvider ? (
+          <UpdatersWrapper isWindowVisible={isWindowVisible}>
+            {updatersChildren}
+          </UpdatersWrapper>
+        ) : (
+          <>{updatersChildren}</>
+        );
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+      },
+      [withReduxProvider, isWindowVisible]
+    );
+    return (
+      <WithReduxProvider>
+        <ConfigProvider
+          magicLinkKey={magicLinkKey}
+          infuraKey={infuraKey}
+          {...props}
+        >
+          <MagicProvider>
             <WalletConnectionProvider
               walletConnectProjectId={props.walletConnectProjectId}
             >
@@ -112,12 +102,11 @@ export const CommitWidgetProviders: React.FC<CommitWidgetProvidersProps> = ({
                 </ChatProvider>
               </WithUpdaters>
             </WalletConnectionProvider>
-          </QueryClientProvider>
-        </MagicProvider>
-      </ConfigProvider>
-    </WithReduxProvider>
-  );
-};
+          </MagicProvider>
+        </ConfigProvider>
+      </WithReduxProvider>
+    );
+  });
 
 function UpdatersWrapper({
   children,

package/src/components/widgets/finance/FinanceWidget.tsx

@@ -3,7 +3,6 @@ import isBetween from "dayjs/plugin/isBetween";
 
 import { ethers } from "ethers";
 import React, { useEffect, useMemo, useRef } from "react";
-import { QueryClient, QueryClientProvider } from "react-query";
 import styled from "styled-components";
 import { useAccount } from "../../../hooks/connection/connection";
 import { useDisconnect } from "../../../hooks/connection/useDisconnect";
@@ -33,6 +32,7 @@ import useFunds from "./useFunds";
 import { useOffersBacked } from "./useOffersBacked";
 import { useSellerDeposit } from "./useSellerDeposit";
 import { useSellerRoles } from "./useSellerRoles";
+import { withQueryClientProvider } from "../../queryClient/withQueryClientProvider";
 dayjs.extend(isBetween);
 
 const StyledConnectButton = styled(ConnectButton)`
@@ -146,14 +146,6 @@ function WithSellerData(WrappedComponent: React.ComponentType<Props>) {
 }
 
 const Component = WithSellerData(Finance);
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      refetchOnWindowFocus: false
-    }
-  }
-});
-
 type FinanceWidgetProps = {
   walletConnectProjectId: string;
 } & Omit<ConfigProviderProps, "magicLinkKey" | "infuraKey"> &
@@ -182,18 +174,16 @@ export function FinanceWidget(props: FinanceWidgetProps) {
           <WalletConnectionProvider
             walletConnectProjectId={walletConnectProjectId}
           >
-            <QueryClientProvider client={queryClient}>
-              <ConvertionRateProvider>
-                <ModalProvider>
-                  {!withExternalSigner && (
-                    <Grid justifyContent="flex-end">
-                      <StyledConnectButton showChangeWallet />
-                    </Grid>
-                  )}
-                  <Component sellerId={sellerId ?? undefined} />
-                </ModalProvider>
-              </ConvertionRateProvider>
-            </QueryClientProvider>
+            <ConvertionRateProvider>
+              <ModalProvider>
+                {!withExternalSigner && (
+                  <Grid justifyContent="flex-end">
+                    <StyledConnectButton showChangeWallet />
+                  </Grid>
+                )}
+                <Component sellerId={sellerId ?? undefined} />
+              </ModalProvider>
+            </ConvertionRateProvider>
           </WalletConnectionProvider>
         </MagicProvider>
       </SignerProvider>
@@ -201,4 +191,4 @@ export function FinanceWidget(props: FinanceWidgetProps) {
   );
 }
 
-export default FinanceWidget;
+export default withQueryClientProvider(FinanceWidget);

package/src/components/widgets/redemption/RedemptionWidgetProviders.tsx

@@ -1,5 +1,4 @@
 import React, { ReactNode } from "react";
-import { QueryClient, QueryClientProvider } from "react-query";
 import { CONFIG } from "../../../lib/config/config";
 import ChatProvider from "../../chat/ChatProvider/ChatProvider";
 import {
@@ -21,6 +20,7 @@ import ConvertionRateProvider, {
 import { CommonWidgetTypes } from "../types";
 import { RedemptionContextProps } from "./provider/RedemptionContext";
 import { RedemptionProvider } from "./provider/RedemptionProvider";
+import { withQueryClientProvider } from "../../queryClient/withQueryClientProvider";
 
 export type RedemptionWidgetProvidersProps = IpfsProviderProps &
   Omit<ConfigProviderProps, "magicLinkKey" | "infuraKey"> &
@@ -33,32 +33,23 @@ export type RedemptionWidgetProvidersProps = IpfsProviderProps &
     children: ReactNode;
   };
 
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      refetchOnWindowFocus: false
-    }
-  }
-});
 const { infuraKey, magicLinkKey } = CONFIG;
 
-export const RedemptionWidgetProviders: React.FC<
-  RedemptionWidgetProvidersProps
-> = ({ children, ...props }) => {
-  const parentOrigin = getParentWindowOrigin();
-  return (
-    <ConfigProvider
-      magicLinkKey={magicLinkKey}
-      infuraKey={infuraKey}
-      {...props}
-    >
-      <GlobalStyle />
-      <SignerProvider
-        parentOrigin={parentOrigin}
-        withExternalSigner={props.withExternalSigner}
+export const RedemptionWidgetProviders: React.FC<RedemptionWidgetProvidersProps> =
+  withQueryClientProvider(({ children, ...props }) => {
+    const parentOrigin = getParentWindowOrigin();
+    return (
+      <ConfigProvider
+        magicLinkKey={magicLinkKey}
+        infuraKey={infuraKey}
+        {...props}
       >
-        <MagicProvider>
-          <QueryClientProvider client={queryClient}>
+        <GlobalStyle />
+        <SignerProvider
+          parentOrigin={parentOrigin}
+          withExternalSigner={props.withExternalSigner}
+        >
+          <MagicProvider>
             <WalletConnectionProvider
               walletConnectProjectId={props.walletConnectProjectId}
             >
@@ -74,9 +65,8 @@ export const RedemptionWidgetProviders: React.FC<
                 </IpfsProvider>
               </ChatProvider>
             </WalletConnectionProvider>
-          </QueryClientProvider>
-        </MagicProvider>
-      </SignerProvider>
-    </ConfigProvider>
-  );
-};
+          </MagicProvider>
+        </SignerProvider>
+      </ConfigProvider>
+    );
+  });

package/src/hooks/useSignerAddress.tsx

@@ -1,35 +1,26 @@
 import { Web3LibAdapter } from "@bosonprotocol/common";
 
-import { useEffect, useState } from "react";
+import { useQuery } from "react-query";
 
 export function useSignerAddress(web3Lib: Web3LibAdapter | undefined) {
-  const [signerAddress, setSignerAddress] = useState<string | undefined>();
-  const [signerContract, setSignerContract] = useState<boolean>(false);
-
-  useEffect(() => {
-    if (web3Lib?.getSignerAddress) {
-      web3Lib
-        .getSignerAddress()
-        .then((address) => {
-          setSignerAddress(address);
-        })
-        .catch((e) => {
-          console.error(e);
-          setSignerAddress(undefined);
-        });
-      web3Lib
-        .isSignerContract()
-        .then((isSignerContract) => {
-          setSignerContract(isSignerContract);
-        })
-        .catch((e) => {
-          console.error(e);
-          setSignerContract(false);
-        });
+  const { data: signerAddress } = useQuery(
+    ["useSignerAddress-signerAddress", web3Lib?.uuid],
+    () => {
+      return web3Lib?.getSignerAddress();
+    },
+    {
+      enabled: !!web3Lib?.getSignerAddress
     }
-
-    return () => setSignerAddress(undefined);
-  }, [web3Lib]);
+  );
+  const { data: signerContract } = useQuery(
+    ["useSignerAddress-signerContract", web3Lib?.uuid],
+    () => {
+      return web3Lib?.isSignerContract();
+    },
+    {
+      enabled: !!web3Lib?.getSignerAddress
+    }
+  );
 
   return { signerAddress, signerContract };
 }

package/src/lib/signer/externalSigner.ts

@@ -53,6 +53,7 @@ const getExternalWeb3LibAdapterListener = ({
   parentOrigin: string;
 }): Web3LibAdapter => {
   return {
+    uuid: crypto.randomUUID(),
     getSignerAddress: (): Promise<string> => {
       return getDefaultHandleSignerFunction<string>({
         parentOrigin,

package/src/lib/signer/useCallSignerFromIframe.ts

@@ -90,7 +90,7 @@ export const useCallSignerFromIframe = ({
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment
               // @ts-ignore
               result = await signer[signerFn]?.(args[0], args[1]);
-            } else {
+            } else if (fn !== "uuid") {
               result = await ethersSigner?.[fn]?.(args[0], args[1]);
             }
             if (