diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-10-21 11:48:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 11:48:10 +0800 |
| commit | 3b46478024f87bd237b507e5fb18068febf02de9 (patch) | |
| tree | 1b70c2e7f431e7e3eb638c7630a2d220fa3dd030 /development/states | |
| parent | 600f755dbf8d4cfdc152e3d521b537ee9a046a35 (diff) | |
| parent | ba3617b685b9dcd8a62e0009ee2015c5997fead3 (diff) | |
| download | tangerine-wallet-browser-3b46478024f87bd237b507e5fb18068febf02de9.tar tangerine-wallet-browser-3b46478024f87bd237b507e5fb18068febf02de9.tar.gz tangerine-wallet-browser-3b46478024f87bd237b507e5fb18068febf02de9.tar.bz2 tangerine-wallet-browser-3b46478024f87bd237b507e5fb18068febf02de9.tar.lz tangerine-wallet-browser-3b46478024f87bd237b507e5fb18068febf02de9.tar.xz tangerine-wallet-browser-3b46478024f87bd237b507e5fb18068febf02de9.tar.zst tangerine-wallet-browser-3b46478024f87bd237b507e5fb18068febf02de9.zip | |
Merge branch 'develop' into develop
Diffstat (limited to 'development/states')
| -rw-r--r-- | development/states/add-token.json | 5 | ||||
| -rw-r--r-- | development/states/confirm-sig-requests.json | 5 | ||||
| -rw-r--r-- | development/states/currency-localization.json | 5 | ||||
| -rw-r--r-- | development/states/first-time.json | 5 | ||||
| -rw-r--r-- | development/states/send-new-ui.json | 5 | ||||
| -rw-r--r-- | development/states/tx-list-items.json | 5 |
6 files changed, 24 insertions, 6 deletions
diff --git a/development/states/add-token.json b/development/states/add-token.json index d04b3a3ca..6a525f2b3 100644 --- a/development/states/add-token.json +++ b/development/states/add-token.json @@ -107,7 +107,10 @@ "maxModeOn": false, "editingTransactionId": null }, - "currentLocale": "en" + "currentLocale": "en", + "preferences": { + "useETHAsPrimaryCurrency": true + } }, "appState": { "menuOpen": false, diff --git a/development/states/confirm-sig-requests.json b/development/states/confirm-sig-requests.json index 5017a4d57..c7103cd13 100644 --- a/development/states/confirm-sig-requests.json +++ b/development/states/confirm-sig-requests.json @@ -150,7 +150,10 @@ "maxModeOn": false, "editingTransactionId": null }, - "currentLocale": "en" + "currentLocale": "en", + "preferences": { + "useETHAsPrimaryCurrency": true + } }, "appState": { "menuOpen": false, diff --git a/development/states/currency-localization.json b/development/states/currency-localization.json index 847ea11a3..7dea42ade 100644 --- a/development/states/currency-localization.json +++ b/development/states/currency-localization.json @@ -108,7 +108,10 @@ "maxModeOn": false, "editingTransactionId": null }, - "currentLocale": "en" + "currentLocale": "en", + "preferences": { + "useETHAsPrimaryCurrency": true + } }, "appState": { "menuOpen": false, diff --git a/development/states/first-time.json b/development/states/first-time.json index a31b985a3..3206b67a3 100644 --- a/development/states/first-time.json +++ b/development/states/first-time.json @@ -37,7 +37,10 @@ "shapeShiftTxList": [], "lostAccounts": [], "tokens": [], - "currentLocale": "en" + "currentLocale": "en", + "preferences": { + "useETHAsPrimaryCurrency": true + } }, "appState": { "menuOpen": false, diff --git a/development/states/send-new-ui.json b/development/states/send-new-ui.json index bb4847155..d9924dd74 100644 --- a/development/states/send-new-ui.json +++ b/development/states/send-new-ui.json @@ -109,7 +109,10 @@ "maxModeOn": false, "editingTransactionId": null }, - "currentLocale": "en" + "currentLocale": "en", + "preferences": { + "useETHAsPrimaryCurrency": true + } }, "appState": { "menuOpen": false, diff --git a/development/states/tx-list-items.json b/development/states/tx-list-items.json index 0d2273cb0..cbffa98e5 100644 --- a/development/states/tx-list-items.json +++ b/development/states/tx-list-items.json @@ -102,7 +102,10 @@ "shapeShiftTxList": [{"depositAddress":"34vJ3AfmNcLiziA4VFgEVcQTwxVLD1qkke","depositType":"BTC","key":"shapeshift","response":{"status":"no_deposits","address":"34vJ3AfmNcLiziA4VFgEVcQTwxVLD1qkke"},"time":1522377459106}], "lostAccounts": [], "send": {}, - "currentLocale": "en" + "currentLocale": "en", + "preferences": { + "useETHAsPrimaryCurrency": true + } }, "appState": { "menuOpen": false, |