Prevent users from changing the From field in the send screen (#5922)

* Prevent users from changing the From field in the send screen

* Fix integration tests

6 files changed, 1274 insertions, 4 deletions

diff --git a/development/states/confirm-new-ui.json b/development/states/confirm-new-ui.json
index fffee9893..a5138c05a 100644
--- a/development/states/confirm-new-ui.json
+++ b/development/states/confirm-new-ui.json
@@ -129,7 +129,10 @@
       "maxModeOn": false,
       "editingTransactionId": null
     },
-    "currentLocale": "en"
+    "currentLocale": "en",
+    "preferences": {
+      "useNativeCurrencyAsPrimaryCurrency": true
+    }
   },
   "appState": {
     "menuOpen": false,
@@ -175,5 +178,321 @@
     "hexGasTotal": "",
     "nonce": "",
     "fetchingMethodData": false
+  },
+  "gas": {
+    "customData": {
+      "price": null,
+      "limit": "0x186a0"
+    },
+    "basicEstimates": {
+      "average": 73,
+      "avgWait": 10.6,
+      "blockTime": 13.871657754010695,
+      "blockNum": 6655504,
+      "fast": 160,
+      "fastest": 290,
+      "fastestWait": 0.5,
+      "fastWait": 0.6,
+      "safeLow": 50,
+      "safeLowWait": 16.1,
+      "speed": 0.6702462692280712
+    },
+    "basicEstimateIsLoading": false,
+    "gasEstimatesLoading": false,
+    "basicPriceAndTimeEstimates": [],
+    "priceAndTimeEstimates": [
+      {
+        "expectedTime": "1374.1168296452973076627",
+        "expectedWait": 99.0593088449,
+        "gasprice": 4.1
+      },
+      {
+        "expectedTime": "1280.88976972896682763716",
+        "expectedWait": 92.3386225672,
+        "gasprice": 4.4
+      },
+      {
+        "expectedTime": "1245.13314632680319175597",
+        "expectedWait": 89.7609477113,
+        "gasprice": 4.8
+      },
+      {
+        "expectedTime": "1227.99925007911014385881",
+        "expectedWait": 88.5257747744,
+        "gasprice": 4.9
+      },
+      {
+        "expectedTime": "965.52572720362993349654",
+        "expectedWait": 69.6042062402,
+        "gasprice": 5
+      },
+      {
+        "expectedTime": "917.466895447437420776",
+        "expectedWait": 66.1396721082,
+        "gasprice": 5.1
+      },
+      {
+        "expectedTime": "915.81694044041496090521",
+        "expectedWait": 66.0207277804,
+        "gasprice": 5.2
+      },
+      {
+        "expectedTime": "902.13145619709089691874",
+        "expectedWait": 65.034148924,
+        "gasprice": 5.3
+      },
+      {
+        "expectedTime": "890.83591122200105749896",
+        "expectedWait": 64.2198594443,
+        "gasprice": 5.4
+      },
+      {
+        "expectedTime": "879.10469542971335712248",
+        "expectedWait": 63.3741627006,
+        "gasprice": 5.5
+      },
+      {
+        "expectedTime": "876.99737395823100420974",
+        "expectedWait": 63.2222470818,
+        "gasprice": 5.6
+      },
+      {
+        "expectedTime": "865.96781957003849098957",
+        "expectedWait": 62.4271327138,
+        "gasprice": 5.7
+      },
+      {
+        "expectedTime": "865.44839472121496158482",
+        "expectedWait": 62.3896876688,
+        "gasprice": 5.8
+      },
+      {
+        "expectedTime": "802.16173170976255602161",
+        "expectedWait": 57.8273877524,
+        "gasprice": 6
+      },
+      {
+        "expectedTime": "780.79313908053047074843",
+        "expectedWait": 56.2869379368,
+        "gasprice": 6.1
+      },
+      {
+        "expectedTime": "770.04888359616469549233",
+        "expectedWait": 55.5123906062,
+        "gasprice": 6.2
+      },
+      {
+        "expectedTime": "745.01007965146736962697",
+        "expectedWait": 53.7073573226,
+        "gasprice": 6.3
+      },
+      {
+        "expectedTime": "735.19921111598501681816",
+        "expectedWait": 53.0000973318,
+        "gasprice": 6.6
+      },
+      {
+        "expectedTime": "705.68767153912619368694",
+        "expectedWait": 50.8726270539,
+        "gasprice": 6.7
+      },
+      {
+        "expectedTime": "705.26438593445239690121",
+        "expectedWait": 50.8421126329,
+        "gasprice": 6.9
+      },
+      {
+        "expectedTime": "652.51573119854865429742",
+        "expectedWait": 47.0394918019,
+        "gasprice": 7
+      },
+      {
+        "expectedTime": "635.51471669299464383162",
+        "expectedWait": 45.813898235,
+        "gasprice": 7.1
+      },
+      {
+        "expectedTime": "634.37181911960854759036",
+        "expectedWait": 45.7315073922,
+        "gasprice": 7.2
+      },
+      {
+        "expectedTime": "633.23097691113902888918",
+        "expectedWait": 45.6492647195,
+        "gasprice": 7.3
+      },
+      {
+        "expectedTime": "112.7753456245379663928",
+        "expectedWait": 8.1299111919,
+        "gasprice": 7.6
+      },
+      {
+        "expectedTime": "102.9665314468898381829",
+        "expectedWait": 7.4227992986,
+        "gasprice": 8
+      },
+      {
+        "expectedTime": "100.94784507024919649891",
+        "expectedWait": 7.2772733339,
+        "gasprice": 8.1
+      },
+      {
+        "expectedTime": "100.46445647447807351078",
+        "expectedWait": 7.2424261221,
+        "gasprice": 8.8
+      },
+      {
+        "expectedTime": "84.91686745986737853339",
+        "expectedWait": 6.1216091808,
+        "gasprice": 9
+      },
+      {
+        "expectedTime": "80.39566429296684383503",
+        "expectedWait": 5.7956781892,
+        "gasprice": 9.1
+      },
+      {
+        "expectedTime": "78.24522052614759252715",
+        "expectedWait": 5.6406539084,
+        "gasprice": 9.2
+      },
+      {
+        "expectedTime": "77.1685119880459882636",
+        "expectedWait": 5.5630345959,
+        "gasprice": 9.5
+      },
+      {
+        "expectedTime": "72.43649507646737870178",
+        "expectedWait": 5.2219061601,
+        "gasprice": 9.8
+      },
+      {
+        "expectedTime": "71.48259532351443753818",
+        "expectedWait": 5.1531400638,
+        "gasprice": 9.9
+      },
+      {
+        "expectedTime": "58.23892805162994573827",
+        "expectedWait": 4.1984115442,
+        "gasprice": 10
+      },
+      {
+        "expectedTime": "53.13065124862245917617",
+        "expectedWait": 3.8301587446,
+        "gasprice": 10.1
+      },
+      {
+        "expectedTime": "53.03510209647058751971",
+        "expectedWait": 3.82327066,
+        "gasprice": 10.3
+      },
+      {
+        "expectedTime": "49.06846157804491912403",
+        "expectedWait": 3.5373177776,
+        "gasprice": 11
+      },
+      {
+        "expectedTime": "48.30893330101818116637",
+        "expectedWait": 3.4825638116,
+        "gasprice": 11.1
+      },
+      {
+        "expectedTime": "48.25099734861818116715",
+        "expectedWait": 3.4783872414,
+        "gasprice": 11.3
+      },
+      {
+        "expectedTime": "47.64416885027272662988",
+        "expectedWait": 3.4346413165,
+        "gasprice": 11.9
+      },
+      {
+        "expectedTime": "46.76354741392085498401",
+        "expectedWait": 3.3711578128,
+        "gasprice": 12.6
+      },
+      {
+        "expectedTime": "44.99427448545882292232",
+        "expectedWait": 3.2436119232,
+        "gasprice": 13
+      },
+      {
+        "expectedTime": "44.61790554199251276697",
+        "expectedWait": 3.2164796979,
+        "gasprice": 13.1
+      },
+      {
+        "expectedTime": "42.87832690973048070488",
+        "expectedWait": 3.0910744534,
+        "gasprice": 14
+      },
+      {
+        "expectedTime": "42.21224091308663044649",
+        "expectedWait": 3.0430566888,
+        "gasprice": 14.9
+      },
+      {
+        "expectedTime": "41.15715335111336842864",
+        "expectedWait": 2.9669960203,
+        "gasprice": 15
+      },
+      {
+        "expectedTime": "40.9600723880876999821",
+        "expectedWait": 2.9527885646,
+        "gasprice": 15.1
+      },
+      {
+        "expectedTime": "38.89138450301711177472",
+        "expectedWait": 2.8036580193,
+        "gasprice": 15.8
+      },
+      {
+        "expectedTime": "37.89655640860213852611",
+        "expectedWait": 2.7319414219,
+        "gasprice": 16
+      },
+      {
+        "expectedTime": "37.35265517364705831954",
+        "expectedWait": 2.692731888,
+        "gasprice": 17.4
+      },
+      {
+        "expectedTime": "36.79447683873796741798",
+        "expectedWait": 2.652493126,
+        "gasprice": 17.8
+      },
+      {
+        "expectedTime": "36.11439350850802090309",
+        "expectedWait": 2.6034663015,
+        "gasprice": 19
+      },
+      {
+        "expectedTime": "31.32676199432192471101",
+        "expectedWait": 2.2583286403,
+        "gasprice": 20
+      },
+      {
+        "expectedTime": "30.76792490132192471855",
+        "expectedWait": 2.2180423888,
+        "gasprice": 20.1
+      },
+      {
+        "expectedTime": "29.94493658520962526441",
+        "expectedWait": 2.1587136243,
+        "gasprice": 25
+      },
+      {
+        "expectedTime": "29.53287347625561457478",
+        "expectedWait": 2.1290082267,
+        "gasprice": 29
+      },
+      {
+        "expectedTime": "29.09318627175614934008",
+        "expectedWait": 2.0973114236,
+        "gasprice": 47
+      }
+    ],
+    "priceAndTimeEstimatesLastRetrieved": 1541527901281,
+    "errors": {}
   }
 }
