github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-18 05:51:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into CAKE-272-implement-localization-generation-script

Browse Source 
# Conflicts:
#	lib/generated/i18n.dart
#	res/values/strings_de.arb
This commit is contained in:
OleksandrSobol
2021-03-19 20:35:22 +02:00
parent a44cb07137 7b7ba17f7a
commit 3bfeaeb46b
13 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/screens/exchange/exchange_page.dart
+2 -2
View File
@@ -272,7 +272,7 @@ class ExchangePage extends BasePage {
],
),
),
if (exchangeViewModel.isReceiveAmountEditable) Padding(
/*if (exchangeViewModel.isReceiveAmountEditable) Padding(
padding: EdgeInsets.only(top: 12, left: 24),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
@@ -286,7 +286,7 @@ class ExchangePage extends BasePage {
),
],
)
),
),*/
Padding(
padding: EdgeInsets.only(top: 30, left: 24, bottom: 24),
child: Row(
lib/view_model/exchange/exchange_view_model.dart
+3 -2
View File
@@ -405,12 +405,13 @@ abstract class ExchangeViewModelBase with Store {
}
void _defineIsReceiveAmountEditable() {
if ((provider is ChangeNowExchangeProvider)
/*if ((provider is ChangeNowExchangeProvider)
&&(depositCurrency == CryptoCurrency.xmr)
&&(receiveCurrency == CryptoCurrency.btc)) {
isReceiveAmountEditable = true;
} else {
isReceiveAmountEditable = false;
}
}*/
isReceiveAmountEditable = false;
}
}