From 67ce2ed38ef177c627a5015e09fd94983da5cccf Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@saes.io>
Date: Tue, 11 Jul 2023 16:36:45 -0300
Subject: [PATCH] fix: merge fixes

---
 .../screens/monero_accounts/monero_account_list_page.dart   | 2 +-
 lib/src/screens/new_wallet/new_wallet_type_page.dart        | 1 +
 lib/src/widgets/picker.dart                                 | 3 ++-
 lib/src/widgets/picker_inner_wrapper_widget.dart            | 5 +++--
 lib/src/widgets/search_bar_widget.dart                      | 6 ++++--
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/src/screens/monero_accounts/monero_account_list_page.dart b/lib/src/screens/monero_accounts/monero_account_list_page.dart
index 55b76945b..6b3d3e08b 100644
--- a/lib/src/screens/monero_accounts/monero_account_list_page.dart
+++ b/lib/src/screens/monero_accounts/monero_account_list_page.dart
@@ -31,7 +31,7 @@ class MoneroAccountListPage extends StatelessWidget {
             child: ListView.separated(
               padding: EdgeInsets.zero,
               controller: controller,
-              separatorBuilder: (context, index) => const SectionDivider(),
+              separatorBuilder: (context, index) => const VerticalSectionDivider(),
               itemCount: accounts.length,
               itemBuilder: (context, index) {
                 final account = accounts[index];
diff --git a/lib/src/screens/new_wallet/new_wallet_type_page.dart b/lib/src/screens/new_wallet/new_wallet_type_page.dart
index 9b1337133..ffede8ec6 100644
--- a/lib/src/screens/new_wallet/new_wallet_type_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_type_page.dart
@@ -4,6 +4,7 @@ import 'package:cake_wallet/src/screens/new_wallet/widgets/select_button.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/search_bar_widget.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/wallet_types.g.dart';
diff --git a/lib/src/widgets/picker.dart b/lib/src/widgets/picker.dart
index 79d06d9a5..66b052c0a 100644
--- a/lib/src/widgets/picker.dart
+++ b/lib/src/widgets/picker.dart
@@ -5,7 +5,8 @@ import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/material.dart';
 import 'package:cw_core/currency.dart';
 import 'package:cake_wallet/src/widgets/picker_wrapper_widget.dart';
-import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
 import 'package:cake_wallet/themes/extensions/picker_theme.dart';
 
 class Picker<Item> extends StatefulWidget {
diff --git a/lib/src/widgets/picker_inner_wrapper_widget.dart b/lib/src/widgets/picker_inner_wrapper_widget.dart
index d91789b2a..e41cde9fc 100644
--- a/lib/src/widgets/picker_inner_wrapper_widget.dart
+++ b/lib/src/widgets/picker_inner_wrapper_widget.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/account_list_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/picker_wrapper_widget.dart';
@@ -44,7 +45,7 @@ class PickerInnerWrapperWidget extends StatelessWidget {
             child: ClipRRect(
               borderRadius: BorderRadius.all(Radius.circular(14)),
               child: Container(
-                color: Theme.of(context).textTheme.displayLarge!.decorationColor!,
+                color: Theme.of(context).extension<AccountListTheme>()!.tilesTextColor,
                 child: ConstrainedBox(
                   constraints: BoxConstraints(
                     maxHeight:
@@ -72,7 +73,7 @@ class PickerInnerWrapperWidget extends StatelessWidget {
           child: ClipRRect(
             borderRadius: BorderRadius.all(Radius.circular(14)),
             child: Container(
-              color: Theme.of(context).textTheme.displayLarge!.decorationColor!,
+              color: Theme.of(context).extension<AccountListTheme>()!.tilesTextColor,
               child: ConstrainedBox(
                 constraints: BoxConstraints(
                   maxHeight: containerHeight,
diff --git a/lib/src/widgets/search_bar_widget.dart b/lib/src/widgets/search_bar_widget.dart
index 04d687cf6..e53081350 100644
--- a/lib/src/widgets/search_bar_widget.dart
+++ b/lib/src/widgets/search_bar_widget.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
@@ -16,12 +18,12 @@ class SearchBarWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return TextFormField(
       controller: searchController,
-      style: TextStyle(color: Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+      style: TextStyle(color: Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor),
       decoration: InputDecoration(
         hintText: hintText ?? S.of(context).search_currency,
         prefixIcon: Image.asset("assets/images/search_icon.png"),
         filled: true,
-        fillColor: Theme.of(context).accentTextTheme!.displaySmall!.color!,
+        fillColor: Theme.of(context).extension<AddressTheme>()!.actionButtonColor,
         alignLabelWithHint: false,
         contentPadding: const EdgeInsets.symmetric(vertical: 4, horizontal: 16),
         enabledBorder: OutlineInputBorder(