diff --git a/assets/translations/en.json b/assets/translations/en.json index 90e9a977dd..6f44d2d4f8 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -48,7 +48,6 @@ "fees": "Fees", "recipientAddress": "Recipient address", "transactionHash": "Transaction Hash", - "transactionSuccessful": "Transaction Successful", "transactionFailed": "Transaction Failed", "hash": "Hash", "fullHash": "Full Hash", @@ -56,7 +55,6 @@ "youSend": "You are sending", "invalidAddress": "Invalid {} address", "customFeeCoin": "Custom fee [{}]", - "customNetworkFee": "Custom network fee", "customFeeOptional": "Custom fee (optional)", "optional": "Optional", "showMore": "Show more", @@ -643,21 +641,23 @@ "allTimeInvestment": "All-time Investment", "allTimeProfit": "All-time Profit", "profitAndLoss": "Profit & Loss", - "alertDialogBitrefill" : "Bitrefill", - "showNoTradingWarning" : "Warning", - "showNoTradingWarningMessage" : "Important: This is a development environment only. Please use test networks and demo assets exclusively for development and testing. KomodoPlatform does not support or permit real trading through this application. By using this app, you acknowledge that any potential losses or issues that may arise are your responsibility. Happy developing!", - "showNoTradingWarningButton" : "I agree", - "amountFieldCheckboxListTile" : "Send maximum amount", - "customFeeToggleTitle" : "Custom fee", - "priceChartCenterText" : "Select an interval to load data", - "statistics" : "Statistics", - "ibcTransferFieldTitle" : "IBC Transfer", - "ibcTransferFieldSubtitle" : "Send to another Cosmos chain", - "successPageHeadline" : "Withdrawal Successful", - "successPageBodySmall" : "Transaction Hash:", - "withdrawErrorCardTileTitle" : "Technical Details", - "transactionSuccessful" : "Transaction Successful", - "customNetworkFee" : "Custom Network Fee", - "previewWithdrawal" : "Preview Withdrawal", - "createNewAddress" : "Create New Address" + "alertDialogBitrefill": "Bitrefill", + "showNoTradingWarning": "Warning", + "showNoTradingWarningMessage": "Important: This is a development environment only. Please use test networks and demo assets exclusively for development and testing. KomodoPlatform does not support or permit real trading through this application. By using this app, you acknowledge that any potential losses or issues that may arise are your responsibility. Happy developing!", + "showNoTradingWarningButton": "I agree", + "amountFieldCheckboxListTile": "Send maximum amount", + "customFeeToggleTitle": "Custom fee", + "priceChartCenterText": "Select an interval to load data", + "statistics": "Statistics", + "ibcTransferFieldTitle": "IBC Transfer", + "ibcTransferFieldSubtitle": "Send to another Cosmos chain", + "successPageHeadline": "Withdrawal Successful", + "successPageBodySmall": "Transaction Hash:", + "withdrawErrorCardTileTitle": "Technical Details", + "transactionSuccessful": "Transaction Successful", + "customNetworkFee": "Custom Network Fee", + "previewWithdrawal": "Preview Withdrawal", + "createNewAddress": "Create New Address", + "searchAddresses": "Search addresses", + "chart": "Chart" } \ No newline at end of file diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart index 9b61ff1abe..40098feb8b 100644 --- a/lib/generated/codegen_loader.g.dart +++ b/lib/generated/codegen_loader.g.dart @@ -52,7 +52,6 @@ abstract class LocaleKeys { static const fees = 'fees'; static const recipientAddress = 'recipientAddress'; static const transactionHash = 'transactionHash'; - static const transactionSuccessful = 'transactionSuccessful'; static const transactionFailed = 'transactionFailed'; static const hash = 'hash'; static const fullHash = 'fullHash'; @@ -60,7 +59,6 @@ abstract class LocaleKeys { static const youSend = 'youSend'; static const invalidAddress = 'invalidAddress'; static const customFeeCoin = 'customFeeCoin'; - static const customNetworkFee = 'customNetworkFee'; static const customFeeOptional = 'customFeeOptional'; static const optional = 'optional'; static const showMore = 'showMore'; @@ -653,7 +651,11 @@ abstract class LocaleKeys { static const successPageHeadline = 'successPageHeadline'; static const successPageBodySmall = 'successPageBodySmall'; static const withdrawErrorCardTileTitle = 'withdrawErrorCardTileTitle'; + static const transactionSuccessful = 'transactionSuccessful'; + static const customNetworkFee = 'customNetworkFee'; static const previewWithdrawal = 'previewWithdrawal'; static const createNewAddress = 'createNewAddress'; + static const searchAddresses = 'searchAddresses'; + static const chart = 'chart'; } diff --git a/lib/views/wallet/wallet_page/common/coins_list_header.dart b/lib/views/wallet/wallet_page/common/coins_list_header.dart index 9c54b5dbb0..79e2626b76 100644 --- a/lib/views/wallet/wallet_page/common/coins_list_header.dart +++ b/lib/views/wallet/wallet_page/common/coins_list_header.dart @@ -28,10 +28,8 @@ class _CoinsListHeaderDesktop extends StatelessWidget { @override Widget build(BuildContext context) { - // final style = Theme.of(context).textTheme.bodyMedium?.copyWith( - // fontWeight: FontWeight.w500, - // ); - final style = Theme.of(context).textTheme.labelSmall; + final style = Theme.of(context).textTheme.labelSmall ?? + DefaultTextStyle.of(context).style; if (isAuth) { return Row( @@ -67,60 +65,34 @@ class _CoinsListHeaderDesktop extends StatelessWidget { const Spacer(), - // // More actions space + // More actions space const SizedBox(width: 48), ], ); } - // ...existing code... + return DefaultTextStyle( + style: style, + child: Container( + padding: const EdgeInsets.fromLTRB(20, 8, 20, 8), + child: Row( + children: [ + // Asset header + Expanded(flex: 3, child: Text(LocaleKeys.asset.tr())), - return Container( - padding: const EdgeInsets.fromLTRB(20, 8, 20, 8), - child: Row( - children: [ - // Asset header - Expanded( - flex: 3, - child: Text( - LocaleKeys.asset.tr(), - style: style, - ), - ), + // Price header + Expanded(flex: 2, child: Text(LocaleKeys.price.tr())), - // Price header - Expanded( - flex: 2, - child: Text( - LocaleKeys.price.tr(), - style: style, - ), - ), + // 24h change header + Expanded(flex: 2, child: Text(LocaleKeys.change24hRevert.tr())), - // 24h change header - Expanded( - flex: 2, - child: Text( - LocaleKeys.change24hRevert.tr(), - style: style, - ), - ), - - // Price Chart header - Expanded( - flex: 2, - child: Text( - LocaleKeys.price.tr(), - style: style, - ), - ), + // Chart header + Expanded(flex: 2, child: Text(LocaleKeys.chart.tr())), - // Space for expand button - ConstrainedBox( - constraints: const BoxConstraints(minWidth: 48), - child: const SizedBox(), - ), - ], + // Space for expand button + Container(constraints: const BoxConstraints(minWidth: 48)), + ], + ), ), ); }