@imtbl/checkout-widgets 2.4.14-alpha.1 → 2.4.14-alpha.3

package/dist/types/functions/checkSanctionedAddresses.d.ts

@@ -1,2 +1,7 @@
 import { CheckoutConfiguration } from '@imtbl/checkout-sdk';
-export declare const checkSanctionedAddresses: (addresses: string[], config: CheckoutConfiguration) => Promise<boolean>;
+type TokenAmount = {
+    address: string;
+    amount: bigint;
+};
+export declare const checkSanctionedAddresses: (addresses: string[], amount: TokenAmount, config: CheckoutConfiguration) => Promise<boolean>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imtbl/checkout-widgets",
-  "version": "2.4.14-alpha.1",
+  "version": "2.4.14-alpha.3",
   "browserslist": {
     "production": [
       ">0.2%",
@@ -18,12 +18,12 @@
     "@biom3/design-tokens": "^0.4.5",
     "@biom3/react": "^0.29.4",
     "@emotion/react": "^11.11.3",
-    "@imtbl/bridge-sdk": "2.4.14-alpha.1",
-    "@imtbl/checkout-sdk": "2.4.14-alpha.1",
-    "@imtbl/config": "2.4.14-alpha.1",
-    "@imtbl/cryptofiat": "2.4.14-alpha.1",
-    "@imtbl/dex-sdk": "2.4.14-alpha.1",
-    "@imtbl/passport": "2.4.14-alpha.1",
+    "@imtbl/bridge-sdk": "2.4.14-alpha.3",
+    "@imtbl/checkout-sdk": "2.4.14-alpha.3",
+    "@imtbl/config": "2.4.14-alpha.3",
+    "@imtbl/cryptofiat": "2.4.14-alpha.3",
+    "@imtbl/dex-sdk": "2.4.14-alpha.3",
+    "@imtbl/passport": "2.4.14-alpha.3",
     "@imtbl/react-analytics": "0.3.2-alpha",
     "@rive-app/react-canvas-lite": "^4.9.0",
     "@walletconnect/ethereum-provider": "^2.11.1",

package/src/functions/checkSanctionedAddresses.ts

@@ -1,13 +1,24 @@
 import {
   CheckoutConfiguration,
-  fetchRiskAssessment,
-  isAddressSanctioned,
+  fetchRiskAssessmentV2,
+  resultHasSanctionedWallets,
 } from '@imtbl/checkout-sdk';
 
+type TokenAmount = {
+  address: string;
+  amount: bigint;
+};
+
 export const checkSanctionedAddresses = async (
   addresses: string[],
+  amount: TokenAmount,
   config: CheckoutConfiguration,
 ): Promise<boolean> => {
-  const result = await fetchRiskAssessment(addresses, config);
-  return isAddressSanctioned(result, undefined);
+  const assessmentData = addresses.map((address) => ({
+    address,
+    amount: amount.amount,
+    tokenAddr: amount.address,
+  }));
+  const result = await fetchRiskAssessmentV2(assessmentData, config);
+  return resultHasSanctionedWallets(result);
 };

package/src/widgets/add-tokens/views/AddTokens.tsx

@@ -30,6 +30,7 @@ import {
 import { useTranslation } from 'react-i18next';
 import { ActionType } from '@0xsquid/squid-types';
 import { trackFlow } from '@imtbl/metrics';
+import { parseUnits } from 'ethers/utils';
 import { SimpleLayout } from '../../../components/SimpleLayout/SimpleLayout';
 import { EventTargetContext } from '../../../context/event-target-context/EventTargetContext';
 import {
@@ -423,23 +424,6 @@ export function AddTokens({
   }, [checkout, id]);
 
   const sendRequestOnRampEvent = async () => {
-    if (
-      toAddress
-      && (await checkSanctionedAddresses([toAddress], checkout.config))
-    ) {
-      viewDispatch({
-        payload: {
-          type: ViewActions.UPDATE_VIEW,
-          view: {
-            type: SharedViews.SERVICE_UNAVAILABLE_ERROR_VIEW,
-            error: new Error('Sanctioned address'),
-          },
-        },
-      });
-
-      return;
-    }
-
     track({
       userJourney: UserJourney.ADD_TOKENS,
       screen: 'InputScreen',
@@ -501,6 +485,7 @@ export function AddTokens({
       && toAddress
       && (await checkSanctionedAddresses(
         [fromAddress, toAddress],
+        { address: selectedToken.address, amount: parseUnits(selectedAmount, selectedToken.decimals) },
         checkout.config,
       ))
     ) {

package/src/widgets/bridge/components/BridgeForm.tsx

@@ -5,14 +5,17 @@ import {
   OptionKey,
 } from '@biom3/react';
 import {
-  fetchRiskAssessment,
+  fetchRiskAssessmentV2,
   GetBalanceResult, WidgetTheme,
+  resultHasSanctionedWallets,
 } from '@imtbl/checkout-sdk';
+import { parseUnits } from 'ethers';
 import {
   useCallback, useContext, useEffect, useMemo, useRef, useState,
 } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Environment } from '@imtbl/config';
+import { trackError } from '@imtbl/metrics';
 import { UserJourney, useAnalytics } from '../../../context/analytics-provider/SegmentAnalyticsProvider';
 import { amountInputValidation } from '../../../lib/validations/amountInputValidations';
 import { BridgeActions, BridgeContext } from '../context/BridgeContext';
@@ -62,6 +65,7 @@ export function BridgeForm(props: BridgeFormProps) {
       to,
       amount,
       token,
+      tokenBridge,
     },
   } = useContext(BridgeContext);
 
@@ -142,9 +146,7 @@ export function BridgeForm(props: BridgeFormProps) {
     tokenBalances,
     cryptoFiatState.conversions,
     defaultTokenAddress,
-    hasSetDefaultState.current,
     formatTokenOptionsId,
-    formatZeroAmount,
   ]);
 
   useEffect(() => {
@@ -168,36 +170,15 @@ export function BridgeForm(props: BridgeFormProps) {
         amount: '',
       },
     });
-  }, [amount, token, tokenBalances]);
+  }, [amount, token, tokenBalances, bridgeDispatch]);
 
   const selectedOption = useMemo(
     () => (formToken && formToken.token
       ? formatTokenOptionsId(formToken.token.symbol, formToken.token.address)
       : undefined),
-    [formToken, tokenBalances, cryptoFiatState.conversions, formatTokenOptionsId],
+    [formToken, formatTokenOptionsId],
   );
 
-  useEffect(() => {
-    if (!checkout || !from || !to) {
-      return;
-    }
-
-    (async () => {
-      const addresses = [from.walletAddress];
-      if (to.walletAddress.toLowerCase() !== from.walletAddress.toLowerCase()) {
-        addresses.push(to.walletAddress);
-      }
-
-      const assessment = await fetchRiskAssessment(addresses, checkout.config);
-      bridgeDispatch({
-        payload: {
-          type: BridgeActions.SET_RISK_ASSESSMENT,
-          riskAssessment: assessment,
-        },
-      });
-    })();
-  }, [checkout, from, to]);
-
   const canFetchEstimates = (silently: boolean): boolean => {
     if (Number.isNaN(parseFloat(formAmount))) return false;
     if (parseFloat(formAmount) <= 0) return false;
@@ -255,7 +236,7 @@ export function BridgeForm(props: BridgeFormProps) {
       formToken.token.symbol,
       cryptoFiatState.conversions,
     ));
-  }, [formAmount, formToken]);
+  }, [formAmount, formToken, cryptoFiatState.conversions]);
 
   const bridgeFormValidator = useCallback((): boolean => {
     const validateTokenError = validateToken(formToken);
@@ -266,10 +247,73 @@ export function BridgeForm(props: BridgeFormProps) {
     return true;
   }, [formToken, formAmount, setTokenError, setAmountError]);
 
+  const getRiskAssessment = useCallback(async () => {
+    if (!from || !to || !formToken || !formAmount || !tokenBridge || !formToken.token.address) return false;
+
+    const addresses = [from.walletAddress];
+    if (to.walletAddress.toLowerCase() !== from.walletAddress.toLowerCase()) {
+      addresses.push(to.walletAddress);
+    }
+
+    // Determine if we're bridging from L1 to L2 (deposit)
+    const isDeposit = checkout.config.l2ChainId === to.network && from.network === checkout.config.l1ChainId;
+
+    let tokenAddress = formToken.token.address;
+
+    // If we are bridging IN from L1 to L2, we need to find the token address on our chain
+    if (isDeposit) {
+      try {
+        const tokenMapping = await tokenBridge.getTokenMapping({
+          rootToken: formToken.token.address,
+          rootChainId: from.network.toString(),
+          childChainId: to.network.toString(),
+        });
+
+        if (!tokenMapping.childToken) {
+          throw new Error(`Token mapping not found for deposit token ${formToken.token.address}`);
+        }
+
+        // Use child token address if mapping exists, otherwise use original token address
+        tokenAddress = tokenMapping.childToken;
+      } catch (error) {
+        trackError('commerce', 'bridgeForm', error instanceof Error ? error : new Error(String(error)));
+      }
+    }
+
+    // Create risk assessment data array
+    const riskAssessmentData = [{
+      address: from.walletAddress,
+      tokenAddr: tokenAddress,
+      amount: parseUnits(formAmount, formToken.token.decimals),
+    }];
+
+    // Add second wallet if different
+    if (to.walletAddress.toLowerCase() !== from.walletAddress.toLowerCase()) {
+      riskAssessmentData.push({
+        address: to.walletAddress,
+        tokenAddr: tokenAddress,
+        amount: parseUnits(formAmount, formToken.token.decimals),
+      });
+    }
+
+    return fetchRiskAssessmentV2(riskAssessmentData, checkout.config);
+  }, [from, to, formToken, formAmount, tokenBridge, checkout]);
+
   const submitBridgeValues = useCallback(async () => {
     if (!bridgeFormValidator()) return;
     if (!checkout || !from?.browserProvider || !formToken) return;
 
+    // perform sanctions check
+    const riskAssessment = await getRiskAssessment();
+    if (riskAssessment && resultHasSanctionedWallets(riskAssessment)) {
+      bridgeDispatch({
+        payload: {
+          type: BridgeActions.SET_RISK_ASSESSMENT,
+          riskAssessment,
+        },
+      });
+    }
+
     track({
       userJourney: UserJourney.BRIDGE,
       screen: 'TokenAmount',
@@ -298,10 +342,15 @@ export function BridgeForm(props: BridgeFormProps) {
       },
     });
   }, [
-    checkout,
-    from?.browserProvider,
+    bridgeDispatch,
     bridgeFormValidator,
+    checkout,
+    formAmount,
     formToken,
+    from,
+    getRiskAssessment,
+    track,
+    viewDispatch,
   ]);
 
   const retrySubmitBridgeValues = async () => {