From 3a392acb06e3446301b057d7e5d41d841ed5e264 Mon Sep 17 00:00:00 2001
From: StuartFerguson <stuart_ferguson1development@outlook.com>
Date: Tue, 1 Sep 2026 20:26:48 +0100
Subject: [PATCH] Refactor shell navigation page resolution

---
 .../Extensions/MauiAppBuilderExtensions.cs                | 2 --
 .../UIServices/ShellNavigationService.cs                  | 8 ++------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs b/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs
index 0614b56d..cf794de8 100644
--- a/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs
+++ b/TransactionProcessor.Mobile/Extensions/MauiAppBuilderExtensions.cs
@@ -176,8 +176,6 @@ public static HttpMessageHandler GetHandler() {
 
         public static MauiAppBuilder ConfigureUIServices(this MauiAppBuilder builder) {
             builder.Services.AddSingleton<IDialogService, DialogService>();
-            builder.Services.AddTransient<Func<MyAccountAddressesPage>>(serviceProvider =>
-                () => serviceProvider.GetRequiredService<MyAccountAddressesPage>());
             builder.Services.AddSingleton<INavigationService, ShellNavigationService>();
             builder.Services.AddSingleton<IApplicationInfoService, ApplicationInfoService>();
             builder.Services.AddSingleton<IApplicationUpdateLauncherService, ApplicationUpdateLauncherService>();
diff --git a/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs b/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs
index 0252ea53..c3317ce9 100644
--- a/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs
+++ b/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs
@@ -14,14 +14,11 @@ namespace TransactionProcessor.Mobile.UIServices;
 public class ShellNavigationService : INavigationService
 {
     private readonly INavigationParameterService NavigationParameterService;
-    private readonly Func<MyAccountAddressesPage> MyAccountAddressesPageFactory;
 
     #region Methods
 
-    public ShellNavigationService(INavigationParameterService navigationParameterService,
-                                  Func<MyAccountAddressesPage> myAccountAddressesPageFactory) {
+    public ShellNavigationService(INavigationParameterService navigationParameterService) {
         this.NavigationParameterService = navigationParameterService;
-        this.MyAccountAddressesPageFactory = myAccountAddressesPageFactory;
     }
 
     public async Task QuitApplication(){
@@ -175,8 +172,7 @@ public async Task GoToViewLogsPage() {
     }
 
     public async Task GoToMyAccountAddresses() {
-        MyAccountAddressesPage p = this.MyAccountAddressesPageFactory();
-        await this.NavigateTo(p);
+        await this.NavigateTo(nameof(MyAccountAddressesPage));
     }
 
     public async Task GoToMyAccountContacts() {