Skip to content

DEX address pill -> swap address #3247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ca333 merged 4 commits into from
Oct 27, 2025
Merged

DEX address pill -> swap address #3247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d674bf
dexAddress -> swapAddress
smk762 Oct 26, 2025
772d0f5
update references for swapAddress
smk762 Oct 26, 2025
268f2c9
remove unrequired import and state check
smk762 Oct 26, 2025
d671c5d
Merge branch 'dev' into clear-pill-name
smk762 Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion lib/generated/codegen_loader.g.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/views/wallet/coin_details/coin_details_info/coin_addresses.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
),
Expand Down
8 changes: 2 additions & 6 deletions lib/views/wallet/wallet_page/common/expandable_coin_list_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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),
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/views/wallet/wallet_page/wallet_main/active_coins_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
),
Expand Down
Loading