CWA-218 | made editable address fields on exchange an exchange template pages; changed "Switch to 6-digit PIN" to "Use 6-digit PIN"; removed "Buy" button; made send and exchange button more transparent in the light mode
Oleksandr Sobol committed
Jun 1, 2020 at 19:26 UTC
d2e8c3d2282f4112c4119566b50de2a58616a411
16 files changed
+35
-41
lib/generated/i18n.dart
+12
-12
@@ -272,7 +272,7 @@ class S implements WidgetsLocalizations {
272
String get transaction_sent => "Transaction sent!";
273
String get transactions => "Transactions";
274
String get transactions_by_date => "Transactions by date";
275
- String get use => "Switch to ";
275
+ String get use => "Use ";
276
String get view_key_private => "View key (private)";
277
String get view_key_public => "View key (public)";
278
String get wallet_keys => "Wallet keys";
@@ -746,7 +746,7 @@ class $de extends S {
746
@override
747
String get restore_from_seed_placeholder => "Bitte geben Sie hier Ihren Code ein";
748
@override
749
- String get use => "Wechseln zu ";
749
+ String get use => "Verwenden Sie ";
750
@override
751
String get trade_details_state => "Zustand";
752
@override
@@ -1362,7 +1362,7 @@ class $hi extends S {
1362
@override
1363
String get restore_from_seed_placeholder => "कृपया अपना कोड वाक्यांश यहां दर्ज करें या पेस्ट करें";
1364
@override
1365
- String get use => "पर स्विच ";
1365
+ String get use => "उपयोग ";
1366
@override
1367
String get trade_details_state => "राज्य";
1368
@override
@@ -1978,7 +1978,7 @@ class $ru extends S {
1978
@override
1979
String get restore_from_seed_placeholder => "Введите или вставьте мнемоническую фразу вашего кошелька";
1980
@override
1981
- String get use => "Переключиться на ";
1981
+ String get use => "Использовать ";
1982
@override
1983
String get trade_details_state => "Статус";
1984
@override
@@ -2594,7 +2594,7 @@ class $ko extends S {
2594
@override
2595
String get restore_from_seed_placeholder => "여기에 코드 문구를 입력하거나 붙여 넣으십시오.";
2596
@override
2597
- String get use => "로 전환 ";
2597
+ String get use => "사용하다 ";
2598
@override
2599
String get trade_details_state => "상태";
2600
@override
@@ -3210,7 +3210,7 @@ class $pt extends S {
3210
@override
3211
String get restore_from_seed_placeholder => "Digite ou cole sua frase de código aqui";
3212
@override
3213
- String get use => "Trocar para PIN de ";
3213
+ String get use => "Use PIN de ";
3214
@override
3215
String get trade_details_state => "Status";
3216
@override
@@ -3826,7 +3826,7 @@ class $uk extends S {
3826
@override
3827
String get restore_from_seed_placeholder => "Введіть або вставте мнемонічну фразу вашого гаманця";
3828
@override
3829
- String get use => "Переключитися на ";
3829
+ String get use => "Використати ";
3830
@override
3831
String get trade_details_state => "Статус";
3832
@override
@@ -4442,7 +4442,7 @@ class $ja extends S {
4442
@override
4443
String get restore_from_seed_placeholder => "ここにコードフレーズを入力または貼り付けてください";
4444
@override
4445
- String get use => "切り替える ";
4445
+ String get use => "使用する ";
4446
@override
4447
String get trade_details_state => "状態";
4448
@override
@@ -5062,7 +5062,7 @@ class $pl extends S {
5062
@override
5063
String get restore_from_seed_placeholder => "Wpisz lub wklej tutaj swoją frazę kodową";
5064
@override
5065
- String get use => "Przełącz na ";
5065
+ String get use => "Używać ";
5066
@override
5067
String get trade_details_state => "Stan";
5068
@override
@@ -5678,7 +5678,7 @@ class $es extends S {
5678
@override
5679
String get restore_from_seed_placeholder => "Ingrese o pegue su frase de código aquí";
5680
@override
5681
- String get use => "Cambiar a ";
5681
+ String get use => "Utilizar a ";
5682
@override
5683
String get trade_details_state => "Estado";
5684
@override
@@ -6294,7 +6294,7 @@ class $nl extends S {
6294
@override
6295
String get restore_from_seed_placeholder => "Voer hier uw codefrase in of plak deze";
6296
@override
6297
- String get use => "Overschakelen naar ";
6297
+ String get use => "Gebruik ";
6298
@override
6299
String get trade_details_state => "Staat";
6300
@override
@@ -6910,7 +6910,7 @@ class $zh extends S {
6910
@override
6911
String get restore_from_seed_placeholder => "请在此处输入或粘贴您的代码短语";
6912
@override
6913
- String get use => "切換到 ";
6913
+ String get use => "採用 ";
6914
@override
6915
String get trade_details_state => "条件";
6916
@override
lib/src/screens/dashboard/widgets/button_header.dart
-8
@@ -62,14 +62,6 @@ class ButtonHeader extends SliverPersistentHeaderDelegate {
62
route: Routes.exchange
63
)
64
),
65
- Flexible(
66
- child: actionButton(
67
- context: context,
68
- image: buyImage,
69
- title: S.of(context).buy,
70
- route: ''
71
- )
72
- )
65
],
66
),
67
),
lib/src/stores/exchange/exchange_store.dart
+10
-8
@@ -33,8 +33,10 @@ abstract class ExchangeStoreBase with Store {
33
provider = initialProvider;
34
depositCurrency = initialDepositCurrency;
35
receiveCurrency = initialReceiveCurrency;
36
- isDepositAddressEnabled = !(depositCurrency == walletStore.type);
37
- isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
36
+ /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
37
+ isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
38
+ isDepositAddressEnabled = true;
39
+ isReceiveAddressEnabled = true;
40
depositAmount = '';
41
receiveAmount = '';
42
depositAddress = '';
@@ -107,16 +109,16 @@ abstract class ExchangeStoreBase with Store {
109
void changeDepositCurrency({CryptoCurrency currency}) {
110
depositCurrency = currency;
111
_onPairChange();
110
- isDepositAddressEnabled = !(depositCurrency == walletStore.type);
111
- isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
112
+ /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
113
+ isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
114
}
115
116
@action
117
void changeReceiveCurrency({CryptoCurrency currency}) {
118
receiveCurrency = currency;
119
_onPairChange();
118
- isDepositAddressEnabled = !(depositCurrency == walletStore.type);
119
- isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
120
+ /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
121
+ isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
122
}
123
124
@action
@@ -240,8 +242,8 @@ abstract class ExchangeStoreBase with Store {
242
receiveCurrency = CryptoCurrency.btc;
243
depositAddress = depositCurrency == walletStore.type ? walletStore.address : '';
244
receiveAddress = receiveCurrency == walletStore.type ? walletStore.address : '';
243
- isDepositAddressEnabled = !(depositCurrency == walletStore.type);
244
- isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
245
+ /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
246
+ isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
247
_onPairChange();
248
}
249
lib/themes.dart
+1
-1
@@ -28,7 +28,7 @@ class Themes {
28
color: Palette.lavender // address field in the wallet card
29
),
30
subhead: TextStyle(
31
- color: Colors.white // send, exchange, buy buttons on dashboard page
31
+ color: Colors.white.withOpacity(0.5) // send, exchange, buy buttons on dashboard page
32
),
33
headline: TextStyle(
34
color: Palette.lightBlueGrey // historyPanelText
res/values/strings_de.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "Neuen Knoten hinzufügen",
131
132
133
- "use" : "Wechseln zu ",
133
+ "use" : "Verwenden Sie ",
134
"digit_pin" : "-stelliger PIN",
135
136
res/values/strings_en.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "Add new node",
131
132
133
- "use" : "Switch to ",
133
+ "use" : "Use ",
134
"digit_pin" : "-digit PIN",
135
136
res/values/strings_es.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "Agregar nuevo nodo",
131
132
133
- "use" : "Cambiar a ",
133
+ "use" : "Utilizar a ",
134
"digit_pin" : "-dígito PIN",
135
136
res/values/strings_hi.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "नया नोड जोड़ें",
131
132
133
- "use" : "पर स्विच ",
133
+ "use" : "उपयोग ",
134
"digit_pin" : "-अंक पिन",
135
136
res/values/strings_ja.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "新しいノードを追加",
131
132
133
- "use" : "切り替える ",
133
+ "use" : "使用する ",
134
"digit_pin" : "桁ピン",
135
136
res/values/strings_ko.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "새 노드 추가",
131
132
133
- "use" : "로 전환 ",
133
+ "use" : "사용하다 ",
134
"digit_pin" : "숫자 PIN",
135
136
res/values/strings_nl.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "Voeg een nieuw knooppunt toe",
131
132
133
- "use" : "Overschakelen naar ",
133
+ "use" : "Gebruik ",
134
"digit_pin" : "-cijferige PIN",
135
136
res/values/strings_pl.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "Dodaj nowy węzeł",
131
132
133
- "use" : "Przełącz na ",
133
+ "use" : "Używać ",
134
"digit_pin" : "-znak PIN",
135
136
res/values/strings_pt.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "Adicionar novo nó",
131
132
133
- "use" : "Trocar para PIN de ",
133
+ "use" : "Use PIN de ",
134
"digit_pin" : "dígitos",
135
136
res/values/strings_ru.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "Добавить новую ноду",
131
132
133
- "use" : "Переключиться на ",
133
+ "use" : "Использовать ",
134
"digit_pin" : "-значный PIN",
135
136
res/values/strings_uk.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "Додати новий вузол",
131
132
133
- "use" : "Переключитися на ",
133
+ "use" : "Використати ",
134
"digit_pin" : "-значний PIN",
135
136
res/values/strings_zh.arb
+1
-1
@@ -130,7 +130,7 @@
130
"add_new_node" : "添加新節點",
131
132
133
- "use" : "切換到 ",
133
+ "use" : "採用 ",
134
"digit_pin" : "数字别针",
135
136