From 3f9840233a5fac6e4c52e141c425062e8aac6530 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Fri, 31 Oct 2025 01:55:01 +0100
Subject: [PATCH] chore: - disable SideShift - minor fixes

---
 lib/core/address_validator.dart                   | 4 ++--
 lib/src/screens/restore/restore_options_page.dart | 8 ++++++--
 lib/view_model/exchange/exchange_view_model.dart  | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/core/address_validator.dart b/lib/core/address_validator.dart
index a18f2feac..d7f15d25c 100644
--- a/lib/core/address_validator.dart
+++ b/lib/core/address_validator.dart
@@ -347,10 +347,10 @@ class AddressValidator extends TextValidator {
         pattern = '([1-9A-HJ-NP-Za-km-z]{90,200})|(@[\w\d.-]+)';
       default:
         if (type.tag == CryptoCurrency.eth.title) {
-          pattern = '0x[0-9a-zA-Z]{42}';
+          pattern = '0x[0-9a-zA-Z]+';
         }
         if (type.tag == CryptoCurrency.maticpoly.tag) {
-          pattern = '0x[0-9a-zA-Z]{42}';
+          pattern = '0x[0-9a-zA-Z]+';
         }
         if (type.tag == CryptoCurrency.sol.title) {
           pattern = '[1-9A-HJ-NP-Za-km-z]{43,44}';
diff --git a/lib/src/screens/restore/restore_options_page.dart b/lib/src/screens/restore/restore_options_page.dart
index 4d9300b06..c56220baf 100644
--- a/lib/src/screens/restore/restore_options_page.dart
+++ b/lib/src/screens/restore/restore_options_page.dart
@@ -137,10 +137,13 @@ class _RestoreOptionsBodyState extends State<_RestoreOptionsBody> {
   }
 
   void _showQRScanError(BuildContext context, String error) {
-    setState(() => isRestoring = false);
+    if (mounted) {
+      setState(() => isRestoring = false);
+    }
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      showPopUp<void>(
+      if (mounted) {
+        showPopUp<void>(
           context: context,
           builder: (BuildContext context) {
             return AlertWithOneAction(
@@ -149,6 +152,7 @@ class _RestoreOptionsBodyState extends State<_RestoreOptionsBody> {
                 buttonText: S.of(context).ok,
                 buttonAction: () => Navigator.of(context).pop());
           });
+      }
     });
   }
 
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index 8c425159e..1372e0160 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -212,7 +212,7 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
 
   List<ExchangeProvider> get _allProviders => [
         ChangeNowExchangeProvider(settingsStore: _settingsStore),
-        SideShiftExchangeProvider(),
+        // SideShiftExchangeProvider(),
         ChainflipExchangeProvider(tradesStore: trades),
         if (FeatureFlag.isExolixEnabled) ExolixExchangeProvider(),
         SwapTradeExchangeProvider(),