safe-global · schmanu · Oct 14, 2024 · Aug 13, 2024 · Aug 13, 2024 · Aug 15, 2024
diff --git a/src/components/common/BlockedAddress/index.tsx b/src/components/common/BlockedAddress/index.tsx
@@ -5,7 +5,15 @@ import { useRouter } from 'next/router'
 import Disclaimer from '@/components/common/Disclaimer'
 import { AppRoutes } from '@/config/routes'
 
-export const BlockedAddress = ({ address }: { address?: string }): ReactElement => {
+export const BlockedAddress = ({
+  address,
+  featureName,
+  onClose,
+}: {
+  address?: string
+  featureName: string
+  onClose?: () => void
+}): ReactElement => {
   const theme = useTheme()
   const isMobile = useMediaQuery(theme.breakpoints.down('sm'))
   const displayAddress = address && isMobile ? shortenAddress(address) : address
@@ -19,8 +27,8 @@ export const BlockedAddress = ({ address }: { address?: string }): ReactElement
     <Disclaimer
       title="Blocked address"
       subtitle={displayAddress}
-      content="The above address is part of the OFAC SDN list and the embedded swaps feature with CoW Swap is unavailable for sanctioned addresses."
-      onAccept={handleAccept}
+      content={`The above address is part of the OFAC SDN list and the ${featureName} is unavailable for sanctioned addresses.`}
+      onAccept={onClose ?? handleAccept}
     />
   )
 }

diff --git a/src/components/safe-apps/AppFrame/index.tsx b/src/components/safe-apps/AppFrame/index.tsx
@@ -4,7 +4,7 @@ import { type AddressBookItem, Methods } from '@safe-global/safe-apps-sdk'
 import type { ReactElement } from 'react'
 import { useMemo } from 'react'
 import { useCallback, useEffect } from 'react'
-import { CircularProgress, Typography } from '@mui/material'
+import { Box, CircularProgress, Typography } from '@mui/material'
 import { useRouter } from 'next/router'
 import Head from 'next/head'
 import type { RequestId } from '@safe-global/safe-apps-sdk'
@@ -28,6 +28,8 @@ import { PermissionStatus, type SafeAppDataWithPermissions } from '@/components/
 import css from './styles.module.css'
 import SafeAppIframe from './SafeAppIframe'
 import { useCustomAppCommunicator } from '@/hooks/safe-apps/useCustomAppCommunicator'
+import { useSanctionedAddress } from '@/hooks/useSanctionedAddress'
+import BlockedAddress from '@/components/common/BlockedAddress'
 
 const UNKNOWN_APP_NAME = 'Unknown Safe App'
 
