From 7f757a92a0d0354956554839a67b3bf9ef54c8d0 Mon Sep 17 00:00:00 2001
From: David Adegoke <64401859+Blazebrain@users.noreply.github.com>
Date: Tue, 18 Nov 2025 20:26:06 +0100
Subject: [PATCH] fix: block wrongly parsed addresses (#2656)

* fix: block wrongly parsed addresses

* fix: move parsed address check into handlePaymentFlow method

* fix: Handle QR URLs separately for pay anything flow
---
 lib/src/screens/send/widgets/send_card.dart    | 4 ++--
 lib/view_model/payment/payment_view_model.dart | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/screens/send/widgets/send_card.dart b/lib/src/screens/send/widgets/send_card.dart
index b0d4f767e..76eec7dc1 100644
--- a/lib/src/screens/send/widgets/send_card.dart
+++ b/lib/src/screens/send/widgets/send_card.dart
@@ -149,6 +149,8 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
   }
 
   Future<void> _handlePaymentFlow(String uri, PaymentRequest paymentRequest) async {
+    if (uri.contains('@') || paymentRequest.address.contains('@')) return;
+
     try {
       final result = await paymentViewModel.processAddress(uri);
 
@@ -446,8 +448,6 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                       final address =
                           output.isParsedAddress ? output.extractedAddress : output.address;
 
-                      if (address.contains('@')) return;
-
                       await _handlePaymentFlow(
                         address,
                         PaymentRequest(
diff --git a/lib/view_model/payment/payment_view_model.dart b/lib/view_model/payment/payment_view_model.dart
index 9e8bf3136..1095a9011 100644
--- a/lib/view_model/payment/payment_view_model.dart
+++ b/lib/view_model/payment/payment_view_model.dart
@@ -45,7 +45,7 @@ abstract class PaymentViewModelBase with Store {
         return PaymentFlowResult.incompatible('Unable to detect address type');
       }
 
-      if (_isEVMAddress(detectionResult.address)) {
+      if (!addressData.contains(':') && _isEVMAddress(detectionResult.address)) {
         return PaymentFlowResult.evmNetworkSelection(detectionResult);
       }