diff --git a/cw_zcash/lib/src/zcash_wallet.dart b/cw_zcash/lib/src/zcash_wallet.dart
index e9a44adbd..386e69f49 100644
--- a/cw_zcash/lib/src/zcash_wallet.dart
+++ b/cw_zcash/lib/src/zcash_wallet.dart
@@ -175,7 +175,8 @@ abstract class ZcashWalletBase
       }
 
       final paymentUri = WarpApi.decodePaymentURI(coin, address);
-      String memo = output.note ?? '';
+      // String memo = output.note ?? '';
+      String memo = '';
       if (paymentUri != null && paymentUri.address != null) {
         address = paymentUri.address!;
         if (memo.isEmpty && paymentUri.memo != null) {
diff --git a/lib/exchange/provider/jupiter_exchange_provider.dart b/lib/exchange/provider/jupiter_exchange_provider.dart
index a10920b12..2bd5708e5 100644
--- a/lib/exchange/provider/jupiter_exchange_provider.dart
+++ b/lib/exchange/provider/jupiter_exchange_provider.dart
@@ -81,16 +81,17 @@ class JupiterExchangeProvider extends ExchangeProvider {
     required CryptoCurrency to,
     required bool isFixedRateMode,
   }) async {
-    try {
-      // The Ultra Swap API doesn't have a dedicated limits endpoint
-      // The /order endpoint validates amounts and returns error codes:
-      // - errorCode 1: Insufficient funds
-      // - errorCode 2: Top up SOL for gas
-      // - errorCode 3: Minimum amount for gasless
+    // The Ultra Swap API doesn't have a dedicated limits endpoint
+    // The /order endpoint validates amounts and returns error codes:
+    // - errorCode 1: Insufficient funds
+    // - errorCode 2: Top up SOL for gas
+    // - errorCode 3: Minimum amount for gasless
+
+    // only return null for supported currencies
+    if (_supportedCurrencies.contains(from) && _supportedCurrencies.contains(to)) {
       return Limits(min: null, max: null);
-    } catch (e) {
-      printV('fetchLimits error: $e');
-      throw Exception('Error fetching limits: $e');
+    } else {
+      throw Exception('not supported');
     }
   }
 
diff --git a/lib/view_model/restore/wallet_restore_from_qr_code.dart b/lib/view_model/restore/wallet_restore_from_qr_code.dart
index 5548d29eb..4217aab59 100644
--- a/lib/view_model/restore/wallet_restore_from_qr_code.dart
+++ b/lib/view_model/restore/wallet_restore_from_qr_code.dart
@@ -54,7 +54,10 @@ class WalletRestoreFromQRCode {
     'decred_wallet': WalletType.decred,
     'dogecoin': WalletType.dogecoin,
     'dogecoin-wallet': WalletType.dogecoin,
-    'dogecoin_wallet': WalletType.dogecoin
+    'dogecoin_wallet': WalletType.dogecoin,
+    'zcash': WalletType.zcash,
+    'zcash-wallet': WalletType.zcash,
+    'zcash_wallet': WalletType.zcash,
   };
 
   static WalletType? _extractWalletType(String code) {
diff --git a/lib/view_model/wallet_keys_view_model.dart b/lib/view_model/wallet_keys_view_model.dart
index a1f68a4c3..e6f51d9a1 100644
--- a/lib/view_model/wallet_keys_view_model.dart
+++ b/lib/view_model/wallet_keys_view_model.dart
@@ -308,7 +308,7 @@ abstract class WalletKeysViewModelBase with Store {
         return 'dogecoin-wallet';
       case WalletType.zcash:
         return 'zcash-wallet';
-      default:
+      case WalletType.none:
         throw Exception('Unexpected wallet type: ${_wallet.type.toString()} for wallet keys');
     }
   }
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index 8e19bd1d1..5c8cc8a1f 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -22,7 +22,7 @@ MONERO_COM_SCHEME="monero.com"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="5.9.0"
-CAKEWALLET_BUILD_NUMBER=4302
+CAKEWALLET_BUILD_NUMBER=4304
 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 e2049b3ff..088924bf4 100644
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -18,7 +18,7 @@ MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="5.9.0"
-CAKEWALLET_BUILD_NUMBER=369
+CAKEWALLET_BUILD_NUMBER=372
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"