diff --git a/assets/translations/en.json b/assets/translations/en.json
index d83fa5e865..766b674855 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -213,7 +213,7 @@
   "walletCreationHdBip39SeedError": "Your input seed phrase is not BIP39 compliant, and can not be used in multi-address wallet mode. Please try again, or disable multi-address wallet mode and select 'Allow custom seed' to proceed.",
   "walletPageNoSuchAsset": "No assets match search criteria",
   "swap": "Swap",
-  "dexAddress": "DEX Address",
+  "swapAddress": "Swap Address",
   "fiatBalance": "Fiat balance",
   "yourBalance": "Your balance",
   "all": "All",
diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart
index dd0c6dfc6b..22a4045ab6 100644
--- a/lib/generated/codegen_loader.g.dart
+++ b/lib/generated/codegen_loader.g.dart
@@ -210,7 +210,7 @@ abstract class  LocaleKeys {
   static const walletCreationHdBip39SeedError = 'walletCreationHdBip39SeedError';
   static const walletPageNoSuchAsset = 'walletPageNoSuchAsset';
   static const swap = 'swap';
-  static const dexAddress = 'dexAddress';
+  static const swapAddress = 'swapAddress';
   static const fiatBalance = 'fiatBalance';
   static const yourBalance = 'yourBalance';
   static const all = 'all';
diff --git a/lib/views/wallet/coin_details/coin_details_info/coin_addresses.dart b/lib/views/wallet/coin_details/coin_details_info/coin_addresses.dart
index 6b3cece384..d4bb6f7a1a 100644
--- a/lib/views/wallet/coin_details/coin_details_info/coin_addresses.dart
+++ b/lib/views/wallet/coin_details/coin_details_info/coin_addresses.dart
@@ -610,7 +610,7 @@ class SwapAddressTag extends StatelessWidget {
                 borderRadius: BorderRadius.circular(16.0),
               ),
               child: Text(
-                LocaleKeys.dexAddress.tr(),
+                LocaleKeys.swapAddress.tr(),
                 style: TextStyle(fontSize: isMobile ? 9 : 12),
               ),
             ),
diff --git a/lib/views/wallet/wallet_page/common/expandable_coin_list_item.dart b/lib/views/wallet/wallet_page/common/expandable_coin_list_item.dart
index b0ac070a09..64d59f8ac4 100644
--- a/lib/views/wallet/wallet_page/common/expandable_coin_list_item.dart
+++ b/lib/views/wallet/wallet_page/common/expandable_coin_list_item.dart
@@ -9,7 +9,6 @@ import 'package:komodo_defi_types/komodo_defi_types.dart';
 import 'package:komodo_ui/komodo_ui.dart';
 import 'package:komodo_ui_kit/komodo_ui_kit.dart';
 import 'package:web_dex/bloc/coins_bloc/coins_bloc.dart';
-import 'package:web_dex/bloc/trading_status/trading_status_bloc.dart';
 import 'package:web_dex/common/screen.dart';
 import 'package:web_dex/generated/codegen_loader.g.dart';
 import 'package:web_dex/model/coin.dart';
@@ -284,9 +283,6 @@ class _AddressRow extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final tradingState = context.watch<TradingStatusBloc>().state;
-    final canTradeCoin = tradingState.canTradeAssets([coin.id]);
-
     return ClipRRect(
       borderRadius: BorderRadius.circular(12),
       child: ListTile(
@@ -314,7 +310,7 @@ class _AddressRow extends StatelessWidget {
                 visualDensity: VisualDensity.compact,
               ),
             ),
-            if (isSwapAddress && canTradeCoin) ...[
+            if (isSwapAddress) ...[
               const SizedBox(width: 8),
               // TODO: Refactor to use "DexPill" component from the SDK UI library (not yet created)
               Padding(
@@ -329,7 +325,7 @@ class _AddressRow extends StatelessWidget {
                     borderRadius: BorderRadius.circular(16.0),
                   ),
                   child: Text(
-                    LocaleKeys.dexAddress.tr(),
+                    LocaleKeys.swapAddress.tr(),
                     style: TextStyle(fontSize: isMobile ? 9 : 12),
                   ),
                 ),
diff --git a/lib/views/wallet/wallet_page/wallet_main/active_coins_list.dart b/lib/views/wallet/wallet_page/wallet_main/active_coins_list.dart
index 18d4303b35..97582eaa59 100644
--- a/lib/views/wallet/wallet_page/wallet_main/active_coins_list.dart
+++ b/lib/views/wallet/wallet_page/wallet_main/active_coins_list.dart
@@ -252,7 +252,7 @@ class AddressBalanceCard extends StatelessWidget {
                                   borderRadius: BorderRadius.circular(16.0),
                                 ),
                                 child: Text(
-                                  LocaleKeys.dexAddress.tr(),
+                                  LocaleKeys.swapAddress.tr(),
                                   style: TextStyle(fontSize: isMobile ? 9 : 12),
                                 ),
                               ),