diff --git a/development/states/confirm-sig-requests.json b/development/states/confirm-sig-requests.json
index 1ffde3938..f261ce67f 100644
--- a/development/states/confirm-sig-requests.json
+++ b/development/states/confirm-sig-requests.json
@@ -203,5 +203,321 @@
     "hexGasTotal": "",
     "nonce": "",
     "fetchingMethodData": false
+  },
+  "gas": {
+    "customData": {
+      "price": null,
+      "limit": "0x186a0"
+    },
+    "basicEstimates": {
+      "average": 73,
+      "avgWait": 10.6,
+      "blockTime": 13.871657754010695,
+      "blockNum": 6655504,
+      "fast": 160,
+      "fastest": 290,
+      "fastestWait": 0.5,
+      "fastWait": 0.6,
+      "safeLow": 50,
+      "safeLowWait": 16.1,
+      "speed": 0.6702462692280712
+    },
+    "basicEstimateIsLoading": false,
+    "gasEstimatesLoading": false,
+    "basicPriceAndTimeEstimates": [],
+    "priceAndTimeEstimates": [
+      {
+        "expectedTime": "1374.1168296452973076627",
+        "expectedWait": 99.0593088449,
+        "gasprice": 4.1
+      },
+      {
+        "expectedTime": "1280.88976972896682763716",
+        "expectedWait": 92.3386225672,
+        "gasprice": 4.4
+      },
+      {
+        "expectedTime": "1245.13314632680319175597",
+        "expectedWait": 89.7609477113,
+        "gasprice": 4.8
+      },
+      {
+        "expectedTime": "1227.99925007911014385881",
+        "expectedWait": 88.5257747744,
+        "gasprice": 4.9
+      },
+      {
+        "expectedTime": "965.52572720362993349654",
+        "expectedWait": 69.6042062402,
+        "gasprice": 5
+      },
+      {
+        "expectedTime": "917.466895447437420776",
+        "expectedWait": 66.1396721082,
+        "gasprice": 5.1
+      },
+      {
+        "expectedTime": "915.81694044041496090521",
+        "expectedWait": 66.0207277804,
+        "gasprice": 5.2
+      },
+      {
+        "expectedTime": "902.13145619709089691874",
+        "expectedWait": 65.034148924,
+        "gasprice": 5.3
+      },
+      {
+        "expectedTime": "890.83591122200105749896",
+        "expectedWait": 64.2198594443,
+        "gasprice": 5.4
+      },
+      {
+        "expectedTime": "879.10469542971335712248",
+        "expectedWait": 63.3741627006,
+        "gasprice": 5.5
+      },
+      {
+        "expectedTime": "876.99737395823100420974",
+        "expectedWait": 63.2222470818,
+        "gasprice": 5.6
+      },
+      {
+        "expectedTime": "865.96781957003849098957",
+        "expectedWait": 62.4271327138,
+        "gasprice": 5.7
+      },
+      {
+        "expectedTime": "865.44839472121496158482",
+        "expectedWait": 62.3896876688,
+        "gasprice": 5.8
+      },
+      {
+        "expectedTime": "802.16173170976255602161",
+        "expectedWait": 57.8273877524,
+        "gasprice": 6
+      },
+      {
+        "expectedTime": "780.79313908053047074843",
+        "expectedWait": 56.2869379368,
+        "gasprice": 6.1
+      },
+      {
+        "expectedTime": "770.04888359616469549233",
+        "expectedWait": 55.5123906062,
+        "gasprice": 6.2
+      },
+      {
+        "expectedTime": "745.01007965146736962697",
+        "expectedWait": 53.7073573226,
+        "gasprice": 6.3
+      },
+      {
+        "expectedTime": "735.19921111598501681816",
+        "expectedWait": 53.0000973318,
+        "gasprice": 6.6
+      },
+      {
+        "expectedTime": "705.68767153912619368694",
+        "expectedWait": 50.8726270539,
+        "gasprice": 6.7
+      },
+      {
+        "expectedTime": "705.26438593445239690121",
+        "expectedWait": 50.8421126329,
+        "gasprice": 6.9
+      },
+      {
+        "expectedTime": "652.51573119854865429742",
+        "expectedWait": 47.0394918019,
+        "gasprice": 7
+      },
+      {
+        "expectedTime": "635.51471669299464383162",
+        "expectedWait": 45.813898235,
+        "gasprice": 7.1
+      },
+      {
+        "expectedTime": "634.37181911960854759036",
+        "expectedWait": 45.7315073922,
+        "gasprice": 7.2
+      },
+      {
+        "expectedTime": "633.23097691113902888918",
+        "expectedWait": 45.6492647195,
+        "gasprice": 7.3
+      },
+      {
+        "expectedTime": "112.7753456245379663928",
+        "expectedWait": 8.1299111919,
+        "gasprice": 7.6
+      },
+      {
+        "expectedTime": "102.9665314468898381829",
+        "expectedWait": 7.4227992986,
+        "gasprice": 8
+      },
+      {
+        "expectedTime": "100.94784507024919649891",
+        "expectedWait": 7.2772733339,
+        "gasprice": 8.1
+      },
+      {
+        "expectedTime": "100.46445647447807351078",
+        "expectedWait": 7.2424261221,
+        "gasprice": 8.8
+      },
+      {
+        "expectedTime": "84.91686745986737853339",
+        "expectedWait": 6.1216091808,
+        "gasprice": 9
+      },
+      {
+        "expectedTime": "80.39566429296684383503",
+        "expectedWait": 5.7956781892,
+        "gasprice": 9.1
+      },
+      {
+        "expectedTime": "78.24522052614759252715",
+        "expectedWait": 5.6406539084,
+        "gasprice": 9.2
+      },
+      {
+        "expectedTime": "77.1685119880459882636",
+        "expectedWait": 5.5630345959,
+        "gasprice": 9.5
+      },
+      {
+        "expectedTime": "72.43649507646737870178",
+        "expectedWait": 5.2219061601,
+        "gasprice": 9.8
+      },
+      {
+        "expectedTime": "71.48259532351443753818",
+        "expectedWait": 5.1531400638,
+        "gasprice": 9.9
+      },
+      {
+        "expectedTime": "58.23892805162994573827",
+        "expectedWait": 4.1984115442,
+        "gasprice": 10
+      },
+      {
+        "expectedTime": "53.13065124862245917617",
+        "expectedWait": 3.8301587446,
+        "gasprice": 10.1
+      },
+      {
+        "expectedTime": "53.03510209647058751971",
+        "expectedWait": 3.82327066,
+        "gasprice": 10.3
+      },
+      {
+        "expectedTime": "49.06846157804491912403",
+        "expectedWait": 3.5373177776,
+        "gasprice": 11
+      },
+      {
+        "expectedTime": "48.30893330101818116637",
+        "expectedWait": 3.4825638116,
+        "gasprice": 11.1
+      },
+      {
+        "expectedTime": "48.25099734861818116715",
+        "expectedWait": 3.4783872414,
+        "gasprice": 11.3
+      },
+      {
+        "expectedTime": "47.64416885027272662988",
+        "expectedWait": 3.4346413165,
+        "gasprice": 11.9
+      },
+      {
+        "expectedTime": "46.76354741392085498401",
+        "expectedWait": 3.3711578128,
+        "gasprice": 12.6
+      },
+      {
+        "expectedTime": "44.99427448545882292232",
+        "expectedWait": 3.2436119232,
+        "gasprice": 13
+      },
+      {
+        "expectedTime": "44.61790554199251276697",
+        "expectedWait": 3.2164796979,
+        "gasprice": 13.1
+      },
+      {
+        "expectedTime": "42.87832690973048070488",
+        "expectedWait": 3.0910744534,
+        "gasprice": 14
+      },
+      {
+        "expectedTime": "42.21224091308663044649",
+        "expectedWait": 3.0430566888,
+        "gasprice": 14.9
+      },
+      {
+        "expectedTime": "41.15715335111336842864",
+        "expectedWait": 2.9669960203,
+        "gasprice": 15
+      },
+      {
+        "expectedTime": "40.9600723880876999821",
+        "expectedWait": 2.9527885646,
+        "gasprice": 15.1
+      },
+      {
+        "expectedTime": "38.89138450301711177472",
+        "expectedWait": 2.8036580193,
+        "gasprice": 15.8
+      },
+      {
+        "expectedTime": "37.89655640860213852611",
+        "expectedWait": 2.7319414219,
+        "gasprice": 16
+      },
+      {
+        "expectedTime": "37.35265517364705831954",
+        "expectedWait": 2.692731888,
+        "gasprice": 17.4
+      },
+      {
+        "expectedTime": "36.79447683873796741798",
+        "expectedWait": 2.652493126,
+        "gasprice": 17.8
+      },
+      {
+        "expectedTime": "36.11439350850802090309",
+        "expectedWait": 2.6034663015,
+        "gasprice": 19
+      },
+      {
+        "expectedTime": "31.32676199432192471101",
+        "expectedWait": 2.2583286403,
+        "gasprice": 20
+      },
+      {
+        "expectedTime": "30.76792490132192471855",
+        "expectedWait": 2.2180423888,
+        "gasprice": 20.1
+      },
+      {
+        "expectedTime": "29.94493658520962526441",
+        "expectedWait": 2.1587136243,
+        "gasprice": 25
+      },
+      {
+        "expectedTime": "29.53287347625561457478",
+        "expectedWait": 2.1290082267,
+        "gasprice": 29
+      },
+      {
+        "expectedTime": "29.09318627175614934008",
+        "expectedWait": 2.0973114236,
+        "gasprice": 47
+      }
+    ],
+    "priceAndTimeEstimatesLastRetrieved": 1541527901281,
+    "errors": {}
   }
 }
