Merge pull request #1308 from SatoshiPortal/fix-amount-format-selection-issue

Make sure no selection is added if amount field is unfocused

Author: i5hi

lib/core/widgets/inputs/amount_input_formatter.dart

@@ -66,10 +66,13 @@ class AmountInputFormatter extends TextInputFormatter {
       // If characters were removed (by leading zero logic or regex truncation)
       if (charsRemovedByLeadingZeroLogic > 0) {
         // Leading zeros removed: keep cursor at original position
-        newOffset = oldValue.selection.baseOffset;
+        newOffset = oldValue.selection.baseOffset.clamp(0, validText.length);
       } else if (charsRemovedByRegex > 0) {
         // Text truncated by regex (invalid chars or excess decimals): move to end
         newOffset = validText.length;
+      } else if (oldValue.selection.baseOffset == -1) {
+        // Field was unfocused, preserve the new offset from the caller (dial pad)
+        newOffset = newValue.selection.baseOffset.clamp(0, validText.length);
       } else {
         // Normal case: adjust cursor by the text length difference
         final lengthDifference = validText.length - oldValue.text.length;

lib/features/receive/ui/screens/receive_amount_screen.dart

@@ -59,6 +59,18 @@ class _AmountPageState extends State<AmountPage> {
       }
     });
     _amountFocusNode = FocusNode();
+
+    // When focus changes, reset selection if unfocused
+    _amountFocusNode.addListener(() {
+      if (!_amountFocusNode.hasFocus) {
+        // Field lost focus, reset selection to end without showing cursor
+        final currentText = _amountController.text;
+        _amountController.value = TextEditingValue(
+          text: currentText,
+          selection: TextSelection.collapsed(offset: currentText.length),
+        );
+      }
+    });
   }
 
   @override