chore: clean up ofac

src/components/v2v3/V2V3Project/ProjectDashboard/ProjectDashboard.tsx

@@ -2,7 +2,6 @@ import { Footer } from 'components/Footer/Footer'
 import { TransactionProvider } from 'contexts/Transaction/TransactionProvider'
 import { useHasNftRewards } from 'hooks/JB721Delegate/useHasNftRewards'
 import { useIsJuicecrowd } from 'hooks/v2v3/useIsJuiceCrowd'
-import { useMemo } from 'react'
 import { twMerge } from 'tailwind-merge'
 import { BlockedProjectBanner } from './components/BlockedProjectBanner'
 import { Cart } from './components/Cart/Cart'
@@ -21,17 +20,11 @@ import { useProjectPageQueries } from './hooks/useProjectPageQueries'
 
 export const ProjectDashboard = () => {
   const { projectPayReceipt } = useProjectPageQueries()
-
   const { value: hasNftRewards } = useHasNftRewards()
   const isJuicecrowd = useIsJuicecrowd()
-  const shouldShowNftCard = useMemo(() => {
-    // disable juicecrowd nft rewards
-    if (isJuicecrowd) {
-      return false
-    }
 
-    return hasNftRewards
-  }, [hasNftRewards, isJuicecrowd])
+  // disable juicecrowd nft rewards
+  const shouldShowNftCard = isJuicecrowd ? false : hasNftRewards
 
   return (
     <TransactionProvider>

src/components/v2v3/V2V3Project/ProjectDashboard/components/Cart/components/SummaryPayButton.tsx

@@ -1,44 +1,19 @@
-import { useMemo } from 'react'
-import { Button, Tooltip } from 'antd'
-import { t, Trans } from '@lingui/macro'
-
+import { Trans } from '@lingui/macro'
+import { Button } from 'antd'
 import { useCartSummary } from '../hooks/useCartSummary'
-import { useProjectIsOFACListed } from '../../../hooks/useProjectIsOFACListed'
 
 export const SummaryPayButton = ({ className }: { className?: string }) => {
   const { payProject, walletConnected } = useCartSummary()
-  const { isAddressListedInOFAC, isLoading: isOFACChecking } =
-    useProjectIsOFACListed()
-
-  const isLoading = useMemo(() => {
-    return Boolean(walletConnected && isOFACChecking)
-  }, [walletConnected, isOFACChecking])
-
-  const isDisabled = useMemo(() => {
-    return Boolean(walletConnected && isAddressListedInOFAC)
-  }, [isAddressListedInOFAC, walletConnected])
 
   return (
-    <Tooltip
-      title={t`You can't pay this project because your wallet address failed compliance check.`}
-      placement="top"
-      open={isDisabled ? undefined : false}
-    >
-      <Button
-        className={className}
-        type="primary"
-        onClick={payProject}
-        loading={isLoading}
-        disabled={isDisabled}
-      >
-        <span>
-          {walletConnected ? (
-            <Trans>Pay project</Trans>
-          ) : (
-            <Trans>Connect wallet</Trans>
-          )}
-        </span>
-      </Button>
-    </Tooltip>
+    <Button className={className} type="primary" onClick={payProject}>
+      <span>
+        {walletConnected ? (
+          <Trans>Pay project</Trans>
+        ) : (
+          <Trans>Connect wallet</Trans>
+        )}
+      </span>
+    </Button>
   )
 }

src/components/v2v3/V2V3Project/ProjectDashboard/components/NftRewardsPanel/NftReward/NftReward.tsx

@@ -37,11 +37,12 @@ export function NftReward({
   hideAttributes,
 }: NftRewardProps) {
   const [previewVisible, setPreviewVisible] = useState<boolean>(false)
+
   const cart = useProjectCart()
   const nftsEnabledForPay = useNftRewardsEnabledForPay()
-
   const { fundingCycleMetadata } = useProjectContext()
-  const { isAddressListedInOFAC } = useProjectIsOFACListed()
+  const { isAddressListedInOFAC, isLoading: isOFACLoading } =
+    useProjectIsOFACListed()
 
   const quantitySelected = useMemo(
     () => cart.nftRewards.find(nft => nft.id === rewardTier?.id)?.quantity ?? 0,
@@ -75,14 +76,15 @@ export function NftReward({
       !hasRemainingSupply ||
       !nftsEnabledForPay ||
       fundingCycleMetadata?.pausePay ||
-      isAddressListedInOFAC ||
+      (!isOFACLoading && isAddressListedInOFAC) ||
       isJuicecrowdNft
     )
   }, [
     hasRemainingSupply,
     nftsEnabledForPay,
     fundingCycleMetadata?.pausePay,
     isAddressListedInOFAC,
+    isOFACLoading,
     isJuicecrowdNft,
   ])
   const disabledReason = useMemo(() => {
@@ -92,7 +94,7 @@ export function NftReward({
     if (isJuicecrowdNft)
       return t`This project's NFTs can only be purchased on juicecrowd.gg.`
     if (isAddressListedInOFAC)
-      return t`NFTs can't be purchased because your wallet address failed compliance check.`
+      return t`NFTs can't be purchased because your wallet address failed the compliance check.`
   }, [
     isJuicecrowdNft,
     nftsEnabledForPay,

src/components/v2v3/V2V3Project/ProjectDashboard/components/PayProjectCard/PayProjectCard.tsx

@@ -1,5 +1,3 @@
-import { useMemo } from 'react'
-
 import {
   NoSymbolIcon,
   QuestionMarkCircleIcon,
@@ -12,6 +10,7 @@ import { Formik } from 'formik'
 import { useV2BlockedProject } from 'hooks/useBlockedProject'
 import { useIsJuicecrowd } from 'hooks/v2v3/useIsJuiceCrowd'
 import { V2V3CurrencyOption } from 'models/v2v3/currencyOption'
+import { useMemo } from 'react'
 import { twMerge } from 'tailwind-merge'
 import { V2V3_CURRENCY_ETH } from 'utils/v2v3/currency'
 import { DisplayCard } from '../ui/DisplayCard'
@@ -20,7 +19,8 @@ import { TokensPerEth } from './components/TokensPerEth'
 
 export const PayProjectCard = ({ className }: { className?: string }) => {
   const isBlockedProject = useV2BlockedProject()
-  const { isAddressListedInOFAC } = useProjectIsOFACListed()
+  const { isAddressListedInOFAC, isLoading: isOFACLoading } =
+    useProjectIsOFACListed()
   const { validationSchema, paymentsPaused, addPay } = usePayProjectCard()
   const determiningIfProjectCanReceivePayments = paymentsPaused === undefined
 
@@ -30,11 +30,12 @@ export const PayProjectCard = ({ className }: { className?: string }) => {
     return (
       paymentsPaused ||
       isBlockedProject ||
-      isAddressListedInOFAC ||
+      (!isOFACLoading && isAddressListedInOFAC) ||
       isJuicecrowdProject
     )
   }, [
     isAddressListedInOFAC,
+    isOFACLoading,
     paymentsPaused,
     isBlockedProject,
     isJuicecrowdProject,
@@ -50,7 +51,7 @@ export const PayProjectCard = ({ className }: { className?: string }) => {
 
     if (isAddressListedInOFAC) {
       return {
-        title: t`You can't pay this project because your wallet address failed compliance check.`,
+        title: t`You can't pay this project because your wallet address failed the compliance check.`,
         open: undefined,
       }
     }

src/components/v2v3/V2V3Project/ProjectDashboard/components/ProjectTabs/ProjectTabs.tsx

@@ -24,6 +24,13 @@ import { TokensPanel } from '../TokensPanel/TokensPanel'
 import { UpdatesPanel } from '../UpdatesPanel/UpdatesPanel'
 import { ProjectTab } from '../ui/ProjectTab'
 
+type ProjectTabConfig = {
+  id: string
+  name: JSX.Element | string
+  panel: JSX.Element | string
+  hideTab?: boolean
+}
+
 export const ProjectTabs = ({ className }: { className?: string }) => {
   const { projectUpdates } = useContext(ProjectUpdatesContext)
   const { projectPageTab, setProjectPageTab } = useProjectPageQueries()
@@ -65,7 +72,7 @@ export const ProjectTabs = ({ className }: { className?: string }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [projectPageTab])
 
-  const tabs = useMemo(
+  const tabs: ProjectTabConfig[] = useMemo(
     () => [
       { id: 'activity', name: t`Activity`, panel: <ActivityPanel /> },
       { id: 'about', name: t`About`, panel: <AboutPanel /> },

src/contexts/v2v3/V2V3ProjectMetadataProvider.tsx

@@ -15,6 +15,7 @@ export default function V2V3ProjectMetadataProvider({
   projectId: number
 }>) {
   const hasMetadata = Boolean(metadata)
+  console.info('🧃 Server metadata', metadata)
 
   // only load metadata if it hasn't been previously loaded into the prop.
   const { data: metadataCid, refetchValue } = useProjectMetadataContent(

src/contexts/v2v3/V2V3ProjectOFACProvider.tsx

@@ -24,10 +24,12 @@ export default function V2V3ProjectOFACProvider({
   const { userAddress, isConnected } = useWallet()
   const { projectMetadata } = useProjectMetadata()
 
+  const enabled = projectMetadata?.projectRequiredOFACCheck && isConnected
+
   const { data: isAddressListedInOFAC, isLoading } = useQuery(
     ['isAddressListedInOFAC', userAddress],
     async () => {
-      if (!(projectMetadata?.projectRequiredOFACCheck && isConnected)) {
+      if (!enabled) {
         return
       }
 
@@ -46,6 +48,7 @@ export default function V2V3ProjectOFACProvider({
         return true
       }
     },
+    { enabled },
   )
 
   return (

src/hooks/useProjectMetadata.ts

@@ -11,7 +11,9 @@ export function useProjectMetadata(uri: string | null | undefined) {
       }
 
       const response = await ipfsGet<AnyProjectMetadata>(uri)
-      return consolidateMetadata(response.data)
+      const metadata = consolidateMetadata(response.data)
+      console.info('📗 Project metadata', consolidateMetadata)
+      return metadata
     },
     {
       enabled: !!uri,

src/locales/messages.pot

@@ -1421,9 +1421,6 @@ msgstr ""
 msgid "Collection Symbol"
 msgstr ""
 
-msgid "NFTs can't be purchased because your wallet address failed compliance check."
-msgstr ""
-
 msgid "Check this to mint {tokenSymbol} ERC-20 to your wallet. Leave unchecked to have the Juicebox protocol internally track your token balance, saving gas on this transaction. You can claim your ERC-20 tokens later."
 msgstr ""
 
@@ -2234,6 +2231,9 @@ msgstr ""
 msgid "Highest paid"
 msgstr ""
 
+msgid "You can't pay this project because your wallet address failed the compliance check."
+msgstr ""
+
 msgid "Community owned"
 msgstr ""
 
@@ -2429,9 +2429,6 @@ msgstr ""
 msgid "When enabled, fees are held in the project instead of being processed automatically. <0>Learn more.</0>"
 msgstr ""
 
-msgid "You can't pay this project because your wallet address failed compliance check."
-msgstr ""
-
 msgid "No, keep"
 msgstr ""
 
@@ -3668,6 +3665,9 @@ msgstr ""
 msgid "Select NFTs to redeem"
 msgstr ""
 
+msgid "NFTs can't be purchased because your wallet address failed the compliance check."
+msgstr ""
+
 msgid "A contract which defines custom behavior which can be used when somebody pays this project or redeems from it. <0>Learn more</0>"
 msgstr ""