Merge branch 'develop' into fa-add

app/scripts/lib/security-provider-helpers.js

@@ -1,5 +1,8 @@
+import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout';
 import { MESSAGE_TYPE } from '../../../shared/constants/app';
 
+const fetchWithTimeout = getFetchWithTimeout();
+
 export async function securityProviderCheck(
   requestData,
   methodName,
@@ -47,7 +50,7 @@ export async function securityProviderCheck(
     };
   }
 
-  const response = await fetch(
+  const response = await fetchWithTimeout(
     'https://eos9d7dmfj.execute-api.us-east-1.amazonaws.com/metamask/validate',
     {
       method: 'POST',

ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js

@@ -11,6 +11,8 @@ import Typography from '../../../ui/typography';
 import { TypographyVariant } from '../../../../helpers/constants/design-system';
 import DepositPopover from '../../deposit-popover/deposit-popover';
 
+import SecurityProviderBannerMessage from '../../security-provider-banner-message/security-provider-banner-message';
+import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../../security-provider-banner-message/security-provider-banner-message.constants';
 import { ConfirmPageContainerSummary, ConfirmPageContainerWarning } from '.';
 
 export default class ConfirmPageContainerContent extends Component {
@@ -55,6 +57,7 @@ export default class ConfirmPageContainerContent extends Component {
     toAddress: PropTypes.string,
     transactionType: PropTypes.string,
     isBuyableChain: PropTypes.bool,
+    txData: PropTypes.object,
   };
 
   state = {
@@ -166,6 +169,7 @@ export default class ConfirmPageContainerContent extends Component {
       toAddress,
       transactionType,
       isBuyableChain,
+      txData,
     } = this.props;
 
     const { t } = this.context;
@@ -187,6 +191,15 @@ export default class ConfirmPageContainerContent extends Component {
         {ethGasPriceWarning && (
           <ConfirmPageContainerWarning warning={ethGasPriceWarning} />
         )}
+        {(txData?.securityProviderResponse?.flagAsDangerous !== undefined &&
+          txData?.securityProviderResponse?.flagAsDangerous !==
+            SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS) ||
+        (txData?.securityProviderResponse &&
+          Object.keys(txData.securityProviderResponse).length === 0) ? (
+          <SecurityProviderBannerMessage
+            securityProviderResponse={txData.securityProviderResponse}
+          />
+        ) : null}
         <ConfirmPageContainerSummary
           className={classnames({
             'confirm-page-container-summary--border':

ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js

@@ -4,6 +4,7 @@ import configureMockStore from 'redux-mock-store';
 import { TransactionType } from '../../../../../shared/constants/transaction';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import { TRANSACTION_ERROR_KEY } from '../../../../helpers/constants/error-keys';
+import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../../security-provider-banner-message/security-provider-banner-message.constants';
 import ConfirmPageContainerContent from './confirm-page-container-content.component';
 
 describe('Confirm Page Container Content', () => {
@@ -47,6 +48,13 @@ describe('Confirm Page Container Content', () => {
       disabled: true,
       origin: 'http://localhost:4200',
       hideTitle: false,
+      txData: {
+        securityProviderResponse: {
+          flagAsDangerous: '?',
+          reason: 'Some reason...',
+          reason_header: 'Some reason header...',
+        },
+      },
     };
   });
 
@@ -126,4 +134,40 @@ describe('Confirm Page Container Content', () => {
 
     expect(queryByText('Address Book Account 1')).not.toBeInTheDocument();
   });
+
+  it('should render SecurityProviderBannerMessage component properly', () => {
+    const { queryByText } = renderWithProvider(
+      <ConfirmPageContainerContent {...props} />,
+      store,
+    );
+
+    expect(queryByText('Request not verified')).toBeInTheDocument();
+    expect(
+      queryByText(
+        'Because of an error, this request was not verified by the security provider. Proceed with caution.',
+      ),
+    ).toBeInTheDocument();
+    expect(
+      queryByText('This is based on information from'),
+    ).toBeInTheDocument();
+  });
+
+  it('should not render SecurityProviderBannerMessage component when flagAsDangerous is not malicious', () => {
+    props.txData.securityProviderResponse = {
+      flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS,
+    };
+
+    const { queryByText } = renderWithProvider(
+      <ConfirmPageContainerContent {...props} />,
+      store,
+    );
+
+    expect(queryByText('Request not verified')).toBeNull();
+    expect(
+      queryByText(
+        'Because of an error, this request was not verified by the security provider. Proceed with caution.',
+      ),
+    ).toBeNull();
+    expect(queryByText('This is based on information from')).toBeNull();
+  });
 });

ui/components/app/confirm-page-container/confirm-page-container.component.js

@@ -86,9 +86,7 @@ const ConfirmPageContainer = (props) => {
     currentTransaction,
     supportsEIP1559,
     nativeCurrency,
-    ///: BEGIN:ONLY_INCLUDE_IN(flask)
     txData,
-    ///: END:ONLY_INCLUDE_IN(flask)
     assetStandard,
     isApprovalOrRejection,
   } = props;
@@ -223,6 +221,7 @@ const ConfirmPageContainer = (props) => {
             toAddress={toAddress}
             transactionType={currentTransaction.type}
             isBuyableChain={isBuyableChain}
+            txData={txData}
           />
         )}
         {shouldDisplayWarning && errorKey === INSUFFICIENT_FUNDS_ERROR_KEY && (
@@ -346,9 +345,7 @@ ConfirmPageContainer.propTypes = {
   dataComponent: PropTypes.node,
   dataHexComponent: PropTypes.node,
   detailsComponent: PropTypes.node,
-  ///: BEGIN:ONLY_INCLUDE_IN(flask)
   txData: PropTypes.object,
-  ///: END:ONLY_INCLUDE_IN(flask)
   tokenAddress: PropTypes.string,
   nonce: PropTypes.string,
   warning: PropTypes.string,

ui/components/app/security-provider-banner-message/index.js

@@ -0,0 +1 @@
+export { default } from './security-provider-banner-message';

ui/components/app/security-provider-banner-message/security-provider-banner-message.constants.js

@@ -0,0 +1,5 @@
+export const SECURITY_PROVIDER_MESSAGE_SEVERITIES = {
+  NOT_MALICIOUS: 0,
+  MALICIOUS: 1,
+  NOT_SAFE: 2,
+};

ui/components/app/security-provider-banner-message/security-provider-banner-message.js

@@ -0,0 +1,74 @@
+import React, { useContext } from 'react';
+import PropTypes from 'prop-types';
+import {
+  Color,
+  SEVERITIES,
+  Size,
+  TypographyVariant,
+} from '../../../helpers/constants/design-system';
+import { I18nContext } from '../../../../.storybook/i18n';
+import { BannerAlert, ButtonLink } from '../../component-library';
+import Typography from '../../ui/typography/typography';
+import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from './security-provider-banner-message.constants';
+
+export default function SecurityProviderBannerMessage({
+  securityProviderResponse,
+}) {
+  const t = useContext(I18nContext);
+
+  let messageTitle;
+  let messageText;
+  let severity;
+
+  if (
+    securityProviderResponse.flagAsDangerous ===
+    SECURITY_PROVIDER_MESSAGE_SEVERITIES.MALICIOUS
+  ) {
+    messageTitle =
+      securityProviderResponse.reason_header === ''
+        ? t('requestFlaggedAsMaliciousFallbackCopyReasonTitle')
+        : securityProviderResponse.reason_header;
+    messageText =
+      securityProviderResponse.reason === ''
+        ? t('requestFlaggedAsMaliciousFallbackCopyReason')
+        : securityProviderResponse.reason;
+    severity = SEVERITIES.DANGER;
+  } else if (
+    securityProviderResponse.flagAsDangerous ===
+    SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_SAFE
+  ) {
+    messageTitle = t('requestMayNotBeSafe');
+    messageText = t('requestMayNotBeSafeError');
+    severity = SEVERITIES.WARNING;
+  } else {
+    messageTitle = t('requestNotVerified');
+    messageText = t('requestNotVerifiedError');
+    severity = SEVERITIES.WARNING;
+  }
+
+  return (
+    <BannerAlert
+      marginTop={4}
+      marginRight={4}
+      marginLeft={4}
+      title={messageTitle}
+      severity={severity}
+    >
+      <Typography variant={TypographyVariant.H6}>{messageText}</Typography>
+      <Typography variant={TypographyVariant.H7} color={Color.textAlternative}>
+        {t('thisIsBasedOn')}
+        <ButtonLink
+          size={Size.inherit}
+          href="https://opensea.io/"
+          target="_blank"
+        >
+          {t('openSeaNew')}
+        </ButtonLink>
+      </Typography>
+    </BannerAlert>
+  );
+}
+
+SecurityProviderBannerMessage.propTypes = {
+  securityProviderResponse: PropTypes.object,
+};