Change gas labels to Slow/Average/Fast (#6090)

* Change gas labels to Slow/Average/Fast

* Fix unit test

2 files changed, 60 insertions, 60 deletions

diff --git a/ui/app/selectors/custom-gas.js b/ui/app/selectors/custom-gas.js
index f9cedf9fb..e4fba5b01 100644
--- a/ui/app/selectors/custom-gas.js
+++ b/ui/app/selectors/custom-gas.js
@@ -242,25 +242,25 @@ function getRenderableBasicEstimateData (state, gasLimit) {
 
   return [
     {
-      labelKey: 'fastest',
-      feeInPrimaryCurrency: getRenderableConvertedCurrencyFee(fastest, gasLimit, currentCurrency, conversionRate),
-      feeInSecondaryCurrency: getRenderableEthFee(fastest, gasLimit),
-      timeEstimate: fastestWait && getRenderableTimeEstimate(fastestWait),
-      priceInHexWei: getGasPriceInHexWei(fastest),
+      labelKey: 'slow',
+      feeInPrimaryCurrency: getRenderableConvertedCurrencyFee(safeLow, gasLimit, currentCurrency, conversionRate),
+      feeInSecondaryCurrency: getRenderableEthFee(safeLow, gasLimit),
+      timeEstimate: safeLowWait && getRenderableTimeEstimate(safeLowWait),
+      priceInHexWei: getGasPriceInHexWei(safeLow),
     },
     {
-      labelKey: 'fast',
+      labelKey: 'average',
       feeInPrimaryCurrency: getRenderableConvertedCurrencyFee(fast, gasLimit, currentCurrency, conversionRate),
       feeInSecondaryCurrency: getRenderableEthFee(fast, gasLimit),
       timeEstimate: fastWait && getRenderableTimeEstimate(fastWait),
       priceInHexWei: getGasPriceInHexWei(fast),
     },
     {
-      labelKey: 'slow',
-      feeInPrimaryCurrency: getRenderableConvertedCurrencyFee(safeLow, gasLimit, currentCurrency, conversionRate),
-      feeInSecondaryCurrency: getRenderableEthFee(safeLow, gasLimit),
-      timeEstimate: safeLowWait && getRenderableTimeEstimate(safeLowWait),
-      priceInHexWei: getGasPriceInHexWei(safeLow),
+      labelKey: 'fast',
+      feeInPrimaryCurrency: getRenderableConvertedCurrencyFee(fastest, gasLimit, currentCurrency, conversionRate),
+      feeInSecondaryCurrency: getRenderableEthFee(fastest, gasLimit),
+      timeEstimate: fastestWait && getRenderableTimeEstimate(fastestWait),
+      priceInHexWei: getGasPriceInHexWei(fastest),
     },
   ]
 }
@@ -284,22 +284,22 @@ function getRenderableEstimateDataForSmallButtonsFromGWEI (state) {
 
   return [
     {
-      labelKey: 'fastest',
-      feeInSecondaryCurrency: getRenderableConvertedCurrencyFee(fastest, gasLimit, currentCurrency, conversionRate),
-      feeInPrimaryCurrency: getRenderableEthFee(fastest, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
-      priceInHexWei: getGasPriceInHexWei(fastest, true),
+      labelKey: 'slow',
+      feeInSecondaryCurrency: getRenderableConvertedCurrencyFee(safeLow, gasLimit, currentCurrency, conversionRate),
+      feeInPrimaryCurrency: getRenderableEthFee(safeLow, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
+      priceInHexWei: getGasPriceInHexWei(safeLow, true),
     },
     {
-      labelKey: 'fast',
+      labelKey: 'average',
       feeInSecondaryCurrency: getRenderableConvertedCurrencyFee(fast, gasLimit, currentCurrency, conversionRate),
       feeInPrimaryCurrency: getRenderableEthFee(fast, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
       priceInHexWei: getGasPriceInHexWei(fast, true),
     },
     {
-      labelKey: 'slow',
-      feeInSecondaryCurrency: getRenderableConvertedCurrencyFee(safeLow, gasLimit, currentCurrency, conversionRate),
-      feeInPrimaryCurrency: getRenderableEthFee(safeLow, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
-      priceInHexWei: getGasPriceInHexWei(safeLow, true),
+      labelKey: 'fast',
+      feeInSecondaryCurrency: getRenderableConvertedCurrencyFee(fastest, gasLimit, currentCurrency, conversionRate),
+      feeInPrimaryCurrency: getRenderableEthFee(fastest, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
+      priceInHexWei: getGasPriceInHexWei(fastest, true),
     },
   ]
 }
diff --git a/ui/app/selectors/tests/custom-gas.test.js b/ui/app/selectors/tests/custom-gas.test.js
index e43fd0d74..0776ac4d0 100644
--- a/ui/app/selectors/tests/custom-gas.test.js
+++ b/ui/app/selectors/tests/custom-gas.test.js
@@ -77,25 +77,25 @@ describe('custom-gas selectors', () => {
       {
         expectedResult: [
           {
-            labelKey: 'fastest',
-            feeInPrimaryCurrency: '$0.05',
-            feeInSecondaryCurrency: '0.00021 ETH',
-            timeEstimate: '~30 sec',
-            priceInHexWei: '0x2540be400',
+            labelKey: 'slow',
+            feeInPrimaryCurrency: '$0.01',
+            feeInSecondaryCurrency: '0.0000525 ETH',
+            timeEstimate: '~6 min 36 sec',
+            priceInHexWei: '0x9502f900',
           },
           {
-            labelKey: 'fast',
+            labelKey: 'average',
             feeInPrimaryCurrency: '$0.03',
             feeInSecondaryCurrency: '0.000105 ETH',
             timeEstimate: '~3 min 18 sec',
             priceInHexWei: '0x12a05f200',
           },
           {
-            labelKey: 'slow',
-            feeInPrimaryCurrency: '$0.01',
-            feeInSecondaryCurrency: '0.0000525 ETH',
-            timeEstimate: '~6 min 36 sec',
-            priceInHexWei: '0x9502f900',
+            labelKey: 'fast',
+            feeInPrimaryCurrency: '$0.05',
+            feeInSecondaryCurrency: '0.00021 ETH',
+            timeEstimate: '~30 sec',
+            priceInHexWei: '0x2540be400',
           },
         ],
         mockState: {
@@ -119,25 +119,25 @@ describe('custom-gas selectors', () => {
       {
         expectedResult: [
           {
-            labelKey: 'fastest',
-            feeInPrimaryCurrency: '$1.07',
-            feeInSecondaryCurrency: '0.00042 ETH',
-            timeEstimate: '~1 min',
-            priceInHexWei: '0x4a817c800',
+            labelKey: 'slow',
+            feeInPrimaryCurrency: '$0.27',
+            feeInSecondaryCurrency: '0.000105 ETH',
+            timeEstimate: '~13 min 12 sec',
+            priceInHexWei: '0x12a05f200',
           },
           {
-            labelKey: 'fast',
+            labelKey: 'average',
             feeInPrimaryCurrency: '$0.54',
             feeInSecondaryCurrency: '0.00021 ETH',
             timeEstimate: '~6 min 36 sec',
             priceInHexWei: '0x2540be400',
           },
           {
-            labelKey: 'slow',
-            feeInPrimaryCurrency: '$0.27',
-            feeInSecondaryCurrency: '0.000105 ETH',
-            timeEstimate: '~13 min 12 sec',
-            priceInHexWei: '0x12a05f200',
+            labelKey: 'fast',
+            feeInPrimaryCurrency: '$1.07',
+            feeInSecondaryCurrency: '0.00042 ETH',
+            timeEstimate: '~1 min',
+            priceInHexWei: '0x4a817c800',
           },
         ],
         mockState: {
@@ -178,22 +178,22 @@ describe('custom-gas selectors', () => {
       {
         expectedResult: [
           {
-            feeInSecondaryCurrency: '$0.54',
-            feeInPrimaryCurrency: '0.0021 ETH',
-            labelKey: 'fastest',
-            priceInHexWei: '0x174876e800',
+            feeInSecondaryCurrency: '$0.13',
+            feeInPrimaryCurrency: '0.00052 ETH',
+            labelKey: 'slow',
+            priceInHexWei: '0x5d21dba00',
           },
           {
             feeInSecondaryCurrency: '$0.27',
             feeInPrimaryCurrency: '0.00105 ETH',
-            labelKey: 'fast',
+            labelKey: 'average',
             priceInHexWei: '0xba43b7400',
           },
           {
-            feeInSecondaryCurrency: '$0.13',
-            feeInPrimaryCurrency: '0.00052 ETH',
-            labelKey: 'slow',
-            priceInHexWei: '0x5d21dba00',
+            feeInSecondaryCurrency: '$0.54',
+            feeInPrimaryCurrency: '0.0021 ETH',
+            labelKey: 'fast',
+            priceInHexWei: '0x174876e800',
           },
         ],
         mockState: {
@@ -220,22 +220,22 @@ describe('custom-gas selectors', () => {
       {
         expectedResult: [
           {
-            feeInSecondaryCurrency: '$10.74',
-            feeInPrimaryCurrency: '0.0042 ETH',
-            labelKey: 'fastest',
-            priceInHexWei: '0x2e90edd000',
+            feeInSecondaryCurrency: '$2.68',
+            feeInPrimaryCurrency: '0.00105 ETH',
+            labelKey: 'slow',
+            priceInHexWei: '0xba43b7400',
           },
           {
             feeInSecondaryCurrency: '$5.37',
             feeInPrimaryCurrency: '0.0021 ETH',
-            labelKey: 'fast',
+            labelKey: 'average',
             priceInHexWei: '0x174876e800',
           },
           {
-            feeInSecondaryCurrency: '$2.68',
-            feeInPrimaryCurrency: '0.00105 ETH',
-            labelKey: 'slow',
-            priceInHexWei: '0xba43b7400',
+            feeInSecondaryCurrency: '$10.74',
+            feeInPrimaryCurrency: '0.0042 ETH',
+            labelKey: 'fast',
+            priceInHexWei: '0x2e90edd000',
           },
         ],
         mockState: {