feat: show conesnts before import modal

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

@@ -236,8 +236,8 @@ msgid "Your TWAP order won't execute and is protected if the market price dips m
 msgstr "Your TWAP order won't execute and is protected if the market price dips more than your set price protection."
 
 #: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
-msgid "If you fall into any of these categories, select Cancel."
-msgstr "If you fall into any of these categories, select Cancel."
+#~ msgid "If you fall into any of these categories, select Cancel."
+#~ msgstr "If you fall into any of these categories, select Cancel."
 
 #: apps/cowswap-frontend/src/api/cowProtocol/errors/OperatorError.ts
 msgid "The order cannot be {statusText}. Your account is deny-listed."
@@ -542,8 +542,8 @@ msgid "(modified)"
 msgstr "(modified)"
 
 #: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
-msgid "A resident of any jurisdiction where trading securities or cryptographic tokens is regulated or prohibited by applicable laws."
-msgstr "A resident of any jurisdiction where trading securities or cryptographic tokens is regulated or prohibited by applicable laws."
+#~ msgid "A resident of any jurisdiction where trading securities or cryptographic tokens is regulated or prohibited by applicable laws."
+#~ msgstr "A resident of any jurisdiction where trading securities or cryptographic tokens is regulated or prohibited by applicable laws."
 
 #: apps/cowswap-frontend/src/modules/limitOrders/pure/DeadlineSelector/deadlines.ts
 #: apps/cowswap-frontend/src/modules/twap/const.ts
@@ -583,8 +583,8 @@ msgid "When selling {aNativeCurrency}, the minimum slippage tolerance is set to
 msgstr "When selling {aNativeCurrency}, the minimum slippage tolerance is set to {minimumETHFlowSlippage}% or higher to ensure a high likelihood of order matching, even in volatile market conditions."
 
 #: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
-msgid "A U.S. Person or resident of the United States."
-msgstr "A U.S. Person or resident of the United States."
+#~ msgid "A U.S. Person or resident of the United States."
+#~ msgstr "A U.S. Person or resident of the United States."
 
 #: apps/cowswap-frontend/src/modules/account/pure/ConnectedAccountBlocked/index.tsx
 msgid "If you believe this is an error, please send an email including your address to "
@@ -1053,8 +1053,8 @@ msgid "Orders history"
 msgstr "Orders history"
 
 #: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
-msgid "We could not reliably determine your location (e.g., due to VPN or privacy settings). Access to {displaySymbol} is strictly limited to specific regions."
-msgstr "We could not reliably determine your location (e.g., due to VPN or privacy settings). Access to {displaySymbol} is strictly limited to specific regions."
+#~ msgid "We could not reliably determine your location (e.g., due to VPN or privacy settings). Access to {displaySymbol} is strictly limited to specific regions."
+#~ msgstr "We could not reliably determine your location (e.g., due to VPN or privacy settings). Access to {displaySymbol} is strictly limited to specific regions."
 
 #: apps/cowswap-frontend/src/modules/erc20Approve/pure/ApprovalTooltip/index.tsx
 msgid "You must give the CoW Protocol smart contracts permission to use your <0/>."
@@ -1365,8 +1365,8 @@ msgid "Please read more in this"
 msgstr "Please read more in this"
 
 #: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
-msgid "Additional confirmation required for this token"
-msgstr "Additional confirmation required for this token"
+#~ msgid "Additional confirmation required for this token"
+#~ msgstr "Additional confirmation required for this token"
 
 #: libs/hook-dapp-lib/src/hookDappsRegistry.ts
 #~ msgid "Bungee"
@@ -1530,8 +1530,8 @@ msgid "Enter a hook dapp URL"
 msgstr "Enter a hook dapp URL"
 
 #: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
-msgid "By clicking Confirm, you expressly represent and warrant that you are NOT:"
-msgstr "By clicking Confirm, you expressly represent and warrant that you are NOT:"
+#~ msgid "By clicking Confirm, you expressly represent and warrant that you are NOT:"
+#~ msgstr "By clicking Confirm, you expressly represent and warrant that you are NOT:"
 
 #: apps/cowswap-frontend/src/modules/ordersTable/pure/ReceiptModal/index.tsx
 #: apps/cowswap-frontend/src/modules/trade/pure/TotalFeeRow/index.tsx
