Fixed few issues

MetaMask · Feb 21, 2023 · 85db441 · 85db441
1 parent c72bed0
commit 85db441
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 20 deletions.
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/...page-container/confirm-page-container-content/confirm-page-container-content.component.js b/...page-container/confirm-page-container-content/confirm-page-container-content.component.js
@@ -191,13 +191,15 @@ export default class ConfirmPageContainerContent extends Component {
         {ethGasPriceWarning && (
           <ConfirmPageContainerWarning warning={ethGasPriceWarning} />
         )}
-        {txData?.securityProviderResponse?.flagAsDangerous !== undefined &&
+        {(txData?.securityProviderResponse?.flagAsDangerous !== undefined &&
           txData?.securityProviderResponse?.flagAsDangerous !==
-            SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS && (
-            <SecurityProviderBannerMessage
-              securityProviderResponse={txData.securityProviderResponse}
-            />
-          )}
+            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':

diff --git a/ui/components/app/security-provider-banner-message/security-provider-banner-message.js b/ui/components/app/security-provider-banner-message/security-provider-banner-message.js
@@ -24,8 +24,14 @@ export default function SecurityProviderBannerMessage({
     securityProviderResponse.flagAsDangerous ===
     SECURITY_PROVIDER_MESSAGE_SEVERITIES.MALICIOUS
   ) {
-    messageTitle = securityProviderResponse.reason_header;
-    messageText = securityProviderResponse.reason;
+    messageTitle =
+      securityProviderResponse.reason_header === ''
+        ? t('requestFlaggedAsMaliciousFallbackCopyReasonTitle')
+        : securityProviderResponse.reason_header;
+    messageText =
+      securityProviderResponse.reason === ''
+        ? t('requestFlaggedAsMaliciousFallbackCopyReason')
+        : securityProviderResponse.reason;
     severity = SEVERITIES.DANGER;
   } else if (
     securityProviderResponse.flagAsDangerous ===

diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js
@@ -137,13 +137,15 @@ export default class SignatureRequestOriginal extends Component {
 
     return (
       <div className="request-signature__body">
-        {txData?.securityProviderResponse?.flagAsDangerous !== undefined &&
+        {(txData?.securityProviderResponse?.flagAsDangerous !== undefined &&
           txData?.securityProviderResponse?.flagAsDangerous !==
-            SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS && (
-            <SecurityProviderBannerMessage
-              securityProviderResponse={txData.securityProviderResponse}
-            />
-          )}
+            SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS) ||
+        (txData?.securityProviderResponse &&
+          Object.keys(txData.securityProviderResponse).length === 0) ? (
+          <SecurityProviderBannerMessage
+            securityProviderResponse={txData.securityProviderResponse}
+          />
+        ) : null}
         <div className="request-signature__origin">
           <SiteOrigin
             siteOrigin={txData.msgParams.origin}

diff --git a/ui/components/app/signature-request-siwe/signature-request-siwe.js b/ui/components/app/signature-request-siwe/signature-request-siwe.js
@@ -16,6 +16,8 @@ import { formatMessageParams } from '../../../../shared/modules/siwe';
 import { Icon } from '../../component-library/icon/icon';
 import { IconColor } from '../../../helpers/constants/design-system';
 
+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 Header from './signature-request-siwe-header';
 import Message from './signature-request-siwe-message';
 
@@ -88,6 +90,15 @@ export default function SignatureRequestSIWE({
         isSIWEDomainValid={isSIWEDomainValid}
         subjectMetadata={targetSubjectMetadata}
       />
+      {(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}
       <Message data={formatMessageParams(parsedMessage, t)} />
       {!isMatchingAddress && (
         <ActionableMessage

diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js
@@ -227,13 +227,15 @@ export default class SignatureRequest extends PureComponent {
           />
         </div>
         <div className="signature-request-content">
-          {txData?.securityProviderResponse?.flagAsDangerous !== undefined &&
+          {(txData?.securityProviderResponse?.flagAsDangerous !== undefined &&
             txData?.securityProviderResponse?.flagAsDangerous !==
-              SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS && (
-              <SecurityProviderBannerMessage
-                securityProviderResponse={txData.securityProviderResponse}
-              />
-            )}
+              SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS) ||
+          (txData?.securityProviderResponse &&
+            Object.keys(txData.securityProviderResponse).length === 0) ? (
+            <SecurityProviderBannerMessage
+              securityProviderResponse={txData.securityProviderResponse}
+            />
+          ) : null}
           <div className="signature-request__origin">
             <SiteOrigin
               siteOrigin={origin}