- Fix not filling fiat amount - Fix conflicts with master
- Fix not filling fiat amount - Fix conflicts with master
OmarHatem committed
Dec 12, 2022 at 18:01 UTC
826ae46b072cde306e6f1f88287cc98c8a5e09a2
2 files changed
+11
-6
lib/src/screens/send/send_page.dart
+1
-2
@@ -29,12 +29,11 @@ class SendPage extends BasePage {
29
SendPage({
30
required this.sendViewModel,
31
this.initialPaymentRequest,
32
- }) : _formKey = GlobalKey<FormState>(),fiatFromSettings = settingsViewModel.fiatCurrency;
32
+ }) : _formKey = GlobalKey<FormState>();
33
34
final SendViewModel sendViewModel;
35
final GlobalKey<FormState> _formKey;
36
final controller = PageController(initialPage: 0);
37
- final FiatCurrency fiatFromSettings;
37
final PaymentRequest? initialPaymentRequest;
38
39
bool _effectsInstalled = false;
lib/src/screens/send/widgets/send_card.dart
+10
-4
@@ -43,8 +43,8 @@ class SendCardState extends State<SendCard>
43
required this.output,
44
required this.sendViewModel,
45
this.initialPaymentRequest})
46
- : addressController = TextEditingController(text: initialPaymentRequest?.address.toLowerCase()),
47
- cryptoAmountController = TextEditingController(text: initialPaymentRequest?.amount),
46
+ : addressController = TextEditingController(),
47
+ cryptoAmountController = TextEditingController(),
48
fiatAmountController = TextEditingController(),
49
noteController = TextEditingController(),
50
extractedAddressController = TextEditingController(),
@@ -545,8 +545,7 @@ class SendCardState extends State<SendCard>
545
if (output.address.isNotEmpty) {
546
addressController.text = output.address;
547
}
548
- if (output.cryptoAmount.isNotEmpty ||
549
- sendViewModel.walletCurrencyName != initialPaymentRequest?.scheme.toLowerCase()) {
548
+ if (output.cryptoAmount.isNotEmpty) {
549
cryptoAmountController.text = output.cryptoAmount;
550
}
551
fiatAmountController.text = output.fiatAmount;
@@ -640,6 +639,13 @@ class SendCardState extends State<SendCard>
639
extractedAddressController.text = extractedAddress;
640
});
641
642
+ if (initialPaymentRequest != null &&
643
+ sendViewModel.walletCurrencyName != initialPaymentRequest!.scheme.toLowerCase()) {
644
+ addressController.text = initialPaymentRequest!.address;
645
+ cryptoAmountController.text = initialPaymentRequest!.amount;
646
+ noteController.text = initialPaymentRequest!.note;
647
+ }
648
+
649
_effectsInstalled = true;
650
}
651