diff --git a/development/states/currency-localization.json b/development/states/currency-localization.json
index ef28891a3..43acf7fda 100644
--- a/development/states/currency-localization.json
+++ b/development/states/currency-localization.json
@@ -152,5 +152,321 @@
     "hexGasTotal": "",
     "nonce": "",
     "fetchingMethodData": false
+  },
+  "gas": {
+    "customData": {
+      "price": null,
+      "limit": "0x186a0"
+    },
+    "basicEstimates": {
+      "average": 73,
+      "avgWait": 10.6,
+      "blockTime": 13.871657754010695,
+      "blockNum": 6655504,
+      "fast": 160,
+      "fastest": 290,
+      "fastestWait": 0.5,
+      "fastWait": 0.6,
+      "safeLow": 50,
+      "safeLowWait": 16.1,
+      "speed": 0.6702462692280712
+    },
+    "basicEstimateIsLoading": false,
+    "gasEstimatesLoading": false,
+    "basicPriceAndTimeEstimates": [],
+    "priceAndTimeEstimates": [
+      {
+        "expectedTime": "1374.1168296452973076627",
+        "expectedWait": 99.0593088449,
+        "gasprice": 4.1
+      },
+      {
+        "expectedTime": "1280.88976972896682763716",
+        "expectedWait": 92.3386225672,
+        "gasprice": 4.4
+      },
+      {
+        "expectedTime": "1245.13314632680319175597",
+        "expectedWait": 89.7609477113,
+        "gasprice": 4.8
+      },
+      {
+        "expectedTime": "1227.99925007911014385881",
+        "expectedWait": 88.5257747744,
+        "gasprice": 4.9
+      },
+      {
+        "expectedTime": "965.52572720362993349654",
+        "expectedWait": 69.6042062402,
+        "gasprice": 5
+      },
+      {
+        "expectedTime": "917.466895447437420776",
+        "expectedWait": 66.1396721082,
+        "gasprice": 5.1
+      },
+      {
+        "expectedTime": "915.81694044041496090521",
+        "expectedWait": 66.0207277804,
+        "gasprice": 5.2
+      },
+      {
+        "expectedTime": "902.13145619709089691874",
+        "expectedWait": 65.034148924,
+        "gasprice": 5.3
+      },
+      {
+        "expectedTime": "890.83591122200105749896",
+        "expectedWait": 64.2198594443,
+        "gasprice": 5.4
+      },
+      {
+        "expectedTime": "879.10469542971335712248",
+        "expectedWait": 63.3741627006,
+        "gasprice": 5.5
+      },
+      {
+        "expectedTime": "876.99737395823100420974",
+        "expectedWait": 63.2222470818,
+        "gasprice": 5.6
+      },
+      {
+        "expectedTime": "865.96781957003849098957",
+        "expectedWait": 62.4271327138,
+        "gasprice": 5.7
+      },
+      {
+        "expectedTime": "865.44839472121496158482",
+        "expectedWait": 62.3896876688,
+        "gasprice": 5.8
+      },
+      {
+        "expectedTime": "802.16173170976255602161",
+        "expectedWait": 57.8273877524,
+        "gasprice": 6
+      },
+      {
+        "expectedTime": "780.79313908053047074843",
+        "expectedWait": 56.2869379368,
+        "gasprice": 6.1
+      },
+      {
+        "expectedTime": "770.04888359616469549233",
+        "expectedWait": 55.5123906062,
+        "gasprice": 6.2
+      },
+      {
+        "expectedTime": "745.01007965146736962697",
+        "expectedWait": 53.7073573226,
+        "gasprice": 6.3
+      },
+      {
+        "expectedTime": "735.19921111598501681816",
+        "expectedWait": 53.0000973318,
+        "gasprice": 6.6
+      },
+      {
+        "expectedTime": "705.68767153912619368694",
+        "expectedWait": 50.8726270539,
+        "gasprice": 6.7
+      },
+      {
+        "expectedTime": "705.26438593445239690121",
+        "expectedWait": 50.8421126329,
+        "gasprice": 6.9
+      },
+      {
+        "expectedTime": "652.51573119854865429742",
+        "expectedWait": 47.0394918019,
+        "gasprice": 7
+      },
+      {
+        "expectedTime": "635.51471669299464383162",
+        "expectedWait": 45.813898235,
+        "gasprice": 7.1
+      },
+      {
+        "expectedTime": "634.37181911960854759036",
+        "expectedWait": 45.7315073922,
+        "gasprice": 7.2
+      },
+      {
+        "expectedTime": "633.23097691113902888918",
+        "expectedWait": 45.6492647195,
+        "gasprice": 7.3
+      },
+      {
+        "expectedTime": "112.7753456245379663928",
+        "expectedWait": 8.1299111919,
+        "gasprice": 7.6
+      },
+      {
+        "expectedTime": "102.9665314468898381829",
+        "expectedWait": 7.4227992986,
+        "gasprice": 8
+      },
+      {
+        "expectedTime": "100.94784507024919649891",
+        "expectedWait": 7.2772733339,
+        "gasprice": 8.1
+      },
+      {
+        "expectedTime": "100.46445647447807351078",
+        "expectedWait": 7.2424261221,
+        "gasprice": 8.8
+      },
+      {
+        "expectedTime": "84.91686745986737853339",
+        "expectedWait": 6.1216091808,
+        "gasprice": 9
+      },
+      {
+        "expectedTime": "80.39566429296684383503",
+        "expectedWait": 5.7956781892,
+        "gasprice": 9.1
+      },
+      {
+        "expectedTime": "78.24522052614759252715",
+        "expectedWait": 5.6406539084,
+        "gasprice": 9.2
+      },
+      {
+        "expectedTime": "77.1685119880459882636",
+        "expectedWait": 5.5630345959,
+        "gasprice": 9.5
+      },
+      {
+        "expectedTime": "72.43649507646737870178",
+        "expectedWait": 5.2219061601,
+        "gasprice": 9.8
+      },
+      {
+        "expectedTime": "71.48259532351443753818",
+        "expectedWait": 5.1531400638,
+        "gasprice": 9.9
+      },
+      {
+        "expectedTime": "58.23892805162994573827",
+        "expectedWait": 4.1984115442,
+        "gasprice": 10
+      },
+      {
+        "expectedTime": "53.13065124862245917617",
+        "expectedWait": 3.8301587446,
+        "gasprice": 10.1
+      },
+      {
+        "expectedTime": "53.03510209647058751971",
+        "expectedWait": 3.82327066,
+        "gasprice": 10.3
+      },
+      {
+        "expectedTime": "49.06846157804491912403",
+        "expectedWait": 3.5373177776,
+        "gasprice": 11
+      },
+      {
+        "expectedTime": "48.30893330101818116637",
+        "expectedWait": 3.4825638116,
+        "gasprice": 11.1
+      },
+      {
+        "expectedTime": "48.25099734861818116715",
+        "expectedWait": 3.4783872414,
+        "gasprice": 11.3
+      },
+      {
+        "expectedTime": "47.64416885027272662988",
+        "expectedWait": 3.4346413165,
+        "gasprice": 11.9
+      },
+      {
+        "expectedTime": "46.76354741392085498401",
+        "expectedWait": 3.3711578128,
+        "gasprice": 12.6
+      },
+      {
+        "expectedTime": "44.99427448545882292232",
+        "expectedWait": 3.2436119232,
+        "gasprice": 13
+      },
+      {
+        "expectedTime": "44.61790554199251276697",
+        "expectedWait": 3.2164796979,
+        "gasprice": 13.1
+      },
+      {
+        "expectedTime": "42.87832690973048070488",
+        "expectedWait": 3.0910744534,
+        "gasprice": 14
+      },
+      {
+        "expectedTime": "42.21224091308663044649",
+        "expectedWait": 3.0430566888,
+        "gasprice": 14.9
+      },
+      {
+        "expectedTime": "41.15715335111336842864",
+        "expectedWait": 2.9669960203,
+        "gasprice": 15
+      },
+      {
+        "expectedTime": "40.9600723880876999821",
+        "expectedWait": 2.9527885646,
+        "gasprice": 15.1
+      },
+      {
+        "expectedTime": "38.89138450301711177472",
+        "expectedWait": 2.8036580193,
+        "gasprice": 15.8
+      },
+      {
+        "expectedTime": "37.89655640860213852611",
+        "expectedWait": 2.7319414219,
+        "gasprice": 16
+      },
+      {
+        "expectedTime": "37.35265517364705831954",
+        "expectedWait": 2.692731888,
+        "gasprice": 17.4
+      },
+      {
+        "expectedTime": "36.79447683873796741798",
+        "expectedWait": 2.652493126,
+        "gasprice": 17.8
+      },
+      {
+        "expectedTime": "36.11439350850802090309",
+        "expectedWait": 2.6034663015,
+        "gasprice": 19
+      },
+      {
+        "expectedTime": "31.32676199432192471101",
+        "expectedWait": 2.2583286403,
+        "gasprice": 20
+      },
+      {
+        "expectedTime": "30.76792490132192471855",
+        "expectedWait": 2.2180423888,
+        "gasprice": 20.1
+      },
+      {
+        "expectedTime": "29.94493658520962526441",
+        "expectedWait": 2.1587136243,
+        "gasprice": 25
+      },
+      {
+        "expectedTime": "29.53287347625561457478",
+        "expectedWait": 2.1290082267,
+        "gasprice": 29
+      },
+      {
+        "expectedTime": "29.09318627175614934008",
+        "expectedWait": 2.0973114236,
+        "gasprice": 47
+      }
+    ],
+    "priceAndTimeEstimatesLastRetrieved": 1541527901281,
+    "errors": {}
   }
 }
