From 310531eeb6c5954c68493b46f8b9b22fd4792ef4 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Thu, 1 Jul 2021 09:37:00 -0500
Subject: [PATCH] EIP 1559 - Provide a GWEI label for advanced gas control
 fields (#11419)

---
 .../advanced-gas-controls-row.component.js           | 12 +++++++++++-
 .../advanced-gas-controls.component.js               |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ui/components/app/advanced-gas-controls/advanced-gas-controls-row.component.js b/ui/components/app/advanced-gas-controls/advanced-gas-controls-row.component.js
index 1ae8919b1..cb0bd2c0d 100644
--- a/ui/components/app/advanced-gas-controls/advanced-gas-controls-row.component.js
+++ b/ui/components/app/advanced-gas-controls/advanced-gas-controls-row.component.js
@@ -16,6 +16,7 @@ import InfoTooltip from '../../ui/info-tooltip/info-tooltip';
 
 export default function AdvancedGasControlsRow({
   titleText,
+  titleUnit,
   tooltipText,
   titleDetailText,
   error,
@@ -39,7 +40,14 @@ export default function AdvancedGasControlsRow({
             >
               {titleText}
             </Typography>
-
+            <Typography
+              tag={TYPOGRAPHY.H6}
+              variant={TYPOGRAPHY.H6}
+              color={COLORS.UI4}
+              boxProps={{ display: DISPLAY.INLINE_BLOCK }}
+            >
+              {titleUnit}
+            </Typography>
             <InfoTooltip position="top" contentText={tooltipText} />
           </div>
           {titleDetailText && (
@@ -70,6 +78,7 @@ export default function AdvancedGasControlsRow({
 
 AdvancedGasControlsRow.propTypes = {
   titleText: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+  titleUnit: PropTypes.string,
   tooltipText: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   titleDetailText: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   error: PropTypes.string,
@@ -79,6 +88,7 @@ AdvancedGasControlsRow.propTypes = {
 
 AdvancedGasControlsRow.defaultProps = {
   titleText: '',
+  titleUnit: '',
   tooltipText: '',
   titleDetailText: '',
   error: '',
diff --git a/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js b/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
index 5ba93e06c..ffd45cc2c 100644
--- a/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
+++ b/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
@@ -32,6 +32,7 @@ export default function AdvancedGasControls() {
         <>
           <AdvancedGasControlsRow
             titleText={t('maxPriorityFee')}
+            titleUnit="(GWEI)"
             tooltipText=""
             onChange={setMaxPriorityFee}
             value={maxPriorityFee}
@@ -55,6 +56,7 @@ export default function AdvancedGasControls() {
           />
           <AdvancedGasControlsRow
             titleText={t('maxFee')}
+            titleUnit="(GWEI)"
             tooltipText=""
             onChange={setMaxFee}
             value={maxFee}
@@ -81,6 +83,7 @@ export default function AdvancedGasControls() {
         <>
           <AdvancedGasControlsRow
             titleText={t('gasPrice')}
+            titleUnit="(GWEI)"
             onChange={setGasPrice}
             tooltipText=""
             titleDetailText=""