From 42fcc9465b67f5385545332741166d759cd5b6be Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Wed, 10 Dec 2025 04:15:03 +0200
Subject: [PATCH] v5.6.2

---
 assets/text/Monerocom_Release_Notes.txt       |  7 ++----
 assets/text/Release_Notes.txt                 | 11 ++-------
 cw_core/lib/utils/proxy_socket/secure.dart    | 24 ++++++++++++-------
 .../wallet_restore_from_keys_form.dart        | 15 ++++++------
 lib/src/screens/send/widgets/send_card.dart   |  2 +-
 scripts/android/app_env.sh                    |  8 +++----
 scripts/ios/app_env.sh                        |  8 +++----
 7 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt
index 978e605de..76b14c4e8 100644
--- a/assets/text/Monerocom_Release_Notes.txt
+++ b/assets/text/Monerocom_Release_Notes.txt
@@ -1,6 +1,3 @@
-Improve wallets performance
-Improvements for AnyPay
-Better automatic node switching
-New navbar/tab navigation
-Add Dark and tintable app icons
+Fix QR scanning
+UI enhancements
 Bug fixes
\ No newline at end of file
diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt
index 2ee3110df..76b14c4e8 100644
--- a/assets/text/Release_Notes.txt
+++ b/assets/text/Release_Notes.txt
@@ -1,10 +1,3 @@
-Improve wallets performance
-Litecoin and MWEB support in Cupcake Android
-Ethereum and EVM chains enhancements
-Improved EVM fee estimation
-Improvements for AnyPay
-Better automatic node switching
-New navbar/tab navigation
-WalletConnect enhancements
-Add Dark and tintable app icons
+Fix QR scanning
+UI enhancements
 Bug fixes
\ No newline at end of file
diff --git a/cw_core/lib/utils/proxy_socket/secure.dart b/cw_core/lib/utils/proxy_socket/secure.dart
index b281392cd..d35a25a0a 100644
--- a/cw_core/lib/utils/proxy_socket/secure.dart
+++ b/cw_core/lib/utils/proxy_socket/secure.dart
@@ -40,16 +40,22 @@ class ProxySocketSecure implements ProxySocket {
   
   @override
   void write(String data) {
-    try {
-      if (isClosed) {
-        printV("ProxySocketSecure: write: socket is closed");
-        return;
+    runZonedGuarded(() {
+      try {
+        if (isClosed) {
+          printV("ProxySocketSecure: write: socket is closed");
+          return;
+        }
+
+        socket.write(data);
+      } catch (e) {
+        // Catches synchronous errors
+        printV("ProxySocketSecure: write (sync error): $e");
       }
-      socket.write(data);
-    } catch (e) {
-      printV("ProxySocketSecure: write: $e");
-      return;
-    }
+    }, (e, stack) {
+      // Catches asynchronous errors (like the Bad State from the StreamConsumer)
+      printV("ProxySocketSecure: write (async error): $e");
+    });
   }
   
   @override
diff --git a/lib/src/screens/restore/wallet_restore_from_keys_form.dart b/lib/src/screens/restore/wallet_restore_from_keys_form.dart
index baa0964f5..41c943633 100644
--- a/lib/src/screens/restore/wallet_restore_from_keys_form.dart
+++ b/lib/src/screens/restore/wallet_restore_from_keys_form.dart
@@ -267,14 +267,15 @@ class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
             maxLines: null,
           ),
         ),
-        Container(
-          padding: EdgeInsets.only(top: 20.0),
-          child: BaseTextFormField(
-            controller: scanSecretController,
-            hintText: "Scan secret",
-            maxLines: null,
+        if (widget.walletRestoreViewModel.type == WalletType.litecoin)
+          Container(
+            padding: EdgeInsets.only(top: 20.0),
+            child: BaseTextFormField(
+              controller: scanSecretController,
+              hintText: "Scan secret",
+              maxLines: null,
+            ),
           ),
-        ),
         Container(
           padding: EdgeInsets.only(top: 20.0),
           child: BaseTextFormField(
diff --git a/lib/src/screens/send/widgets/send_card.dart b/lib/src/screens/send/widgets/send_card.dart
index df3af561b..3a1e0c71f 100644
--- a/lib/src/screens/send/widgets/send_card.dart
+++ b/lib/src/screens/send/widgets/send_card.dart
@@ -299,7 +299,7 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
     PaymentRequest paymentRequest,
     PaymentFlowResult result,
   ) async {
-    if (context.mounted && Navigator.of(context).canPop()) {
+    if (mounted && Navigator.of(context).canPop()) {
       Navigator.of(context).pop();
     }
 
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index 219f38c23..52d0a5046 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -14,15 +14,15 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="5.6.1"
-MONERO_COM_BUILD_NUMBER=4146
+MONERO_COM_VERSION="5.6.2"
+MONERO_COM_BUILD_NUMBER=4147
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 MONERO_COM_SCHEME="monero.com"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="5.6.1"
-CAKEWALLET_BUILD_NUMBER=4292
+CAKEWALLET_VERSION="5.6.2"
+CAKEWALLET_BUILD_NUMBER=4293
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"
diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh
index 87b4bda2e..0adc08a21 100644
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -12,13 +12,13 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="5.6.1"
-MONERO_COM_BUILD_NUMBER=149
+MONERO_COM_VERSION="5.6.2"
+MONERO_COM_BUILD_NUMBER=150
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="5.6.1"
-CAKEWALLET_BUILD_NUMBER=355
+CAKEWALLET_VERSION="5.6.2"
+CAKEWALLET_BUILD_NUMBER=356
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"