fix: fail closed for RWA geoblocking

Author: fairlighteth

apps/cowswap-frontend/src/locales/en-US.po

@@ -899,6 +899,12 @@ msgstr "Unsupported Token"
 #~ msgid "Limit price (incl. costs)"
 #~ msgstr "Limit price (incl. costs)"
 
+#: apps/cowswap-frontend/src/modules/rwa/hooks/useImportTokenConsentFlow.tsx
+#: apps/cowswap-frontend/src/modules/tokensList/hooks/useRestrictedTokenImportStatus.ts
+#: apps/cowswap-frontend/src/modules/tokensList/hooks/useRestrictedTokensImportStatus.ts
+msgid "Checking token availability."
+msgstr "Checking token availability."
+
 #: apps/cowswap-frontend/src/modules/ordersTable/pure/ContextMenu/OrderContextMenu.pure.tsx
 msgid "Order receipt"
 msgstr "Order receipt"
@@ -1992,6 +1998,10 @@ msgstr "Import List"
 msgid "TWAP orders currently require a Safe with a special fallback handler. Have one? Switch to it! Need setup? <0>Click here</0>. Future updates may extend wallet support!"
 msgstr "TWAP orders currently require a Safe with a special fallback handler. Have one? Switch to it! Need setup? <0>Click here</0>. Future updates may extend wallet support!"
 
+#: apps/cowswap-frontend/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
+msgid "Checking token availability"
+msgstr "Checking token availability"
+
 #: apps/cowswap-frontend/src/modules/orderProgressBar/constants.ts
 msgid "CoW Swap was the first DEX to offer intent-based trading, gasless swaps, coincidences of wants, and many other DeFi innovations."
 msgstr "CoW Swap was the first DEX to offer intent-based trading, gasless swaps, coincidences of wants, and many other DeFi innovations."

apps/cowswap-frontend/src/modules/application/containers/App/Updaters.tsx