@@ -43,6 +45,8 @@ const AppFrame = ({ appUrl, allowedFeaturesList, safeAppFromManifest }: AppFrame
   const chainId = useChainId()
   const chain = useCurrentChain()
   const router = useRouter()
+  const sanctionedAddress = useSanctionedAddress()
+  const isSafePassApp = appUrl.startsWith('https://community.safe.global')
   const {
     expanded: queueBarExpanded,
     dismissedByUser: queueBarDismissed,
@@ -116,6 +120,19 @@ const AppFrame = ({ appUrl, allowedFeaturesList, safeAppFromManifest }: AppFrame
     return <div />
   }
 
+  if (Boolean(sanctionedAddress) && isSafePassApp) {
+    return (
+      <>
+        <Head>
+          <title>{`Safe Apps - Viewer - ${remoteApp ? remoteApp.name : UNKNOWN_APP_NAME}`}</title>
+        </Head>
+        <Box p={2}>
+          <BlockedAddress address={sanctionedAddress} featureName="Safe{Pass} Safe app" />
+        </Box>
+      </>
+    )
+  }
+
   return (
     <>
       <Head>

diff --git a/src/features/swap/index.tsx b/src/features/swap/index.tsx
@@ -288,7 +288,7 @@ const SwapWidget = ({ sell }: Params) => {
   useCustomAppCommunicator(iframeRef, appData, chain)
 
   if (blockedAddress) {
-    return <BlockedAddress address={blockedAddress} />
+    return <BlockedAddress address={blockedAddress} featureName="embedded swaps feature with CoW Swap" />
   }
 
   if (!isConsentAccepted) {

diff --git a/src/features/walletconnect/components/WcProposalForm/index.tsx b/src/features/walletconnect/components/WcProposalForm/index.tsx
@@ -4,6 +4,7 @@ import {
   getPeerName,
   getSupportedChainIds,
   isBlockedBridge,
+  isSafePassApp,
   isWarnedBridge,
 } from '@/features/walletconnect/services/utils'
 import { WalletConnectContext } from '@/features/walletconnect/WalletConnectContext'
@@ -20,6 +21,8 @@ import { type Dispatch, type SetStateAction, useCallback, useContext, useEffect,
 import { CompatibilityWarning } from './CompatibilityWarning'
 import ProposalVerification from './ProposalVerification'
 import css from './styles.module.css'
+import { useSanctionedAddress } from '@/hooks/useSanctionedAddress'
+import BlockedAddress from '@/components/common/BlockedAddress'
 
 type ProposalFormProps = {
   proposal: Web3WalletTypes.SessionProposal
@@ -38,13 +41,22 @@ const WcProposalForm = ({ proposal, setProposal, onApprove }: ProposalFormProps)
   const { isScam, origin } = proposal.verifyContext.verified
   const url = proposer.metadata.url || origin
 
+  const sanctionedAddress = useSanctionedAddress()
+  const isSafePass = isSafePassApp(origin)
+
   const chainIds = useMemo(() => getSupportedChainIds(configs, proposal.params), [configs, proposal.params])
   const isUnsupportedChain = !chainIds.includes(chainId)
 
   const name = getPeerName(proposer) || 'Unknown dApp'
   const isHighRisk = proposal.verifyContext.verified.validation === 'INVALID' || isWarnedBridge(origin, name)
   const isBlocked = isScam || isBlockedBridge(origin)
-  const disabled = !safeLoaded || isUnsupportedChain || isBlocked || (isHighRisk && !understandsRisk) || !!isLoading
+  const disabled =
+    !safeLoaded ||
+    isUnsupportedChain ||
+    isBlocked ||
+    (isHighRisk && !understandsRisk) ||
+    !!isLoading ||
+    (Boolean(sanctionedAddress) && isSafePass)
 
   // On session reject
   const onReject = useCallback(async () => {
@@ -134,6 +146,10 @@ const WcProposalForm = ({ proposal, setProposal, onApprove }: ProposalFormProps)
         />
       )}
 
+      {isSafePass && Boolean(sanctionedAddress) && (
+        <BlockedAddress address={sanctionedAddress} featureName="Safe{Pass}" onClose={onReject} />
+      )}
+
       <Divider flexItem className={css.divider} />
 
       <div className={css.buttons}>

diff --git a/src/features/walletconnect/components/WcSessionManager/index.tsx b/src/features/walletconnect/components/WcSessionManager/index.tsx
@@ -11,7 +11,8 @@ import WcErrorMessage from '../WcErrorMessage'
 import WcProposalForm from '../WcProposalForm'
 import { trackEvent } from '@/services/analytics'
 import { WALLETCONNECT_EVENTS } from '@/services/analytics/events/walletconnect'
-import { splitError } from '@/features/walletconnect/services/utils'
+import { isSafePassApp, splitError } from '@/features/walletconnect/services/utils'
+import { useSanctionedAddress } from '@/hooks/useSanctionedAddress'
 
 type WcSessionManagerProps = {
   sessions: SessionTypes.Struct[]
@@ -29,6 +30,7 @@ const WcSessionManager = ({ sessions, uri }: WcSessionManagerProps) => {
   const { safe, safeAddress } = useSafeInfo()
   const { chainId } = safe
   const [proposal, setProposal] = useState<Web3WalletTypes.SessionProposal>()
+  const sanctionedAddress = useSanctionedAddress()
 
   // On session approve
   const onApprove = useCallback(
@@ -91,15 +93,18 @@ const WcSessionManager = ({ sessions, uri }: WcSessionManagerProps) => {
     return walletConnect.onSessionPropose((proposalData) => {
       setError(null)
 
-      if (autoApprove[chainId]?.[proposalData.verifyContext.verified.origin]) {
+      if (
+        autoApprove[chainId]?.[proposalData.verifyContext.verified.origin] &&
+        (!isSafePassApp(proposalData.verifyContext.verified.origin) || !sanctionedAddress)
+      ) {
         onApprove(proposalData)
         return
       }
 
       setProposal(proposalData)
       setIsLoading(undefined)
     })
-  }, [autoApprove, chainId, onApprove, setError, setIsLoading, walletConnect])
+  }, [autoApprove, chainId, onApprove, setError, setIsLoading, walletConnect, sanctionedAddress])
 
   // Track errors
   useEffect(() => {

diff --git a/src/features/walletconnect/services/utils.ts b/src/features/walletconnect/services/utils.ts
@@ -50,6 +50,10 @@ export const isBlockedBridge = (origin: string) => {
   return BlockedBridges.some((bridge) => origin.includes(bridge))
 }
 
+export const isSafePassApp = (origin: string) => {
+  return origin.includes('community.safe.global')
+}
+
 // Bridge defaults to same address on destination chain but allows changing it
 export const isWarnedBridge = (origin: string, name: string) => {
   return WarnedBridges.some((bridge) => origin.includes(bridge)) || WarnedBridgeNames.includes(name)

diff --git a/src/hooks/__tests__/useSanctionedAddress.test.ts b/src/hooks/__tests__/useSanctionedAddress.test.ts
@@ -0,0 +1,70 @@
+import { renderHook } from '@/tests/test-utils'
+import { useSanctionedAddress } from '../useSanctionedAddress'
+import useSafeAddress from '../useSafeAddress'
+import useWallet from '../wallets/useWallet'
+import { faker } from '@faker-js/faker'
+import { connectedWalletBuilder } from '@/tests/builders/wallet'
+import * as ofac from '@/store/ofac'
+
+jest.mock('@/hooks/useSafeAddress')
+jest.mock('@/hooks/wallets/useWallet')
+
+describe('useSanctionedAddress', () => {
+  const mockUseSafeAddress = useSafeAddress as jest.MockedFunction<typeof useSafeAddress>
+  const mockUseWallet = useWallet as jest.MockedFunction<typeof useWallet>
+
+  it('should return undefined without safeAddress and wallet', () => {
+    const { result } = renderHook(() => useSanctionedAddress())
+    expect(result.current).toBeUndefined()
+  })
+
+  it('should return undefined if neither safeAddress nor wallet are sanctioned', () => {
+    mockUseSafeAddress.mockReturnValue(faker.finance.ethereumAddress())
+    mockUseWallet.mockReturnValue(connectedWalletBuilder().build())
+
+    jest.spyOn(ofac, 'useGetIsSanctionedQuery').mockReturnValue({ data: false, refetch: jest.fn() })
+
+    const { result } = renderHook(() => useSanctionedAddress())
+    expect(result.current).toBeUndefined()
+  })
+
+  it('should return safeAddress if it is sanctioned', () => {
+    const mockSafeAddress = faker.finance.ethereumAddress()
+    const mockWalletAddress = faker.finance.ethereumAddress()
+    mockUseSafeAddress.mockReturnValue(mockSafeAddress)
+    mockUseWallet.mockReturnValue(connectedWalletBuilder().with({ address: mockWalletAddress }).build())
+
+    jest
+      .spyOn(ofac, 'useGetIsSanctionedQuery')
+      .mockImplementation((address) => ({ data: address === mockSafeAddress, refetch: jest.fn() }))
+
+    const { result } = renderHook(() => useSanctionedAddress())
+    expect(result.current).toEqual(mockSafeAddress)
+  })
+
+  it('should return walletAddress if it is sanctioned', () => {
+    const mockSafeAddress = faker.finance.ethereumAddress()
+    const mockWalletAddress = faker.finance.ethereumAddress()
+    mockUseSafeAddress.mockReturnValue(mockSafeAddress)
+    mockUseWallet.mockReturnValue(connectedWalletBuilder().with({ address: mockWalletAddress }).build())
+
+    jest
+      .spyOn(ofac, 'useGetIsSanctionedQuery')
+      .mockImplementation((address) => ({ data: address === mockWalletAddress, refetch: jest.fn() }))
+
+    const { result } = renderHook(() => useSanctionedAddress())
+    expect(result.current).toEqual(mockWalletAddress)
+  })
+
+  it('should return safeAddress if both are sanctioned', () => {
+    const mockSafeAddress = faker.finance.ethereumAddress()
+    const mockWalletAddress = faker.finance.ethereumAddress()
+    mockUseSafeAddress.mockReturnValue(mockSafeAddress)
+    mockUseWallet.mockReturnValue(connectedWalletBuilder().with({ address: mockWalletAddress }).build())
+
+    jest.spyOn(ofac, 'useGetIsSanctionedQuery').mockReturnValue({ data: true, refetch: jest.fn() })
+
+    const { result } = renderHook(() => useSanctionedAddress())
+    expect(result.current).toEqual(mockSafeAddress)
+  })
+})
diff --git a/src/hooks/useSanctionedAddress.ts b/src/hooks/useSanctionedAddress.ts
@@ -0,0 +1,22 @@
+import { useGetIsSanctionedQuery } from '@/store/ofac'
+import useSafeAddress from './useSafeAddress'
+import useWallet from './wallets/useWallet'
+import { skipToken } from '@reduxjs/toolkit/query/react'
+
+export const useSanctionedAddress = () => {
+  const wallet = useWallet()
+  const safeAddress = useSafeAddress()
+
+  const { data: isWalletSanctioned } = useGetIsSanctionedQuery(wallet ? wallet.address : skipToken)
+
+  const { data: isSafeSanctioned } = useGetIsSanctionedQuery(safeAddress !== '' ? safeAddress : skipToken)
+
+  if (isSafeSanctioned) {
+    return safeAddress
+  }
+  if (isWalletSanctioned) {
+    return wallet?.address
+  }
+
+  return undefined
+}
diff --git a/src/store/ofac.ts b/src/store/ofac.ts
@@ -44,7 +44,7 @@ export const ofacApi = createApi({
   reducerPath: 'ofacApi',
   baseQuery: noopBaseQuery,
   endpoints: (builder) => ({
-    getIsSanctioned: builder.query({
+    getIsSanctioned: builder.query<boolean, string>({
       async queryFn(address, { getState }) {
         const state = getState()
         const chain = selectChainById(state as RootState, chains.eth)