Merge pull request #410 from cake-tech/CW-114-Exchange-screen-QR-code-scanning-bug

fix exchangenow payment request
This commit is contained in:
mkyq 2022-07-11 14:46:37 +01:00 committed by GitHub
commit 1f8cf9b229
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -316,9 +316,10 @@ class ExchangeCardState extends State<ExchangeCard> {
if (amountController.text.isNotEmpty) { if (amountController.text.isNotEmpty) {
_showAmountPopup(context, paymentRequest); _showAmountPopup(context, paymentRequest);
} else { return;
amountController.text = paymentRequest.amount;
} }
widget.amountFocusNode.requestFocus();
amountController.text = paymentRequest.amount;
}, },
placeholder: widget.hasRefundAddress placeholder: widget.hasRefundAddress
? S.of(context).refund_address ? S.of(context).refund_address
@ -465,6 +466,7 @@ class ExchangeCardState extends State<ExchangeCard> {
rightButtonText: S.of(context).ok, rightButtonText: S.of(context).ok,
leftButtonText: S.of(context).cancel, leftButtonText: S.of(context).cancel,
actionRightButton: () { actionRightButton: () {
widget.amountFocusNode.requestFocus();
amountController.text = paymentRequest.amount; amountController.text = paymentRequest.amount;
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },