Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ba0c0e4
Aligned Column Headers
TazzyMeister Mar 19, 2025
5ba6ba1
feat: Rework unauthenticated assets list
CharlVS Mar 27, 2025
fbc4ccf
Aligned Column Headers
TazzyMeister Mar 19, 2025
cea1d00
Merge branch 'fix/align-walletpage-headers' of https://github.com/Taz…
TazzyMeister Mar 28, 2025
77b2bdc
fix: revert changed Firebase site ID
CharlVS Mar 28, 2025
c79f834
fix(ui): Fix expanded state issues in assets list when searching
CharlVS Mar 29, 2025
f7a28a0
Merge branch 'dev' into fix/align-walletpage-headers
TazzyMeister Mar 31, 2025
d980503
Merge branch 'dev' of https://github.com/KomodoPlatform/komodo-wallet…
CharlVS Mar 31, 2025
4372191
fix(ui): Fix PR QA review issue and Coderabbit feedback
CharlVS Mar 31, 2025
8aaa083
Merge branch 'dev' into fix/align-walletpage-headers
TazzyMeister Mar 31, 2025
ce368eb
Aligned coin list headers
TazzyMeister Mar 31, 2025
3f3c384
Merge branch 'dev' of https://github.com/TazzyMeister/komodo-wallet i…
CharlVS Apr 9, 2025
09f925c
Merge branch 'add/assets-list-rework' of https://github.com/KomodoPla…
CharlVS Apr 9, 2025
75f17ff
Updated header name for chart
TazzyMeister Apr 10, 2025
9cc5c21
Merge branch 'dev' into fix/align-walletpage-headers
CharlVS Apr 11, 2025
ab406e1
fix: address qa review
CharlVS Apr 21, 2025
c102349
fix: formatting
CharlVS Apr 21, 2025
4b585c2
Merge branch 'dev' of https://github.com/KomodoPlatform/komodo-wallet…
CharlVS Apr 21, 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
38 changes: 19 additions & 19 deletions assets/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,13 @@
"fees": "Fees",
"recipientAddress": "Recipient address",
"transactionHash": "Transaction Hash",
"transactionSuccessful": "Transaction Successful",
"transactionFailed": "Transaction Failed",
"hash": "Hash",
"fullHash": "Full Hash",
"coinAddress": "Enter {} address",
"youSend": "You are sending",
"invalidAddress": "Invalid {} address",
"customFeeCoin": "Custom fee [{}]",
"customNetworkFee": "Custom network fee",
"customFeeOptional": "Custom fee (optional)",
"optional": "Optional",
"showMore": "Show more",
Expand Down Expand Up @@ -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"
}
6 changes: 4 additions & 2 deletions lib/generated/codegen_loader.g.dart
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,13 @@ 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';
static const coinAddress = 'coinAddress';
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';
Expand Down Expand Up @@ -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';

}
70 changes: 21 additions & 49 deletions lib/views/wallet/wallet_page/common/coins_list_header.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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)),
],
),
),
);
}
Expand Down
Loading