From 493448c96e4ebdbd350c6603dbd3208616b13b9f Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 16 Jul 2021 11:19:09 -0500
Subject: [PATCH] EIP-1559 - Don't show submit button  when in education mode,
 don't duplicate title (#11541)

---
 .../edit-gas-display-education.component.js   |  7 -----
 .../edit-gas-popover.component.js             | 30 ++++++++++---------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/ui/components/app/edit-gas-display-education/edit-gas-display-education.component.js b/ui/components/app/edit-gas-display-education/edit-gas-display-education.component.js
index 3b0ce0c17..ab2fd2104 100644
--- a/ui/components/app/edit-gas-display-education/edit-gas-display-education.component.js
+++ b/ui/components/app/edit-gas-display-education/edit-gas-display-education.component.js
@@ -14,13 +14,6 @@ export default function EditGasDisplayEducation() {
 
   return (
     <div className="edit-gas-display-education">
-      <Typography
-        color={COLORS.BLACK}
-        variant={TYPOGRAPHY.H4}
-        fontWeight={FONT_WEIGHT.BOLD}
-      >
-        {t('editGasEducationModalTitle')}
-      </Typography>
       <Typography tag="p" color={COLORS.UI4} variant={TYPOGRAPHY.H6}>
         {t('editGasEducationModalIntro')}
       </Typography>
diff --git a/ui/components/app/edit-gas-popover/edit-gas-popover.component.js b/ui/components/app/edit-gas-popover/edit-gas-popover.component.js
index 6bbf5eede..5f48b16d0 100644
--- a/ui/components/app/edit-gas-popover/edit-gas-popover.component.js
+++ b/ui/components/app/edit-gas-popover/edit-gas-popover.component.js
@@ -168,20 +168,22 @@ export default function EditGasPopover({
         showEducationContent ? () => setShowEducationContent(false) : undefined
       }
       footer={
-        <>
-          <Button
-            type="primary"
-            onClick={onSubmit}
-            disabled={
-              isMaxFeeError ||
-              isMaxPriorityFeeError ||
-              isGasTooLow ||
-              isGasEstimatesLoading
-            }
-          >
-            {footerButtonText}
-          </Button>
-        </>
+        showEducationContent ? null : (
+          <>
+            <Button
+              type="primary"
+              onClick={onSubmit}
+              disabled={
+                isMaxFeeError ||
+                isMaxPriorityFeeError ||
+                isGasTooLow ||
+                isGasEstimatesLoading
+              }
+            >
+              {footerButtonText}
+            </Button>
+          </>
+        )
       }
     >
       <div style={{ padding: '0 20px 20px 20px' }}>