aboutsummaryrefslogtreecommitdiffstats
path: root/development
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-10-21 13:59:53 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-10-21 13:59:53 +0800
commit9c1b2108f69334884473eb95758e2d1c02c984d6 (patch)
tree93f5255399307a28cb9380dc23c275b406403929 /development
parent13820b6cc1801a420f39cdfecd7ccb5309dc597b (diff)
parentb0c649a4e3c68293e08e764bbf4d53939df88e2d (diff)
downloadtangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar
tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.gz
tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.bz2
tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.lz
tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.xz
tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.zst
tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.zip
fix merge conflicts
Diffstat (limited to 'development')
-rw-r--r--development/states/add-token.json5
-rw-r--r--development/states/confirm-sig-requests.json5
-rw-r--r--development/states/currency-localization.json5
-rw-r--r--development/states/first-time.json5
-rw-r--r--development/states/send-new-ui.json5
-rw-r--r--development/states/tx-list-items.json5
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,