Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-09-29 09:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #65 from cake-tech/CWA-218-bug-fix-1

Browse source 
CWA-218 | made editable address fields on exchange an exchange templa…
This commit is contained in:
Oleksandr Sobol 2020-06-03 18:08:50 +03:00 committed by GitHub
commit baf158459d
16 changed files with 35 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/generated/i18n.dart
View file

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

8
lib/src/screens/dashboard/widgets/button_header.dart
View file

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

18
lib/src/stores/exchange/exchange_store.dart
View file

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

2
lib/themes.dart
View file

@ -28,7 +28,7 @@ class Themes {
color: Palette.lavender // address field in the wallet card
),
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(
color: Palette.lightBlueGrey // historyPanelText

2
res/values/strings_de.arb
View file

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

2
res/values/strings_en.arb
View file

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

2
res/values/strings_es.arb
View file

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

2
res/values/strings_hi.arb
View file

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

2
res/values/strings_ja.arb
View file

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

2
res/values/strings_ko.arb
View file

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

2
res/values/strings_nl.arb
View file

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

2
res/values/strings_pl.arb
View file

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

2
res/values/strings_pt.arb
View file

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

2
res/values/strings_ru.arb
View file

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

2
res/values/strings_uk.arb
View file

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

2
res/values/strings_zh.arb
View file

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