From f948b3dea6e6584abf4c346dc25bc399dbfb4e7c Mon Sep 17 00:00:00 2001
From: fosse <matt.cfosse@gmail.com>
Date: Fri, 18 Aug 2023 08:58:37 -0400
Subject: [PATCH] merge conflict fixes

---
 lib/src/screens/dashboard/widgets/address_page.dart        | 7 ++++---
 lib/src/screens/nano_accounts/nano_account_list_page.dart  | 2 +-
 .../screens/restore/wallet_restore_choose_derivation.dart  | 2 +-
 lib/src/screens/settings/manage_pow_nodes_page.dart        | 3 +--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/src/screens/dashboard/widgets/address_page.dart b/lib/src/screens/dashboard/widgets/address_page.dart
index 9d97c4e4f..f04011337 100644
--- a/lib/src/screens/dashboard/widgets/address_page.dart
+++ b/lib/src/screens/dashboard/widgets/address_page.dart
@@ -214,13 +214,14 @@ class AddressPage extends BasePage {
                                     style: TextStyle(
                                         fontSize: 14,
                                         fontWeight: FontWeight.w500,
-                                        color: Theme.of(context).extension<DashboardPageTheme>()!.textColor),
+                                        color: Theme.of(context)
+                                            .extension<DashboardPageTheme>()!
+                                            .textColor),
                                   )),
                           Icon(
                             Icons.arrow_forward_ios,
                             size: 14,
-                            color:
-                                Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+                            color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
                           )
                         ],
                       ),
diff --git a/lib/src/screens/nano_accounts/nano_account_list_page.dart b/lib/src/screens/nano_accounts/nano_account_list_page.dart
index 8fdbb9121..b5c7e1186 100644
--- a/lib/src/screens/nano_accounts/nano_account_list_page.dart
+++ b/lib/src/screens/nano_accounts/nano_account_list_page.dart
@@ -30,7 +30,7 @@ class NanoAccountListPage 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/restore/wallet_restore_choose_derivation.dart b/lib/src/screens/restore/wallet_restore_choose_derivation.dart
index 8a777c720..735d4400b 100644
--- a/lib/src/screens/restore/wallet_restore_choose_derivation.dart
+++ b/lib/src/screens/restore/wallet_restore_choose_derivation.dart
@@ -19,7 +19,7 @@ class WalletRestoreChooseDerivationPage extends BasePage {
                 fontSize: 18.0,
                 fontWeight: FontWeight.bold,
                 fontFamily: 'Lato',
-                color: titleColor ?? Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+                color: titleColor(context)),
           ));
 
   final WalletRestoreChooseDerivationViewModel walletRestoreChooseDerivationViewModel;
diff --git a/lib/src/screens/settings/manage_pow_nodes_page.dart b/lib/src/screens/settings/manage_pow_nodes_page.dart
index d8c253e0c..723695ac9 100644
--- a/lib/src/screens/settings/manage_pow_nodes_page.dart
+++ b/lib/src/screens/settings/manage_pow_nodes_page.dart
@@ -40,12 +40,11 @@ class ManagePowNodesPage extends BasePage {
               return Flexible(
                 child: SectionStandardList(
                   sectionCount: 1,
-                  context: context,
                   dividerPadding: EdgeInsets.symmetric(horizontal: 24),
                   itemCounter: (int sectionIndex) {
                     return nodeListViewModel.nodes.length;
                   },
-                  itemBuilder: (_, sectionIndex, index) {
+                  itemBuilder: (_, index) {
                     final node = nodeListViewModel.nodes[index];
                     final isSelected = node.keyIndex == nodeListViewModel.currentNode.keyIndex;
                     final nodeListRow = PowNodeListRow(