diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-03-27 15:20:35 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-03-27 15:20:35 +0800 |
| commit | 6f367a5a6b4fb8918405f233293dc3f4840b4a3d (patch) | |
| tree | c60c01300c90204f8634d1f3e9e79b4ecc2fceda /development/states | |
| parent | 72ffa2c3f5abbcb06c8ab5fdf20b9d934c330692 (diff) | |
| parent | e001c0900b5256c0c8769f0c3eb5d2007f5b18d3 (diff) | |
| download | tangerine-wallet-browser-6f367a5a6b4fb8918405f233293dc3f4840b4a3d.tar.gz tangerine-wallet-browser-6f367a5a6b4fb8918405f233293dc3f4840b4a3d.tar.zst tangerine-wallet-browser-6f367a5a6b4fb8918405f233293dc3f4840b4a3d.zip | |
Fix merge conflicts
Diffstat (limited to 'development/states')
| -rw-r--r-- | development/states/confirm-new-ui.json | 2 | ||||
| -rw-r--r-- | development/states/first-time.json | 2 | ||||
| -rw-r--r-- | development/states/send-edit.json | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/development/states/confirm-new-ui.json b/development/states/confirm-new-ui.json index 6ea8e64cd..6981781a9 100644 --- a/development/states/confirm-new-ui.json +++ b/development/states/confirm-new-ui.json @@ -116,7 +116,7 @@ "send": { "gasLimit": "0xea60", "gasPrice": "0xba43b7400", - "gasTotal": "0xb451dc41b578", + "gasTotal": "0xaa87bee538000", "tokenBalance": null, "from": { "address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb", diff --git a/development/states/first-time.json b/development/states/first-time.json index 6e7435db1..4f5352992 100644 --- a/development/states/first-time.json +++ b/development/states/first-time.json @@ -8,7 +8,7 @@ "frequentRpcList": [], "unapprovedTxs": {}, "currentCurrency": "USD", - "featureFlags": {"betaUI": true}, + "featureFlags": {"betaUI": false}, "conversionRate": 12.7527416, "conversionDate": 1487624341, "noActiveNotices": false, diff --git a/development/states/send-edit.json b/development/states/send-edit.json index 6ea8e64cd..6981781a9 100644 --- a/development/states/send-edit.json +++ b/development/states/send-edit.json @@ -116,7 +116,7 @@ "send": { "gasLimit": "0xea60", "gasPrice": "0xba43b7400", - "gasTotal": "0xb451dc41b578", + "gasTotal": "0xaa87bee538000", "tokenBalance": null, "from": { "address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb", |