From 9c842282e63a399da2636b47c259e073bc809e2f Mon Sep 17 00:00:00 2001 From: Omar Date: Sun, 19 Apr 2026 03:05:51 +0200 Subject: [PATCH] minor fix [skip ci] --- lib/new-ui/pages/addresses_page.dart | 40 +++++++++++++++------------- scripts/android/app_env.sh | 4 +-- scripts/ios/app_env.sh | 4 +-- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/lib/new-ui/pages/addresses_page.dart b/lib/new-ui/pages/addresses_page.dart index 9016116d0..a73b063d5 100644 --- a/lib/new-ui/pages/addresses_page.dart +++ b/lib/new-ui/pages/addresses_page.dart @@ -14,7 +14,6 @@ import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/utils/address_formatter.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; -import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart'; import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_item.dart'; import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart'; import 'package:cake_wallet/wownero/wownero.dart'; @@ -22,7 +21,6 @@ import 'package:cw_core/card_design.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:cake_wallet/utils/list_item.dart'; import 'package:mobx/mobx.dart'; @@ -146,7 +144,8 @@ class _NewAddressesPageState extends State { if (item is WalletAddressListItem) { return Observer( builder: (_) => AddressRow( - selected: item.address == widget.addressListViewModel.address.address, + selected: + item.address == widget.addressListViewModel.address.address, first: widget.showHidden && index == 0, last: index == filteredItems.length - 1, item: item, @@ -159,6 +158,8 @@ class _NewAddressesPageState extends State { updateItems(); }, walletType: widget.addressListViewModel.type, + hasBalance: widget.addressListViewModel.isBalanceAvailable, + hasReceived: widget.addressListViewModel.isReceivedAvailable, ), ); } @@ -304,16 +305,19 @@ class AccountPreviewHeader extends StatelessWidget { } class AddressRow extends StatelessWidget { - const AddressRow( - {super.key, - required this.selected, - required this.first, - required this.last, - required this.item, - required this.onSelect, - required this.walletType, - required this.onLabelChanged, - required this.onAddressHidden}); + const AddressRow({ + super.key, + required this.selected, + required this.first, + required this.last, + required this.item, + required this.onSelect, + required this.walletType, + required this.onLabelChanged, + required this.onAddressHidden, + required this.hasBalance, + required this.hasReceived, + }); final bool selected; final bool first; @@ -323,6 +327,8 @@ class AddressRow extends StatelessWidget { final VoidCallback onLabelChanged; final VoidCallback onAddressHidden; final WalletType walletType; + final bool hasBalance; + final bool hasReceived; @override Widget build(BuildContext context) { @@ -425,7 +431,7 @@ class AddressRow extends StatelessWidget { fontSize: 12, color: Theme.of(context).colorScheme.onSurfaceVariant), ), - Text("${S.of(context).balance}: ${item.balance}", + Text("${hasReceived ? S.of(context).received : S.of(context).balance}: ${item.balance}", style: TextStyle( fontSize: 12, color: Theme.of(context).colorScheme.onSurfaceVariant)), @@ -434,8 +440,7 @@ class AddressRow extends StatelessWidget { ], ), ), - if (selected) CakeImageWidget( - imageUrl: "assets/new-ui/checkmark.svg") + if (selected) CakeImageWidget(imageUrl: "assets/new-ui/checkmark.svg") ], ), ), @@ -474,8 +479,7 @@ class ShowHiddenButton extends StatelessWidget { Text(S.of(context).show_hidden_addresses), RotatedBox( quarterTurns: 1, - child:CakeImageWidget( - imageUrl: "assets/new-ui/dropdown_arrow.svg")) + child: CakeImageWidget(imageUrl: "assets/new-ui/dropdown_arrow.svg")) ], ), ), diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index e63821930..5874fff1f 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -21,8 +21,8 @@ MONERO_COM_PACKAGE="com.monero.app" MONERO_COM_SCHEME="monero.com" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="6.1.0" -CAKEWALLET_BUILD_NUMBER=4408 +CAKEWALLET_VERSION="6.1.1" +CAKEWALLET_BUILD_NUMBER=4409 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" CAKEWALLET_SCHEME="cakewallet" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index ab82e58c9..d3e4ba53b 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -17,8 +17,8 @@ MONERO_COM_BUILD_NUMBER=162 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="6.1.0" -CAKEWALLET_BUILD_NUMBER=416 +CAKEWALLET_VERSION="6.1.1" +CAKEWALLET_BUILD_NUMBER=417 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"