From 18434237a01232addb632d49f69ac803d3e05a52 Mon Sep 17 00:00:00 2001
From: StuartFerguson <stuart_ferguson1development@outlook.com>
Date: Mon, 6 Jul 2026 14:21:33 +0100
Subject: [PATCH 1/3] fix transaction mix navigation

---
 .../UIServices/ShellNavigationService.cs                   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs b/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs
index 74b7a5a0..77e37887 100644
--- a/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs
+++ b/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs
@@ -191,6 +191,13 @@ public async Task GoToDailyPerformanceSummaryPage()
 
     public async Task GoToTransactionMixSummaryPage()
     {
+        TransactionMixPage? page = MauiProgram.Container.Services.GetService(typeof(TransactionMixPage)) as TransactionMixPage;
+        if (page is not null)
+        {
+            await this.NavigateTo(page);
+            return;
+        }
+
         await this.NavigateTo(nameof(TransactionMixPage));
     }
 

From 2ae94213f1c2546898e7fac53be0e8462c2cdbff Mon Sep 17 00:00:00 2001
From: StuartFerguson <stuart_ferguson1development@outlook.com>
Date: Mon, 6 Jul 2026 15:36:53 +0100
Subject: [PATCH 2/3] Improve transaction mix report chart

---
 .../TransactionMixPageViewModelTests.cs       |  8 ++--
 .../Reports/TransactionMixPageViewModel.cs    | 40 ++++++-------------
 TransactionProcessor.Mobile/MauiProgram.cs    | 10 +++--
 .../Pages/Reports/TransactionMixPage.xaml     | 18 +++++----
 .../UIServices/ShellNavigationService.cs      | 10 ++---
 5 files changed, 38 insertions(+), 48 deletions(-)

diff --git a/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/Reports/TransactionMixPageViewModelTests.cs b/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/Reports/TransactionMixPageViewModelTests.cs
index 8a029727..ab8a04d4 100644
--- a/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/Reports/TransactionMixPageViewModelTests.cs
+++ b/TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/Reports/TransactionMixPageViewModelTests.cs
@@ -57,9 +57,11 @@ public async Task Initialise_LoadsDefaultTransactionMixSummary()
         this.ViewModel.Items.Count.ShouldBeGreaterThan(0);
         this.ViewModel.TopItems.Count.ShouldBeGreaterThan(0);
         this.ViewModel.HasChartData.ShouldBeTrue();
-        this.ViewModel.ChartSeries.Length.ShouldBe(1);
-        this.ViewModel.ChartYAxes.Count.ShouldBe(1);
-        this.ViewModel.ChartXAxes.Count.ShouldBe(1);
+        this.ViewModel.ChartSeries.Length.ShouldBeGreaterThan(0);
+        this.ViewModel.ChartYAxes.Count.ShouldBe(0);
+        this.ViewModel.ChartXAxes.Count.ShouldBe(0);
+        this.ViewModel.ChartSubtitle.ShouldContain("Transaction Type");
+        this.ViewModel.ChartSubtitle.ShouldContain("count");
         this.ViewModel.IsLoading.ShouldBeFalse();
     }
 }
diff --git a/TransactionProcessor.Mobile.BusinessLogic/ViewModels/Reports/TransactionMixPageViewModel.cs b/TransactionProcessor.Mobile.BusinessLogic/ViewModels/Reports/TransactionMixPageViewModel.cs
index 7d1756a7..f8caa8e4 100644
--- a/TransactionProcessor.Mobile.BusinessLogic/ViewModels/Reports/TransactionMixPageViewModel.cs
+++ b/TransactionProcessor.Mobile.BusinessLogic/ViewModels/Reports/TransactionMixPageViewModel.cs
@@ -172,6 +172,10 @@ public List<ICartesianAxis> ChartYAxes
 
     public bool HasChartData => this.ChartSeries.Length > 0;
 