@@ -1891,8 +1891,8 @@ msgid "Failed to cancel order selling {sellTokenSymbol}"
 msgstr "Failed to cancel order selling {sellTokenSymbol}"
 
 #: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
-msgid "You are solely responsible for complying with your local laws."
-msgstr "You are solely responsible for complying with your local laws."
+#~ msgid "You are solely responsible for complying with your local laws."
+#~ msgstr "You are solely responsible for complying with your local laws."
 
 #: apps/cowswap-frontend/src/modules/swap/containers/SwapConfirmModal/useLabelsAndTooltips.tsx
 #: apps/cowswap-frontend/src/modules/trade/containers/TradeBasicConfirmDetails/index.tsx
@@ -2007,8 +2007,8 @@ msgid "Creating..."
 msgstr "Creating..."
 
 #: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
-msgid "A resident of any country subject to international sanctions (e.g., OFAC, UN lists)."
-msgstr "A resident of any country subject to international sanctions (e.g., OFAC, UN lists)."
+#~ msgid "A resident of any country subject to international sanctions (e.g., OFAC, UN lists)."
+#~ msgstr "A resident of any country subject to international sanctions (e.g., OFAC, UN lists)."
 
 #: apps/cowswap-frontend/src/modules/hooksStore/pure/HookDappDetails/index.tsx
 msgid "{typeLabel} hooks are externally hosted code which needs to be independently verified by the user."
@@ -3423,8 +3423,8 @@ msgid "Wrap <0/> and Swap"
 msgstr "Wrap <0/> and Swap"
 
 #: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
-msgid "View full consent terms ↗"
-msgstr "View full consent terms ↗"
+#~ msgid "View full consent terms ↗"
+#~ msgstr "View full consent terms ↗"
 
 #: apps/cowswap-frontend/src/modules/twap/containers/TwapFormWarnings/warnings/BigPartTimeWarning.tsx
 msgid "A maximum of <0>{time}</0> between parts is required. Increase the number of parts or decrease the total duration."
@@ -3613,8 +3613,8 @@ msgid "Approving <0>{currencySymbolOrContext}</0> for trading"
 msgstr "Approving <0>{currencySymbolOrContext}</0> for trading"
 
 #: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
-msgid "A resident of the EU or EEA."
-msgstr "A resident of the EU or EEA."
+#~ msgid "A resident of the EU or EEA."
+#~ msgstr "A resident of the EU or EEA."
 
 #: apps/cowswap-frontend/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
 msgid "Couldn't load balances"
@@ -4185,7 +4185,6 @@ msgstr "Governance"
 #: apps/cowswap-frontend/src/modules/limitOrders/pure/DeadlineSelector/index.tsx
 #: apps/cowswap-frontend/src/modules/orderProgressBar/pure/TransactionSubmittedContent/index.tsx
 #: apps/cowswap-frontend/src/modules/ordersTable/containers/MultipleCancellationMenu/index.tsx
-#: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
 #: apps/cowswap-frontend/src/modules/twap/pure/CustomDeadlineSelector/index.tsx
 msgid "Cancel"
 msgstr "Cancel"
@@ -5962,8 +5961,8 @@ msgid "User rejected signing COW claim transaction"
 msgstr "User rejected signing COW claim transaction"
 
 #: apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx
-msgid "I Confirm"
-msgstr "I Confirm"
+#~ msgid "I Confirm"
+#~ msgstr "I Confirm"
 
 #: apps/cowswap-frontend/src/modules/account/containers/Transaction/StatusDetails.tsx
 #: apps/cowswap-frontend/src/modules/orderProgressBar/pure/TransactionSubmittedContent/index.tsx

apps/cowswap-frontend/src/modules/limitOrders/containers/TradeButtons/index.tsx

@@ -4,7 +4,7 @@ import { MessageDescriptor } from '@lingui/core'
 import { useLingui } from '@lingui/react/macro'
 
 import { useLimitOrdersWarningsAccepted } from 'modules/limitOrders/hooks/useLimitOrdersWarningsAccepted'
-import { useTradeConfirmActions } from 'modules/trade'
+import { useConfirmTradeWithRwaCheck } from 'modules/trade'
 import {
   TradeFormBlankButton,
   TradeFormButtons,
@@ -34,9 +34,8 @@ export function TradeButtons({ isTradeContextReady }: TradeButtonsProps) {
   const localFormValidation = useLimitOrdersFormState()
   const primaryFormValidation = useGetTradeFormValidation()
   const warningsAccepted = useLimitOrdersWarningsAccepted(false)
-  const tradeConfirmActions = useTradeConfirmActions()
 
-  const confirmTrade = tradeConfirmActions.onOpen
+  const { confirmTrade } = useConfirmTradeWithRwaCheck()
 
   const tradeFormButtonContext = useTradeFormButtonContext(CONFIRM_TEXT, confirmTrade)
 

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

@@ -2,13 +2,9 @@ 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 { useRwaConsentModalState } from '../../hooks/useRwaConsentModalState'
-import { useRwaConsentStatus } from '../../hooks/useRwaConsentStatus'
-import { RwaConsentModal } from '../../pure/RwaConsentModal'
-import { RwaConsentKey } from '../../types/rwaConsent'
-
 export function RwaConsentModalContainer(): ReactNode {
   const { account } = useWalletInfo()
   const { isModalOpen, closeModal, context } = useRwaConsentModalState()
@@ -37,7 +33,14 @@ export function RwaConsentModalContainer(): ReactNode {
 
     confirmConsent()
     closeModal()
-    tradeConfirmActions.onOpen()
+
+    // 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) {
+      context.onImportSuccess()
+    } else {
+      tradeConfirmActions.onOpen()
+    }
   }, [account, context, consentKey, confirmConsent, closeModal, tradeConfirmActions])
 
   if (!isModalOpen || !context) {

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

@@ -1,18 +1,14 @@
 import { useAtomValue, useSetAtom } from 'jotai'
 import { useCallback } from 'react'
 
-import { TokenWithLogo } from '@cowprotocol/common-const'
-
 import {
   rwaConsentModalStateAtom,
   updateRwaConsentModalStateAtom,
   RwaConsentModalState,
+  RwaConsentModalContext,
 } from '../state/rwaConsentModalStateAtom'
 
-export interface RwaConsentModalContext {
-  consentHash: string
-  token?: TokenWithLogo
-}
+export type { RwaConsentModalContext }
 
 export function useRwaConsentModalState(): {
   isModalOpen: boolean

apps/cowswap-frontend/src/modules/rwa/index.ts

@@ -5,6 +5,7 @@ export * from './state/geoDataAtom'
 export * from './hooks/useRwaConsentStatus'
 export * from './hooks/useRwaConsentModalState'
 export * from './hooks/useGeoCountry'
+export * from './hooks/useGeoStatus'
 export * from './hooks/useRwaTokenStatus'
 export * from './pure/RwaConsentModal'
 export * from './containers/RwaConsentModalContainer'

apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/index.tsx

@@ -4,30 +4,23 @@ import { TokenWithLogo } from '@cowprotocol/common-const'
 import { TokenLogo } from '@cowprotocol/tokens'
 import { ButtonPrimary, ButtonOutlined, ModalHeader } from '@cowprotocol/ui'
 
-import { Trans } from '@lingui/react/macro'
-
 import * as styledEl from './styled'
 
 export interface RwaConsentModalProps {
   onDismiss(): void
   onConfirm(): void
   token?: TokenWithLogo
-  consentHash: string
+  consentHash?: string
 }
 
-const IPFS_GATEWAY = 'https://ipfs.io/ipfs'
-
 export function RwaConsentModal(props: RwaConsentModalProps): ReactNode {
-  const { onDismiss, onConfirm, token, consentHash } = props
+  const { onDismiss, onConfirm, token } = props
 
   const displaySymbol = token?.symbol || 'this token'
-  const consentUrl = `${IPFS_GATEWAY}/${consentHash}`
 
   return (
     <styledEl.Wrapper>
-      <ModalHeader onClose={onDismiss}>
-        <Trans>Additional confirmation required for this token</Trans>
-      </ModalHeader>
+      <ModalHeader onClose={onDismiss}>Additional confirmation required for this token</ModalHeader>
       <styledEl.Contents>
         {token && (
           <styledEl.TokenBlock>
@@ -45,50 +38,27 @@ export function RwaConsentModal(props: RwaConsentModalProps): ReactNode {
         )}
         <styledEl.Body>
           <p>
-            <Trans>
-              We could not reliably determine your location (e.g., due to VPN or privacy settings). Access to{' '}
-              {displaySymbol} is strictly limited to specific regions.
-            </Trans>
+            We could not reliably determine your location (e.g., due to VPN or privacy settings). Access to{' '}
+            {displaySymbol} is strictly limited to specific regions.
           </p>
           <styledEl.AcknowledgementSection>
-            <p>
-              <Trans>By clicking Confirm, you expressly represent and warrant that you are NOT:</Trans>
-            </p>
+            <p>By clicking Confirm, you expressly represent and warrant that you are NOT:</p>
             <styledEl.BulletList>
+              <li>A U.S. Person or resident of the United States.</li>
+              <li>A resident of the EU or EEA.</li>
+              <li>A resident of any country subject to international sanctions (e.g., OFAC, UN lists).</li>
               <li>
-                <Trans>A U.S. Person or resident of the United States.</Trans>
-              </li>
-              <li>
-                <Trans>A resident of the EU or EEA.</Trans>
-              </li>
-              <li>
-                <Trans>A resident of any country subject to international sanctions (e.g., OFAC, UN lists).</Trans>
-              </li>
-              <li>
-                <Trans>
-                  A resident of any jurisdiction where trading securities or cryptographic tokens is regulated or
-                  prohibited by applicable laws.
-                </Trans>
+                A resident of any jurisdiction where trading securities or cryptographic tokens is regulated or
+                prohibited by applicable laws.
               </li>
             </styledEl.BulletList>
           </styledEl.AcknowledgementSection>
-          <p>
-            <Trans>If you fall into any of these categories, select Cancel.</Trans>
-          </p>
-          <p>
-            <Trans>You are solely responsible for complying with your local laws.</Trans>
-          </p>
-          <styledEl.ConsentLink href={consentUrl} target="_blank" rel="noopener noreferrer">
-            <Trans>View full consent terms ↗</Trans>
-          </styledEl.ConsentLink>
+          <p>If you fall into any of these categories, select Cancel.</p>
+          <p>You are solely responsible for complying with your local laws.</p>
         </styledEl.Body>
         <styledEl.ButtonContainer>
-          <ButtonPrimary onClick={onConfirm}>
-            <Trans>I Confirm</Trans>
-          </ButtonPrimary>
-          <ButtonOutlined onClick={onDismiss}>
-            <Trans>Cancel</Trans>
-          </ButtonOutlined>
+          <ButtonPrimary onClick={onConfirm}>I Confirm</ButtonPrimary>
+          <ButtonOutlined onClick={onDismiss}>Cancel</ButtonOutlined>
         </styledEl.ButtonContainer>
       </styledEl.Contents>
     </styledEl.Wrapper>

apps/cowswap-frontend/src/modules/rwa/pure/RwaConsentModal/styled.ts

@@ -100,24 +100,3 @@ export const ButtonContainer = styled.div`
     min-height: 56px;
   }
 `
-
-export const ConsentLink = styled.a`
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  color: var(${UI.COLOR_PRIMARY});
-  font-size: 13px;
-  text-decoration: none;
-  opacity: 0.8;
-  transition: opacity 0.15s ease-in-out;
-
-  &:hover {
-    opacity: 1;
-    text-decoration: underline;
-  }
-
-  > svg {
-    width: 12px;
-    height: 12px;
-  }
-`

apps/cowswap-frontend/src/modules/rwa/state/rwaConsentModalStateAtom.ts

@@ -3,12 +3,16 @@ import { atom } from 'jotai'
 import { TokenWithLogo } from '@cowprotocol/common-const'
 import { atomWithPartialUpdate } from '@cowprotocol/common-utils'
 
+export interface RwaConsentModalContext {
+  consentHash: string
+  token?: TokenWithLogo
+  pendingImportTokens?: TokenWithLogo[]
+  onImportSuccess?: () => void
+}
+
 export interface RwaConsentModalState {
   isModalOpen: boolean
-  context?: {
-    consentHash: string
-    token?: TokenWithLogo
-  }
+  context?: RwaConsentModalContext
 }
 
 const initialRwaConsentModalState: RwaConsentModalState = {