Blockaid experimental settings should be visible on all networks (#8412)

MetaMask · Jan 26, 2024 · d2e926e · d2e926e
1 parent 807f1fc
commit d2e926e
Show file tree

Hide file tree

Showing 11 changed files with 129 additions and 124 deletions.
diff --git a/app/components/UI/ApproveTransactionReview/index.js b/app/components/UI/ApproveTransactionReview/index.js
@@ -53,10 +53,7 @@ import TransactionReviewDetailsCard from '../../UI/TransactionReview/Transaction
 import AppConstants from '../../../core/AppConstants';
 import { UINT256_HEX_MAX_VALUE } from '../../../constants/transaction';
 import { WALLET_CONNECT_ORIGIN } from '../../../util/walletconnect';
-import {
-  isBlockaidFeatureEnabled,
-  getBlockaidMetricsParams,
-} from '../../../util/blockaid';
+import { getBlockaidMetricsParams } from '../../../util/blockaid';
 import { withNavigation } from '@react-navigation/compat';
 import {
   isTestNet,
@@ -822,13 +819,11 @@ class ApproveTransactionReview extends PureComponent {
                     style={styles.accountApprovalWrapper}
                     onStartShouldSetResponder={() => true}
                   >
-                    {isBlockaidFeatureEnabled() && (
-                      <TransactionBlockaidBanner
-                        transactionId={transactionId}
-                        style={styles.blockaidWarning}
-                        onContactUsClicked={this.onContactUsClicked}
-                      />
-                    )}
+                    <TransactionBlockaidBanner
+                      transactionId={transactionId}
+                      style={styles.blockaidWarning}
+                      onContactUsClicked={this.onContactUsClicked}
+                    />
                     <Text variant={TextVariant.HeadingMD} style={styles.title}>
                       {strings(
                         `spend_limit_edition.${

diff --git a/app/components/UI/BlockaidBanner/BlockaidBanner.test.tsx b/app/components/UI/BlockaidBanner/BlockaidBanner.test.tsx
@@ -15,6 +15,7 @@ import renderWithProvider from '../../../util/test/renderWithProvider';
 
 jest.mock('../../../util/blockaid', () => ({
   isBlockaidFeatureEnabled: jest.fn().mockReturnValue(true),
+  isBlockaidSupportedOnCurrentChain: jest.fn().mockReturnValue(true),
 }));
 
 jest.mock('react-native-gzip', () => ({

diff --git a/app/components/UI/BlockaidBanner/BlockaidBanner.tsx b/app/components/UI/BlockaidBanner/BlockaidBanner.tsx
@@ -19,7 +19,10 @@ 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 {
+  isBlockaidFeatureEnabled,
+  isBlockaidSupportedOnCurrentChain,
+} from '../../../util/blockaid';
 import {
   ATTRIBUTION_LINE_TEST_ID,
   FALSE_POSITIVE_REPOST_LINE_TEST_ID,
@@ -38,11 +41,7 @@ import {
   FALSE_POSITIVE_REPORT_BASE_URL,
   UTM_SOURCE,
 } from '../../../constants/urls';
-import {
-  BLOCKAID_SUPPORTED_CHAIN_IDS,
-  BLOCKAID_SUPPORTED_NETWORK_NAMES,
-} from '../../../util/networks';
-import { selectChainId } from '../../../selectors/networkController';
+import { BLOCKAID_SUPPORTED_NETWORK_NAMES } from '../../../util/networks';
 import { selectIsSecurityAlertsEnabled } from '../../../selectors/preferencesController';
 import BlockaidVersionInfo from '../../../lib/ppom/blockaid-version';
 
@@ -99,7 +98,6 @@ const BlockaidBanner = (bannerProps: BlockaidBannerProps) => {
   } = bannerProps;
   const { styles, theme } = useStyles(styleSheet, { style });
   const [displayPositiveResponse, setDisplayPositiveResponse] = useState(false);
-  const networkChainId = useSelector(selectChainId);
   const [reportUrl, setReportUrl] = useState<string>('');
   const isSecurityAlertsEnabled = useSelector(selectIsSecurityAlertsEnabled);
 
@@ -141,7 +139,7 @@ const BlockaidBanner = (bannerProps: BlockaidBannerProps) => {
   if (
     !securityAlertResponse ||
     !isBlockaidFeatureEnabled() ||
-    !BLOCKAID_SUPPORTED_CHAIN_IDS.includes(networkChainId) ||
+    !isBlockaidSupportedOnCurrentChain() ||
     !isSecurityAlertsEnabled
   ) {
     return null;

diff --git a/app/components/UI/SignatureRequest/index.js b/app/components/UI/SignatureRequest/index.js
@@ -12,7 +12,6 @@ import { selectProviderType } from '../../../selectors/networkController';
 import { fontStyles } from '../../../styles/common';
 import { isHardwareAccount } from '../../../util/address';
 import AnalyticsV2 from '../../../util/analyticsV2';
-import { isBlockaidFeatureEnabled } from '../../../util/blockaid';
 import { getHost } from '../../../util/browser';
 import { getAnalyticsParams } from '../../../util/confirmation/signatureUtils';
 import Device from '../../../util/device';
@@ -367,13 +366,11 @@ class SignatureRequest extends PureComponent {
                 </TouchableOpacity>
               ) : null}
             </View>
-            {isBlockaidFeatureEnabled() && (
-              <BlockaidBanner
-                securityAlertResponse={securityAlertResponse}
-                style={styles.blockaidBanner}
-                onContactUsClicked={this.onContactUsClicked}
-              />
-            )}
+            <BlockaidBanner
+              securityAlertResponse={securityAlertResponse}
+              style={styles.blockaidBanner}
+              onContactUsClicked={this.onContactUsClicked}
+            />
             {this.renderActionViewChildren()}
           </View>
         </ActionView>

diff --git a/app/components/UI/TransactionBlockaidBanner/TransactionBlockaidBanner.test.tsx b/app/components/UI/TransactionBlockaidBanner/TransactionBlockaidBanner.test.tsx
@@ -9,6 +9,7 @@ import TransactionBlockaidBanner from './TransactionBlockaidBanner';
 
 jest.mock('../../../util/blockaid', () => ({
   isBlockaidFeatureEnabled: jest.fn().mockReturnValue(true),
+  isBlockaidSupportedOnCurrentChain: jest.fn().mockReturnValue(true),
 }));
 
 jest.mock('react-native-gzip', () => ({

diff --git a/app/components/UI/TransactionReview/index.js b/app/components/UI/TransactionReview/index.js
@@ -34,10 +34,7 @@ import {
 } from '../../../util/number';
 import { safeToChecksumAddress } from '../../../util/address';
 import Device from '../../../util/device';
-import {
-  isBlockaidFeatureEnabled,
-  getBlockaidMetricsParams,
-} from '../../../util/blockaid';
+import { getBlockaidMetricsParams } from '../../../util/blockaid';
 import TransactionReviewInformation from './TransactionReviewInformation';
 import TransactionReviewSummary from './TransactionReviewSummary';
 import TransactionReviewData from './TransactionReviewData';
@@ -518,13 +515,11 @@ class TransactionReview extends PureComponent {
                     style={styles.accountTransactionWrapper}
                     onStartShouldSetResponder={() => true}
                   >
-                    {isBlockaidFeatureEnabled() && (
-                      <TransactionBlockaidBanner
-                        transactionId={transactionId}
-                        style={styles.blockaidWarning}
-                        onContactUsClicked={this.onContactUsClicked}
-                      />
-                    )}
+                    <TransactionBlockaidBanner
+                      transactionId={transactionId}
+                      style={styles.blockaidWarning}
+                      onContactUsClicked={this.onContactUsClicked}
+                    />
                     <TransactionReviewSummary
                       actionKey={actionKey}
                       assetAmount={assetAmount}

diff --git a/app/components/Views/Settings/ExperimentalSettings/index.test.tsx b/app/components/Views/Settings/ExperimentalSettings/index.test.tsx
@@ -29,6 +29,7 @@ jest.mock('@react-navigation/native', () => ({
 
 jest.mock('../../../../util/blockaid', () => ({
   isBlockaidFeatureEnabled: jest.fn().mockReturnValue(true),
+  isBlockaidSupportedOnCurrentChain: jest.fn().mockReturnValue(true),
 }));
 
 jest.mock('../../../../core/Engine', () => ({

diff --git a/app/core/RPCMethods/RPCMethodMiddleware.ts b/app/core/RPCMethods/RPCMethodMiddleware.ts
@@ -19,7 +19,6 @@ import Networks, {
   blockTagParamIndex,
   getAllNetworks,
 } from '../../util/networks';
-import { isBlockaidFeatureEnabled } from '../../util/blockaid';
 import { polyfillGasPrice } from './utils';
 import ImportedEngine from '../Engine';
 import { strings } from '../../../locales/i18n';
@@ -550,9 +549,7 @@ export const getRpcMethodMiddleware = ({
             address: req.params[0].from,
             checkSelectedAddress: isMMSDK || isWalletConnect,
           });
-          if (isBlockaidFeatureEnabled()) {
-            PPOMUtil.validateRequest(req);
-          }
+          PPOMUtil.validateRequest(req);
           const rawSig = await SignatureController.newUnsignedMessage({
             data: req.params[1],
             from: req.params[0],
@@ -600,9 +597,7 @@ export const getRpcMethodMiddleware = ({
           checkSelectedAddress: isMMSDK || isWalletConnect,
         });
 
-        if (isBlockaidFeatureEnabled()) {
-          PPOMUtil.validateRequest(req);
-        }
+        PPOMUtil.validateRequest(req);
 
         const rawSig = await SignatureController.newUnsignedPersonalMessage({
           ...params,
@@ -649,9 +644,7 @@ export const getRpcMethodMiddleware = ({
           checkSelectedAddress: isMMSDK || isWalletConnect,
         });
 
-        if (isBlockaidFeatureEnabled()) {
-          PPOMUtil.validateRequest(req);
-        }
+        PPOMUtil.validateRequest(req);
 
         const rawSig = await SignatureController.newUnsignedTypedMessage(
           {
@@ -673,9 +666,7 @@ export const getRpcMethodMiddleware = ({
             ? JSON.parse(req.params[1])
             : req.params[1];
         const chainId = data.domain.chainId;
-        if (isBlockaidFeatureEnabled()) {
-          PPOMUtil.validateRequest(req);
-        }
+        PPOMUtil.validateRequest(req);
         res.result = await generateRawSignature({
           version: 'V3',
           req,
@@ -695,9 +686,7 @@ export const getRpcMethodMiddleware = ({
       eth_signTypedData_v4: async () => {
         const data = JSON.parse(req.params[1]);
         const chainId = data.domain.chainId;
-        if (isBlockaidFeatureEnabled()) {
-          PPOMUtil.validateRequest(req);
-        }
+        PPOMUtil.validateRequest(req);
         res.result = await generateRawSignature({
           version: 'V4',
           req,

diff --git a/app/core/RPCMethods/eth_sendTransaction.ts b/app/core/RPCMethods/eth_sendTransaction.ts
@@ -5,7 +5,6 @@ import {
 } from '@metamask/transaction-controller';
 import { ethErrors } from 'eth-json-rpc-errors';
 import ppomUtil from '../../lib/ppom/ppom-util';
-import { isBlockaidFeatureEnabled } from '../../util/blockaid';
 
 /**
  * A JavaScript object that is not `null`, a function, or an array.
@@ -99,9 +98,7 @@ async function eth_sendTransaction({
     origin: hostname,
   });
 
-  if (isBlockaidFeatureEnabled()) {
-    ppomUtil.validateRequest(req, transactionMeta?.id);
-  }
+  ppomUtil.validateRequest(req, transactionMeta?.id);
 
   res.result = await result;
 }