+    public string ChartSubtitle => this.HasChartData
+        ? $"Top {this.TopItems.Count} {this.SelectedBreakdown.ToDisplayText()} categories by {this.SelectedMeasure.ToDisplayText().ToLowerInvariant()}"
+        : "No chart data available";
+
     public IReadOnlyList<TransactionMixDrillDownTransactionModel> SelectedItemTransactions
     {
         get
@@ -303,43 +307,25 @@ private void UpdateChart()
             return;
         }
 
-        List<string> labels = topItems.Select(item => item.Label).ToList();
         List<double> values = topItems.Select(item => this.SelectedMeasure == TransactionMixMeasure.Value ? (double)item.Value : (double)item.Count).ToList();
 
-        this.ChartSeries = new ISeries[]
-        {
-            new RowSeries<double>
-            {
-                Values = values,
-                Name = this.SelectedMeasure.ToDisplayText(),
-                Stroke = null,
-                Fill = null,
-            }
-        };
-
-        this.ChartYAxes = new List<ICartesianAxis>
+        this.ChartSeries = topItems.Select((item, index) =>
         {
-            new Axis
+            double value = values[index];
+            return new PieSeries<double>(new[] { value })
             {
-                Labels = labels,
-                LabelsRotation = 0,
-                Name = this.SelectedBreakdown.ToDisplayText(),
-            }
-        };
+                Name = item.Label,
+            };
+        }).Cast<ISeries>().ToArray();
 
-        this.ChartXAxes = new List<ICartesianAxis>
-        {
-            new Axis
-            {
-                Labeler = value => this.SelectedMeasure == TransactionMixMeasure.Value ? value.ToString("N2") : value.ToString("N0"),
-                Name = this.SelectedMeasure.ToDisplayText(),
-            }
-        };
+        this.ChartYAxes = [];
+        this.ChartXAxes = [];
 
         this.OnPropertyChanged(nameof(this.ChartSeries));
         this.OnPropertyChanged(nameof(this.ChartXAxes));
         this.OnPropertyChanged(nameof(this.ChartYAxes));
         this.OnPropertyChanged(nameof(this.HasChartData));
+        this.OnPropertyChanged(nameof(this.ChartSubtitle));
     }
 }
 
diff --git a/TransactionProcessor.Mobile/MauiProgram.cs b/TransactionProcessor.Mobile/MauiProgram.cs
index 7e7391dd..c3588019 100644
--- a/TransactionProcessor.Mobile/MauiProgram.cs
+++ b/TransactionProcessor.Mobile/MauiProgram.cs
@@ -1,14 +1,16 @@
-using CommunityToolkit.Maui;
+using CommunityToolkit.Maui;
+using LiveChartsCore.SkiaSharpView.Maui;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Maui.Controls.Hosting;
 using Microsoft.Maui.Hosting;
+using SkiaSharp.Views.Maui.Controls.Hosting;
 using TransactionProcessor.Mobile.BusinessLogic.Common;
 using TransactionProcessor.Mobile.BusinessLogic.Logging;
+using TransactionProcessor.Mobile.BusinessLogic.Serialisation;
 using TransactionProcessor.Mobile.BusinessLogic.UIServices;
 using TransactionProcessor.Mobile.Extensions;
 using TransactionProcessor.Mobile.UIServices;
