From 814d4fb101571db79b4a76af946b07cfbc751bb7 Mon Sep 17 00:00:00 2001
From: digiwand <20778143+digiwand@users.noreply.github.com>
Date: Thu, 3 Aug 2023 18:48:35 +0200
Subject: [PATCH] BlockaidBannerAlert: rm footer w failed resultType

---
 ...ecurity-provider-banner-alert.test.js.snap |  2 +-
 .../blockaid-banner-alert.test.js.snap        | 56 ++++++------------
 .../blockaid-banner-alert.js                  |  4 +-
 .../security-provider-banner-alert.js         | 58 ++++++++++---------
 .../security-provider-banner-alert.stories.js |  5 +-
 5 files changed, 55 insertions(+), 70 deletions(-)

diff --git a/ui/components/app/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap b/ui/components/app/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
index 7cf86eeb7a10..37761b2ba4e1 100644
--- a/ui/components/app/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
+++ b/ui/components/app/security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
@@ -59,7 +59,7 @@ exports[`Security Provider Banner Alert should match snapshot 1`] = `
         </details>
       </div>
       <p
-        class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--align-items-center mm-box--color-text-alternative"
+        class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
       >
         <span
           class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
diff --git a/ui/components/app/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap b/ui/components/app/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
index 0bce41fae2b7..a3a0998f0ac5 100644
--- a/ui/components/app/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
+++ b/ui/components/app/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
@@ -21,15 +21,15 @@ exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertRespo
       If you approve this request, a third party known for scams might take all your assets.
     </p>
     <p
-      class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
+      class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
     >
       <span
         class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
         style="mask-image: url('./images/icons/security-tick.svg');"
       />
       <span>
-
-        Security advice by
+         
+        Security advice by 
         <a
           class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           href="https://blockaid.io/"
@@ -38,8 +38,8 @@ exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertRespo
         >
           Blockaid
         </a>
-
-
+        
+         
       </span>
     </p>
   </div>
@@ -66,28 +66,6 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
     >
       If you approve this request, a third party known for scams might take all your assets.
     </p>
-    <p
-      class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
-    >
-      <span
-        class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
-        style="mask-image: url('./images/icons/security-tick.svg');"
-      />
-      <span>
-
-        Security advice by
-        <a
-          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-          href="https://blockaid.io/"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Blockaid
-        </a>
-
-
-      </span>
-    </p>
   </div>
 </div>
 `;
@@ -113,15 +91,15 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
       If you approve this request, a third party known for scams might take all your assets.
     </p>
     <p
-      class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
+      class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
     >
       <span
         class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
         style="mask-image: url('./images/icons/security-tick.svg');"
       />
       <span>
-
-        Security advice by
+         
+        Security advice by 
         <a
           class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           href="https://blockaid.io/"
@@ -130,8 +108,8 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
         >
           Blockaid
         </a>
-
-
+        
+         
       </span>
     </p>
   </div>
@@ -183,11 +161,11 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
               class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
             >
               <li>
-                •
+                • 
                 Operator is an EOA
               </li>
               <li>
-                •
+                • 
                 Operator is untrusted according to previous activity
               </li>
             </ul>
@@ -198,15 +176,15 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
         </details>
       </div>
       <p
-        class="mm-box mm-text mm-text--body-sm mm-box--margin-top-2 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
+        class="mm-box mm-text mm-text--body-sm mm-box--margin-top-3 mm-box--display-flex mm-box--align-items-center mm-box--color-text-alternative"
       >
         <span
           class="mm-box disclosure__summary--icon mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-primary-default"
           style="mask-image: url('./images/icons/security-tick.svg');"
         />
         <span>
-
-          Security advice by
+           
+          Security advice by 
           <a
             class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md-medium mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
             href="https://blockaid.io/"
@@ -215,8 +193,8 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
           >
             Blockaid
           </a>
-
-
+          
+           
         </span>
       </p>
     </div>
diff --git a/ui/components/app/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js b/ui/components/app/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
index 8fd36fda0263..c5af935b8efb 100644
--- a/ui/components/app/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
+++ b/ui/components/app/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.js
@@ -71,6 +71,8 @@ function BlockaidBannerAlert({ securityAlertResponse }) {
     </Text>
   );
 