diff --git a/development/states/send-edit.json b/development/states/send-edit.json
index 7951b06cf..09a380730 100644
--- a/development/states/send-edit.json
+++ b/development/states/send-edit.json
@@ -107,7 +107,7 @@
         ]
       }
     ],
-    "selectedAddress": "0xd85a4b6a394794842887b8284293d69163007bbb",
+    "selectedAddress": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
     "currentCurrency": "USD",
     "provider": {
       "type": "testnet"
@@ -130,7 +130,10 @@
       "maxModeOn": false,
       "editingTransactionId": null
     },
-    "currentLocale": "en"
+    "currentLocale": "en",
+    "preferences": {
+      "useNativeCurrencyAsPrimaryCurrency": true
+    }
   },
   "appState": {
     "menuOpen": false,
diff --git a/development/states/send-new-ui.json b/development/states/send-new-ui.json
index fd048596c..60a4af228 100644
--- a/development/states/send-new-ui.json
+++ b/development/states/send-new-ui.json
@@ -89,7 +89,7 @@
         ]
       }
     ],
-    "selectedAddress": "0xd85a4b6a394794842887b8284293d69163007bbb",
+    "selectedAddress": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
     "currentCurrency": "USD",
     "provider": {
       "type": "testnet"
diff --git a/development/states/tx-list-items.json b/development/states/tx-list-items.json
index e83179a17..a3fcd9184 100644
--- a/development/states/tx-list-items.json
+++ b/development/states/tx-list-items.json
@@ -133,5 +133,321 @@
     "fromDropdownOpen": false,
     "toDropdownOpen": false,
     "errors": {}
+  },
+  "gas": {
+    "customData": {
+      "price": null,
+      "limit": "0x186a0"
+    },
+    "basicEstimates": {
+      "average": 73,
+      "avgWait": 10.6,
+      "blockTime": 13.871657754010695,
+      "blockNum": 6655504,
+      "fast": 160,
+      "fastest": 290,
+      "fastestWait": 0.5,
+      "fastWait": 0.6,
+      "safeLow": 50,
+      "safeLowWait": 16.1,
+      "speed": 0.6702462692280712
+    },
+    "basicEstimateIsLoading": false,
+    "gasEstimatesLoading": false,
+    "basicPriceAndTimeEstimates": [],
+    "priceAndTimeEstimates": [
+      {
+        "expectedTime": "1374.1168296452973076627",
+        "expectedWait": 99.0593088449,
+        "gasprice": 4.1
+      },
+      {
+        "expectedTime": "1280.88976972896682763716",
+        "expectedWait": 92.3386225672,
+        "gasprice": 4.4
+      },
+      {
+        "expectedTime": "1245.13314632680319175597",
+        "expectedWait": 89.7609477113,
+        "gasprice": 4.8
+      },
+      {
+        "expectedTime": "1227.99925007911014385881",
+        "expectedWait": 88.5257747744,
+        "gasprice": 4.9
+      },
+      {
+        "expectedTime": "965.52572720362993349654",
+        "expectedWait": 69.6042062402,
+        "gasprice": 5
+      },
+      {
+        "expectedTime": "917.466895447437420776",
+        "expectedWait": 66.1396721082,
+        "gasprice": 5.1
+      },
+      {
+        "expectedTime": "915.81694044041496090521",
+        "expectedWait": 66.0207277804,
+        "gasprice": 5.2
+      },
+      {
+        "expectedTime": "902.13145619709089691874",
+        "expectedWait": 65.034148924,
+        "gasprice": 5.3
+      },
+      {
+        "expectedTime": "890.83591122200105749896",
+        "expectedWait": 64.2198594443,
+        "gasprice": 5.4
+      },
+      {
+        "expectedTime": "879.10469542971335712248",
+        "expectedWait": 63.3741627006,
+        "gasprice": 5.5
+      },
+      {
+        "expectedTime": "876.99737395823100420974",
+        "expectedWait": 63.2222470818,
+        "gasprice": 5.6
+      },
+      {
+        "expectedTime": "865.96781957003849098957",
+        "expectedWait": 62.4271327138,
+        "gasprice": 5.7
+      },
+      {
+        "expectedTime": "865.44839472121496158482",
+        "expectedWait": 62.3896876688,
+        "gasprice": 5.8
+      },
+      {
+        "expectedTime": "802.16173170976255602161",
+        "expectedWait": 57.8273877524,
+        "gasprice": 6
+      },
+      {
+        "expectedTime": "780.79313908053047074843",
+        "expectedWait": 56.2869379368,
+        "gasprice": 6.1
+      },
+      {
+        "expectedTime": "770.04888359616469549233",
+        "expectedWait": 55.5123906062,
+        "gasprice": 6.2
+      },
+      {
+        "expectedTime": "745.01007965146736962697",
+        "expectedWait": 53.7073573226,
+        "gasprice": 6.3
+      },
+      {
+        "expectedTime": "735.19921111598501681816",
+        "expectedWait": 53.0000973318,
+        "gasprice": 6.6
+      },
+      {
+        "expectedTime": "705.68767153912619368694",
+        "expectedWait": 50.8726270539,
+        "gasprice": 6.7
+      },
+      {
+        "expectedTime": "705.26438593445239690121",
+        "expectedWait": 50.8421126329,
+        "gasprice": 6.9
+      },
+      {
+        "expectedTime": "652.51573119854865429742",
+        "expectedWait": 47.0394918019,
+        "gasprice": 7
+      },
+      {
+        "expectedTime": "635.51471669299464383162",
+        "expectedWait": 45.813898235,
+        "gasprice": 7.1
+      },
+      {
+        "expectedTime": "634.37181911960854759036",
+        "expectedWait": 45.7315073922,
+        "gasprice": 7.2
+      },
+      {
+        "expectedTime": "633.23097691113902888918",
+        "expectedWait": 45.6492647195,
+        "gasprice": 7.3
+      },
+      {
+        "expectedTime": "112.7753456245379663928",
+        "expectedWait": 8.1299111919,
+        "gasprice": 7.6
+      },
+      {
+        "expectedTime": "102.9665314468898381829",
+        "expectedWait": 7.4227992986,
+        "gasprice": 8
+      },
+      {
+        "expectedTime": "100.94784507024919649891",
+        "expectedWait": 7.2772733339,
+        "gasprice": 8.1
+      },
+      {
+        "expectedTime": "100.46445647447807351078",
+        "expectedWait": 7.2424261221,
+        "gasprice": 8.8
+      },
+      {
+        "expectedTime": "84.91686745986737853339",
+        "expectedWait": 6.1216091808,
+        "gasprice": 9
+      },
+      {
+        "expectedTime": "80.39566429296684383503",
+        "expectedWait": 5.7956781892,
+        "gasprice": 9.1
+      },
+      {
+        "expectedTime": "78.24522052614759252715",
+        "expectedWait": 5.6406539084,
+        "gasprice": 9.2
+      },
+      {
+        "expectedTime": "77.1685119880459882636",
+        "expectedWait": 5.5630345959,
+        "gasprice": 9.5
+      },
+      {
+        "expectedTime": "72.43649507646737870178",
+        "expectedWait": 5.2219061601,
+        "gasprice": 9.8
+      },
+      {
+        "expectedTime": "71.48259532351443753818",
+        "expectedWait": 5.1531400638,
+        "gasprice": 9.9
+      },
+      {
+        "expectedTime": "58.23892805162994573827",
+        "expectedWait": 4.1984115442,
+        "gasprice": 10
+      },
+      {
+        "expectedTime": "53.13065124862245917617",
+        "expectedWait": 3.8301587446,
+        "gasprice": 10.1
+      },
+      {
+        "expectedTime": "53.03510209647058751971",
+        "expectedWait": 3.82327066,
+        "gasprice": 10.3
+      },
+      {
+        "expectedTime": "49.06846157804491912403",
+        "expectedWait": 3.5373177776,
+        "gasprice": 11
+      },
+      {
+        "expectedTime": "48.30893330101818116637",
+        "expectedWait": 3.4825638116,
+        "gasprice": 11.1
+      },
+      {
+        "expectedTime": "48.25099734861818116715",
+        "expectedWait": 3.4783872414,
+        "gasprice": 11.3
+      },
+      {
+        "expectedTime": "47.64416885027272662988",
+        "expectedWait": 3.4346413165,
+        "gasprice": 11.9
+      },
+      {
+        "expectedTime": "46.76354741392085498401",
+        "expectedWait": 3.3711578128,
+        "gasprice": 12.6
+      },
+      {
+        "expectedTime": "44.99427448545882292232",
+        "expectedWait": 3.2436119232,
+        "gasprice": 13
+      },
+      {
+        "expectedTime": "44.61790554199251276697",
+        "expectedWait": 3.2164796979,
+        "gasprice": 13.1
+      },
+      {
+        "expectedTime": "42.87832690973048070488",
+        "expectedWait": 3.0910744534,
+        "gasprice": 14
+      },
+      {
+        "expectedTime": "42.21224091308663044649",
+        "expectedWait": 3.0430566888,
+        "gasprice": 14.9
+      },
+      {
+        "expectedTime": "41.15715335111336842864",
+        "expectedWait": 2.9669960203,
+        "gasprice": 15
+      },
+      {
+        "expectedTime": "40.9600723880876999821",
+        "expectedWait": 2.9527885646,
+        "gasprice": 15.1
+      },
+      {
+        "expectedTime": "38.89138450301711177472",
+        "expectedWait": 2.8036580193,
+        "gasprice": 15.8
+      },
+      {
+        "expectedTime": "37.89655640860213852611",
+        "expectedWait": 2.7319414219,
+        "gasprice": 16
+      },
+      {
+        "expectedTime": "37.35265517364705831954",
+        "expectedWait": 2.692731888,
+        "gasprice": 17.4
+      },
+      {
+        "expectedTime": "36.79447683873796741798",
+        "expectedWait": 2.652493126,
+        "gasprice": 17.8
+      },
+      {
+        "expectedTime": "36.11439350850802090309",
+        "expectedWait": 2.6034663015,
+        "gasprice": 19
+      },
+      {
+        "expectedTime": "31.32676199432192471101",
+        "expectedWait": 2.2583286403,
+        "gasprice": 20
+      },
+      {
+        "expectedTime": "30.76792490132192471855",
+        "expectedWait": 2.2180423888,
+        "gasprice": 20.1
+      },
+      {
+        "expectedTime": "29.94493658520962526441",
+        "expectedWait": 2.1587136243,
+        "gasprice": 25
+      },
+      {
+        "expectedTime": "29.53287347625561457478",
+        "expectedWait": 2.1290082267,
+        "gasprice": 29
+      },
+      {
+        "expectedTime": "29.09318627175614934008",
+        "expectedWait": 2.0973114236,
+        "gasprice": 47
+      }
+    ],
+    "priceAndTimeEstimatesLastRetrieved": 1541527901281,
+    "errors": {}
   }
 }