From 429f6f334f617abec12966edcb3576141457d16e Mon Sep 17 00:00:00 2001
From: malik1004x <malikowskirobert@gmail.com>
Date: Fri, 13 Mar 2026 01:36:33 +0100
Subject: [PATCH] fix validation edge cases when applying payment request
 (#3063)

---
 lib/new-ui/pages/send_page.dart                      | 6 ++++++
 lib/new-ui/widgets/send_page/send_address_input.dart | 1 +
 lib/new-ui/widgets/send_page/send_amount_input.dart  | 1 +
 3 files changed, 8 insertions(+)

diff --git a/lib/new-ui/pages/send_page.dart b/lib/new-ui/pages/send_page.dart
index 6387f54ed..0c8ab49cf 100644
--- a/lib/new-ui/pages/send_page.dart
+++ b/lib/new-ui/pages/send_page.dart
@@ -687,6 +687,12 @@ class _NewSendPageState extends State<NewSendPage> {
   void _handleSend() async {
     //TODO refactor this action. code was copied over from old ui. i don't like it.
 
+    for(int i=0; i<widget.sendViewModel.outputs.length; i++) {
+      if(i < _amountControllers.length) {
+        widget.sendViewModel.outputs[i].cryptoAmount = _amountControllers[i].text;
+      }
+    }
+
     if (_formKey.currentState != null && !_formKey.currentState!.validate()) {
       if (widget.sendViewModel.outputs.length > 1) {
         showErrorValidationAlert(context);
diff --git a/lib/new-ui/widgets/send_page/send_address_input.dart b/lib/new-ui/widgets/send_page/send_address_input.dart
index c4685efc2..405777c3d 100644
--- a/lib/new-ui/widgets/send_page/send_address_input.dart
+++ b/lib/new-ui/widgets/send_page/send_address_input.dart
@@ -70,6 +70,7 @@ class _NewSendAddressInputState extends State<NewSendAddressInput> {
           : EdgeInsets.zero,
       child: FormField<String>(
         key: formFieldKey,
+        initialValue: widget.addressController.text,
         validator: widget.validator,
         builder: (state) => Column(
           crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/lib/new-ui/widgets/send_page/send_amount_input.dart b/lib/new-ui/widgets/send_page/send_amount_input.dart
index d711622c5..178b316d6 100644
--- a/lib/new-ui/widgets/send_page/send_amount_input.dart
+++ b/lib/new-ui/widgets/send_page/send_amount_input.dart
@@ -39,6 +39,7 @@ class _NewSendAmountInputState extends State<NewSendAmountInput> {
   Widget build(BuildContext context) {
     return FormField<String>(
       key: formFieldKey,
+      initialValue: widget.amountController.text,
       validator: widget.validator,
       builder: (state) => Column(
         crossAxisAlignment: CrossAxisAlignment.start,