fix: resolve locale message merge conflicts

Author: AGMASO

src/components/AddressBlocked.tsx

@@ -11,12 +11,17 @@ export const AddressBlocked = ({ children }: { children: ReactNode }) => {
   const { currentAccount, readOnlyMode } = useWeb3Context();
   const { disconnect } = useDisconnect();
   const screenAddress = readOnlyMode || ENABLE_TESTNET ? '' : currentAccount;
-  const { isAllowed } = useAddressAllowed(screenAddress);
+  const { isAllowed, message } = useAddressAllowed(screenAddress);
 
   if (!isAllowed) {
     return (
       <MainLayout>
-        <AddressBlockedModal address={currentAccount} onDisconnectWallet={() => disconnect()} />;
+        <AddressBlockedModal
+          address={currentAccount}
+          onDisconnectWallet={() => disconnect()}
+          message={message}
+        />
+        ;
       </MainLayout>
     );
   }

src/components/AddressBlockedModal.tsx

@@ -1,15 +1,20 @@
 import { ExclamationCircleIcon, LogoutIcon } from '@heroicons/react/outline';
 import { Trans } from '@lingui/macro';
-import { Box, Button, SvgIcon, Typography } from '@mui/material';
+import { Box, Button, Link, SvgIcon, Typography } from '@mui/material';
 
 import { BasicModal } from './primitives/BasicModal';
 
 export interface AddressBlockedProps {
   address: string;
   onDisconnectWallet: () => void;
+  message?: string;
 }
 
-export const AddressBlockedModal = ({ address, onDisconnectWallet }: AddressBlockedProps) => {
+export const AddressBlockedModal = ({
+  address,
+  onDisconnectWallet,
+  message,
+}: AddressBlockedProps) => {
   // eslint-disable-next-line @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars
   const setOpen = (_value: boolean) => {}; // ignore, we want the modal to not be dismissable
 
@@ -27,13 +32,25 @@ export const AddressBlockedModal = ({ address, onDisconnectWallet }: AddressBloc
           <ExclamationCircleIcon />
         </SvgIcon>
         <Typography variant="h2">
-          <Trans>Blocked Address</Trans>
+          {message ? <Trans>Connection Failed</Trans> : <Trans>Blocked Address</Trans>}
         </Typography>
         <Typography variant="helperText" sx={{ my: 4 }}>
           {address}
         </Typography>
         <Typography variant="description" sx={{ textAlign: 'center', mb: 4 }}>
-          <Trans>This address is blocked on app.aave.com.</Trans>
+          {message ? (
+            message
+          ) : (
+            <>
+              <Trans>
+                This address is blocked on app.aave.com because it is associated with one or more
+              </Trans>{' '}
+              <Link href="https://docs.aave.com/faq/#address-screening" underline="always">
+                <Trans>blocked activities</Trans>
+              </Link>
+              {'.'}
+            </>
+          )}
         </Typography>
         <Button variant="contained" onClick={onDisconnectWallet}>
           <SvgIcon fontSize="small" sx={{ mx: 1 }}>

src/hooks/useAddressAllowed.tsx

@@ -4,12 +4,14 @@ import { usePolling } from './usePolling';
 
 export interface AddressAllowedResult {
   isAllowed: boolean;
+  message?: string;
 }
 
 const TWO_MINUTES = 2 * 60 * 1000;
 
 export const useAddressAllowed = (address: string): AddressAllowedResult => {
   const [isAllowed, setIsAllowed] = useState(true);
+  const [message, setMessage] = useState<string | undefined>(undefined);
 
   const screeningUrl = `${process.env.NEXT_PUBLIC_API_BASEURL}/addresses/status`;
   const queryParams = `?address=${address}`;
@@ -19,8 +21,9 @@ export const useAddressAllowed = (address: string): AddressAllowedResult => {
       try {
         const response = await fetch(screeningUrl + queryParams);
         if (response.ok) {
-          const data: { addressAllowed: boolean } = await response.json();
+          const data: { addressAllowed: boolean; message?: string } = await response.json();
           setIsAllowed(data.addressAllowed);
+          setMessage(data.message);
         }
       } catch (e) {}
     } else {
@@ -32,5 +35,6 @@ export const useAddressAllowed = (address: string): AddressAllowedResult => {
 
   return {
     isAllowed,
+    message,
   };
 };

src/locales/el/messages.js

@@ -1869,6 +1869,10 @@ msgstr "Borrow balance after switch"
 msgid "Asset has been successfully sent to CCIP contract. You can check the status of the transactions below"
 msgstr "Asset has been successfully sent to CCIP contract. You can check the status of the transactions below"
 
+#: src/components/AddressBlockedModal.tsx
+msgid "blocked activities"
+msgstr "blocked activities"
+
 #: pages/500.page.tsx
 msgid "Reload the page"
 msgstr "Reload the page"
@@ -2415,10 +2419,6 @@ msgstr "Action requires an active reserve"
 msgid "Amount to unstake"
 msgstr "Amount to unstake"
 
-#: src/components/AddressBlockedModal.tsx
-msgid "This address is blocked on app.aave.com."
-msgstr "This address is blocked on app.aave.com."
-
 #: src/components/infoTooltips/SlippageTooltip.tsx
 msgid "Slippage is the difference between the quoted and received amounts from changing market conditions between the moment the transaction is submitted and its verification."
 msgstr "Slippage is the difference between the quoted and received amounts from changing market conditions between the moment the transaction is submitted and its verification."
@@ -2558,6 +2558,10 @@ msgstr "Please connect your wallet to get free testnet assets."
 msgid "Approve Confirmed"
 msgstr "Approve Confirmed"
 
+#: src/components/AddressBlockedModal.tsx
+msgid "This address is blocked on app.aave.com because it is associated with one or more"
+msgstr "This address is blocked on app.aave.com because it is associated with one or more"
+
 #: src/ui-config/errorMapping.tsx
 msgid "Zero address not valid"
 msgstr "Zero address not valid"
@@ -3186,6 +3190,10 @@ msgstr "The caller of this function must be a pool"
 msgid "Migrate to V3"
 msgstr "Migrate to V3"
 
+#: src/components/AddressBlockedModal.tsx
+msgid "Connection Failed"
+msgstr "Connection Failed"
+
 #: src/modules/reserve-overview/ReserveConfiguration.tsx
 msgid "Interest rate strategy"
 msgstr "Interest rate strategy"