diff --git a/cw_core/lib/n2_node.dart b/cw_core/lib/n2_node.dart
index 0fad9d1b5..a2eb6e4d3 100644
--- a/cw_core/lib/n2_node.dart
+++ b/cw_core/lib/n2_node.dart
@@ -14,7 +14,7 @@ class N2Node {
   String? alias;
 
   factory N2Node.fromJson(Map<String, dynamic> json) => N2Node(
-        weight: double.tryParse((json['weight'] as num).toString()),
+        weight: double.tryParse((json['weight'] as num?).toString()),
         uptime: json['uptime'] as String?,
         score: json['score'] as int?,
         account: json['rep_address'] as String?,
diff --git a/cw_core/lib/wallet_addresses.dart b/cw_core/lib/wallet_addresses.dart
index a2a2a50a3..e987b5d0e 100644
--- a/cw_core/lib/wallet_addresses.dart
+++ b/cw_core/lib/wallet_addresses.dart
@@ -41,5 +41,6 @@ abstract class WalletAddresses {
     }
   }
 
-  bool containsAddress(String address) => allAddressesMap.containsKey(address);
+  bool containsAddress(String address) =>
+      addressesMap.containsKey(address) || allAddressesMap.containsKey(address);
 }
diff --git a/lib/exchange/provider/trocador_exchange_provider.dart b/lib/exchange/provider/trocador_exchange_provider.dart
index 326573016..688bf15c9 100644
--- a/lib/exchange/provider/trocador_exchange_provider.dart
+++ b/lib/exchange/provider/trocador_exchange_provider.dart
@@ -32,7 +32,17 @@ class TrocadorExchangeProvider extends ExchangeProvider {
     'Exolix',
     'Godex',
     'Exch',
-    'CoinCraddle'
+    'CoinCraddle',
+    'Alfacash',
+    'LocalMonero',
+    'XChange',
+    'NeroSwap',
+    'Changee',
+    'BitcoinVN',
+    'EasyBit',
+    'WizardSwap',
+    'Quantex',
+    'SwapSpace',
   ];
 
   static const List<CryptoCurrency> _notSupported = [
diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart
index 28cd0128f..038301db4 100644
--- a/lib/view_model/send/send_view_model.dart
+++ b/lib/view_model/send/send_view_model.dart
@@ -156,10 +156,10 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
     return priority;
   }
 
-
   int? getCustomPriorityIndex(List<TransactionPriority> priorities) {
     if (wallet.type == WalletType.bitcoin) {
-      final customItem = priorities.firstWhereOrNull((element) => element == bitcoin!.getBitcoinTransactionPriorityCustom());
+      final customItem = priorities
+          .firstWhereOrNull((element) => element == bitcoin!.getBitcoinTransactionPriorityCustom());
 
       return customItem != null ? priorities.indexOf(customItem) : null;
     }
@@ -503,7 +503,9 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
         address = output.address;
       }
 
-      if (address.isNotEmpty && !contactAddresses.contains(address)) {
+      if (address.isNotEmpty &&
+          !contactAddresses.contains(address) &&
+          selectedCryptoCurrency.raw != -1) {
         return ContactRecord(
             contactListViewModel.contactSource,
             Contact(
diff --git a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
index a2aab5251..20980f5f0 100644
--- a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
+++ b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
@@ -213,10 +213,6 @@ abstract class WalletAddressListViewModelBase extends WalletChangeListenerViewMo
       return S.current.addresses;
     }
 
-    if (isAutoGenerateSubaddressEnabled) {
-      return hasAccounts ? S.current.accounts : S.current.account;
-    }
-
     return hasAccounts ? S.current.accounts_subaddresses : S.current.addresses;
   }
 
diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh
index 7e4f214ab..61f690c0b 100644
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -18,8 +18,8 @@ MONERO_COM_BUILD_NUMBER=77
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.15.3"
-CAKEWALLET_BUILD_NUMBER=221
+CAKEWALLET_VERSION="4.16.0"
+CAKEWALLET_BUILD_NUMBER=226
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"