@@ -121,7 +121,7 @@ export function Updaters(): ReactNode {
         isYieldEnabled={isYieldEnabled}
         bridgeNetworkInfo={bridgeNetworkInfo?.data}
       />
-      <RestrictedTokensListUpdater isRwaGeoblockEnabled={!!isRwaGeoblockEnabled} />
+      <RestrictedTokensListUpdater isRwaGeoblockEnabled={isRwaGeoblockEnabled} />
       <BlockedListSourcesUpdater />
       <RecentTokensStorageUpdater />
       <GeoDataUpdater />

apps/cowswap-frontend/src/modules/ethFlow/containers/EthFlow/hooks/useEthFlowActions.ts

@@ -1,7 +1,7 @@
 import { useSetAtom } from 'jotai'
 import { useMemo } from 'react'
 
-import { WRAPPED_NATIVE_CURRENCIES } from '@cowprotocol/common-const'
+import { TokenWithLogo, WRAPPED_NATIVE_CURRENCIES } from '@cowprotocol/common-const'
 import { Command } from '@cowprotocol/types'
 import { useWalletInfo } from '@cowprotocol/wallet'
 
@@ -10,8 +10,9 @@ import { Field } from 'legacy/state/types'
 
 import { MAX_APPROVE_AMOUNT, TradeApproveCallback } from 'modules/erc20Approve'
 import { useIsInfiniteApproveDisabledInWidget } from 'modules/injectedWidget'
+import { RwaTokenStatus, useRwaConsentModalState, useRwaTokenStatus } from 'modules/rwa'
 import { useSwapPartialApprovalToggleState } from 'modules/swap/hooks/useSwapSettings'
-import { useOnCurrencySelection, useTradeConfirmActions } from 'modules/trade'
+import { useDerivedTradeState, useOnCurrencySelection, useTradeConfirmActions } from 'modules/trade'
 
 import { updateEthFlowContextAtom } from '../../../state/ethFlowContextAtom'
 
@@ -32,14 +33,21 @@ export interface EthFlowActions {
   directSwap(): void
 }
 
+// eslint-disable-next-line max-lines-per-function
 export function useEthFlowActions(callbacks: EthFlowActionCallbacks, amountToApprove?: bigint): EthFlowActions {
   const { chainId } = useWalletInfo()
+  const { outputCurrency } = useDerivedTradeState() || {}
 
   const updateEthFlowContext = useSetAtom(updateEthFlowContextAtom)
   const onCurrencySelection = useOnCurrencySelection()
   const { onOpen: openSwapConfirmModal } = useTradeConfirmActions()
+  const { openModal: openRwaConsentModal } = useRwaConsentModalState()
   const [isPartialApproveEnabledBySettings] = useSwapPartialApprovalToggleState()
   const isInfiniteApproveDisabledInWidget = useIsInfiniteApproveDisabledInWidget()
+  const { status: rwaStatus, rwaTokenInfo } = useRwaTokenStatus({
+    inputCurrency: WRAPPED_NATIVE_CURRENCIES[chainId],
+    outputCurrency,
+  })
 
   return useMemo(() => {
     function sendTransaction(type: 'approve' | 'wrap', callback: () => Promise<string | undefined>): Promise<void> {
@@ -61,6 +69,19 @@ export function useEthFlowActions(callbacks: EthFlowActionCallbacks, amountToApp
     }
 
     const swap = async (): Promise<void> => {
+      if (rwaStatus === RwaTokenStatus.ChecksPending || rwaStatus === RwaTokenStatus.Restricted) {
+        return
+      }
+
+      if (rwaStatus === RwaTokenStatus.RequiredConsent && rwaTokenInfo) {
+        callbacks.dismiss()
+        openRwaConsentModal({
+          consentHash: rwaTokenInfo.consentHash,
+          token: TokenWithLogo.fromToken(rwaTokenInfo.token),
+        })
+        return
+      }
+
       callbacks.dismiss()
       onCurrencySelection(Field.INPUT, WRAPPED_NATIVE_CURRENCIES[chainId], () => {
         openSwapConfirmModal(true)
@@ -114,8 +135,11 @@ export function useEthFlowActions(callbacks: EthFlowActionCallbacks, amountToApp
     onCurrencySelection,
     chainId,
     openSwapConfirmModal,
+    openRwaConsentModal,
     isPartialApproveEnabledBySettings,
     isInfiniteApproveDisabledInWidget,
     amountToApprove,
+    rwaStatus,
+    rwaTokenInfo,
   ])
 }

apps/cowswap-frontend/src/modules/rwa/containers/RwaConsentModalContainer/index.tsx

@@ -3,12 +3,17 @@ import { ReactNode, useCallback, useMemo } from 'react'
 import { useWalletInfo } from '@cowprotocol/wallet'
 
 import { RwaConsentKey, RwaConsentModal, useRwaConsentModalState, useRwaConsentStatus } from 'modules/rwa'
-import { useTradeConfirmActions } from 'modules/trade'
+import { useDerivedTradeState, useTradeConfirmActions } from 'modules/trade'
+
+import { RwaTokenStatus, useRwaTokenStatus } from '../../hooks/useRwaTokenStatus'
 
 export function RwaConsentModalContainer(): ReactNode {
   const { account } = useWalletInfo()
   const { isModalOpen, closeModal, context } = useRwaConsentModalState()
   const tradeConfirmActions = useTradeConfirmActions()
+  const derivedState = useDerivedTradeState()
+  const { inputCurrency, outputCurrency } = derivedState || {}
+  const { status: currentRwaStatus } = useRwaTokenStatus({ inputCurrency, outputCurrency })
 
   const consentKey: RwaConsentKey | null = useMemo(() => {
     if (!context || !account) {
@@ -32,17 +37,22 @@ export function RwaConsentModalContainer(): ReactNode {
       return
     }
 
-    confirmConsent()
-    closeModal()
-
     // if this is a token import flow, call the success callback to proceed to import modal
     // if this is a trade flow, open the trade confirmation
     if (context.onImportSuccess) {
+      confirmConsent()
+      closeModal()
       context.onImportSuccess()
     } else {
+      if (currentRwaStatus === RwaTokenStatus.ChecksPending || currentRwaStatus === RwaTokenStatus.Restricted) {
+        return
+      }
+
+      confirmConsent()
+      closeModal()
       tradeConfirmActions.onOpen()
     }
-  }, [account, context, consentKey, confirmConsent, closeModal, tradeConfirmActions])
+  }, [account, context, consentKey, confirmConsent, closeModal, currentRwaStatus, tradeConfirmActions])
 
   if (!isModalOpen || !context) {
     return null

apps/cowswap-frontend/src/modules/rwa/hooks/useImportTokenConsentFlow.tsx

@@ -12,13 +12,13 @@ import { useImportTokenWithConsent } from './useImportTokenWithConsent'
 
 import { RwaConsentModal } from '../pure/RwaConsentModal'
 
-function getRestrictedFlowResult(): CustomFlowResult<TokenSelectorView.ImportToken> {
+function getBlockedFlowResult(message: string): CustomFlowResult<TokenSelectorView.ImportToken> {
   return {
     content: null,
     data: {
       restriction: {
         isBlocked: true,
-        message: t`This token is not available in your region.`,
+        message,
       },
     },
   }
@@ -38,7 +38,11 @@ export function useImportTokenConsentFlow(): ViewFlowConfig<TokenSelectorView.Im
       if (!tokenToImport) return null
 
       if (rwaStatus === 'restricted') {
-        return getRestrictedFlowResult()
+        return getBlockedFlowResult(t`This token is not available in your region.`)
+      }
+
+      if (rwaStatus === 'checks-pending') {
+        return getBlockedFlowResult(t`Checking token availability.`)
       }
 
       // Don't show consent modal to non-connected users - they can import the token

apps/cowswap-frontend/src/modules/rwa/hooks/useImportTokenRwaCheck.ts

@@ -6,7 +6,7 @@ import { useSelectTokenWidgetState } from 'modules/tokensList'
 
 import { useRwaTokenStatus, RwaTokenStatus, RwaTokenInfo } from './useRwaTokenStatus'
 
-type ImportTokenRwaStatus = 'allowed' | 'restricted' | 'requires-consent' | null
+type ImportTokenRwaStatus = 'allowed' | 'restricted' | 'requires-consent' | 'checks-pending' | null
 
 interface UseImportTokenRwaCheckResult {
   tokenToImport: TokenWithLogo | undefined
@@ -16,6 +16,7 @@ interface UseImportTokenRwaCheckResult {
 
 const RWA_STATUS_MAP: Readonly<Record<RwaTokenStatus, ImportTokenRwaStatus>> = {
   [RwaTokenStatus.Allowed]: 'allowed',
+  [RwaTokenStatus.ChecksPending]: 'checks-pending',
   [RwaTokenStatus.Restricted]: 'restricted',
   [RwaTokenStatus.RequiredConsent]: 'requires-consent',
   [RwaTokenStatus.ConsentIsSigned]: 'allowed',