From 18e2df4f4076f1189e9e0a6982652a915ed2ce93 Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Fri, 30 Oct 2020 14:42:23 +0200 Subject: [PATCH] CAKE-135 | removed validation alert in the send and exchange pages when clear/reset buttons was pushed (applied _formKey.currentState.reset()) --- lib/src/screens/exchange/exchange_page.dart | 5 ++++- lib/src/screens/send/send_page.dart | 5 ++++- lib/view_model/send/send_view_model.dart | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/src/screens/exchange/exchange_page.dart b/lib/src/screens/exchange/exchange_page.dart index add3d9c19..87bf6508a 100644 --- a/lib/src/screens/exchange/exchange_page.dart +++ b/lib/src/screens/exchange/exchange_page.dart @@ -61,7 +61,10 @@ class ExchangePage extends BasePage { @override Widget trailing(BuildContext context) => TrailButton( - caption: S.of(context).reset, onPressed: () => exchangeViewModel.reset()); + caption: S.of(context).reset, onPressed: () { + _formKey.currentState.reset(); + exchangeViewModel.reset(); + }); @override Widget body(BuildContext context) { diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart index 459e435d5..d9215ae7f 100644 --- a/lib/src/screens/send/send_page.dart +++ b/lib/src/screens/send/send_page.dart @@ -70,7 +70,10 @@ class SendPage extends BasePage { @override Widget trailing(context) => TrailButton( - caption: S.of(context).clear, onPressed: () => sendViewModel.reset()); + caption: S.of(context).clear, onPressed: () { + _formKey.currentState.reset(); + sendViewModel.reset(); + }); @override Widget body(BuildContext context) { diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart index d49be63f7..360af7f9c 100644 --- a/lib/view_model/send/send_view_model.dart +++ b/lib/view_model/send/send_view_model.dart @@ -107,6 +107,7 @@ abstract class SendViewModelBase with Store { @action void reset() { + sendAll = false; cryptoAmount = ''; fiatAmount = ''; address = '';