-using Microsoft.Extensions.DependencyInjection;
-using TransactionProcessor.Mobile.BusinessLogic.Serialisation;
 
 namespace TransactionProcessor.Mobile
 {
@@ -19,6 +21,8 @@ public static MauiApp CreateMauiApp()
         {
             var builder = MauiApp.CreateBuilder();
             builder.UseMauiApp<App>()
+                .UseLiveCharts()
+                .UseSkiaSharp()
                 .UseMauiCommunityToolkit()
                 .ConfigureRequestHandlers()
                 .ConfigurePages()
diff --git a/TransactionProcessor.Mobile/Pages/Reports/TransactionMixPage.xaml b/TransactionProcessor.Mobile/Pages/Reports/TransactionMixPage.xaml
index 1701640c..73664f47 100644
--- a/TransactionProcessor.Mobile/Pages/Reports/TransactionMixPage.xaml
+++ b/TransactionProcessor.Mobile/Pages/Reports/TransactionMixPage.xaml
@@ -152,23 +152,25 @@
                        FontAttributes="Bold"
                        TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
 
-                <Label Text="Top categories chart"
+                <Label Text="Transaction mix"
                        FontSize="16"
                        FontAttributes="Bold"
                        TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
+                <Label Text="{Binding ChartSubtitle}"
+                       FontSize="12"
+                       Opacity="0.8"
+                       TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
                 <Frame Style="{StaticResource TransactionFormCard}"
                        BackgroundColor="{DynamicResource salesAnalysisCardBackgroundColor}"
                        BorderColor="{DynamicResource salesAnalysisCardBorderColor}"
-                       Padding="12"
+                       Padding="8"
                        CornerRadius="14"
                        HasShadow="False"
                        Margin="0">
-                    <lvc:CartesianChart AutomationId="TransactionMixChart"
-                                        Series="{Binding ChartSeries}"
-                                        XAxes="{Binding ChartXAxes}"
-                                        YAxes="{Binding ChartYAxes}"
-                                        HeightRequest="240"
-                                        HorizontalOptions="FillAndExpand" />
+                    <lvc:PieChart AutomationId="TransactionMixChart"
+                                  Series="{Binding ChartSeries}"
+                                  HeightRequest="260"
+                                  HorizontalOptions="FillAndExpand" />
                 </Frame>
 
                 <HorizontalStackLayout Spacing="12">
diff --git a/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs b/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs
index 77e37887..a5d873bf 100644
--- a/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs
+++ b/TransactionProcessor.Mobile/UIServices/ShellNavigationService.cs
@@ -191,13 +191,6 @@ public async Task GoToDailyPerformanceSummaryPage()
 
     public async Task GoToTransactionMixSummaryPage()
     {
-        TransactionMixPage? page = MauiProgram.Container.Services.GetService(typeof(TransactionMixPage)) as TransactionMixPage;
-        if (page is not null)
-        {
-            await this.NavigateTo(page);
-            return;
-        }
-
         await this.NavigateTo(nameof(TransactionMixPage));
     }
 
@@ -212,6 +205,7 @@ private async Task NavigateTo(String route) {
             }
         catch(Exception e) {
             Logger.LogError($"Error navigating to {route}", e);
+            throw;
         }
     }
 
@@ -226,6 +220,7 @@ private async Task NavigateTo(String route,IDictionary<String,Object> parameters
         catch (Exception e)
         {
             Logger.LogError($"Error navigating to {route} (String route,IDictionary<String,Object> parameters)", e);
+            throw;
         }
     }
 
@@ -237,6 +232,7 @@ private async Task NavigateTo(ContentPage page){
         catch (Exception e)
         {
             Logger.LogError($"Error navigating to page (ContentPage page))", e);
+            throw;
         }
     }
 

From c71dadea52deffba540208365b4016bc8ae625c1 Mon Sep 17 00:00:00 2001
From: StuartFerguson <stuart_ferguson1development@outlook.com>
Date: Mon, 6 Jul 2026 15:45:12 +0100
Subject: [PATCH 3/3] final tweaks

---
 .../RequestHandlers/MerchantRequestHandler.cs                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TransactionProcessor.Mobile.BusinessLogic/RequestHandlers/MerchantRequestHandler.cs b/TransactionProcessor.Mobile.BusinessLogic/RequestHandlers/MerchantRequestHandler.cs
index 01454b5a..dadc58d2 100644
--- a/TransactionProcessor.Mobile.BusinessLogic/RequestHandlers/MerchantRequestHandler.cs
+++ b/TransactionProcessor.Mobile.BusinessLogic/RequestHandlers/MerchantRequestHandler.cs
@@ -80,6 +80,7 @@ public async Task<Result<MerchantDetailsModel>> Handle(MerchantQueries.GetMercha
 
         Result<MerchantDetailsModel> merchantDetails = await merchantService.GetMerchantDetails(cancellationToken);
 
+        //merchantDetails.Data.MerchantReportingId = 1;
         if (merchantDetails.IsSuccess) {
             this.ApplicationCache.SetMerchantDetails(merchantDetails.Data, BuildCacheEntryOptions());
         }