CAKE-116 | merged new world branch into current

OleksandrSobol committed Oct 9, 2020 at 23:19 UTC dea8f872d547f860d92aba49aec956f5c8b7cf96
1 file changed +7 -4
lib/src/screens/send/send_page.dart
+7 -4
@@ -163,14 +163,14 @@ class SendPage extends BasePage {
163 .decorationColor),
164 validator: sendViewModel.addressValidator,
165 ),
166 - Padding(
166 + Observer(builder: (_) => Padding(
167 padding: const EdgeInsets.only(top: 20),
168 child: BaseTextFormField(
169 focusNode: _cryptoAmountFocus,
170 controller: _cryptoAmountController,
171 keyboardType:
172 - TextInputType.numberWithOptions(
173 - signed: false, decimal: true),
172 + TextInputType.numberWithOptions(
173 + signed: false, decimal: true),
174 prefixIcon: Padding(
175 padding: EdgeInsets.only(top: 9),
176 child: Text(
@@ -226,7 +226,9 @@ class SendPage extends BasePage {
226 fontWeight: FontWeight.w500,
227 fontSize: 14),
228 validator:
229 - sendViewModel.amountValidator)),
229 + sendViewModel.sendAll
230 + ? sendViewModel.allAmountValidator
231 + : sendViewModel.amountValidator))),
232 Observer(
233 builder: (_) => Padding(
234 padding: EdgeInsets.only(top: 10),
@@ -513,6 +515,7 @@ class SendPage extends BasePage {
515 final amount = _fiatAmountController.text;
516
517 if (amount != sendViewModel.fiatAmount) {
518 + sendViewModel.sendAll = false;
519 sendViewModel.setFiatAmount(amount);
520 }
521 });