Merge branch 'dev' of github.com-johnnyd-eth:jbx-protocol/juice-interface

Author: johnnyd-eth

src/contexts/ProjectOFACProvider.tsx

@@ -1,8 +1,7 @@
 import { ReactNode, createContext } from 'react'
 
-import axios from 'axios'
-import { useProjectMetadataContext } from 'contexts/ProjectMetadataContext'
 import { useQuery } from '@tanstack/react-query'
+import axios from 'axios'
 import { useWallet } from 'hooks/Wallet'
 
 interface ProjectOFACContextType {
@@ -16,14 +15,15 @@ export const ProjectOFACContext = createContext<ProjectOFACContextType>({
 })
 
 export default function ProjectOFACProvider({
+  ofacEnabled,
   children,
 }: {
-  children?: ReactNode
+  ofacEnabled: boolean,
+  children?: ReactNode,
 }) {
   const { userAddress, isConnected } = useWallet()
-  const { projectMetadata } = useProjectMetadataContext()
-
-  const enabled = projectMetadata?.projectRequiredOFACCheck && isConnected
+  
+  const enabled = ofacEnabled && isConnected 
 
   const { data: isAddressListedInOFAC, isLoading } = useQuery({
     queryKey: ['isAddressListedInOFAC', userAddress],

src/packages/v2v3/contexts/V2V3ProjectPageProvider.tsx

@@ -19,7 +19,7 @@ export const V2V3ProjectPageProvider: React.FC<
       <V2V3ProjectContractsProvider projectId={projectId}>
         <V2V3ProjectMetadataProvider projectId={projectId} metadata={metadata}>
           <V2V3ProjectProvider projectId={projectId}>
-            <ProjectOFACProvider>
+            <ProjectOFACProvider ofacEnabled={Boolean(metadata?.projectRequiredOFACCheck)}>
               <JB721DelegateContractsProvider>
                 <NftRewardsProvider>{children}</NftRewardsProvider>
               </JB721DelegateContractsProvider>

src/packages/v4/views/V4ProjectDashboard/V4ProjectProviders.tsx

@@ -1,20 +1,21 @@
-import { JBChainId, JBProjectProvider } from 'juice-sdk-react'
+import { JBChainId, JBProjectProvider, useJBProjectMetadataContext } from 'juice-sdk-react'
 import React, { PropsWithChildren } from 'react'
 
 import { AppWrapper } from 'components/common/CoreAppWrapper/CoreAppWrapper'
 import { OPEN_IPFS_GATEWAY_HOSTNAME } from 'constants/ipfs'
 import ProjectOFACProvider from 'contexts/ProjectOFACProvider'
-import { Provider } from 'react-redux'
+import store from 'packages/v4/components/ProjectDashboard/redux/store'
 import { ReduxProjectCartProvider } from 'packages/v4/components/ProjectDashboard/ReduxProjectCartProvider'
 import { V4NftRewardsProvider } from 'packages/v4/contexts/V4NftRewards/V4NftRewardsProvider'
 import V4ProjectMetadataProvider from 'packages/v4/contexts/V4ProjectMetadataProvider'
 import { V4UserNftCreditsProvider } from 'packages/v4/contexts/V4UserNftCreditsProvider'
 import { V4UserTotalTokensBalanceProvider } from 'packages/v4/contexts/V4UserTotalTokensBalanceProvider'
-import store from 'packages/v4/components/ProjectDashboard/redux/store'
+import { Provider } from 'react-redux'
 
 const V4ProjectProviders: React.FC<
   PropsWithChildren & { chainId: JBChainId; projectId: bigint }
 > = ({ chainId, projectId, children }) => {
+  const { metadata } = useJBProjectMetadataContext()
   return (
     <AppWrapper txHistoryProvider="wagmi">
       <JBProjectProvider
@@ -25,7 +26,7 @@ const V4ProjectProviders: React.FC<
         }}
       >
         <V4ProjectMetadataProvider projectId={projectId}>
-          <ProjectOFACProvider>
+          <ProjectOFACProvider ofacEnabled={Boolean(metadata?.data?.projectRequiredOFACCheck)}>
             <Provider store={store}>
               <V4UserNftCreditsProvider>
                 <V4UserTotalTokensBalanceProvider>