From f012aaebf479309fac1a19daddac73eed6175625 Mon Sep 17 00:00:00 2001
From: Rafael Saes <76502841+saltrafael@users.noreply.github.com>
Date: Wed, 3 May 2023 21:33:05 -0300
Subject: [PATCH] Cw 363 back button on receive screen in bright theme is white
 (#910)

* feat: Add missing title on wallet_list_page.dart

* feat: add bool lightTitleColor value when theme needs lighter color title, instead of hardcoding to Colors.white

- Light color theme taken from Share button from receive page

* fix: revert changes & use currentTheme.type to use proper theme style

* fix: use share button color logic also on overriden leading Widget on address_page

* refactor: remove unnecessary titleColor
---
 lib/src/screens/dashboard/widgets/address_page.dart | 13 ++++++-------
 lib/src/screens/receive/receive_page.dart           |  3 ++-
 lib/src/screens/wallet_list/wallet_list_page.dart   |  3 +++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/src/screens/dashboard/widgets/address_page.dart b/lib/src/screens/dashboard/widgets/address_page.dart
index 82430f0c6..465c494d1 100644
--- a/lib/src/screens/dashboard/widgets/address_page.dart
+++ b/lib/src/screens/dashboard/widgets/address_page.dart
@@ -59,17 +59,16 @@ class AddressPage extends BasePage {
 
   bool effectsInstalled = false;
 
-  @override
-  Color get titleColor => Colors.white;
-
   @override
   Widget? leading(BuildContext context) {
-    final _backButton = Icon(Icons.arrow_back_ios,
-      color: titleColor,
+    final _backButton = Icon(
+      Icons.arrow_back_ios,
+      color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
       size: 16,
     );
     final _closeButton = currentTheme.type == ThemeType.dark
-        ? closeButtonImageDarkTheme : closeButtonImage;
+        ? closeButtonImageDarkTheme
+        : closeButtonImage;
 
     bool isMobileView = ResponsiveLayoutUtil.instance.isMobile(context);
 
@@ -84,7 +83,7 @@ class AddressPage extends BasePage {
             child: TextButton(
               style: ButtonStyle(
                 overlayColor: MaterialStateColor.resolveWith(
-                        (states) => Colors.transparent),
+                    (states) => Colors.transparent),
               ),
               onPressed: () => onClose(context),
               child: !isMobileView ? _closeButton : _backButton,
diff --git a/lib/src/screens/receive/receive_page.dart b/lib/src/screens/receive/receive_page.dart
index 00a157d97..1dd4b8585 100644
--- a/lib/src/screens/receive/receive_page.dart
+++ b/lib/src/screens/receive/receive_page.dart
@@ -53,7 +53,8 @@ class ReceivePage extends BasePage {
   final FocusNode _cryptoAmountFocus;
 
   @override
-  Color get titleColor => Colors.white;
+  Color? get titleColor =>
+      currentTheme.type == ThemeType.bright ? Colors.white : null;
 
   @override
   Widget middle(BuildContext context) {
diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart
index bf36b129b..dce7e2ccf 100644
--- a/lib/src/screens/wallet_list/wallet_list_page.dart
+++ b/lib/src/screens/wallet_list/wallet_list_page.dart
@@ -24,6 +24,9 @@ class WalletListPage extends BasePage {
   final WalletListViewModel walletListViewModel;
   final AuthService authService;
 
+  @override
+  String get title => S.current.wallets;
+
   @override
   Widget body(BuildContext context) =>
       WalletListBody(walletListViewModel: walletListViewModel, authService: authService);