fix: refactor blockaid metrics sync functions to async

app/components/UI/Navbar/index.js

@@ -533,10 +533,10 @@ export function getSendFlowTitle(
       elevation: 0,
     },
   });
-  const rightAction = () => {
+  const rightAction = async () => {
     const providerType = route?.params?.providerType ?? '';
     const additionalTransactionMetricsParams =
-      getBlockaidTransactionMetricsParams(transaction);
+      await getBlockaidTransactionMetricsParams(transaction);
     trackEvent(MetaMetricsEvents.SEND_FLOW_CANCEL, {
       view: title.split('.')[1],
       network: providerType,

app/components/Views/Notifications/Details/index.test.tsx

@@ -17,6 +17,10 @@ const mockInitialState = {
   },
 };
 
+jest.mock('../../../../lib/ppom/ppom-util', () => ({
+  isChainSupported: jest.fn().mockResolvedValue(true),
+}));
+
 jest.mock('../../../../actions/alert', () => ({
   showAlert: jest.fn(),
 }));

app/components/Views/confirmations/Approval/index.js

@@ -43,7 +43,7 @@ import { providerErrors } from '@metamask/rpc-errors';
 import { getDeviceId } from '../../../../core/Ledger/Ledger';
 import { selectShouldUseSmartTransaction } from '../../../../selectors/smartTransactionsController';
 import ExtendedKeyringTypes from '../../../../constants/keyringTypes';
-import { getBlockaidMetricsParams } from '../../../../util/blockaid';
+import { getBlockaidTransactionMetricsParams } from '../../../../util/blockaid';
 import { getDecimalChainId } from '../../../../util/networks';
 
 import { updateTransaction } from '../../../../util/transaction-controller';
@@ -305,22 +305,6 @@ class Approval extends PureComponent {
     };
   };
 
-  getBlockaidMetricsParams = () => {
-    const { transaction } = this.props;
-
-    let blockaidParams = {};
-
-    if (
-      transaction.id === transaction.currentTransactionSecurityAlertResponse?.id
-    ) {
-      blockaidParams = getBlockaidMetricsParams(
-        transaction.currentTransactionSecurityAlertResponse?.response,
-      );
-    }
-
-    return blockaidParams;
-  };
-
   getAnalyticsParams = ({ gasEstimateType, gasSelected } = {}) => {
     try {
       const {
@@ -388,15 +372,16 @@ class Approval extends PureComponent {
     });
   };
 
-  onCancel = () => {
+  onCancel = async () => {
+    const { transaction } = this.props;
     this.props.hideModal();
     this.state.mode === REVIEW && this.trackOnCancel();
     this.showWalletConnectNotification();
     this.props.metrics.trackEvent(
       MetaMetricsEvents.DAPP_TRANSACTION_CANCELLED,
       {
         ...this.getAnalyticsParams(),
-        ...this.getBlockaidMetricsParams(),
+        ...(await getBlockaidTransactionMetricsParams(transaction)),
         ...this.getTransactionMetrics(),
       },
     );
@@ -553,7 +538,7 @@ class Approval extends PureComponent {
           gasEstimateType,
           gasSelected,
         }),
-        ...this.getBlockaidMetricsParams(),
+        ...(await getBlockaidTransactionMetricsParams(transaction)),
         ...this.getTransactionMetrics(),
       },
     );

app/components/Views/confirmations/Send/index.js

@@ -698,7 +698,7 @@ class Send extends PureComponent {
    *
    * @return {object} - Object containing view, network type, activeCurrency and assetType
    */
-  getTrackingParams = () => {
+  getTrackingParams = async () => {
     const {
       networkType,
       transaction,
@@ -714,7 +714,7 @@ class Send extends PureComponent {
           (selectedAsset.symbol || selectedAsset.contractName)) ||
         'ETH',
       assetType,
-      ...getBlockaidTransactionMetricsParams(transaction),
+      ...(await getBlockaidTransactionMetricsParams(transaction)),
       is_smart_transaction: shouldUseSmartTransaction,
     };
   };

app/components/Views/confirmations/SendFlow/Confirm/index.js

@@ -469,7 +469,10 @@ class Confirm extends PureComponent {
 
     this.setState({ result, transactionMeta });
 
-    if (isBlockaidFeatureEnabled()) {
+    const isBlockaidEnabled = await isBlockaidFeatureEnabled();
+    this.setState({ isBlockaidFeatureEnabled: isBlockaidEnabled });
+
+    if (isBlockaidEnabled) {
       // start validate ppom
       const id = transactionMeta.id;
       const reqObject = {
@@ -899,7 +902,7 @@ class Confirm extends PureComponent {
                 assetType,
                 {
                   ...this.getAnalyticsParams(),
-                  ...getBlockaidTransactionMetricsParams(transaction),
+                  ...(await getBlockaidTransactionMetricsParams(transaction)),
                   ...this.getTransactionMetrics(),
                 },
               ),
@@ -928,7 +931,7 @@ class Confirm extends PureComponent {
         throw transactionMeta.error;
       }
 
-      InteractionManager.runAfterInteractions(() => {
+      InteractionManager.runAfterInteractions(async () => {
         NotificationManager.watchSubmittedTransaction({
           ...transactionMeta,
           assetType,
@@ -938,7 +941,7 @@ class Confirm extends PureComponent {
           MetaMetricsEvents.SEND_TRANSACTION_COMPLETED,
           {
             ...this.getAnalyticsParams(transactionMeta),
-            ...getBlockaidTransactionMetricsParams(transaction),
+            ...(await getBlockaidTransactionMetricsParams(transaction)),
             ...this.getTransactionMetrics(),
           },
         );
@@ -1158,11 +1161,11 @@ class Confirm extends PureComponent {
     });
   };
 
-  onContactUsClicked = () => {
+  onContactUsClicked = async () => {
     const { transaction } = this.props;
     const analyticsParams = {
       ...this.getAnalyticsParams(),
-      ...getBlockaidTransactionMetricsParams(transaction),
+      ...(await getBlockaidTransactionMetricsParams(transaction)),
       external_link_clicked: 'security_alert_support_link',
     };
     this.props.metrics.trackEvent(
@@ -1259,6 +1262,7 @@ class Confirm extends PureComponent {
       EIP1559GasObject,
       EIP1559GasTransaction,
       legacyGasObject,
+      isBlockaidFeatureEnabled,
     } = this.state;
     const colors = this.context.colors || mockTheme.colors;
     const styles = createStyles(colors);
@@ -1292,7 +1296,7 @@ class Confirm extends PureComponent {
           layout="vertical"
         />
         <ScrollView style={baseStyles.flexGrow} ref={this.setScrollViewRef}>
-          {isBlockaidFeatureEnabled() && this.state.transactionMeta?.id && (
+          {isBlockaidFeatureEnabled && this.state.transactionMeta?.id && (
             <TransactionBlockaidBanner
               transactionId={this.state.transactionMeta.id}
               style={styles.blockaidBanner}

app/components/Views/confirmations/SendFlow/Confirm/index.test.tsx

@@ -105,6 +105,7 @@ jest.mock('../../../../../util/ENSUtils', () => ({
 jest.mock('../../../../../lib/ppom/ppom-util', () => ({
   ...jest.requireActual('../../../../../lib/ppom/ppom-util'),
   validateRequest: jest.fn(),
+  isChainSupported: jest.fn(),
 }));
 
 jest.mock('../../../../../core/Engine', () => ({

app/components/Views/confirmations/components/BlockaidBanner/BlockaidBanner.tsx

@@ -17,7 +17,6 @@ import {
 import Icon from '../../../../../component-library/components/Icons/Icon/Icon';
 import Text from '../../../../../component-library/components/Texts/Text/Text';
 import { useStyles } from '../../../../../component-library/hooks/useStyles';
-import { isBlockaidFeatureEnabled } from '../../../../../util/blockaid';
 import {
   FALSE_POSITIVE_REPOST_LINE_TEST_ID,
   REASON_DESCRIPTION_I18N_KEY_MAP,
@@ -109,7 +108,7 @@ const BlockaidBanner = (bannerProps: BlockaidBannerProps) => {
     })();
   }, [securityAlertResponse]);
 
-  if (!securityAlertResponse || !isBlockaidFeatureEnabled()) {
+  if (!securityAlertResponse) {
     return null;
   }
 

app/components/Views/confirmations/components/BlockaidBanner/BlockaidBanner.types.ts

@@ -44,7 +44,7 @@ export interface SecurityAlertResponse {
 type BlockaidBannerAllProps = BannerAlertProps & {
   securityAlertResponse?: SecurityAlertResponse;
   onToggleShowDetails?: () => void;
-  onContactUsClicked?: () => void;
+  onContactUsClicked?: () => Promise<void>;
 };
 
 export type BlockaidBannerProps = Omit<BlockaidBannerAllProps, 'severity'>;

app/components/Views/confirmations/components/BlockaidBanner/BlockaidBannerLink.tsx

@@ -18,20 +18,24 @@ const BlockaidBannerLink = ({
 }: {
   text: string;
   link: string;
-  onContactUsClicked?: () => void | undefined;
+  onContactUsClicked?: () => Promise<void>;
 }) => {
   const { colors } = useTheme();
   const styles = createStyles(colors);
 
+  const handlePress = async () => {
+    if (onContactUsClicked) {
+      await onContactUsClicked();
+    }
+    Linking.openURL(link);
+  };
+
   return (
     <Text
       suppressHighlighting
       style={styles.attributionLink}
       variant={DEFAULT_BANNERBASE_DESCRIPTION_TEXTVARIANT}
-      onPress={() => {
-        onContactUsClicked?.();
-        Linking.openURL(link);
-      }}
+      onPress={handlePress}
     >
       {text}
     </Text>

app/components/Views/confirmations/components/MessageSign/MessageSign.tsx

@@ -87,18 +87,27 @@ const MessageSign = ({
   const styles = createStyles(colors);
 
   useEffect(() => {
-    trackEvent(
-      MetaMetricsEvents.SIGNATURE_REQUESTED,
-      getAnalyticsParams(messageParams, 'eth_sign'),
-    );
+    const trackSignatureRequested = async () => {
+      const analyticsParams = await getAnalyticsParams(
+        messageParams,
+        'eth_sign',
+      );
+      trackEvent(MetaMetricsEvents.SIGNATURE_REQUESTED, analyticsParams);
+    };
+
+    trackSignatureRequested();
 
     // TODO: Replace "any" with type
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const onSignatureError = ({ error }: any) => {
+    const onSignatureError = async ({ error }: any) => {
       if (error?.message.startsWith(KEYSTONE_TX_CANCELED)) {
+        const analyticsParams = await getAnalyticsParams(
+          messageParams,
+          'eth_sign',
+        );
         trackEvent(
           MetaMetricsEvents.QR_HARDWARE_TRANSACTION_CANCELED,
-          getAnalyticsParams(messageParams, 'eth_sign'),
+          analyticsParams,
         );
       }
     };

app/components/Views/confirmations/components/PersonalSign/PersonalSign.tsx

@@ -82,7 +82,7 @@ const PersonalSign = ({
     [key: string]: string | undefined;
   }
 
-  const getAnalyticsParams = useCallback((): AnalyticsParams => {
+  const getAnalyticsParams = useCallback(async (): Promise<AnalyticsParams> => {
     try {
       const chainId = selectChainId(store.getState());
       const pageInfo = currentPageInformation || messageParams.meta;
@@ -91,7 +91,7 @@ const PersonalSign = ({
       let blockaidParams = {};
 
       if (securityAlertResponse) {
-        blockaidParams = getBlockaidMetricsParams(
+        blockaidParams = await getBlockaidMetricsParams(
           securityAlertResponse as SecurityAlertResponse,
         );
       }
@@ -110,11 +110,11 @@ const PersonalSign = ({
   }, [currentPageInformation, messageParams, securityAlertResponse]);
 
   useEffect(() => {
-    const onSignatureError = ({ error }: { error: Error }) => {
+    const onSignatureError = async ({ error }: { error: Error }) => {
       if (error?.message.startsWith(KEYSTONE_TX_CANCELED)) {
         trackEvent(
           MetaMetricsEvents.QR_HARDWARE_TRANSACTION_CANCELED,
-          getAnalyticsParams(),
+          await getAnalyticsParams(),
         );
       }
     };
@@ -151,14 +151,20 @@ const PersonalSign = ({
   const rejectSignature = async () => {
     await onReject();
     showWalletConnectNotification(false);
-    trackEvent(MetaMetricsEvents.SIGNATURE_REJECTED, getAnalyticsParams());
+    trackEvent(
+      MetaMetricsEvents.SIGNATURE_REJECTED,
+      await getAnalyticsParams(),
+    );
   };
 
   const confirmSignature = async () => {
     if (!isExternalHardwareAccount(messageParams.from)) {
       await onConfirm();
       showWalletConnectNotification(true);
-      trackEvent(MetaMetricsEvents.SIGNATURE_APPROVED, getAnalyticsParams());
+      trackEvent(
+        MetaMetricsEvents.SIGNATURE_APPROVED,
+        await getAnalyticsParams(),
+      );
     } else {
       navigation.navigate(
         ...(await createExternalSignModelNav(

app/components/Views/confirmations/components/PersonalSign/index.test.tsx

@@ -40,6 +40,11 @@ jest.mock('../../../../../core/NotificationManager', () => ({
   showSimpleNotification: jest.fn(),
 }));
 
+jest.mock('../../../../../lib/ppom/ppom-util', () => ({
+  ...jest.requireActual('../../../../../lib/ppom/ppom-util'),
+  isChainSupported: jest.fn().mockResolvedValue(true),
+}));
+
 jest.mock('@react-navigation/native');
 
 const messageParamsMock = {
@@ -202,6 +207,7 @@ describe('PersonalSign', () => {
       });
     });
   });
+
   describe('trackEvent', () => {
     it('tracks event for rejected requests', async () => {
       const wrapper = createWrapper().dive();

app/components/Views/confirmations/components/SignatureRequest/index.js

@@ -317,15 +317,15 @@ class SignatureRequest extends PureComponent {
     );
   };
 
-  onContactUsClicked = () => {
+  onContactUsClicked = async () => {
     const { fromAddress, type } = this.props;
     const analyticsParams = {
-      ...getAnalyticsParams(
+      ...(await getAnalyticsParams(
         {
           from: fromAddress,
         },
         type,
-      ),
+      )),
       external_link_clicked: 'security_alert_support_link',
     };
     this.props.metrics.trackEvent(

app/components/Views/confirmations/components/TransactionReview/index.js

@@ -357,12 +357,12 @@ class TransactionReview extends PureComponent {
     }
   };
 
-  onContactUsClicked = () => {
+  onContactUsClicked = async () => {
     const { transaction, metrics } = this.props;
     const additionalParams = {
-      ...getBlockaidMetricsParams(
+      ...(await getBlockaidMetricsParams(
         transaction?.currentTransactionSecurityAlertResponse,
-      ),
+      )),
       external_link_clicked: 'security_alert_support_link',
     };
     metrics.trackEvent(