Generic fixes (#3292)

diff --git a/lib/new-ui/pages/bridge/bridge_network_page.dart b/lib/new-ui/pages/bridge/bridge_network_page.dart
index 0c29cde..e796255 100644
--- a/lib/new-ui/pages/bridge/bridge_network_page.dart
+++ b/lib/new-ui/pages/bridge/bridge_network_page.dart
@@ -57,7 +57,7 @@ class BridgeNetworkPage extends StatelessWidget {
                               (chain) {
                                 final chainName = chain.name;
                                 return ListItemRegularRow(
-                                  iconPath: 'assets/images/crypto/${chainName.toLowerCase()}.webp',
+                                  iconPath: 'assets/new-ui/crypto_full_icons/${chainName.toLowerCase()}.svg',
                                   keyValue: chain.chainId.toString(),
                                   label: chainName,
                                   onTap: () {
diff --git a/lib/new-ui/pages/bridge/bridge_receiving_wallet_page.dart b/lib/new-ui/pages/bridge/bridge_receiving_wallet_page.dart
index 741763c..16872b5 100644
--- a/lib/new-ui/pages/bridge/bridge_receiving_wallet_page.dart
+++ b/lib/new-ui/pages/bridge/bridge_receiving_wallet_page.dart
@@ -63,7 +63,7 @@ class _BridgeReceivingWalletPageState extends State<BridgeReceivingWalletPage> {
                             child: CakeImageWidget(
                               borderRadius: 8,
                               imageUrl: chainName.isNotEmpty
-                                  ? 'assets/images/crypto/${chainName.toLowerCase()}.webp'
+                                  ? 'assets/new-ui/crypto_full_icons/${chainName.toLowerCase()}.svg'
                                   : null,
                               width: 72,
                               height: 72,
diff --git a/lib/new-ui/widgets/bridge/transfer_history_row.dart b/lib/new-ui/widgets/bridge/transfer_history_row.dart
index 6a9b3e7..2734f58 100644
--- a/lib/new-ui/widgets/bridge/transfer_history_row.dart
+++ b/lib/new-ui/widgets/bridge/transfer_history_row.dart
@@ -88,7 +88,7 @@ class TransferHistoryRow extends StatelessWidget {
               child: Stack(
                 children: [
                   CakeImageWidget(
-                    imageUrl: 'assets/images/crypto/${sourceChainName?.toLowerCase()}.webp',
+                    imageUrl: 'assets/new-ui/crypto_full_icons/${sourceChainName?.toLowerCase()}.svg',
                     width: 28,
                     height: 28,
                   ),
@@ -96,7 +96,7 @@ class TransferHistoryRow extends StatelessWidget {
                     top: 14,
                     left: 12,
                     child: CakeImageWidget(
-                      imageUrl: 'assets/images/crypto/${destChainName?.toLowerCase()}.webp',
+                      imageUrl: 'assets/new-ui/crypto_full_icons/${destChainName?.toLowerCase()}.svg',
                       width: 28,
                       height: 28,
                     ),
diff --git a/lib/new-ui/widgets/coins_page/action_row/coin_action_row.dart b/lib/new-ui/widgets/coins_page/action_row/coin_action_row.dart
index 3eafea4..7ac5052 100644
--- a/lib/new-ui/widgets/coins_page/action_row/coin_action_row.dart
+++ b/lib/new-ui/widgets/coins_page/action_row/coin_action_row.dart
@@ -174,12 +174,14 @@ class CoinActionRow extends StatelessWidget {
       } else if (OpenCryptoPayService.isOpenCryptoPayQR(code)) {
         req = PaymentRequest(code, "", "", "", "");
       } else if (Uri.tryParse(code)?.scheme == "wc") {
-        if (!isEVMCompatibleChain(walletType)) {
+        if (!isWalletConnectCompatibleChain(walletType)) {
           showPopUp<void>(
               context: context,
               builder: (context) => AlertWithOneAction(
                   alertTitle: "WalletConnect",
-                  alertContent: S.of(context).switchToEVMCompatibleWallet,
+                  alertContent: S
+                      .of(context)
+                      .switchToWCCompatibleWallet(walletConnectCompatibleChainsLabel()),
                   buttonText: "OK",
                   buttonAction: Navigator.of(context).pop));
           return;
diff --git a/lib/new-ui/widgets/coins_page/assets_history/asset_tile.dart b/lib/new-ui/widgets/coins_page/assets_history/asset_tile.dart
index 618fa5a..198d37b 100644
--- a/lib/new-ui/widgets/coins_page/assets_history/asset_tile.dart
+++ b/lib/new-ui/widgets/coins_page/assets_history/asset_tile.dart
@@ -4,8 +4,8 @@ import 'package:cake_wallet/new-ui/widgets/coins_page/assets_history/asset_detai
 import 'package:cake_wallet/new-ui/widgets/coins_page/token_image_widget.dart';
 import 'package:cake_wallet/src/screens/wallet_connect/utils/string_parsing.dart';
 import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
-import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/wallet_base.dart';
+import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 
 class AssetTile extends StatelessWidget {
@@ -34,7 +34,7 @@ class AssetTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final iconPath = _getIconPath();
+    final iconPath = balance.asset.iconPath ?? "";
 
     return GestureDetector(
       onTap: (){
@@ -161,18 +161,5 @@ class AssetTile extends StatelessWidget {
     );
   }
 
-  String _getChainTitle() {
-    try {
-      return CryptoCurrency.fromString(wallet.currency.tag ??wallet.currency.title).fullName ?? "";
-    } catch(e) {
-      return wallet.currency.fullName ?? "";
-    }
-  }
-
-  String _getIconPath() {
-    if(balance.asset == CryptoCurrency.baseEth)
-      return "assets/new-ui/crypto_full_icons/base.svg";
-
-    return balance.asset.iconPath ?? "";
-  }
+  String _getChainTitle() => walletTypeToDisplayName(wallet.type);
 }
diff --git a/lib/new-ui/widgets/currency_picker/currency_picker_row.dart b/lib/new-ui/widgets/currency_picker/currency_picker_row.dart
index 3f079ee..54d7122 100644
--- a/lib/new-ui/widgets/currency_picker/currency_picker_row.dart
+++ b/lib/new-ui/widgets/currency_picker/currency_picker_row.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/new-ui/widgets/coins_page/token_image_widget.dart';
 import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:flutter/material.dart';
@@ -86,11 +87,9 @@ class _IconWithBadge extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final icon = CakeImageWidget(
-      imageUrl: currency.iconPath,
-      width: 32,
-      height: 32,
-      fit: BoxFit.cover,
+    final icon = TokenImageWidget(
+      imageUrl: currency.iconPath ?? '',
+      size: 32,
       errorWidget: Container(
         width: 32,
         height: 32,
diff --git a/lib/new-ui/widgets/currency_picker/currency_picker_search_field.dart b/lib/new-ui/widgets/currency_picker/currency_picker_search_field.dart
index 8971190..8a62c35 100644
--- a/lib/new-ui/widgets/currency_picker/currency_picker_search_field.dart
+++ b/lib/new-ui/widgets/currency_picker/currency_picker_search_field.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/new-ui/widgets/currency_picker/currency_picker_args.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:flutter/material.dart';
 
@@ -62,7 +63,10 @@ class CurrencyPickerSearchField extends StatelessWidget {
 bool currencyMatchesQuery(CryptoCurrency c, String query) {
   if (query.isEmpty) return true;
   final q = query.toLowerCase();
-  return c.title.toLowerCase().contains(q) ||
-      c.name.toLowerCase().contains(q) ||
-      (c.fullName?.toLowerCase().contains(q) ?? false);
+  if (c.title.toLowerCase().contains(q)) return true;
+  if (c.name.toLowerCase().contains(q)) return true;
+  if (c.fullName?.toLowerCase().contains(q) ?? false) return true;
+  if (c.tag?.toLowerCase().contains(q) ?? false) return true;
+  if (chainNameForCurrency(c).toLowerCase().contains(q)) return true;
+  return false;
 }
diff --git a/lib/new-ui/widgets/currency_picker/multi_network_currency_picker.dart b/lib/new-ui/widgets/currency_picker/multi_network_currency_picker.dart
index 9b31b8a..ffea261 100644
--- a/lib/new-ui/widgets/currency_picker/multi_network_currency_picker.dart
+++ b/lib/new-ui/widgets/currency_picker/multi_network_currency_picker.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/new-ui/widgets/coins_page/token_image_widget.dart';
 import 'package:cake_wallet/new-ui/widgets/currency_picker/chain_chip_strip.dart';
 import 'package:cake_wallet/new-ui/widgets/currency_picker/currency_picker_args.dart';
 import 'package:cake_wallet/new-ui/widgets/currency_picker/picker_recents_loader.dart';
@@ -8,7 +9,6 @@ import 'package:cake_wallet/new-ui/widgets/currency_picker/currency_picker_searc
 import 'package:cake_wallet/new-ui/widgets/currency_picker/picker_section_header.dart';
 import 'package:cake_wallet/new-ui/widgets/currency_picker/pill_grid.dart';
 import 'package:cake_wallet/new-ui/widgets/currency_picker/select_network_page.dart';
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/wallet_types.g.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/currency_for_wallet_type.dart';
@@ -651,11 +651,9 @@ class _RecentPill extends StatelessWidget {
         child: Row(
           mainAxisSize: MainAxisSize.min,
           children: [
-            CakeImageWidget(
-              imageUrl: currency.iconPath,
-              width: 24,
-              height: 24,
-              fit: BoxFit.cover,
+            TokenImageWidget(
+              imageUrl: currency.iconPath ?? '',
+              size: 24,
             ),
             const SizedBox(width: 8),
             Text(
diff --git a/lib/new-ui/widgets/currency_picker/pill_grid.dart b/lib/new-ui/widgets/currency_picker/pill_grid.dart
index 8ac130e..fdcd577 100644
--- a/lib/new-ui/widgets/currency_picker/pill_grid.dart
+++ b/lib/new-ui/widgets/currency_picker/pill_grid.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/new-ui/widgets/coins_page/token_image_widget.dart';
 import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:flutter/material.dart';
@@ -71,11 +72,9 @@ class _PillCard extends StatelessWidget {
         ),
         child: Row(
           children: [
-            CakeImageWidget(
-              imageUrl: currency.iconPath,
-              width: 24,
-              height: 24,
-              fit: BoxFit.cover,
+            TokenImageWidget(
+              imageUrl: currency.iconPath ?? '',
+              size: 24,
             ),
             const SizedBox(width: 8),
             Expanded(
diff --git a/lib/new-ui/widgets/send_page/l2_action_wallet_selector.dart b/lib/new-ui/widgets/send_page/l2_action_wallet_selector.dart
index 2ee57ef..6a9aa35 100644
--- a/lib/new-ui/widgets/send_page/l2_action_wallet_selector.dart
+++ b/lib/new-ui/widgets/send_page/l2_action_wallet_selector.dart
@@ -126,7 +126,7 @@ class _L2ActionWalletSelectorState extends State<L2ActionWalletSelector> {
                               padding: const EdgeInsets.symmetric(vertical: 4.0),
                               child: WalletRow(
                                 currencyIconPath:
-                                    walletTypeToCryptoCurrency(item.type).iconPath ?? "",
+                                    getCryptoCurrencyIconForWalletListItem(item.type),
                                 walletName: item.name,
                                 isCurrent: item.name == widget.sendViewModel.wallet.name,
                                 isSelected: _selectedWalletIndex == index && !textEntered,
diff --git a/lib/new-ui/widgets/swap_page/swap_address_selection_modal.dart b/lib/new-ui/widgets/swap_page/swap_address_selection_modal.dart
index 271f388..134abce 100644
--- a/lib/new-ui/widgets/swap_page/swap_address_selection_modal.dart
+++ b/lib/new-ui/widgets/swap_page/swap_address_selection_modal.dart
@@ -105,7 +105,7 @@ class _SwapAddressSelectionModalState extends State<SwapAddressSelectionModal> {
                             !widget.exchangeViewModel.isSendFromExternal;
                       }
 
-                      final String currencyIconPath = walletTypeToCryptoCurrency(item.type).iconPath ?? "";
+                      final String currencyIconPath = getCryptoCurrencyIconForWalletListItem(item.type);
 
                             final bool hasAccounts =
                                 item.type == WalletType.monero && widget.isSelectingReceiver;
diff --git a/lib/reactions/wallet_connect.dart b/lib/reactions/wallet_connect.dart
index 96fe0a6..fcfb06f 100644
--- a/lib/reactions/wallet_connect.dart
+++ b/lib/reactions/wallet_connect.dart
@@ -5,6 +5,22 @@ import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/so
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/evm/evm.dart';
 
+const List<WalletType> walletConnectCompatibleChains = [
+  WalletType.ethereum,
+  WalletType.polygon,
+  WalletType.base,
+  WalletType.arbitrum,
+  WalletType.bsc,
+  WalletType.solana,
+];
+
+String walletConnectCompatibleChainsLabel() {
+  final names = walletConnectCompatibleChains.map(walletTypeToDisplayName).toList();
+  if (names.length <= 1) return names.join();
+  final head = names.sublist(0, names.length - 1).join(', ');
+  return '$head, and ${names.last}';
+}
+
 bool isEVMCompatibleChain(WalletType walletType) {
   switch (walletType) {
     case WalletType.polygon:
@@ -47,19 +63,8 @@ bool isNFTACtivatedChain(WalletType walletType, {int? chainId}) {
   }
 }
 
-bool isWalletConnectCompatibleChain(WalletType walletType) {
-  switch (walletType) {
-    case WalletType.solana:
-    case WalletType.polygon:
-    case WalletType.ethereum:
-    case WalletType.base:
-    case WalletType.arbitrum:
-    case WalletType.bsc:
-      return true;
-    default:
-      return false;
-  }
-}
+bool isWalletConnectCompatibleChain(WalletType walletType) =>
+    walletConnectCompatibleChains.contains(walletType);
 
 String getChainNameSpaceAndIdBasedOnWalletType(WalletType walletType, {int? chainId}) {
   if (chainId != null) {
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index 7cfa3f1..07cb562 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -1,6 +1,7 @@
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/entities/contact_base.dart';
 import 'package:cake_wallet/entities/contact_record.dart';
+import 'package:cake_wallet/entities/wallet_contact.dart';
 import 'package:cake_wallet/entities/wallet_list_order_types.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
@@ -16,6 +17,8 @@ import 'package:cake_wallet/utils/feature_flag.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart';
+import 'package:cw_core/crypto_currency.dart';
+import 'package:cw_core/currency_for_wallet_type.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -281,8 +284,10 @@ class _ContactPageBodyState extends State<ContactPageBody> with SingleTickerProv
   }
 
   Widget _buildCurrencyIcon(ContactBase contact) {
-    final image = contact.type.iconPath;
-    return image != null
+    final image = (contact is WalletContact && contact.walletType != null)
+        ? getCryptoCurrencyIconForWalletListItem(contact.walletType!)
+        : contact.type.iconPath;
+    return (image != null && image.isNotEmpty)
         ? CakeImageWidget(imageUrl: image, height: 24, width: 24)
         : const SizedBox(height: 24, width: 24);
   }
@@ -373,9 +378,11 @@ class _ContactListBodyState extends State<ContactListBody> {
   }
 
   Widget generateContactRaw(BuildContext context, ContactRecord contact, bool isLast) {
-    final image = contact.type.iconPath;
-    final currencyIcon = image != null
-        ? Image.asset(image, height: 24, width: 24)
+    final image = contact.type == CryptoCurrency.baseEth
+        ? 'assets/new-ui/crypto_full_icons/base.svg'
+        : contact.type.iconPath;
+    final currencyIcon = (image != null && image.isNotEmpty)
+        ? CakeImageWidget(imageUrl: image, height: 24, width: 24)
         : const SizedBox(height: 24, width: 24);
     return Column(
       children: [
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
index 1ae7c21..db93e4e 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
@@ -31,26 +31,26 @@ class DesktopWalletSelectionDropDown extends StatefulWidget {
 }
 
 class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionDropDown> {
-  final moneroIcon = Image.asset('assets/images/crypto/monero.webp', height: 24, width: 24);
-  final bitcoinIcon = Image.asset('assets/images/crypto/bitcoin.webp', height: 24, width: 24);
+  final moneroIcon = Image.asset('assets/new-ui/crypto_full_icons/monero.svg', height: 24, width: 24);
+  final bitcoinIcon = Image.asset('assets/new-ui/crypto_full_icons/bitcoin.svg', height: 24, width: 24);
   final tBitcoinIcon = Image.asset('assets/images/tbtc.png', height: 24, width: 24);
-  final litecoinIcon = Image.asset('assets/images/crypto/litecoin.webp', height: 24, width: 24);
+  final litecoinIcon = Image.asset('assets/new-ui/crypto_full_icons/litecoin.svg', height: 24, width: 24);
   final havenIcon = Image.asset('assets/images/haven_logo.webp', height: 24, width: 24);
-  final ethereumIcon = Image.asset('assets/images/crypto/ethereum.webp', height: 24, width: 24);
-  final polygonIcon = Image.asset('assets/images/crypto/polygon.webp', height: 24, width: 24);
-  final bitcoinCashIcon = Image.asset('assets/images/crypto/bitcoin-cash.webp', height: 24, width: 24);
-  final baseIcon = Image.asset('assets/images/crypto/base_icon.webp', height: 24, width: 24);
-  final arbitrumIcon = Image.asset('assets/images/crypto/arbitrum.webp', height: 24, width: 24);
-  final bscIcon = Image.asset('assets/images/crypto/BNB.webp', height: 24, width: 24);
-  final nanoIcon = Image.asset('assets/images/crypto/nano.webp', height: 24, width: 24);
-  final bananoIcon = Image.asset('assets/images/crypto/nano.webp', height: 24, width: 24);
-  final solanaIcon = Image.asset('assets/images/crypto/solana.webp', height: 24, width: 24);
-  final tronIcon = Image.asset('assets/images/crypto/tron.webp', height: 24, width: 24);
-  final wowneroIcon = Image.asset('assets/images/crypto/wownero.webp', height: 24, width: 24);
-  final zanoIcon = Image.asset('assets/images/crypto/zano.webp', height: 24, width: 24);
-  final decredIcon = Image.asset('assets/images/crypto/decred.webp', height: 24, width: 24);
-  final dogeIcon = Image.asset('assets/images/crypto/dogecoin.webp', height: 24, width: 24);
-  final zcashIcon = Image.asset('assets/images/crypto/zcash.webp', height: 24, width: 24);
+  final ethereumIcon = Image.asset('assets/new-ui/crypto_full_icons/ethereum.svg', height: 24, width: 24);
+  final polygonIcon = Image.asset('assets/new-ui/crypto_full_icons/polygon.svg', height: 24, width: 24);
+  final bitcoinCashIcon = Image.asset('assets/new-ui/crypto_full_icons/bitcoin-cash.svg', height: 24, width: 24);
+  final baseIcon = Image.asset('assets/new-ui/crypto_full_icons/base.svg', height: 24, width: 24);
+  final arbitrumIcon = Image.asset('assets/new-ui/crypto_full_icons/arbitrum.svg', height: 24, width: 24);
+  final bscIcon = Image.asset('assets/new-ui/crypto_full_icons/bnb.svg', height: 24, width: 24);
+  final nanoIcon = Image.asset('assets/new-ui/crypto_full_icons/nano.svg', height: 24, width: 24);
+  final bananoIcon = Image.asset('assets/new-ui/crypto_full_icons/nano.svg', height: 24, width: 24);
+  final solanaIcon = Image.asset('assets/new-ui/crypto_full_icons/solana.svg', height: 24, width: 24);
+  final tronIcon = Image.asset('assets/new-ui/crypto_full_icons/tron.svg', height: 24, width: 24);
+  final wowneroIcon = Image.asset('assets/new-ui/crypto_full_icons/wownero.svg', height: 24, width: 24);
+  final zanoIcon = Image.asset('assets/new-ui/crypto_full_icons/zano.svg', height: 24, width: 24);
+  final decredIcon = Image.asset('assets/new-ui/crypto_full_icons/decred.svg', height: 24, width: 24);
+  final dogeIcon = Image.asset('assets/new-ui/crypto_full_icons/dogecoin.svg', height: 24, width: 24);
+  final zcashIcon = Image.asset('assets/new-ui/crypto_full_icons/zcash.svg', height: 24, width: 24);
   final nonWalletTypeIcon = Image.asset('assets/images/close.png', height: 24, width: 24);
 
   Image _newWalletImage(BuildContext context) => Image.asset(
diff --git a/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart b/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart
index de05bcc..0f0d03a 100644
--- a/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart
+++ b/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart
@@ -371,7 +371,7 @@ class CryptoBalanceWidget extends StatelessWidget {
                     child: InfoCard(
                       title: S.of(context).synchronizing,
                       description: S.of(context).decred_info_card_details,
-                      image: 'assets/images/crypto/decred.webp',
+                      image: 'assets/new-ui/crypto_full_icons/decred.svg',
                       leftButtonTitle: S.of(context).litecoin_mweb_dismiss,
                       rightButtonTitle: S.of(context).learn_more,
                       leftButtonAction: () => dashboardViewModel.dismissDecredInfoCard(),
diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart
index 37f2e2c..fbdb058 100644
--- a/lib/src/screens/dashboard/widgets/menu_widget.dart
+++ b/lib/src/screens/dashboard/widgets/menu_widget.dart
@@ -24,25 +24,25 @@ class MenuWidgetState extends State<MenuWidget> {
         this.tileHeight = 60,
         this.fromTopEdge = 50,
         this.fromBottomEdge = 25,
-        this.moneroIcon = Image.asset('assets/images/crypto/monero.webp'),
-        this.bitcoinIcon = Image.asset('assets/images/crypto/bitcoin.webp'),
-        this.litecoinIcon = Image.asset('assets/images/crypto/litecoin.webp'),
+        this.moneroIcon = Image.asset('assets/new-ui/crypto_full_icons/monero.svg'),
+        this.bitcoinIcon = Image.asset('assets/new-ui/crypto_full_icons/bitcoin.svg'),
+        this.litecoinIcon = Image.asset('assets/new-ui/crypto_full_icons/litecoin.svg'),
         this.havenIcon = Image.asset('assets/images/haven_menu.webp'),
-        this.ethereumIcon = Image.asset('assets/images/crypto/ethereum.webp'),
-        this.nanoIcon = Image.asset('assets/images/crypto/nano.webp'),
-        this.bananoIcon = Image.asset('assets/images/crypto/nano.webp'),
-        this.bitcoinCashIcon = Image.asset('assets/images/crypto/bitcoin-cash.webp'),
-        this.polygonIcon = Image.asset('assets/images/crypto/polygon.webp'),
-        this.baseIcon = Image.asset('assets/images/crypto/base_icon.webp'),
-        this.arbitrumIcon = Image.asset('assets/images/crypto/arbitrum.webp'),
-        this.bscIcon = Image.asset('assets/images/crypto/BNB.webp'),
-        this.solanaIcon = Image.asset('assets/images/crypto/solana.webp'),
-        this.tronIcon = Image.asset('assets/images/crypto/tron.webp'),
-        this.wowneroIcon = Image.asset('assets/images/crypto/wownero.webp'),
-        this.zanoIcon = Image.asset('assets/images/crypto/zano.webp'),
-        this.decredIcon = Image.asset('assets/images/crypto/decred.webp'),
-        this.dogecoinIcon = Image.asset('assets/images/crypto/dogecoin.webp'),
-        this.zcashIcon = Image.asset('assets/images/crypto/zcash.webp');
+        this.ethereumIcon = Image.asset('assets/new-ui/crypto_full_icons/ethereum.svg'),
+        this.nanoIcon = Image.asset('assets/new-ui/crypto_full_icons/nano.svg'),
+        this.bananoIcon = Image.asset('assets/new-ui/crypto_full_icons/nano.svg'),
+        this.bitcoinCashIcon = Image.asset('assets/new-ui/crypto_full_icons/bitcoin-cash.svg'),
+        this.polygonIcon = Image.asset('assets/new-ui/crypto_full_icons/polygon.svg'),
+        this.baseIcon = Image.asset('assets/new-ui/crypto_full_icons/base.svg'),
+        this.arbitrumIcon = Image.asset('assets/new-ui/crypto_full_icons/arbitrum.svg'),
+        this.bscIcon = Image.asset('assets/new-ui/crypto_full_icons/bnb.svg'),
+        this.solanaIcon = Image.asset('assets/new-ui/crypto_full_icons/solana.svg'),
+        this.tronIcon = Image.asset('assets/new-ui/crypto_full_icons/tron.svg'),
+        this.wowneroIcon = Image.asset('assets/new-ui/crypto_full_icons/wownero.svg'),
+        this.zanoIcon = Image.asset('assets/new-ui/crypto_full_icons/zano.svg'),
+        this.decredIcon = Image.asset('assets/new-ui/crypto_full_icons/decred.svg'),
+        this.dogecoinIcon = Image.asset('assets/new-ui/crypto_full_icons/dogecoin.svg'),
+        this.zcashIcon = Image.asset('assets/new-ui/crypto_full_icons/zcash.svg');
 
   final largeScreen = 731;
 
@@ -122,8 +122,8 @@ class MenuWidgetState extends State<MenuWidget> {
     }
     int itemCount = items.length;
 
-    moneroIcon = Image.asset('assets/images/crypto/monero.webp');
-    bitcoinIcon = Image.asset('assets/images/crypto/bitcoin.webp');
+    moneroIcon = Image.asset('assets/new-ui/crypto_full_icons/monero.svg');
+    bitcoinIcon = Image.asset('assets/new-ui/crypto_full_icons/bitcoin.svg');
 
     return Row(
       mainAxisSize: MainAxisSize.max,
diff --git a/lib/src/screens/new_wallet/new_wallet_type_page.dart b/lib/src/screens/new_wallet/new_wallet_type_page.dart
index 7bcf3ed..55bd168 100644
--- a/lib/src/screens/new_wallet/new_wallet_type_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_type_page.dart
@@ -149,7 +149,6 @@ class WalletTypeFormState extends State<WalletTypeForm> {
                     shrinkWrap: true,
                     itemBuilder: (context, index) {
                       final item = filteredTypes[index];
-                      final curr = getCryptoCurrencyForWalletListItem(item);
 
                       return GestureDetector(
                         key: ValueKey('new_wallet_type_${item.name}_button_key'),
@@ -169,7 +168,7 @@ class WalletTypeFormState extends State<WalletTypeForm> {
                                     CakeImageWidget(
                                       height: 24,
                                       width: 24,
-                                      imageUrl: curr.iconPath,
+                                      imageUrl: getCryptoCurrencyIconForWalletListItem(item),
                                     ),
                                     const SizedBox(width: 12),
                                     Text(walletTypeToDisplayName(item)),
diff --git a/lib/src/screens/nodes/node_share_page.dart b/lib/src/screens/nodes/node_share_page.dart
index 1319d84..bb96b5b 100644
--- a/lib/src/screens/nodes/node_share_page.dart
+++ b/lib/src/screens/nodes/node_share_page.dart
@@ -31,38 +31,12 @@ class NodeSharePage extends StatelessWidget {
                 mainAxisAlignment: MainAxisAlignment.center,
                 spacing: 40,
                 children: [
-                  Stack(alignment: Alignment.center, children: [
-                    SizedBox(
-                      width: qrSize,
-                      height: qrSize,
-                      child: ClipRRect(
-                          borderRadius: BorderRadius.circular(18),
-                          child: QrImage(
-                              size: qrSize - padding * 2,
-                              embeddedImagePath: "",
-                              data: uri.toString())),
-                    ),
-                    SizedBox(
-                      width: 60,
-                      height: 60,
-                      child: Stack(
-                        children: [
-                          CakeImageWidget(
-                            imageUrl: "assets/new-ui/settings_row_icons/nodes.svg",
-                            width: 54,
-                            height: 54,
-                          ),
-                          Align(
-                              alignment: Alignment.bottomRight,
-                              child: CakeImageWidget(
-                                imageUrl: currency.iconPath,
-                                width: 24,
-                                height: 24,
-                              ))
-                        ],
-                      ),
-                    ),
-                  ]),
+                  QrImage(
+                    size: qrSize - padding * 2,
+                    embeddedImagePath: "assets/new-ui/node-qr-icon.svg",
+                    badgeImageOnEmbeddedImagePath: currency.iconPath,
+                    data: uri.toString(),
+                  ),
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 36.0),
                     child: Text(S.of(context).node_share_desc,
diff --git a/lib/src/screens/receive/widgets/qr_image.dart b/lib/src/screens/receive/widgets/qr_image.dart
index 3f847c3..da856df 100644
--- a/lib/src/screens/receive/widgets/qr_image.dart
+++ b/lib/src/screens/receive/widgets/qr_image.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/new-ui/widgets/coins_page/token_image_widget.dart';
+import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:qr_flutter/qr_flutter.dart' as qr;
 
@@ -11,6 +12,7 @@ class QrImage extends StatelessWidget {
     this.version,
     this.errorCorrectionLevel = qr.QrErrorCorrectLevel.H,
     this.embeddedImagePath,
+    this.badgeImageOnEmbeddedImagePath,
   });
 
   final double? size;
@@ -20,6 +22,7 @@ class QrImage extends StatelessWidget {
   final int? version;
   final int errorCorrectionLevel;
   final String? embeddedImagePath;
+  final String? badgeImageOnEmbeddedImagePath;
 
   @override
   Widget build(BuildContext context) {
@@ -27,6 +30,33 @@ class QrImage extends StatelessWidget {
     final qrSize = size ?? 100.0;
     final logoSize = qrSize * 0.30;
 
+    final centerImage = TokenImageWidget(
+      imageUrl: imagePath,
+      size: logoSize * 0.8,
+    );
+
+    Widget centerImageToUse;
+    if (badgeImageOnEmbeddedImagePath != null) {
+      centerImageToUse = Stack(
+        children: [
+          centerImage,
+          Positioned(
+            bottom: 0,
+            right: 0,
+            child: Align(
+              alignment: Alignment.bottomRight,
+              child: CakeImageWidget(
+                imageUrl: badgeImageOnEmbeddedImagePath!,
+                width: 24,
+                height: 24,
+              ),
+            ),
+          ),
+        ],
+      );
+    } else {
+      centerImageToUse = centerImage;
+    }
     return Stack(
       alignment: Alignment.center,
       children: [
@@ -39,10 +69,7 @@ class QrImage extends StatelessWidget {
           backgroundColor: backgroundColor,
           padding: const EdgeInsets.all(12.0),
         ),
-        TokenImageWidget(
-          imageUrl: imagePath,
-          size: logoSize * 0.8,
-        ),
+        centerImageToUse,
       ],
     );
   }
diff --git a/lib/src/widgets/setting_actions.dart b/lib/src/widgets/setting_actions.dart
index f42a4da..8ca375a 100644
--- a/lib/src/widgets/setting_actions.dart
+++ b/lib/src/widgets/setting_actions.dart
@@ -43,7 +43,7 @@ class SettingActions {
   static SettingActions exportOutputsAction = SettingActions._(
     key: ValueKey('dashboard_page_menu_widget_export_outputs_settings_button_key'),
     name: (context) => S.of(context).export_outputs,
-    image: 'assets/images/crypto/monero.webp',
+    image: 'assets/new-ui/crypto_full_icons/monero.svg',
     onTap: (BuildContext context) {
       Navigator.of(context)
           .pushNamed(Routes.urqrAnimatedPage, arguments: {'export-outputs': 'export-outputs'});
diff --git a/lib/view_model/link_view_model.dart b/lib/view_model/link_view_model.dart
index 3320348..a9e7427 100644
--- a/lib/view_model/link_view_model.dart
+++ b/lib/view_model/link_view_model.dart
@@ -34,7 +34,7 @@ class LinkViewModel {
   String? getRouteToGo() {
     if (isWalletConnectLink) {
       if (!isWalletConnectCompatibleChain(appStore.wallet!.type)) {
-        _errorToast(S.current.switchToEVMCompatibleWallet);
+        _errorToast(S.current.switchToWCCompatibleWallet(walletConnectCompatibleChainsLabel()));
         return null;
       }
       return Routes.walletConnectConnectionsListing;
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 96997ac..89c5374 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
@@ -481,7 +481,7 @@ abstract class WalletAddressListViewModelBase extends WalletChangeListenerViewMo
           ];
         case 137:
           return [
-            'assets/images/crypto/polygon.webp',
+            'assets/new-ui/crypto_full_icons/polygon.svg',
             'assets/images/eth_pol_icon.svg',
             'assets/images/usdc_icon.svg',
             'assets/images/usdt_wallet_icon.svg',
@@ -495,20 +495,20 @@ abstract class WalletAddressListViewModelBase extends WalletChangeListenerViewMo
           ];
         case 42161:
           return [
-            'assets/images/crypto/arbitrum.webp',
+            'assets/new-ui/crypto_full_icons/arbitrum.svg',
             'assets/images/usdc_icon.svg',
             'assets/images/more_tokens.svg',
           ];
         case 56:
           return [
-            'assets/images/crypto/BNB.webp',
+            'assets/new-ui/crypto_full_icons/bnb.svg',
             'assets/images/usdc_icon.svg',
             'assets/images/usdt_wallet_icon.svg',
             'assets/images/more_tokens.svg',
           ];
         default:
           return [
-            'assets/images/crypto/ethereum.webp',
+            'assets/new-ui/crypto_full_icons/ethereum.svg',
             'assets/images/usdc_icon.svg',
             'assets/images/usdt_wallet_icon.svg',
           ];
diff --git a/res/pictures/node-qr-icon.svg b/res/pictures/node-qr-icon.svg
new file mode 100644
index 0000000..11e7588
--- /dev/null
+++ b/res/pictures/node-qr-icon.svg
@@ -0,0 +1,21 @@
+<svg width="69" height="69" viewBox="0 0 69 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_20948_375067)">
+<path d="M0 23C0 14.9492 0 10.9239 1.56678 7.84889C2.94496 5.14406 5.14406 2.94496 7.84889 1.56678C10.9239 0 14.9492 0 23 0H46C54.0508 0 58.0761 0 61.1511 1.56678C63.8559 2.94496 66.055 5.14406 67.4332 7.84889C69 10.9239 69 14.9492 69 23V46C69 54.0508 69 58.0761 67.4332 61.1511C66.055 63.8559 63.8559 66.055 61.1511 67.4332C58.0761 69 54.0508 69 46 69H23C14.9492 69 10.9239 69 7.84889 67.4332C5.14406 66.055 2.94496 63.8559 1.56678 61.1511C0 58.0761 0 54.0508 0 46V23Z" fill="url(#paint0_linear_20948_375067)"/>
+<path d="M46 66V69H23V66H46ZM66 46V23C66 18.9251 65.998 16.0493 65.8145 13.8027C65.6338 11.5912 65.2918 10.255 64.7598 9.21094C63.6692 7.07068 61.9293 5.33078 59.7891 4.24023C58.745 3.70825 57.4088 3.36624 55.1973 3.18555C52.9507 3.002 50.0749 3 46 3H23C18.9251 3 16.0493 3.002 13.8027 3.18555C11.5912 3.36624 10.255 3.70825 9.21094 4.24023C7.07068 5.33078 5.33078 7.07068 4.24023 9.21094C3.70825 10.255 3.36624 11.5912 3.18555 13.8027C3.002 16.0493 3 18.9251 3 23V46C3 50.0749 3.002 52.9507 3.18555 55.1973C3.36624 57.4088 3.70825 58.745 4.24023 59.7891C5.33078 61.9293 7.07068 63.6692 9.21094 64.7598C10.255 65.2918 11.5912 65.6338 13.8027 65.8145C16.0493 65.998 18.9251 66 23 66V69L20.1641 68.9971C14.1792 68.9764 10.7869 68.8161 8.13965 67.5752L7.84863 67.4336C5.31293 66.1416 3.22204 64.1276 1.83496 61.6523L1.56641 61.1514C-0.000375032 58.0764 0 54.0508 0 46V23C0 14.9492 -0.000375032 10.9236 1.56641 7.84863C2.94458 5.14384 5.14384 2.94458 7.84863 1.56641C10.9236 -0.000375032 14.9492 0 23 0H46C54.0508 0 58.0764 -0.000375032 61.1514 1.56641C63.8562 2.94458 66.0554 5.14384 67.4336 7.84863C69.0004 10.9236 69 14.9492 69 23V46C69 54.0508 69.0004 58.0764 67.4336 61.1514L67.165 61.6523C65.778 64.1276 63.6871 66.1416 61.1514 67.4336L60.8604 67.5752C57.821 68.9999 53.7996 69 46 69V66C50.0749 66 52.9507 65.998 55.1973 65.8145C57.4088 65.6338 58.745 65.2918 59.7891 64.7598C61.9293 63.6692 63.6692 61.9293 64.7598 59.7891C65.2918 58.745 65.6338 57.4088 65.8145 55.1973C65.998 52.9507 66 50.0749 66 46Z" fill="black"/>
+<path d="M19.5051 55.4285C17.6211 55.4285 16.0074 54.7569 14.6642 53.4137C13.321 52.0705 12.6494 50.4569 12.6494 48.5728C12.6494 46.6887 13.321 45.0751 14.6642 43.7319C16.0074 42.3887 17.6211 41.7171 19.5051 41.7171C20.1798 41.7171 20.8357 41.8181 21.4728 42.0201C22.1103 42.2221 22.6943 42.506 23.2248 42.8717L32.7744 33.3221V25.2054C31.2944 24.8251 30.0692 24.0266 29.099 22.8099C28.1288 21.5928 27.6437 20.1843 27.6437 18.5842C27.6437 16.7002 28.3153 15.0865 29.6585 13.7433C31.0017 12.4001 32.6153 11.7285 34.4994 11.7285C36.3835 11.7285 37.9971 12.4001 39.3403 13.7433C40.6835 15.0865 41.3551 16.7002 41.3551 18.5842C41.3551 20.1843 40.8737 21.5928 39.9107 22.8099C38.9482 24.0266 37.7194 24.8251 36.2244 25.2054V33.3221L45.8091 42.8717C46.34 42.506 46.9169 42.2221 47.5398 42.0201C48.1628 41.8181 48.814 41.7171 49.4937 41.7171C51.3778 41.7171 52.9914 42.3887 54.3346 43.7319C55.6778 45.0751 56.3494 46.6887 56.3494 48.5728C56.3494 50.4569 55.6778 52.0705 54.3346 53.4137C52.9914 54.7569 51.3778 55.4285 49.4937 55.4285C47.6096 55.4285 45.996 54.7569 44.6528 53.4137C43.3096 52.0705 42.638 50.4569 42.638 48.5728C42.638 48.0001 42.7058 47.4433 42.8415 46.9024C42.9772 46.3619 43.1762 45.8557 43.4384 45.3838L34.4994 36.4449L25.5605 45.3838C25.8227 45.8557 26.0216 46.3619 26.1573 46.9024C26.293 47.4433 26.3609 48.0001 26.3609 48.5728C26.3609 50.4569 25.6893 52.0705 24.3461 53.4137C23.0029 54.7569 21.3892 55.4285 19.5051 55.4285ZM49.4908 51.9785C50.4361 51.9785 51.2405 51.6477 51.9041 50.9861C52.5676 50.3244 52.8994 49.5208 52.8994 48.5751C52.8994 47.6298 52.5686 46.8256 51.907 46.1624C51.2453 45.4988 50.4417 45.1671 49.496 45.1671C48.5507 45.1671 47.7465 45.4979 47.0833 46.1595C46.4197 46.8211 46.088 47.6246 46.088 48.5699C46.088 49.5152 46.4188 50.3196 47.0804 50.9832C47.742 51.6467 48.5455 51.9785 49.4908 51.9785ZM34.4965 21.99C35.4422 21.99 36.2466 21.6591 36.9098 20.9975C37.5734 20.3359 37.9051 19.5324 37.9051 18.5871C37.9051 17.6418 37.5743 16.8374 36.9127 16.1738C36.2511 15.5103 35.4476 15.1785 34.5023 15.1785C33.5566 15.1785 32.7522 15.5093 32.089 16.171C31.4255 16.8326 31.0937 17.6363 31.0937 18.5819C31.0937 19.5272 31.4245 20.3315 32.0861 20.9946C32.7478 21.6582 33.5512 21.99 34.4965 21.99ZM19.5028 51.9785C20.4481 51.9785 21.2524 51.6477 21.9155 50.9861C22.5791 50.3244 22.9109 49.5208 22.9109 48.5751C22.9109 47.6298 22.58 46.8256 21.9184 46.1624C21.2568 45.4988 20.4533 45.1671 19.508 45.1671C18.5627 45.1671 17.7583 45.4979 17.0947 46.1595C16.4312 46.8211 16.0994 47.6246 16.0994 48.5699C16.0994 49.5152 16.4302 50.3196 17.0919 50.9832C17.7535 51.6467 18.5572 51.9785 19.5028 51.9785Z" fill="white"/>
+<path d="M19.5051 55.4285C17.6211 55.4285 16.0074 54.7569 14.6642 53.4137C13.321 52.0705 12.6494 50.4569 12.6494 48.5728C12.6494 46.6887 13.321 45.0751 14.6642 43.7319C16.0074 42.3887 17.6211 41.7171 19.5051 41.7171C20.1798 41.7171 20.8357 41.8181 21.4728 42.0201C22.1103 42.2221 22.6943 42.506 23.2248 42.8717L32.7744 33.3221V25.2054C31.2944 24.8251 30.0692 24.0266 29.099 22.8099C28.1288 21.5928 27.6437 20.1843 27.6437 18.5842C27.6437 16.7002 28.3153 15.0865 29.6585 13.7433C31.0017 12.4001 32.6153 11.7285 34.4994 11.7285C36.3835 11.7285 37.9971 12.4001 39.3403 13.7433C40.6835 15.0865 41.3551 16.7002 41.3551 18.5842C41.3551 20.1843 40.8737 21.5928 39.9107 22.8099C38.9482 24.0266 37.7194 24.8251 36.2244 25.2054V33.3221L45.8091 42.8717C46.34 42.506 46.9169 42.2221 47.5398 42.0201C48.1628 41.8181 48.814 41.7171 49.4937 41.7171C51.3778 41.7171 52.9914 42.3887 54.3346 43.7319C55.6778 45.0751 56.3494 46.6887 56.3494 48.5728C56.3494 50.4569 55.6778 52.0705 54.3346 53.4137C52.9914 54.7569 51.3778 55.4285 49.4937 55.4285C47.6096 55.4285 45.996 54.7569 44.6528 53.4137C43.3096 52.0705 42.638 50.4569 42.638 48.5728C42.638 48.0001 42.7058 47.4433 42.8415 46.9024C42.9772 46.3619 43.1762 45.8557 43.4384 45.3838L34.4994 36.4449L25.5605 45.3838C25.8227 45.8557 26.0216 46.3619 26.1573 46.9024C26.293 47.4433 26.3609 48.0001 26.3609 48.5728C26.3609 50.4569 25.6893 52.0705 24.3461 53.4137C23.0029 54.7569 21.3892 55.4285 19.5051 55.4285ZM49.4908 51.9785C50.4361 51.9785 51.2405 51.6477 51.9041 50.9861C52.5676 50.3244 52.8994 49.5208 52.8994 48.5751C52.8994 47.6298 52.5686 46.8256 51.907 46.1624C51.2453 45.4988 50.4417 45.1671 49.496 45.1671C48.5507 45.1671 47.7465 45.4979 47.0833 46.1595C46.4197 46.8211 46.088 47.6246 46.088 48.5699C46.088 49.5152 46.4188 50.3196 47.0804 50.9832C47.742 51.6467 48.5455 51.9785 49.4908 51.9785ZM34.4965 21.99C35.4422 21.99 36.2466 21.6591 36.9098 20.9975C37.5734 20.3359 37.9051 19.5324 37.9051 18.5871C37.9051 17.6418 37.5743 16.8374 36.9127 16.1738C36.2511 15.5103 35.4476 15.1785 34.5023 15.1785C33.5566 15.1785 32.7522 15.5093 32.089 16.171C31.4255 16.8326 31.0937 17.6363 31.0937 18.5819C31.0937 19.5272 31.4245 20.3315 32.0861 20.9946C32.7478 21.6582 33.5512 21.99 34.4965 21.99ZM19.5028 51.9785C20.4481 51.9785 21.2524 51.6477 21.9155 50.9861C22.5791 50.3244 22.9109 49.5208 22.9109 48.5751C22.9109 47.6298 22.58 46.8256 21.9184 46.1624C21.2568 45.4988 20.4533 45.1671 19.508 45.1671C18.5627 45.1671 17.7583 45.4979 17.0947 46.1595C16.4312 46.8211 16.0994 47.6246 16.0994 48.5699C16.0994 49.5152 16.4302 50.3196 17.0919 50.9832C17.7535 51.6467 18.5572 51.9785 19.5028 51.9785Z" fill="url(#paint1_linear_20948_375067)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_20948_375067" x1="34.5" y1="0" x2="34.5" y2="69" gradientUnits="userSpaceOnUse">
+<stop stop-color="#8F8F8F"/>
+<stop offset="1" stop-color="#6D6D6D"/>
+</linearGradient>
+<linearGradient id="paint1_linear_20948_375067" x1="34.4994" y1="11.7285" x2="34.4994" y2="55.4285" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#DADADA"/>
+</linearGradient>
+<clipPath id="clip0_20948_375067">
+<rect width="69" height="69" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb
index fd40e96..ff77d35 100644
--- a/res/values/strings_ar.arb
+++ b/res/values/strings_ar.arb
@@ -1110,7 +1110,7 @@
   "swipe_to_send": "اسحب للإرسال",
   "switch_wallet": "تبديل المحفظة",
   "switchToETHWallet": "يرجى التبديل إلى محفظة Ethereum والمحاولة مرة أخرى",
-  "switchToEVMCompatibleWallet": "يرجى التبديل إلى محفظة متوافقة مع EVM ثم المحاولة مرة أخرى (Ethereum، Polygon)",
+  "switchToWCCompatibleWallet": "يرجى التبديل إلى محفظة متوافقة مع WalletConnect والمحاولة مرة أخرى (${chains}).",
   "symbol": "الرمز",
   "sync_all_wallets": "مزامنة جميع المحافظ",
   "sync_attempting": "جارٍ محاولة المزامنة",
@@ -1415,4 +1415,4 @@
   "zcash_card_missing_funds": "هل أموالك مفقودة؟",
   "zcash_card_scan": "مسح",
   "zcash_card_warning": "لا تُغلق التطبيق حتى يكتمل الإجراء، لأنك إن فعلت ذلك فستحتاج هذه العملية إلى البدء من جديد من البداية."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb
index ccb4cd3..ccf9428 100644
--- a/res/values/strings_bg.arb
+++ b/res/values/strings_bg.arb
@@ -1110,7 +1110,7 @@
   "swipe_to_send": "Плъзнете, за да изпратите",
   "switch_wallet": "Превключване на портфейл",
   "switchToETHWallet": "Моля, превключете към портфейл за Ethereum и опитайте отново",
-  "switchToEVMCompatibleWallet": "Моля, превключете към EVM‑съвместим портфейл и опитайте отново (Ethereum, Polygon).",
+  "switchToWCCompatibleWallet": "Моля, превключете към портфейл, съвместим с WalletConnect, и опитайте отново (${chains}).",
   "symbol": "Символ",
   "sync_all_wallets": "Синхронизиране на всички портфейли",
   "sync_attempting": "Опит за синхронизиране",
@@ -1415,4 +1415,4 @@
   "zcash_card_missing_funds": "Липсват средства?",
   "zcash_card_scan": "Сканирай",
   "zcash_card_warning": "Не затваряйте приложението, докато процедурата не приключи. Ако го направите, процесът ще трябва да започне отначало."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb
index 3df4e52..2df5e02 100644
--- a/res/values/strings_cs.arb
+++ b/res/values/strings_cs.arb
@@ -1110,7 +1110,7 @@
   "swipe_to_send": "Přejeďte pro odeslání",
   "switch_wallet": "Přepnout peněženku",
   "switchToETHWallet": "Přepněte na peněženku Ethereum a zkuste to znovu",
-  "switchToEVMCompatibleWallet": "Přepněte prosím na peněženku kompatibilní s EVM a zkuste to znovu (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Přepněte prosím na peněženku kompatibilní s WalletConnect a zkuste to znovu (${chains}).",
   "symbol": "Symbol",
   "sync_all_wallets": "Synchronizovat všechny peněženky",
   "sync_attempting": "Probíhá synchronizace",
@@ -1415,4 +1415,4 @@
   "zcash_card_missing_funds": "Chybějící prostředky?",
   "zcash_card_scan": "Skenovat",
   "zcash_card_warning": "Nezavírejte aplikaci, dokud se postup nedokončí. Pokud tak učiníte, bude nutné tento proces spustit znovu od začátku."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 3596572..ab74cb1 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -277,6 +277,7 @@
   "creating_new_wallet": "Neues Wallet wird erstellt",
   "creating_new_wallet_error": "Fehler: ${description}",
   "creation_date": "Erstellungsdatum",
+  "csv_nothing_to_export": "Nichts zum Exportieren",
   "current_swap": "Aktueller Swap",
   "current_wallet": "Aktuelle Wallet",
   "custom": "Benutzerdefiniert",
@@ -362,8 +363,8 @@
   "donation": "Spende",
   "donation_link_details": "Details zum Spendenlink",
   "done": "Fertig",
-  "duress_pin_description": "Dadurch wird eine Notfall-PIN eingerichtet, eine erweiterte Funktion, die von den meisten Nutzern nicht verwendet werden sollte. Diese PIN sollte nur verwendet werden, wenn Sie in Gefahr sind. Nachdem Sie diese PIN verwendet haben, werden alle Ihre Wallets gelöscht. Stellen Sie daher bitte sicher, dass alle Ihre Seeds gesichert sind, bevor Sie sie verwenden.",
   "duress_PIN": "Notfall-PIN",
+  "duress_pin_description": "Dadurch wird eine Notfall-PIN eingerichtet, eine erweiterte Funktion, die von den meisten Nutzern nicht verwendet werden sollte. Diese PIN sollte nur verwendet werden, wenn Sie in Gefahr sind. Nachdem Sie diese PIN verwendet haben, werden alle Ihre Wallets gelöscht. Stellen Sie daher bitte sicher, dass alle Ihre Seeds gesichert sind, bevor Sie sie verwenden.",
   "duress_PIN_set_up_successfully": "Die Notfall-PIN wurde erfolgreich eingerichtet",
   "e_sign_consent": "Einwilligung zur E-Signatur",
   "edit": "Bearbeiten",
@@ -450,14 +451,12 @@
   "expires": "Läuft ab",
   "expiresOn": "Läuft ab am",
   "expiry_and_validity": "Ablauf und Gültigkeit",
-  "csv_nothing_to_export": "Nichts zum Exportieren",
   "export_backup": "Backup exportieren",
   "export_csv": "Export CSV",
   "export_lightning_logs": "Lightning-Logs exportieren",
   "export_logs": "Protokolle exportieren",
   "export_outputs": "Outputs exportieren",
   "export_payjoin_logs": "Payjoin-Logs exportieren",
-  "generating_csv": "CSV wird erstellt...",
   "extend_session": "Sitzung verlängern",
   "external": "Extern",
   "external_wallet": "Externe Wallet",
@@ -494,6 +493,7 @@
   "gas_price": "Gaspreis",
   "general": "Allgemein",
   "generate_name": "Namen generieren",
+  "generating_csv": "CSV wird erstellt...",
   "generating_gift_card": "Geschenkkarte wird generiert",
   "generating_transaction": "Transaktion wird erstellt",
   "get_a": "Holen Sie sich",
@@ -1111,7 +1111,7 @@
   "swipe_to_send": "Zum Senden wischen",
   "switch_wallet": "Wallet wechseln",
   "switchToETHWallet": "Bitte wechseln Sie zu einer Ethereum-Wallet und versuchen Sie es erneut",
-  "switchToEVMCompatibleWallet": "Bitte wechseln Sie zu einem EVM-kompatiblen Wallet und versuchen Sie es erneut (Ethereum, Polygon).",
+  "switchToWCCompatibleWallet": "Bitte wechseln Sie zu einer WalletConnect-kompatiblen Wallet und versuchen Sie es erneut (${chains}).",
   "symbol": "Symbol",
   "sync_all_wallets": "Alle Wallets synchronisieren",
   "sync_attempting": "Synchronisierung wird versucht",
@@ -1419,4 +1419,4 @@
   "zcash_card_missing_funds": "Fehlende Gelder?",
   "zcash_card_scan": "Scannen",
   "zcash_card_warning": "Schließen Sie die App nicht, bis der Vorgang abgeschlossen ist. Andernfalls muss der Vorgang von Grund auf neu gestartet werden."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 1900934..964255c 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -732,11 +732,11 @@
   "outputs": "Outputs",
   "overshot": "Overshot",
   "overwrite_amount": "Overwrite amount",
-  "pairingInvalidEvent": "Pairing Invalid Event",
   "pairing_code": "Pairing Code",
   "pairing_code_desc_1": "Your device will show a pairing code.",
   "pairing_code_desc_2": "Input here to continue",
   "pairing_error": "Pairing Error",
+  "pairingInvalidEvent": "Pairing Invalid Event",
   "passphrase": "Passphrase (Optional)",
   "passphrase_view_keys": "Passphrase",
   "passphrases_doesnt_match": "Passphrases do not match, please try again",
@@ -1060,9 +1060,9 @@
   "setup_your_debit_card": "Set up your debit card",
   "share": "Share",
   "share_address": "Share address",
+  "share_this_node": "Share this node",
   "shared_seed_wallet_groups": "Shared Seed Wallet Groups",
   "shared_seed_wallets": "Shared Seed Wallets",
-  "share_this_node": "Share this node",
   "show": "Show",
   "show_address_book_popup": "Show Address Book popup",
   "show_balance": "Long Press to Show Balance",
@@ -1138,7 +1138,7 @@
   "swipe_to_send": "Swipe to send",
   "switch_wallet": "Switch Wallet",
   "switchToETHWallet": "Please switch to an Ethereum wallet and try again",
-  "switchToEVMCompatibleWallet": "Please switch to an EVM compatible wallet and try again (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Please switch to a WalletConnect compatible wallet and try again (${chains}).",
   "symbol": "Symbol",
   "sync_all_wallets": "Sync all wallets",
   "sync_attempting": "Attempting sync",
@@ -1325,10 +1325,10 @@
   "value_type": "Value Type",
   "variable_pair_not_supported": "This variable pair is not supported with the selected exchanges",
   "verification": "Verification",
-  "verifying_code": "Verifying Code",
   "verify_message": "Verify Message",
   "verify_seed": "Verify Seed",
   "verify_with_2fa": "Verify with Cake 2FA",
+  "verifying_code": "Verifying Code",
   "version": "Version ${currentVersion}",
   "view_all": "View all",
   "view_in_block_explorer": "View in Block Explorer",
@@ -1433,8 +1433,8 @@
   "yat_popup_content": "You can now send and receive crypto in Cake Wallet with your Yat - a short, emoji-based username. Manage Yats at any time on the settings screen",
   "yat_popup_title": "Your wallet address can be emojified.",
   "yes": "Yes",
-  "yesterday": "Yesterday",
   "yes_exit": "Yes. Exit",
+  "yesterday": "Yesterday",
   "you_now_have_debit_card": "You now have a debit card",
   "you_pay": "You Pay",
   "you_will_get": "Convert to",
@@ -1449,4 +1449,4 @@
   "zcash_card_missing_funds": "Missing funds?",
   "zcash_card_scan": "Scan",
   "zcash_card_warning": "Do not close the app until the procedure completes, if you do so this process will need to restart from scratch."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 8f2623e..c8a45aa 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -1111,7 +1111,7 @@
   "swipe_to_send": "Desliza para enviar",
   "switch_wallet": "Cambiar cartera",
   "switchToETHWallet": "Por favor, cambia a una billetera de Ethereum y vuelve a intentarlo.",
-  "switchToEVMCompatibleWallet": "Cambia a una billetera compatible con EVM e inténtalo de nuevo (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Cambie a una billetera compatible con WalletConnect e inténtelo nuevamente (${chains}).",
   "symbol": "Símbolo",
   "sync_all_wallets": "Sincronizar todas las billeteras",
   "sync_attempting": "Intentando sincronizar",
@@ -1417,4 +1417,4 @@
   "zcash_card_missing_funds": "¿Faltan fondos?",
   "zcash_card_scan": "Escanear",
   "zcash_card_warning": "No cierre la aplicación hasta que se complete el procedimiento; si lo hace, este proceso deberá reiniciarse desde cero."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_fa.arb b/res/values/strings_fa.arb
index 5597a2c..515e6f3 100644
--- a/res/values/strings_fa.arb
+++ b/res/values/strings_fa.arb
@@ -1109,7 +1109,7 @@
   "swipe_to_send": "برای ارسال، انگشت خود را بکشید",
   "switch_wallet": "تعویض کیف پول",
   "switchToETHWallet": "لطفاً به کیف پول اتریوم تغییر دهید و دوباره تلاش کنید",
-  "switchToEVMCompatibleWallet": "لطفاً به یک کیف پول سازگار با EVM تغییر دهید و دوباره تلاش کنید (Ethereum، Polygon)",
+  "switchToWCCompatibleWallet": "لطفاً به یک کیف پول سازگار با WalletConnect بروید و دوباره امتحان کنید (${chains}).",
   "symbol": "نماد",
   "sync_all_wallets": "همگام‌سازی همه کیف‌پول‌ها",
   "sync_attempting": "در حال تلاش برای همگام‌سازی",
@@ -1412,4 +1412,4 @@
   "zcash_card_missing_funds": "موجودی گم شده؟",
   "zcash_card_scan": "اسکن",
   "zcash_card_warning": "تا زمانی که این فرایند کامل نشده است، برنامه را نبندید؛ در غیر این صورت، این فرایند باید از ابتدا دوباره شروع شود."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index 364c38f..c674f09 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -1110,7 +1110,7 @@
   "swipe_to_send": "Faites glisser pour envoyer",
   "switch_wallet": "Changer de portefeuille",
   "switchToETHWallet": "Veuillez passer à un portefeuille Ethereum et réessayer",
-  "switchToEVMCompatibleWallet": "Veuillez passer à un portefeuille compatible EVM et réessayer (Ethereum, Polygon).",
+  "switchToWCCompatibleWallet": "Veuillez passer à un portefeuille compatible WalletConnect et réessayer (${chains}).",
   "symbol": "Symbole",
   "sync_all_wallets": "Synchroniser tous les portefeuilles",
   "sync_attempting": "Synchronisation en cours",
@@ -1415,4 +1415,4 @@
   "zcash_card_missing_funds": "Fonds manquants ?",
   "zcash_card_scan": "Scanner",
   "zcash_card_warning": "Ne fermez pas l'application tant que la procédure n'est pas terminée. Si vous le faites, ce processus devra redémarrer depuis le début."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_gn.arb b/res/values/strings_gn.arb
index a99bad5..80dc4de 100644
--- a/res/values/strings_gn.arb
+++ b/res/values/strings_gn.arb
@@ -895,7 +895,7 @@
   "sweeping_wallet_alert": "Kóva ndoguerahámo’ãi heta aravo. ANI REHEJA KO PANTALLA, térã umi fondo oñemopotĩva ikatu okañy.",
   "swipe_to_send": "Emoinge hag̃ua emondo hag̃ua.",
   "switchToETHWallet": "Ikatúpa emoambue peteĩ billetera Ethereum-pe ha eha’ãjey.",
-  "switchToEVMCompatibleWallet": "Ikatúpa emoambue peteĩ billetera ojoajukuaa hag̃ua EVM ndive ha eha’ãjey (Ethereum, Polygon).",
+  "switchToWCCompatibleWallet": "Embohasa peteĩ billetera WalletConnect ndive ha eñeha’ã jey (${chains}).",
   "symbol": "Ta'ãnga’i",
   "sync_all_wallets": "Embojuehe opaite billetera",
   "sync_attempting": "Oñeha’ãvo ojesincronisa",
@@ -1162,4 +1162,4 @@
   "zcash_card_missing_funds": "¿Nde fondo okañy?",
   "zcash_card_scan": "Escanear",
   "zcash_card_warning": "Ani remboty pe app pe procedimiento opa hag̃ua, rejapo ramo upéicha ko proceso tekotevẽta oñepyrũ jey cero guive."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb
index 5a0593c..0a48000 100644
--- a/res/values/strings_ha.arb
+++ b/res/values/strings_ha.arb
@@ -1112,7 +1112,7 @@
   "swipe_to_send": "Zame don aikawa",
   "switch_wallet": "Canja Wallet",
   "switchToETHWallet": "Da fatan za a koma zuwa walat ɗin Ethereum kuma a sake gwadawa",
-  "switchToEVMCompatibleWallet": "Da fatan za a koma zuwa walat mai jituwa da EVM sannan a sake gwadawa (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Da fatan za a canza zuwa WalletConnect mai dacewa da walat kuma a sake gwadawa (${chains}).",
   "symbol": "Alama",
   "sync_all_wallets": "Daidaita duk walat",
   "sync_attempting": "Ana ƙoƙarin daidaitawa",
@@ -1418,4 +1418,4 @@
   "zcash_card_missing_funds": "Kuɗi sun ɓace?",
   "zcash_card_scan": "Duba",
   "zcash_card_warning": "Kada ku rufe manhajar har sai an kammala aikin; idan kun yi haka, wannan tsari zai buƙaci a sake farawa daga farko."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index b86c423..51c8839 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -1112,7 +1112,7 @@
   "swipe_to_send": "भेजने के लिए स्वाइप करें",
   "switch_wallet": "वॉलेट बदलें",
   "switchToETHWallet": "कृपया Ethereum वॉलेट पर स्विच करें और फिर से प्रयास करें",
-  "switchToEVMCompatibleWallet": "कृपया EVM-संगत वॉलेट पर स्विच करें और फिर से प्रयास करें (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "कृपया वॉलेटकनेक्ट संगत वॉलेट पर स्विच करें और पुनः प्रयास करें (${chains})।",
   "symbol": "प्रतीक",
   "sync_all_wallets": "सभी वॉलेट सिंक करें",
   "sync_attempting": "सिंक करने का प्रयास किया जा रहा है",
@@ -1417,4 +1417,4 @@
   "zcash_card_missing_funds": "फंड गायब हैं?",
   "zcash_card_scan": "स्कैन",
   "zcash_card_warning": "प्रक्रिया पूरी होने तक ऐप बंद न करें। यदि आप ऐसा करते हैं, तो यह प्रक्रिया शुरू से फिर से शुरू करनी होगी।"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index d472ce9..aa81926 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -1110,7 +1110,7 @@
   "swipe_to_send": "Prijeđite prstom za slanje",
   "switch_wallet": "Prebaci novčanik",
   "switchToETHWallet": "Molimo prebacite se na Ethereum novčanik i pokušajte ponovno",
-  "switchToEVMCompatibleWallet": "Molimo prebacite se na novčanik kompatibilan s EVM-om i pokušajte ponovno (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Prebacite se na novčanik kompatibilan s WalletConnectom i pokušajte ponovno (${chains}).",
   "symbol": "Simbol",
   "sync_all_wallets": "Sinkroniziraj sve novčanike",
   "sync_attempting": "Pokušaj sinkronizacije",
@@ -1415,4 +1415,4 @@
   "zcash_card_missing_funds": "Nedostaju sredstva?",
   "zcash_card_scan": "Skeniraj",
   "zcash_card_warning": "Ne zatvarajte aplikaciju dok se postupak ne dovrši; ako to učinite, postupak će se morati ponovno pokrenuti ispočetka."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_hy.arb b/res/values/strings_hy.arb
index 9cb7e48..af2c288 100644
--- a/res/values/strings_hy.arb
+++ b/res/values/strings_hy.arb
@@ -1108,7 +1108,7 @@
   "swipe_to_send": "Ուղարկելու համար սահեցրեք",
   "switch_wallet": "Փոխել դրամապանակը",
   "switchToETHWallet": "Խնդրում ենք անցնել Ethereum դրամապանակի և կրկին փորձել",
-  "switchToEVMCompatibleWallet": "Խնդրում ենք անցնել EVM-ի հետ համատեղելի դրամապանակի և փորձել կրկին (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Խնդրում ենք անցնել WalletConnect-ի համատեղելի դրամապանակին և նորից փորձել (${chains}):",
   "symbol": "Սիմվոլ",
   "sync_all_wallets": "Համաժամեցնել բոլոր դրամապանակները",
   "sync_attempting": "Համաժամացման փորձ",
@@ -1412,4 +1412,4 @@
   "zcash_card_missing_funds": "Միջոցները բացակա՞յում են",
   "zcash_card_scan": "Սկանավորել",
   "zcash_card_warning": "Մի փակեք հավելվածը մինչև ընթացակարգի ավարտը, քանի որ հակառակ դեպքում այս գործընթացը պետք է վերագործարկվի զրոյից։"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb
index ad6b69f..105c512 100644
--- a/res/values/strings_id.arb
+++ b/res/values/strings_id.arb
@@ -1113,7 +1113,7 @@
   "swipe_to_send": "Geser untuk mengirim",
   "switch_wallet": "Ganti Wallet",
   "switchToETHWallet": "Silakan beralih ke dompet Ethereum dan coba lagi",
-  "switchToEVMCompatibleWallet": "Silakan beralih ke dompet yang kompatibel dengan EVM dan coba lagi (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Silakan beralih ke dompet yang kompatibel dengan WalletConnect dan coba lagi (${chains}).",
   "symbol": "Simbol",
   "sync_all_wallets": "Sinkronkan semua dompet",
   "sync_attempting": "Mencoba menyinkronkan",
@@ -1417,4 +1417,4 @@
   "zcash_card_missing_funds": "Dana hilang?",
   "zcash_card_scan": "Pindai",
   "zcash_card_warning": "Jangan tutup aplikasi sampai prosedur selesai. Jika Anda melakukannya, proses ini harus dimulai ulang dari awal."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index 46d5d2c..f2349d1 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -1110,7 +1110,7 @@
   "swipe_to_send": "Scorri per inviare",
   "switch_wallet": "Cambia wallet",
   "switchToETHWallet": "Passa a un wallet Ethereum e riprova",
-  "switchToEVMCompatibleWallet": "Passa a un wallet compatibile con EVM e riprova (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Passa a un portafoglio compatibile con WalletConnect e riprova (${chains}).",
   "symbol": "Simbolo",
   "sync_all_wallets": "Sincronizza tutti i wallet",
   "sync_attempting": "Sincronizzazione in corso",
@@ -1416,4 +1416,4 @@
   "zcash_card_missing_funds": "Fondi mancanti?",
   "zcash_card_scan": "Scansiona",
   "zcash_card_warning": "Non chiudere l'app finché la procedura non è completata, altrimenti sarà necessario riavviare il processo da zero."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 579cd5f..97af836 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -1110,7 +1110,7 @@
   "swipe_to_send": "スワイプして送信",
   "switch_wallet": "ウォレットを切り替える",
   "switchToETHWallet": "Ethereumウォレットに切り替えて、もう一度お試しください",
-  "switchToEVMCompatibleWallet": "EVM互換ウォレットに切り替えて、もう一度お試しください（Ethereum、Polygon）",
+  "switchToWCCompatibleWallet": "WalletConnect と互換性のあるウォレットに切り替えて、もう一度お試しください (${chains})。",
   "symbol": "シンボル",
   "sync_all_wallets": "すべてのウォレットを同期",
   "sync_attempting": "同期を試みています",
@@ -1414,4 +1414,4 @@
   "zcash_card_missing_funds": "資金が見当たりませんか？",
   "zcash_card_scan": "スキャン",
   "zcash_card_warning": "手順が完了するまでアプリを閉じないでください。閉じると、このプロセスを最初からやり直す必要があります。"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 94e03d8..54df24f 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -1110,7 +1110,7 @@
   "swipe_to_send": "밀어서 보내기",
   "switch_wallet": "지갑 전환",
   "switchToETHWallet": "이더리움 지갑으로 전환한 후 다시 시도하세요",
-  "switchToEVMCompatibleWallet": "EVM 호환 지갑(Ethereum, Polygon)으로 전환한 후 다시 시도하세요",
+  "switchToWCCompatibleWallet": "WalletConnect 호환 지갑으로 전환한 후 다시 시도하세요(${chains}).",
   "symbol": "심볼",
   "sync_all_wallets": "모든 지갑 동기화",
   "sync_attempting": "동기화를 시도하는 중",
@@ -1414,4 +1414,4 @@
   "zcash_card_missing_funds": "자금이 사라졌나요?",
   "zcash_card_scan": "스캔",
   "zcash_card_warning": "절차가 완료될 때까지 앱을 닫지 마십시오. 닫으면 이 과정을 처음부터 다시 시작해야 합니다."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb
index e69bd17..93b4cc8 100644
--- a/res/values/strings_my.arb
+++ b/res/values/strings_my.arb
@@ -1109,7 +1109,7 @@
   "swipe_to_send": "ပို့ရန် ပွတ်ဆွဲပါ",
   "switch_wallet": "ပိုက်ဆံအိတ် ပြောင်းရန်",
   "switchToETHWallet": "ကျေးဇူးပြု၍ Ethereum ပိုက်ဆံအိတ်သို့ ပြောင်းပြီး ထပ်မံကြိုးစားကြည့်ပါ။",
-  "switchToEVMCompatibleWallet": "ကျေးဇူးပြု၍ EVM နှင့် တွဲဖက်အသုံးပြုနိုင်သော ပိုက်ဆံအိတ်သို့ ပြောင်းပြီး ထပ်မံကြိုးစားကြည့်ပါ (Ethereum၊ Polygon)",
+  "switchToWCCompatibleWallet": "ကျေးဇူးပြု၍ WalletConnect တွဲဖက်သုံးနိုင်သော ပိုက်ဆံအိတ်သို့ ပြောင်းပြီး ထပ်စမ်းကြည့်ပါ (${chains})။",
   "symbol": "သင်္ကေတ",
   "sync_all_wallets": "ပိုက်ဆံအိတ်အားလုံးကို စင့်ခ်လုပ်ရန်",
   "sync_attempting": "ထပ်တူပြုလုပ်ရန် ကြိုးစားနေသည်",
@@ -1413,4 +1413,4 @@
   "zcash_card_missing_funds": "ငွေကြေး ပျောက်ဆုံးနေပါသလား?",
   "zcash_card_scan": "စကင်",
   "zcash_card_warning": "လုပ်ငန်းစဉ် ပြီးဆုံးသည်အထိ အက်ပ်ကို မပိတ်ပါနှင့်။ ပိတ်လိုက်ပါက ဤလုပ်ငန်းစဉ်ကို အစမှ ပြန်လည်စတင်ရမည်ဖြစ်သည်။"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index d21e674..80a37a4 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -1106,7 +1106,7 @@
   "swipe_to_send": "Swipe om te verzenden",
   "switch_wallet": "Wissel van wallet",
   "switchToETHWallet": "Schakel over naar een Ethereum-wallet en probeer het opnieuw",
-  "switchToEVMCompatibleWallet": "Schakel over naar een EVM-compatibele wallet en probeer het opnieuw (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Schakel over naar een WalletConnect-compatibele portemonnee en probeer het opnieuw (${chains}).",
   "symbol": "Symbool",
   "sync_all_wallets": "Alle wallets synchroniseren",
   "sync_attempting": "Bezig met synchroniseren",
@@ -1411,4 +1411,4 @@
   "zcash_card_missing_funds": "Fondsen ontbreken?",
   "zcash_card_scan": "Scannen",
   "zcash_card_warning": "Sluit de app niet voordat de procedure is voltooid. Als je dit wel doet, moet dit proces helemaal opnieuw worden gestart."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 41f14a9..5719de7 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -1108,7 +1108,7 @@
   "swipe_to_send": "Przesuń, aby wysłać",
   "switch_wallet": "Przełącz portfel",
   "switchToETHWallet": "Przełącz się na portfel Ethereum i spróbuj ponownie",
-  "switchToEVMCompatibleWallet": "Przełącz się na portfel kompatybilny z EVM i spróbuj ponownie (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Przełącz się na portfel zgodny z WalletConnect i spróbuj ponownie (${chains}).",
   "symbol": "Symbol",
   "sync_all_wallets": "Synchronizuj wszystkie portfele",
   "sync_attempting": "Trwa synchronizacja",
@@ -1412,4 +1412,4 @@
   "zcash_card_missing_funds": "Brakuje środków?",
   "zcash_card_scan": "Skanuj",
   "zcash_card_warning": "Nie zamykaj aplikacji do czasu zakończenia procedury. Jeśli to zrobisz, proces będzie musiał rozpocząć się od nowa."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 594a465..1768419 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -1111,7 +1111,7 @@
   "swipe_to_send": "Deslize para enviar",
   "switch_wallet": "Alternar carteira",
   "switchToETHWallet": "Por favor, mude para uma carteira Ethereum e tente novamente",
-  "switchToEVMCompatibleWallet": "Por favor, mude para uma carteira compatível com EVM e tente novamente (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Mude para uma carteira compatível com WalletConnect e tente novamente (${chains}).",
   "symbol": "Símbolo",
   "sync_all_wallets": "Sincronizar todas as carteiras",
   "sync_attempting": "Tentando sincronizar",
@@ -1416,4 +1416,4 @@
   "zcash_card_missing_funds": "Fundos em falta?",
   "zcash_card_scan": "Escanear",
   "zcash_card_warning": "Não feche o aplicativo até que o procedimento seja concluído; se você fizer isso, esse processo precisará ser reiniciado do zero."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_pt_BR.arb b/res/values/strings_pt_BR.arb
index 1776b6a..fe41b7a 100644
--- a/res/values/strings_pt_BR.arb
+++ b/res/values/strings_pt_BR.arb
@@ -1090,7 +1090,7 @@
   "swipe_to_send": "Deslize para enviar",
   "switch_wallet": "Alternar carteira",
   "switchToETHWallet": "Por favor, mude para uma carteira Ethereum e tente novamente",
-  "switchToEVMCompatibleWallet": "Por favor, mude para uma carteira compatível com EVM e tente novamente (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Mude para uma carteira compatível com WalletConnect e tente novamente (${chains}).",
   "symbol": "Símbolo",
   "sync_all_wallets": "Sincronizar todas as carteiras",
   "sync_attempting": "Tentando sincronizar",
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 373ca64..b3541bc 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -1110,7 +1110,7 @@
   "swipe_to_send": "Проведите, чтобы отправить",
   "switch_wallet": "Переключить кошелёк",
   "switchToETHWallet": "Пожалуйста, переключитесь на кошелёк Ethereum и повторите попытку",
-  "switchToEVMCompatibleWallet": "Пожалуйста, переключитесь на кошелек, совместимый с EVM, и повторите попытку (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Пожалуйста, переключитесь на кошелек, совместимый с WalletConnect, и повторите попытку (${chains}).",
   "symbol": "Символ",
   "sync_all_wallets": "Синхронизировать все кошельки",
   "sync_attempting": "Выполняется синхронизация",
@@ -1414,4 +1414,4 @@
   "zcash_card_missing_funds": "Не хватает средств?",
   "zcash_card_scan": "Сканировать",
   "zcash_card_warning": "Не закрывайте приложение до завершения процедуры. Если вы это сделаете, процесс придется перезапустить с нуля."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb
index d5bd0d4..932925c 100644
--- a/res/values/strings_th.arb
+++ b/res/values/strings_th.arb
@@ -1109,7 +1109,7 @@
   "swipe_to_send": "ปัดเพื่อส่ง",
   "switch_wallet": "สลับกระเป๋าเงิน",
   "switchToETHWallet": "โปรดสลับไปยังกระเป๋าเงิน Ethereum แล้วลองอีกครั้ง",
-  "switchToEVMCompatibleWallet": "โปรดสลับไปใช้กระเป๋าเงินที่รองรับ EVM แล้วลองอีกครั้ง (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "โปรดเปลี่ยนไปใช้กระเป๋าเงินที่รองรับ WalletConnect แล้วลองอีกครั้ง (${chains})",
   "symbol": "สัญลักษณ์",
   "sync_all_wallets": "ซิงค์กระเป๋าเงินทั้งหมด",
   "sync_attempting": "กำลังพยายามซิงค์",
@@ -1413,4 +1413,4 @@
   "zcash_card_missing_funds": "ยอดเงินหายไป?",
   "zcash_card_scan": "สแกน",
   "zcash_card_warning": "อย่าปิดแอปจนกว่าขั้นตอนจะเสร็จสิ้น หากคุณปิดแอป กระบวนการนี้จะต้องเริ่มใหม่ตั้งแต่ต้น"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_tl.arb b/res/values/strings_tl.arb
index b001c5a..5422ef2 100644
--- a/res/values/strings_tl.arb
+++ b/res/values/strings_tl.arb
@@ -1109,7 +1109,7 @@
   "swipe_to_send": "I-swipe para magpadala",
   "switch_wallet": "Lumipat ng Wallet",
   "switchToETHWallet": "Mangyaring lumipat sa isang Ethereum wallet at subukang muli",
-  "switchToEVMCompatibleWallet": "Mangyaring lumipat sa isang EVM-compatible na wallet at subukang muli (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Mangyaring lumipat sa isang WalletConnect na katugmang wallet at subukang muli (${chains}).",
   "symbol": "Simbolo",
   "sync_all_wallets": "I-sync ang lahat ng wallet",
   "sync_attempting": "Sinusubukang i-sync",
@@ -1413,4 +1413,4 @@
   "zcash_card_missing_funds": "Nawawalang pondo?",
   "zcash_card_scan": "I-scan",
   "zcash_card_warning": "Huwag isara ang app hanggang sa makumpleto ang proseso; kung gagawin mo ito, kakailanganing magsimula muli mula sa simula."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb
index e57233f..53ffe19 100644
--- a/res/values/strings_tr.arb
+++ b/res/values/strings_tr.arb
@@ -1109,7 +1109,7 @@
   "swipe_to_send": "Göndermek için kaydırın",
   "switch_wallet": "Cüzdan Değiştir",
   "switchToETHWallet": "Lütfen bir Ethereum cüzdanına geçin ve tekrar deneyin",
-  "switchToEVMCompatibleWallet": "Lütfen EVM uyumlu bir cüzdana geçin ve tekrar deneyin (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Lütfen WalletConnect uyumlu bir cüzdana geçin ve tekrar deneyin (${chains}).",
   "symbol": "Sembol",
   "sync_all_wallets": "Tüm cüzdanları senkronize et",
   "sync_attempting": "Senkronizasyon deneniyor",
@@ -1413,4 +1413,4 @@
   "zcash_card_missing_funds": "Bakiye eksik mi?",
   "zcash_card_scan": "Tara",
   "zcash_card_warning": "İşlem tamamlanana kadar uygulamayı kapatmayın; aksi takdirde bu işlemin baştan yeniden başlatılması gerekecektir."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 01ac89d..1115fb8 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -1110,7 +1110,7 @@
   "swipe_to_send": "Проведіть, щоб надіслати",
   "switch_wallet": "Перемкнути гаманець",
   "switchToETHWallet": "Будь ласка, перемкніться на гаманець Ethereum і спробуйте ще раз",
-  "switchToEVMCompatibleWallet": "Будь ласка, перемкніться на гаманець, сумісний з EVM, і спробуйте ще раз (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Перейдіть на гаманець, сумісний з WalletConnect, і повторіть спробу (${chains}).",
   "symbol": "Символ",
   "sync_all_wallets": "Синхронізувати всі гаманці",
   "sync_attempting": "Спроба синхронізації",
@@ -1414,4 +1414,4 @@
   "zcash_card_missing_funds": "Зникли кошти?",
   "zcash_card_scan": "Сканувати",
   "zcash_card_warning": "Не закривайте застосунок, доки процедура не завершиться. Якщо ви це зробите, цей процес потрібно буде перезапустити з нуля."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb
index d9ed60d..5514779 100644
--- a/res/values/strings_ur.arb
+++ b/res/values/strings_ur.arb
@@ -1111,7 +1111,7 @@
   "swipe_to_send": "بھیجنے کے لیے سوائپ کریں",
   "switch_wallet": "والیٹ تبدیل کریں",
   "switchToETHWallet": "براہِ کرم Ethereum والیٹ پر سوئچ کریں اور دوبارہ کوشش کریں",
-  "switchToEVMCompatibleWallet": "براہ کرم ایک EVM کے ساتھ مطابقت رکھنے والے والیٹ پر سوئچ کریں اور دوبارہ کوشش کریں (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "براہ کرم WalletConnect کے موافق والیٹ پر سوئچ کریں اور دوبارہ کوشش کریں (${chains})۔",
   "symbol": "علامت",
   "sync_all_wallets": "تمام والیٹس کو ہم آہنگ کریں",
   "sync_attempting": "ہم آہنگی کی کوشش کی جا رہی ہے",
@@ -1415,4 +1415,4 @@
   "zcash_card_missing_funds": "فنڈز غائب ہیں؟",
   "zcash_card_scan": "اسکین کریں",
   "zcash_card_warning": "طریقہ کار مکمل ہونے تک ایپ بند نہ کریں۔ اگر آپ ایسا کریں گے تو یہ عمل شروع سے دوبارہ شروع کرنا پڑے گا۔"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_vi.arb b/res/values/strings_vi.arb
index 9eb5700..5fcbf82 100644
--- a/res/values/strings_vi.arb
+++ b/res/values/strings_vi.arb
@@ -1106,7 +1106,7 @@
   "swipe_to_send": "Vuốt để gửi",
   "switch_wallet": "Chuyển đổi ví",
   "switchToETHWallet": "Vui lòng chuyển sang ví Ethereum và thử lại",
-  "switchToEVMCompatibleWallet": "Vui lòng chuyển sang ví tương thích với EVM và thử lại (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Vui lòng chuyển sang ví tương thích với WalletConnect và thử lại (${chains}).",
   "symbol": "Ký hiệu",
   "sync_all_wallets": "Đồng bộ tất cả ví",
   "sync_attempting": "Đang thử đồng bộ",
@@ -1410,4 +1410,4 @@
   "zcash_card_missing_funds": "Thiếu tiền?",
   "zcash_card_scan": "Quét",
   "zcash_card_warning": "Không đóng ứng dụng cho đến khi quy trình hoàn tất; nếu bạn làm vậy, quy trình này sẽ phải bắt đầu lại từ đầu."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb
index 715fc65..2fd9dcf 100644
--- a/res/values/strings_yo.arb
+++ b/res/values/strings_yo.arb
@@ -1110,7 +1110,7 @@
   "swipe_to_send": "Ra lati fi ránṣẹ́",
   "switch_wallet": "Yí apamọwọ padà",
   "switchToETHWallet": "Jọwọ yipada sí apamọwọ Ethereum kí o sì tún gbìyànjú lẹ́ẹ̀kansi",
-  "switchToEVMCompatibleWallet": "Jọwọ yipada sí apamọwọ tí ó bá EVM mu, kí o sì tún gbìyànjú lẹ́ẹ̀kansi (Ethereum, Polygon)",
+  "switchToWCCompatibleWallet": "Jọwọ yipada si apamọwọ ibaramu WalletConnect ki o tun gbiyanju lẹẹkansi (${chains}).",
   "symbol": "Àmì",
   "sync_all_wallets": "Muṣiṣẹpọ gbogbo awọn woleti",
   "sync_attempting": "Ń gbìyànjú láti ṣe amuṣiṣẹpọ",
@@ -1414,4 +1414,4 @@
   "zcash_card_missing_funds": "Ṣe owó rẹ sọnù?",
   "zcash_card_scan": "Ṣàwárí",
   "zcash_card_warning": "Maṣe pa ohun elo naa titi ilana naa yoo fi pari; bí o bá ṣe bẹ́ẹ̀, ilana yìí yóò ní láti tún bẹ̀rẹ̀ láti ìbẹ̀rẹ̀."
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index b850267..017e28c 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -1109,7 +1109,7 @@
   "swipe_to_send": "滑动以发送",
   "switch_wallet": "切换钱包",
   "switchToETHWallet": "请切换到以太坊钱包后重试",
-  "switchToEVMCompatibleWallet": "请切换到 EVM 兼容的钱包并重试（以太坊、Polygon）",
+  "switchToWCCompatibleWallet": "請切換到 WalletConnect 相容錢包並重試 (${chains})。",
   "symbol": "代号",
   "sync_all_wallets": "同步所有钱包",
   "sync_attempting": "正在尝试同步",
@@ -1413,4 +1413,4 @@
   "zcash_card_missing_funds": "资金不见了？",
   "zcash_card_scan": "扫描",
   "zcash_card_warning": "在该过程完成之前请勿关闭应用程序，否则该过程将需要从头重新开始。"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_zh_tw.arb b/res/values/strings_zh_tw.arb
index a8a41cb..4fb7cbf 100644
--- a/res/values/strings_zh_tw.arb
+++ b/res/values/strings_zh_tw.arb
@@ -946,7 +946,7 @@
   "sweeping_wallet_alert": "這應該不會花很長時間。請勿離開此畫面，否則被歸集的資金可能會遺失。",
   "switch_wallet": "切換錢包",
   "switchToETHWallet": "請切換到以太坊錢包後再試一次",
-  "switchToEVMCompatibleWallet": "請切換至 EVM 相容的錢包後再試一次（Ethereum、Polygon）",
+  "switchToWCCompatibleWallet": "請切換到 WalletConnect 相容錢包並重試 (${chains})。",
   "symbol": "代號",
   "sync_all_wallets": "同步所有錢包",
   "sync_status_attempting_scan": "正在嘗試掃描",