From c257c60d72f211b20b68b73705b4d1667366c9bc Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Thu, 17 Dec 2020 20:14:16 +0200 Subject: [PATCH] CAKE-210 | added possibility to enter comma in amount field (qr_widget.dart); replaced comma by dot in the MoneroURI and BitcoinURI classes (wallet_address_list_view_model.dart) --- lib/src/screens/receive/widgets/qr_widget.dart | 2 +- .../wallet_address_list/wallet_address_list_view_model.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/screens/receive/widgets/qr_widget.dart b/lib/src/screens/receive/widgets/qr_widget.dart index e9435126..2b77ce85 100644 --- a/lib/src/screens/receive/widgets/qr_widget.dart +++ b/lib/src/screens/receive/widgets/qr_widget.dart @@ -67,7 +67,7 @@ class QRWidget extends StatelessWidget { decimal: true), inputFormatters: [ BlacklistingTextInputFormatter( - RegExp('[\\-|\\ |\\,]')) + RegExp('[\\-|\\ ]')) ], textAlign: TextAlign.center, hintText: S.of(context).receive_amount, diff --git a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart index aca1ef80..0e8fe850 100644 --- a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart +++ b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart @@ -31,7 +31,7 @@ class MoneroURI extends PaymentURI { var base = 'monero:' + address; if (amount?.isNotEmpty ?? false) { - base += '?tx_amount=$amount'; + base += '?tx_amount=${amount.replaceAll(',', '.')}'; } return base; @@ -47,7 +47,7 @@ class BitcoinURI extends PaymentURI { var base = 'bitcoin:' + address; if (amount?.isNotEmpty ?? false) { - base += '?amount=$amount'; + base += '?amount=${amount.replaceAll(',', '.')}'; } return base;