+  const isFailedResultType = resultType === BlockaidResultType.Failed;
+
   const severity =
     resultType === BlockaidResultType.Malicious
       ? Severity.Danger
@@ -82,7 +84,7 @@ function BlockaidBannerAlert({ securityAlertResponse }) {
     <SecurityProviderBannerAlert
       description={description}
       details={details}
-      provider={SecurityProvider.Blockaid}
+      provider={isFailedResultType ? null : SecurityProvider.Blockaid}
       severity={severity}
       title={title}
     />
diff --git a/ui/components/app/security-provider-banner-alert/security-provider-banner-alert.js b/ui/components/app/security-provider-banner-alert/security-provider-banner-alert.js
index 51deb48a7c7c..5e115c193d62 100644
--- a/ui/components/app/security-provider-banner-alert/security-provider-banner-alert.js
+++ b/ui/components/app/security-provider-banner-alert/security-provider-banner-alert.js
@@ -46,31 +46,33 @@ function SecurityProviderBannerAlert({
         </Disclosure>
       )}
 
-      <Text
-        marginTop={2}
-        display={Display.Flex}
-        alignItems={AlignItems.center}
-        color={Color.textAlternative}
-        variant={TextVariant.bodySm}
-      >
-        <Icon
-          className="disclosure__summary--icon"
-          color={IconColor.primaryDefault}
-          name={IconName.SecurityTick}
-          size={IconSize.Sm}
-          marginInlineEnd={1}
-        />
-        {t('securityProviderAdviceBy', [
-          <ButtonLink
-            key={`security-provider-button-link-${provider}`}
-            size={Size.inherit}
-            href={SECURITY_PROVIDER_CONFIG[provider].url}
-            externalLink
-          >
-            {t(SECURITY_PROVIDER_CONFIG[provider].tKeyName)}
-          </ButtonLink>,
-        ])}
-      </Text>
+      {provider && (
+        <Text
+          marginTop={3}
+          display={Display.Flex}
+          alignItems={AlignItems.center}
+          color={Color.textAlternative}
+          variant={TextVariant.bodySm}
+        >
+          <Icon
+            className="disclosure__summary--icon"
+            color={IconColor.primaryDefault}
+            name={IconName.SecurityTick}
+            size={IconSize.Sm}
+            marginInlineEnd={1}
+          />
+          {t('securityProviderAdviceBy', [
+            <ButtonLink
+              key={`security-provider-button-link-${provider}`}
+              size={Size.inherit}
+              href={SECURITY_PROVIDER_CONFIG[provider].url}
+              externalLink
+            >
+              {t(SECURITY_PROVIDER_CONFIG[provider].tKeyName)}
+            </ButtonLink>,
+          ])}
+        </Text>
+      )}
     </BannerAlert>
   );
 }
@@ -80,9 +82,6 @@ SecurityProviderBannerAlert.propTypes = {
   description: PropTypes.oneOfType([PropTypes.string, PropTypes.element])
     .isRequired,
 
-  /** Name of the security provider */
-  provider: PropTypes.oneOfType(Object.values(SecurityProvider)).isRequired,
-
   /** Severity level */
   severity: PropTypes.oneOfType([Severity.Danger, Severity.Warning]).isRequired,
 
@@ -95,6 +94,9 @@ SecurityProviderBannerAlert.propTypes = {
 
   /** Additional details to be displayed under the description */
   details: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
+
+  /** Name of the security provider */
+  provider: PropTypes.oneOfType(Object.values(SecurityProvider)),
 };
 
 export default SecurityProviderBannerAlert;
diff --git a/ui/components/app/security-provider-banner-alert/security-provider-banner-alert.stories.js b/ui/components/app/security-provider-banner-alert/security-provider-banner-alert.stories.js
index c78ce3f8fefd..bb2ab44e0118 100644
--- a/ui/components/app/security-provider-banner-alert/security-provider-banner-alert.stories.js
+++ b/ui/components/app/security-provider-banner-alert/security-provider-banner-alert.stories.js
@@ -53,7 +53,10 @@ export default {
       control: {
         type: 'select',
       },
-      options: [Object.values(SecurityProvider)],
+      options: ['none', ...Object.values(SecurityProvider)],
+      mapping: {
+        none: null,
+      },
     },
     severity: {
       control: {