diff --git a/modules/activity/lib/src/presentation/activity_screen.dart b/modules/activity/lib/src/presentation/activity_screen.dart index d99d7854..d0c6240b 100644 --- a/modules/activity/lib/src/presentation/activity_screen.dart +++ b/modules/activity/lib/src/presentation/activity_screen.dart @@ -186,8 +186,6 @@ class _ActivityScreenState extends ConsumerState { ); } - final walletId = viewState.selectedTab!.walletId; - final balanceAsync = ref.watch(walletBalanceProvider(walletId)); final currentTransactions = viewState.transactionPages[viewState.currentPage]; return RefreshIndicator( @@ -197,19 +195,22 @@ class _ActivityScreenState extends ConsumerState { physics: const AlwaysScrollableScrollPhysics(), padding: const EdgeInsets.symmetric(horizontal: 24), children: [ - Padding( - padding: const EdgeInsets.only(bottom: 16), - child: balanceAsync.when( - loading: () => - const Center(child: AppLoadingIndicator(size: 48)), - error: (_, __) => const SizedBox.shrink(), - data: (balance) => WalletBalanceBlock( - availableBalance: balance.availableBalance, - allocatedBalance: balance.allocatedBalance, - totalBalance: balance.totalBalance, - ), - ), - ), + // TODO: WalletBalanceBlock temporarily hidden + // final walletId = viewState.selectedTab!.walletId; + // final balanceAsync = ref.watch(walletBalanceProvider(walletId)); + // Padding( + // padding: const EdgeInsets.only(bottom: 16), + // child: balanceAsync.when( + // loading: () => + // const Center(child: AppLoadingIndicator(size: 48)), + // error: (_, __) => const SizedBox.shrink(), + // data: (balance) => WalletBalanceBlock( + // availableBalance: balance.availableBalance, + // allocatedBalance: balance.allocatedBalance, + // totalBalance: balance.totalBalance, + // ), + // ), + // ), ...currentTransactions.map( (tx) => Padding( padding: const EdgeInsets.only(bottom: 12), diff --git a/modules/home/lib/src/presentation/home_screen.dart b/modules/home/lib/src/presentation/home_screen.dart index 0c738cbf..e2b8c23f 100644 --- a/modules/home/lib/src/presentation/home_screen.dart +++ b/modules/home/lib/src/presentation/home_screen.dart @@ -37,32 +37,20 @@ class HomeScreen extends ConsumerWidget { margin: EdgeInsets.all(30), child: Column( children: [ - Row( - children: [ - Expanded( - child: Text.rich( + Align( + alignment: Alignment.centerLeft, + child: Text.rich( + TextSpan( + text: context.translate(I18n.homeGreeting), + style: TextStyle(fontSize: 25), + children: [ TextSpan( - text: context.translate(I18n.homeGreeting), - style: TextStyle(fontSize: 25), - children: [ - TextSpan( - text: viewState.userName, - style: TextStyle(fontWeight: FontWeight.w500), - ), - ], + text: viewState.userName, + style: TextStyle(fontWeight: FontWeight.w500), ), - ), + ], ), - IconButton( - onPressed: () => - navigationContract.pushTo(AppRoutes.deviceSetup), - icon: Icon( - Icons.person_add_outlined, - color: theme.getColorFor(ThemeCode.textPrimary), - ), - tooltip: context.translate(I18n.homeAddAnotherKid), - ), - ], + ), ), const ChildWalletsSlider(), Align(