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

This commit is contained in:
Oleksandr Sobol 2020-06-01 19:26:53 +03:00
parent d9e0c260d4
commit d2e8c3d228
16 changed files with 35 additions and 41 deletions

View file

@ -272,7 +272,7 @@ class S implements WidgetsLocalizations {
String get transaction_sent => "Transaction sent!"; String get transaction_sent => "Transaction sent!";
String get transactions => "Transactions"; String get transactions => "Transactions";
String get transactions_by_date => "Transactions by date"; String get transactions_by_date => "Transactions by date";
String get use => "Switch to "; String get use => "Use ";
String get view_key_private => "View key (private)"; String get view_key_private => "View key (private)";
String get view_key_public => "View key (public)"; String get view_key_public => "View key (public)";
String get wallet_keys => "Wallet keys"; String get wallet_keys => "Wallet keys";
@ -746,7 +746,7 @@ class $de extends S {
@override @override
String get restore_from_seed_placeholder => "Bitte geben Sie hier Ihren Code ein"; String get restore_from_seed_placeholder => "Bitte geben Sie hier Ihren Code ein";
@override @override
String get use => "Wechseln zu "; String get use => "Verwenden Sie ";
@override @override
String get trade_details_state => "Zustand"; String get trade_details_state => "Zustand";
@override @override
@ -1362,7 +1362,7 @@ class $hi extends S {
@override @override
String get restore_from_seed_placeholder => "कृपया अपना कोड वाक्यांश यहां दर्ज करें या पेस्ट करें"; String get restore_from_seed_placeholder => "कृपया अपना कोड वाक्यांश यहां दर्ज करें या पेस्ट करें";
@override @override
String get use => "पर स्विच "; String get use => "उपयोग ";
@override @override
String get trade_details_state => "राज्य"; String get trade_details_state => "राज्य";
@override @override
@ -1978,7 +1978,7 @@ class $ru extends S {
@override @override
String get restore_from_seed_placeholder => "Введите или вставьте мнемоническую фразу вашего кошелька"; String get restore_from_seed_placeholder => "Введите или вставьте мнемоническую фразу вашего кошелька";
@override @override
String get use => "Переключиться на "; String get use => "Использовать ";
@override @override
String get trade_details_state => "Статус"; String get trade_details_state => "Статус";
@override @override
@ -2594,7 +2594,7 @@ class $ko extends S {
@override @override
String get restore_from_seed_placeholder => "여기에 코드 문구를 입력하거나 붙여 넣으십시오."; String get restore_from_seed_placeholder => "여기에 코드 문구를 입력하거나 붙여 넣으십시오.";
@override @override
String get use => "로 전환 "; String get use => "사용하다 ";
@override @override
String get trade_details_state => "상태"; String get trade_details_state => "상태";
@override @override
@ -3210,7 +3210,7 @@ class $pt extends S {
@override @override
String get restore_from_seed_placeholder => "Digite ou cole sua frase de código aqui"; String get restore_from_seed_placeholder => "Digite ou cole sua frase de código aqui";
@override @override
String get use => "Trocar para PIN de "; String get use => "Use PIN de ";
@override @override
String get trade_details_state => "Status"; String get trade_details_state => "Status";
@override @override
@ -3826,7 +3826,7 @@ class $uk extends S {
@override @override
String get restore_from_seed_placeholder => "Введіть або вставте мнемонічну фразу вашого гаманця"; String get restore_from_seed_placeholder => "Введіть або вставте мнемонічну фразу вашого гаманця";
@override @override
String get use => "Переключитися на "; String get use => "Використати ";
@override @override
String get trade_details_state => "Статус"; String get trade_details_state => "Статус";
@override @override
@ -4442,7 +4442,7 @@ class $ja extends S {
@override @override
String get restore_from_seed_placeholder => "ここにコードフレーズを入力または貼り付けてください"; String get restore_from_seed_placeholder => "ここにコードフレーズを入力または貼り付けてください";
@override @override
String get use => "切り替え"; String get use => "使用す";
@override @override
String get trade_details_state => "状態"; String get trade_details_state => "状態";
@override @override
@ -5062,7 +5062,7 @@ class $pl extends S {
@override @override
String get restore_from_seed_placeholder => "Wpisz lub wklej tutaj swoją frazę kodową"; String get restore_from_seed_placeholder => "Wpisz lub wklej tutaj swoją frazę kodową";
@override @override
String get use => "Przełącz na "; String get use => "Używać ";
@override @override
String get trade_details_state => "Stan"; String get trade_details_state => "Stan";
@override @override
@ -5678,7 +5678,7 @@ class $es extends S {
@override @override
String get restore_from_seed_placeholder => "Ingrese o pegue su frase de código aquí"; String get restore_from_seed_placeholder => "Ingrese o pegue su frase de código aquí";
@override @override
String get use => "Cambiar a "; String get use => "Utilizar a ";
@override @override
String get trade_details_state => "Estado"; String get trade_details_state => "Estado";
@override @override
@ -6294,7 +6294,7 @@ class $nl extends S {
@override @override
String get restore_from_seed_placeholder => "Voer hier uw codefrase in of plak deze"; String get restore_from_seed_placeholder => "Voer hier uw codefrase in of plak deze";
@override @override
String get use => "Overschakelen naar "; String get use => "Gebruik ";
@override @override
String get trade_details_state => "Staat"; String get trade_details_state => "Staat";
@override @override
@ -6910,7 +6910,7 @@ class $zh extends S {
@override @override
String get restore_from_seed_placeholder => "请在此处输入或粘贴您的代码短语"; String get restore_from_seed_placeholder => "请在此处输入或粘贴您的代码短语";
@override @override
String get use => "切換到 "; String get use => "採用 ";
@override @override
String get trade_details_state => "条件"; String get trade_details_state => "条件";
@override @override

View file

@ -62,14 +62,6 @@ class ButtonHeader extends SliverPersistentHeaderDelegate {
route: Routes.exchange route: Routes.exchange
) )
), ),
Flexible(
child: actionButton(
context: context,
image: buyImage,
title: S.of(context).buy,
route: ''
)
)
], ],
), ),
), ),

View file

@ -33,8 +33,10 @@ abstract class ExchangeStoreBase with Store {
provider = initialProvider; provider = initialProvider;
depositCurrency = initialDepositCurrency; depositCurrency = initialDepositCurrency;
receiveCurrency = initialReceiveCurrency; receiveCurrency = initialReceiveCurrency;
isDepositAddressEnabled = !(depositCurrency == walletStore.type); /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
isReceiveAddressEnabled = !(receiveCurrency == walletStore.type); isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
isDepositAddressEnabled = true;
isReceiveAddressEnabled = true;
depositAmount = ''; depositAmount = '';
receiveAmount = ''; receiveAmount = '';
depositAddress = ''; depositAddress = '';
@ -107,16 +109,16 @@ abstract class ExchangeStoreBase with Store {
void changeDepositCurrency({CryptoCurrency currency}) { void changeDepositCurrency({CryptoCurrency currency}) {
depositCurrency = currency; depositCurrency = currency;
_onPairChange(); _onPairChange();
isDepositAddressEnabled = !(depositCurrency == walletStore.type); /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
isReceiveAddressEnabled = !(receiveCurrency == walletStore.type); isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
} }
@action @action
void changeReceiveCurrency({CryptoCurrency currency}) { void changeReceiveCurrency({CryptoCurrency currency}) {
receiveCurrency = currency; receiveCurrency = currency;
_onPairChange(); _onPairChange();
isDepositAddressEnabled = !(depositCurrency == walletStore.type); /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
isReceiveAddressEnabled = !(receiveCurrency == walletStore.type); isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
} }
@action @action
@ -240,8 +242,8 @@ abstract class ExchangeStoreBase with Store {
receiveCurrency = CryptoCurrency.btc; receiveCurrency = CryptoCurrency.btc;
depositAddress = depositCurrency == walletStore.type ? walletStore.address : ''; depositAddress = depositCurrency == walletStore.type ? walletStore.address : '';
receiveAddress = receiveCurrency == walletStore.type ? walletStore.address : ''; receiveAddress = receiveCurrency == walletStore.type ? walletStore.address : '';
isDepositAddressEnabled = !(depositCurrency == walletStore.type); /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
isReceiveAddressEnabled = !(receiveCurrency == walletStore.type); isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
_onPairChange(); _onPairChange();
} }

View file

@ -28,7 +28,7 @@ class Themes {
color: Palette.lavender // address field in the wallet card color: Palette.lavender // address field in the wallet card
), ),
subhead: TextStyle( subhead: TextStyle(
color: Colors.white // send, exchange, buy buttons on dashboard page color: Colors.white.withOpacity(0.5) // send, exchange, buy buttons on dashboard page
), ),
headline: TextStyle( headline: TextStyle(
color: Palette.lightBlueGrey // historyPanelText color: Palette.lightBlueGrey // historyPanelText

View file

@ -130,7 +130,7 @@
"add_new_node" : "Neuen Knoten hinzufügen", "add_new_node" : "Neuen Knoten hinzufügen",
"use" : "Wechseln zu ", "use" : "Verwenden Sie ",
"digit_pin" : "-stelliger PIN", "digit_pin" : "-stelliger PIN",

View file

@ -130,7 +130,7 @@
"add_new_node" : "Add new node", "add_new_node" : "Add new node",
"use" : "Switch to ", "use" : "Use ",
"digit_pin" : "-digit PIN", "digit_pin" : "-digit PIN",

View file

@ -130,7 +130,7 @@
"add_new_node" : "Agregar nuevo nodo", "add_new_node" : "Agregar nuevo nodo",
"use" : "Cambiar a ", "use" : "Utilizar a ",
"digit_pin" : "-dígito PIN", "digit_pin" : "-dígito PIN",

View file

@ -130,7 +130,7 @@
"add_new_node" : "नया नोड जोड़ें", "add_new_node" : "नया नोड जोड़ें",
"use" : "पर स्विच ", "use" : "उपयोग ",
"digit_pin" : "-अंक पिन", "digit_pin" : "-अंक पिन",

View file

@ -130,7 +130,7 @@
"add_new_node" : "新しいノードを追加", "add_new_node" : "新しいノードを追加",
"use" : "切り替える ", "use" : "使用する ",
"digit_pin" : "桁ピン", "digit_pin" : "桁ピン",

View file

@ -130,7 +130,7 @@
"add_new_node" : "새 노드 추가", "add_new_node" : "새 노드 추가",
"use" : "로 전환 ", "use" : "사용하다 ",
"digit_pin" : "숫자 PIN", "digit_pin" : "숫자 PIN",

View file

@ -130,7 +130,7 @@
"add_new_node" : "Voeg een nieuw knooppunt toe", "add_new_node" : "Voeg een nieuw knooppunt toe",
"use" : "Overschakelen naar ", "use" : "Gebruik ",
"digit_pin" : "-cijferige PIN", "digit_pin" : "-cijferige PIN",

View file

@ -130,7 +130,7 @@
"add_new_node" : "Dodaj nowy węzeł", "add_new_node" : "Dodaj nowy węzeł",
"use" : "Przełącz na ", "use" : "Używać ",
"digit_pin" : "-znak PIN", "digit_pin" : "-znak PIN",

View file

@ -130,7 +130,7 @@
"add_new_node" : "Adicionar novo nó", "add_new_node" : "Adicionar novo nó",
"use" : "Trocar para PIN de ", "use" : "Use PIN de ",
"digit_pin" : "dígitos", "digit_pin" : "dígitos",

View file

@ -130,7 +130,7 @@
"add_new_node" : "Добавить новую ноду", "add_new_node" : "Добавить новую ноду",
"use" : "Переключиться на ", "use" : "Использовать ",
"digit_pin" : "-значный PIN", "digit_pin" : "-значный PIN",

View file

@ -130,7 +130,7 @@
"add_new_node" : "Додати новий вузол", "add_new_node" : "Додати новий вузол",
"use" : "Переключитися на ", "use" : "Використати ",
"digit_pin" : "-значний PIN", "digit_pin" : "-значний PIN",

View file

@ -130,7 +130,7 @@
"add_new_node" : "添加新節點", "add_new_node" : "添加新節點",
"use" : "切換到 ", "use" : "採用 ",
"digit_pin" : "数字别针", "digit_pin" : "数字别针",