From 62dfd6aa289e84e82fa204a300efefb9171100df Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@outlook.com>
Date: Wed, 15 Mar 2023 18:34:06 +0000
Subject: [PATCH] Ready for PR (i think!)

---
 .../TransactionRequestHandler.cs              |  26 ++--
 .../Common/DockerHelper.cs                    |   2 +-
 .../Features/EndToEndTests.feature            |  37 +++--
 .../Features/EndToEndTests.feature.cs         | 133 ++++++++++++++----
 ...ansactionsSelectMobileTopupOperatorPage.cs | 101 ++++++++++++-
 .../Steps/SharedSteps.cs                      |  48 +++++++
 .../Steps/TransactionsSteps.cs                |  59 +++++++-
 .../Pages/Support/SupportPage.xaml            |   2 +-
 .../Pages/Support/ViewLogsPage.xaml           |   2 +-
 .../Pages/Transactions/Admin/AdminPage.xaml   |   2 +-
 .../BillPayment/BillPaymentFailedPage.xaml    |   2 +-
 .../BillPaymentGetAccountPage.xaml            |   2 +-
 .../BillPayment/BillPaymentPayBillPage.xaml   |   2 +-
 .../BillPaymentSelectOperatorPage.xaml        |   2 +-
 .../BillPaymentSelectProductPage.xaml         |   2 +-
 .../BillPayment/BillPaymentSuccessPage.xaml   |   2 +-
 .../MobileTopup/MobileTopupFailedPage.xaml    |   2 +-
 .../MobileTopupPerformTopupPage.xaml          |   2 +-
 .../MobileTopupSelectProductPage.xaml         |   2 +-
 .../MobileTopup/MobileTopupSuccessPage.xaml   |   2 +-
 .../Voucher/VoucherIssueFailedPage.xaml       |   2 +-
 .../Voucher/VoucherIssueSuccessPage.xaml      |   2 +-
 .../Voucher/VoucherPerformIssuePage.xaml      |   2 +-
 .../Voucher/VoucherSelectOperatorPage.xaml    |   2 +-
 .../Voucher/VoucherSelectProductPage.xaml     |   2 +-
 25 files changed, 367 insertions(+), 75 deletions(-)

diff --git a/TransactionMobile.Maui.BusinessLogic/RequestHandlers/TransactionRequestHandler.cs b/TransactionMobile.Maui.BusinessLogic/RequestHandlers/TransactionRequestHandler.cs
index 0c07b9414..4077a16d7 100644
--- a/TransactionMobile.Maui.BusinessLogic/RequestHandlers/TransactionRequestHandler.cs
+++ b/TransactionMobile.Maui.BusinessLogic/RequestHandlers/TransactionRequestHandler.cs
@@ -60,18 +60,18 @@ public async Task<Result<PerformMobileTopupResponseModel>> Handle(PerformMobileT
         ITransactionService transactionService = this.TransactionServiceResolver(useTrainingMode);
 
         // TODO: Factory
-        PerformMobileTopupRequestModel model = new() {
-                                                       ContractId = request.ContractId,
-                                                       CustomerAccountNumber = request.CustomerAccountNumber,
-                                                       CustomerEmailAddress = request.CustomerEmailAddress,
-                                                       OperatorIdentifier = request.OperatorIdentifier,
-                                                       ProductId = request.ProductId,
-                                                       TopupAmount = request.TopupAmount,
-                                                       TransactionDateTime = request.TransactionDateTime,
-                                                       TransactionNumber = transaction.transactionNumber.ToString(),
-                                                       DeviceIdentifier = String.Empty,
-                                                       ApplicationVersion = this.ApplicationInfoService.VersionString
-                                                   };
+        PerformMobileTopupRequestModel model = new(){
+                                                        ContractId = request.ContractId,
+                                                        CustomerAccountNumber = request.CustomerAccountNumber,
+                                                        CustomerEmailAddress = request.CustomerEmailAddress,
+                                                        OperatorIdentifier = request.OperatorIdentifier,
+                                                        ProductId = request.ProductId,
+                                                        TopupAmount = request.TopupAmount,
+                                                        TransactionDateTime = request.TransactionDateTime,
+                                                        TransactionNumber = transaction.transactionNumber.ToString(),
+                                                        DeviceIdentifier = this.DeviceService.GetIdentifier(),
+                                                        ApplicationVersion = this.ApplicationInfoService.VersionString
+                                                    };
 
         Result<PerformMobileTopupResponseModel> result = await transactionService.PerformMobileTopup(model, cancellationToken);
         
@@ -90,7 +90,7 @@ public async Task<Result<PerformMobileTopupResponseModel>> Handle(PerformMobileT
     private async Task<(Int64 transactionNumber, TransactionRecord transactionRecord)> CreateTransactionRecord(TransactionRecord transactionRecord) {
         
         transactionRecord.ApplicationVersion = this.ApplicationInfoService.VersionString;
-        transactionRecord.DeviceIdentifier = String.Empty;
+        transactionRecord.DeviceIdentifier = this.DeviceService.GetIdentifier();
         Int64 transactionNumber = await this.DatabaseContext.CreateTransaction(transactionRecord);
 
         return (transactionNumber, transactionRecord);
diff --git a/TransactionMobile.Maui.UiTests/Common/DockerHelper.cs b/TransactionMobile.Maui.UiTests/Common/DockerHelper.cs
index e921ad5c6..f2c58c1a2 100644
--- a/TransactionMobile.Maui.UiTests/Common/DockerHelper.cs
+++ b/TransactionMobile.Maui.UiTests/Common/DockerHelper.cs
@@ -202,7 +202,7 @@ public async Task<IContainerService> SetupConfigHostContainer(List<INetworkServi
 
             String imageName = "stuartferguson/mobileconfiguration:latest";
 
-            if (FdOs.IsWindows()){
+            if (FdOs.IsWindows() && Shared.IntegrationTesting.DockerHelper.GetDockerEnginePlatform() == DockerEnginePlatform.Windows){
                 imageName = "stuartferguson/mobileconfigurationwindows:latest";
             }
 
diff --git a/TransactionMobile.Maui.UiTests/Features/EndToEndTests.feature b/TransactionMobile.Maui.UiTests/Features/EndToEndTests.feature
index ed9ab9d6f..dd30d25da 100644
--- a/TransactionMobile.Maui.UiTests/Features/EndToEndTests.feature
+++ b/TransactionMobile.Maui.UiTests/Features/EndToEndTests.feature
@@ -1,4 +1,4 @@
-@background @login @toolbar @profile @base @sharedapp @shared
+@background @login @toolbar @profile @base @sharedapp @shared @transactions
 Feature: EndToEndTests
 
 Background: 
@@ -70,6 +70,10 @@ Background:
 	| EmailAddress                  | Password | GivenName    | FamilyName | EstateName    | MerchantName    |
 	| merchantuser@testmerchant1.co.uk | 123456   | TestMerchant | User1      | Test Estate 1 | Test Merchant 1 |
 
+	Given I make the following manual merchant deposits 
+	| Reference | Amount | DateTime | MerchantName    | EstateName    |
+	| Deposit1  | 100.00 | Today    | Test Merchant 1 | Test Estate 1 |
+
 	Given I have created a config for my application
 
 	Given I have created a config for my device
@@ -91,13 +95,6 @@ Scenario: EndToEnd
 	| test address line 1 | TestTown    |
 	When I click on the back button
 	Then the My Profile Page is displayed
-	#When I tap on the Contacts button
-	#Then the Contact List Page is displayed
-	#And the Primary Contact is displayed
-	#| Name         | EmailAddress                 | MobileNumber |
-	#| Test Contact | stuart_ferguson1@outlook.com | 123456789    |
-	#When I click on the back button
-	#Then the My Profile Page is displayed
 	When I tap on the Account Info button
 	Then the Account Info Page is displayed
 	And the Account Info is displayed
@@ -105,5 +102,25 @@ Scenario: EndToEnd
 	| Test Merchant 1 | 0       | 0                |
 	When I click on the back button
 	Then the My Profile Page is displayed
-	When I tap on Logout
-	Then the Login Screen is displayed
\ No newline at end of file
+	When I click on the back button
+	Then the Merchant Home Page is displayed
+	When I tap on Transactions
+	Then the Transaction Page is displayed
+	When I tap on the Mobile Topup button
+	Then the Transaction Select Mobile Topup Operator Page is displayed
+	When I tap on the 'Safaricom' button
+	Then the Select Product Page is displayed
+	When I tap on the 'Custom' product button
+	Then the Enter Topup Details Page is displayed
+	When I enter '07777777775' as the Customer Mobile Number
+	And I enter 10.00 as the Topup Amount
+	And I tap on Perform Topup
+	Then the Mobile Topup Successful Page is displayed
+	And I tap on Complete
+	Then the Transaction Page is displayed
+	When I click on the back button
+	Then the Merchant Home Page is displayed
+	When I click on the back button
+	Then A message is displayed confirming I want to log out
+	When I click yes
+	Then the Login Page is displayed
\ No newline at end of file
diff --git a/TransactionMobile.Maui.UiTests/Features/EndToEndTests.feature.cs b/TransactionMobile.Maui.UiTests/Features/EndToEndTests.feature.cs
index 1b8393a58..4886d2455 100644
--- a/TransactionMobile.Maui.UiTests/Features/EndToEndTests.feature.cs
+++ b/TransactionMobile.Maui.UiTests/Features/EndToEndTests.feature.cs
@@ -28,6 +28,7 @@ namespace TransactionMobile.Maui.UiTests.Features
     [NUnit.Framework.CategoryAttribute("base")]
     [NUnit.Framework.CategoryAttribute("sharedapp")]
     [NUnit.Framework.CategoryAttribute("shared")]
+    [NUnit.Framework.CategoryAttribute("transactions")]
     public partial class EndToEndTestsFeature
     {
         
@@ -40,7 +41,8 @@ public partial class EndToEndTestsFeature
                 "profile",
                 "base",
                 "sharedapp",
-                "shared"};
+                "shared",
+                "transactions"};
         
 #line 1 "EndToEndTests.feature"
 #line hidden
@@ -340,10 +342,25 @@ public virtual void FeatureBackground()
 #line 69
  testRunner.Given("I have created the following security users", ((string)(null)), table14, "Given ");
 #line hidden
+            TechTalk.SpecFlow.Table table15 = new TechTalk.SpecFlow.Table(new string[] {
+                        "Reference",
+                        "Amount",
+                        "DateTime",
+                        "MerchantName",
+                        "EstateName"});
+            table15.AddRow(new string[] {
+                        "Deposit1",
+                        "100.00",
+                        "Today",
+                        "Test Merchant 1",
+                        "Test Estate 1"});
 #line 73
+ testRunner.Given("I make the following manual merchant deposits", ((string)(null)), table15, "Given ");
+#line hidden
+#line 77
  testRunner.Given("I have created a config for my application", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
 #line hidden
-#line 75
+#line 79
  testRunner.Given("I have created a config for my device", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
 #line hidden
         }
@@ -357,7 +374,7 @@ public void EndToEnd()
                     "PRTest"};
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
             TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("EndToEnd", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 78
+#line 82
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
             if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
@@ -370,79 +387,139 @@ public void EndToEnd()
 #line 4
 this.FeatureBackground();
 #line hidden
-#line 79
+#line 83
  testRunner.Given("I am on the Login Screen", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
 #line hidden
-#line 80
+#line 84
  testRunner.And("my device is registered", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
 #line hidden
-#line 81
+#line 85
  testRunner.When("I enter \'merchantuser@testmerchant1.co.uk\' as the Email Address", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
 #line hidden
-#line 82
+#line 86
  testRunner.And("I enter \'123456\' as the Password", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
 #line hidden
-#line 83
+#line 87
  testRunner.And("I tap on Login", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
 #line hidden
-#line 84
+#line 88
  testRunner.Then("the Merchant Home Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
-#line 85
+#line 89
  testRunner.When("I tap on Profile", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
 #line hidden
-#line 86
+#line 90
  testRunner.Then("the My Profile Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
-#line 87
+#line 91
  testRunner.When("I tap on the Addresses button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
 #line hidden
-#line 88
+#line 92
  testRunner.Then("the Address List Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
-                TechTalk.SpecFlow.Table table15 = new TechTalk.SpecFlow.Table(new string[] {
+                TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] {
                             "AddressLine1",
                             "AddressTown"});
-                table15.AddRow(new string[] {
+                table16.AddRow(new string[] {
                             "test address line 1",
                             "TestTown"});
-#line 89
- testRunner.And("the Primary Address is displayed", ((string)(null)), table15, "And ");
+#line 93
+ testRunner.And("the Primary Address is displayed", ((string)(null)), table16, "And ");
 #line hidden
-#line 92
+#line 96
  testRunner.When("I click on the back button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
 #line hidden
-#line 93
+#line 97
  testRunner.Then("the My Profile Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
-#line 101
+#line 98
  testRunner.When("I tap on the Account Info button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
 #line hidden
-#line 102
+#line 99
  testRunner.Then("the Account Info Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
-                TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] {
+                TechTalk.SpecFlow.Table table17 = new TechTalk.SpecFlow.Table(new string[] {
                             "Name",
                             "Balance",
                             "AvailableBalance"});
-                table16.AddRow(new string[] {
+                table17.AddRow(new string[] {
                             "Test Merchant 1",
                             "0",
                             "0"});
+#line 100
+ testRunner.And("the Account Info is displayed", ((string)(null)), table17, "And ");
+#line hidden
 #line 103
- testRunner.And("the Account Info is displayed", ((string)(null)), table16, "And ");
+ testRunner.When("I click on the back button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
 #line hidden
-#line 106
+#line 104
+ testRunner.Then("the My Profile Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+#line 105
  testRunner.When("I click on the back button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
 #line hidden
+#line 106
+ testRunner.Then("the Merchant Home Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
 #line 107
- testRunner.Then("the My Profile Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.When("I tap on Transactions", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
 #line hidden
 #line 108
- testRunner.When("I tap on Logout", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.Then("the Transaction Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
 #line 109
- testRunner.Then("the Login Screen is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.When("I tap on the Mobile Topup button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line hidden
+#line 110
+ testRunner.Then("the Transaction Select Mobile Topup Operator Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+#line 111
+ testRunner.When("I tap on the \'Safaricom\' button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line hidden
+#line 112
+ testRunner.Then("the Select Product Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+#line 113
+ testRunner.When("I tap on the \'Custom\' product button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line hidden
+#line 114
+ testRunner.Then("the Enter Topup Details Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+#line 115
+ testRunner.When("I enter \'07777777775\' as the Customer Mobile Number", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line hidden
+#line 116
+ testRunner.And("I enter 10.00 as the Topup Amount", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line hidden
+#line 117
+ testRunner.And("I tap on Perform Topup", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line hidden
+#line 118
+ testRunner.Then("the Mobile Topup Successful Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+#line 119
+ testRunner.And("I tap on Complete", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line hidden
+#line 120
+ testRunner.Then("the Transaction Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+#line 121
+ testRunner.When("I click on the back button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line hidden
+#line 122
+ testRunner.Then("the Merchant Home Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+#line 123
+ testRunner.When("I click on the back button", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line hidden
+#line 124
+ testRunner.Then("A message is displayed confirming I want to log out", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+#line 125
+ testRunner.When("I click yes", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line hidden
+#line 126
+ testRunner.Then("the Login Page is displayed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
             }
             this.ScenarioCleanup();
diff --git a/TransactionMobile.Maui.UiTests/Pages/TransactionsSelectMobileTopupOperatorPage.cs b/TransactionMobile.Maui.UiTests/Pages/TransactionsSelectMobileTopupOperatorPage.cs
index bdfa223d9..9a932ad26 100644
--- a/TransactionMobile.Maui.UiTests/Pages/TransactionsSelectMobileTopupOperatorPage.cs
+++ b/TransactionMobile.Maui.UiTests/Pages/TransactionsSelectMobileTopupOperatorPage.cs
@@ -1,12 +1,15 @@
 namespace TransactionMobile.Maui.UiTests.Pages;
 
+using OpenQA.Selenium;
 using System;
+using System.Threading.Tasks;
+using Shared.IntegrationTesting;
 using TransactionMobile.Maui.UiTests.Common;
 using UITests;
 
-public class TransactionsSelectMobileTopupOperatorPage : BasePage
+public class TransactionsMobileTopupSelectOperatorPage : BasePage
 {
-    public TransactionsSelectMobileTopupOperatorPage(TestingContext testingContext) : base(testingContext)
+    public TransactionsMobileTopupSelectOperatorPage(TestingContext testingContext) : base(testingContext)
     {
 
     }
@@ -16,4 +19,98 @@ public TransactionsSelectMobileTopupOperatorPage(TestingContext testingContext)
     protected override String Trait => "Select an Operator";
 
     #endregion
+
+    public async Task ClickOperatorButton(String operatorName) {
+        IWebElement element = await this.WaitForElementByAccessibilityId(operatorName);
+        element.Click();
+    }
+}
+
+public class TransactionsMobileTopupSelectProductPage : BasePage {
+    public TransactionsMobileTopupSelectProductPage(TestingContext testingContext) : base(testingContext) {
+
+    }
+
+    #region Properties
+
+    protected override String Trait => "Select a Product";
+
+    #endregion
+
+    public async Task ClickProductButton(String productText) {
+        IWebElement element = await this.WaitForElementByAccessibilityId(productText);
+        element.Click();
+    }
+}
+
+public class TransactionsMobileTopupEnterTopupDetailsPage : BasePage {
+
+    private readonly String CustomerMobileNumberEntry;
+    private readonly String TopupAmountEntry;
+    private readonly String CustomerEmailAddressEntry;
+    private readonly String PerformTopupButton;
+
+    public TransactionsMobileTopupEnterTopupDetailsPage(TestingContext testingContext) : base(testingContext){
+        this.CustomerMobileNumberEntry = "CustomerMobileNumberEntry";
+        this.TopupAmountEntry = "TopupAmountEntry";
+        this.CustomerEmailAddressEntry = "CustomerEmailAddressEntry";
+        this.PerformTopupButton = "PerformTopupButton";
+    }
+
+    #region Properties
+
+    protected override String Trait => "Enter Topup Details";
+
+    public async Task EnterCustomerMobileNumber(String customerMobileNumber) {
+        IWebElement element = await this.WaitForElementByAccessibilityId(this.CustomerMobileNumberEntry);
+
+        element.SendKeys(customerMobileNumber);
+    }
+
+    public async Task EnterTopupAmount(String topupAmount) {
+        IWebElement element = await this.WaitForElementByAccessibilityId(this.TopupAmountEntry);
+
+        element.SendKeys(topupAmount);
+    }
+
+    public async Task EnterCustomerEmailAddress(String customerEmailAddress) {
+        IWebElement element = await this.WaitForElementByAccessibilityId(this.CustomerEmailAddressEntry);
+
+        element.SendKeys(customerEmailAddress);
+    }
+
+    public async Task ClickPerformTopupButton() {
+        await Retry.For(async () => {
+                            IWebElement element = await this.WaitForElementByAccessibilityId(this.PerformTopupButton);
+                            //element.Displayed.ShouldBeTrue();
+                            element.Click();
+                        });
+    }
+
+    #endregion
+}
+
+public class TransactionsMobileTopupSuccessfulTopupPage : BasePage {
+
+    private readonly String CompleteButton;
+
+    public TransactionsMobileTopupSuccessfulTopupPage(TestingContext testingContext) : base(testingContext) {
+        this.CompleteButton = "CompleteButton";
+    }
+
+    #region Properties
+
+    protected override String Trait => "Mobile Topup Successful";
+    
+    public async Task ClickCompleteButton() {
+        await Retry.For(async () => {
+                            IWebElement element = await this.WaitForElementByAccessibilityId(this.CompleteButton);
+                            //element.Displayed.ShouldBeTrue();
+                            element.Click();
+                        });
+    }
+
+    #endregion
+
+
 }
\ No newline at end of file
diff --git a/TransactionMobile.Maui.UiTests/Steps/SharedSteps.cs b/TransactionMobile.Maui.UiTests/Steps/SharedSteps.cs
index f882c4bef..abfc34b85 100644
--- a/TransactionMobile.Maui.UiTests/Steps/SharedSteps.cs
+++ b/TransactionMobile.Maui.UiTests/Steps/SharedSteps.cs
@@ -21,6 +21,7 @@ namespace TransactionMobile.Maui.UiTests.Steps
     using SecurityService.DataTransferObjects.Responses;
     using Shared.IntegrationTesting;
     using Shouldly;
+    using TransactionProcessor.DataTransferObjects;
     using UITests;
     using ClientDetails = Common.ClientDetails;
 
@@ -552,6 +553,53 @@ public async Task GivenIHaveCreatedAConfigForMyApplication()
             response.StatusCode.ShouldBe(HttpStatusCode.OK);
         }
 
+        [Given(@"I make the following manual merchant deposits")]
+        public async Task GivenIMakeTheFollowingManualMerchantDeposits(Table table) {
+            foreach (TableRow tableRow in table.Rows) {
+                EstateDetails estateDetails = this.TestingContext.GetEstateDetails(tableRow);
+
+                String token = this.TestingContext.AccessToken;
+                if (String.IsNullOrEmpty(estateDetails.AccessToken) == false) {
+                    token = estateDetails.AccessToken;
+                }
+
+                // Lookup the merchant id
+                String merchantName = SpecflowTableHelper.GetStringRowValue(tableRow, "MerchantName");
+                Guid merchantId = estateDetails.GetMerchantId(merchantName);
+
+                // Get current balance
+                MerchantBalanceResponse previousMerchantBalance = await this.TestingContext.DockerHelper.TransactionProcessorClient.GetMerchantBalance(token, estateDetails.EstateId, merchantId, CancellationToken.None);
+
+                MakeMerchantDepositRequest makeMerchantDepositRequest = new MakeMerchantDepositRequest {
+                    DepositDateTime = SpecflowTableHelper.GetDateForDateString(SpecflowTableHelper.GetStringRowValue(tableRow, "DateTime"), DateTime.UtcNow),
+                    Reference = SpecflowTableHelper.GetStringRowValue(tableRow, "Reference"),
+                    Amount = SpecflowTableHelper.GetDecimalValue(tableRow, "Amount")
+                };
+
+                MakeMerchantDepositResponse makeMerchantDepositResponse = await this.TestingContext.DockerHelper.EstateClient.MakeMerchantDeposit(token, estateDetails.EstateId, merchantId, makeMerchantDepositRequest, CancellationToken.None).ConfigureAwait(false);
+
+                makeMerchantDepositResponse.EstateId.ShouldBe(estateDetails.EstateId);
+                makeMerchantDepositResponse.MerchantId.ShouldBe(merchantId);
+                makeMerchantDepositResponse.DepositId.ShouldNotBe(Guid.Empty);
+
+                this.TestingContext.Logger.LogInformation($"Deposit Reference {makeMerchantDepositRequest.Reference} made for Merchant {merchantName}");
+
+                await Retry.For(async () =>
+                {
+                    // Check the merchant balance
+                    MerchantBalanceResponse currentMerchantBalance =
+                        await this.TestingContext.DockerHelper.TransactionProcessorClient.GetMerchantBalance(token,
+                                                                                               estateDetails.EstateId,
+                                                                                               merchantId,
+                                                                                               CancellationToken.None);
+
+                    currentMerchantBalance.AvailableBalance.ShouldBe(previousMerchantBalance.AvailableBalance + makeMerchantDepositRequest.Amount);
+                });
+
+
+            }
+        }
+        
         [Given(@"I have created the following security users")]
         public async Task GivenIHaveCreatedTheFollowingSecurityUsers(Table table)
         {
diff --git a/TransactionMobile.Maui.UiTests/Steps/TransactionsSteps.cs b/TransactionMobile.Maui.UiTests/Steps/TransactionsSteps.cs
index 1a5dd4061..5a7bc0f0d 100644
--- a/TransactionMobile.Maui.UiTests/Steps/TransactionsSteps.cs
+++ b/TransactionMobile.Maui.UiTests/Steps/TransactionsSteps.cs
@@ -1,5 +1,6 @@
 namespace TransactionMobile.Maui.UITests.Steps;
 
+using System;
 using System.Threading.Tasks;
 using TechTalk.SpecFlow;
 using UiTests.Common;
@@ -13,12 +14,18 @@ public class TransactionsSteps
 
     private TransactionsPage transactionsPage;
 
-    private TransactionsSelectMobileTopupOperatorPage transactionsSelectMobileTopupOperatorPage;
+    private TransactionsMobileTopupSelectOperatorPage transactionsMobileTopupSelectOperatorPage;
+    private TransactionsMobileTopupSelectProductPage transactionsMobileTopupSelectProductPage;
+    private TransactionsMobileTopupEnterTopupDetailsPage transactionsMobileTopupEnterTopupDetailsPage;
+    private TransactionsMobileTopupSuccessfulTopupPage transactionsMobileTopupSuccessfulTopupPage;
 
     public TransactionsSteps(TestingContext testingContext){
         this.TestingContext = testingContext;
         this.transactionsPage = new TransactionsPage(testingContext);
-        this.transactionsSelectMobileTopupOperatorPage = new TransactionsSelectMobileTopupOperatorPage(testingContext);
+        this.transactionsMobileTopupSelectOperatorPage = new TransactionsMobileTopupSelectOperatorPage(testingContext);
+        this.transactionsMobileTopupSelectProductPage = new TransactionsMobileTopupSelectProductPage(testingContext);
+        this.transactionsMobileTopupEnterTopupDetailsPage = new TransactionsMobileTopupEnterTopupDetailsPage(testingContext);
+        this.transactionsMobileTopupSuccessfulTopupPage = new TransactionsMobileTopupSuccessfulTopupPage(testingContext);
     }
 
     [Then(@"the Transaction Page is displayed")]
@@ -33,6 +40,52 @@ public async Task WhenITapOnTheMobileTopupButton() {
 
     [Then(@"the Transaction Select Mobile Topup Operator Page is displayed")]
     public async Task ThenTheTransactionSelectMobileTopupOperatorPageIsDisplayed() {
-        await this.transactionsSelectMobileTopupOperatorPage.AssertOnPage();
+        await this.transactionsMobileTopupSelectOperatorPage.AssertOnPage();
     }
+
+    [When(@"I tap on the '([^']*)' button")]
+    public async Task WhenITapOnTheButton(String operatorName) {
+        await this.transactionsMobileTopupSelectOperatorPage.ClickOperatorButton(operatorName);
+    }
+    
+    [Then(@"the Select Product Page is displayed")]
+    public async Task ThenTheSelectProductPageIsDisplayed() {
+        await this.transactionsMobileTopupSelectProductPage.AssertOnPage();
+    }
+
+    [When(@"I tap on the '([^']*)' product button")]
+    public async Task WhenITapOnTheProductButton(String productText) {
+        await this.transactionsMobileTopupSelectProductPage.ClickProductButton(productText);
+    }
+    
+    [Then(@"the Enter Topup Details Page is displayed")]
+    public async Task ThenTheEnterTopupDetailsPageIsDisplayed() {
+        await this.transactionsMobileTopupEnterTopupDetailsPage.AssertOnPage();
+    }
+
+    [When(@"I enter '([^']*)' as the Customer Mobile Number")]
+    public async Task WhenIEnterAsTheCustomerMobileNumber(string customerMobileNumber){
+        await this.transactionsMobileTopupEnterTopupDetailsPage.EnterCustomerMobileNumber(customerMobileNumber);
+    }
+
+    [When(@"I enter (.*) as the Topup Amount")]
+    public async Task WhenIEnterAsTheTopupAmount(Decimal topupAmount) {
+        await this.transactionsMobileTopupEnterTopupDetailsPage.EnterTopupAmount(topupAmount.ToString());
+    }
+
+    [When(@"I tap on Perform Topup")]
+    public async Task WhenITapOnPerformTopup(){
+        await this.transactionsMobileTopupEnterTopupDetailsPage.ClickPerformTopupButton();
+    }
+
+    [Then(@"the Mobile Topup Successful Page is displayed")]
+    public async Task ThenTheMobileTopupSuccessfulPageIsDisplayed() {
+        await this.transactionsMobileTopupSuccessfulTopupPage.AssertOnPage();
+    }
+
+    [Then(@"I tap on Complete")]
+    public async Task ThenITapOnComplete(){
+        await this.transactionsMobileTopupSuccessfulTopupPage.ClickCompleteButton();
+    }
+
 }
\ No newline at end of file
diff --git a/TransactionMobile.Maui/Pages/Support/SupportPage.xaml b/TransactionMobile.Maui/Pages/Support/SupportPage.xaml
index b95a78bc8..089ccd801 100644
--- a/TransactionMobile.Maui/Pages/Support/SupportPage.xaml
+++ b/TransactionMobile.Maui/Pages/Support/SupportPage.xaml
@@ -8,7 +8,7 @@
     <ScrollView>
         <VerticalStackLayout>
 
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
 
             <!--Main image-->
             <Image Source="techsupport.jpg" VerticalOptions="Start" Aspect="AspectFit"/>
diff --git a/TransactionMobile.Maui/Pages/Support/ViewLogsPage.xaml b/TransactionMobile.Maui/Pages/Support/ViewLogsPage.xaml
index 50614eb5e..d56b8f46f 100644
--- a/TransactionMobile.Maui/Pages/Support/ViewLogsPage.xaml
+++ b/TransactionMobile.Maui/Pages/Support/ViewLogsPage.xaml
@@ -5,7 +5,7 @@
              xmlns:userControls="clr-namespace:TransactionMobile.Maui.Controls;assembly=TransactionMobile.Maui"
              Shell.NavBarIsVisible="False">
     <StackLayout Margin="20">
-    <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"
+        <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"
                                  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
         <ListView ItemsSource="{Binding LogMessages}" HasUnevenRows="true" VerticalScrollBarVisibility="Always">
                 <ListView.ItemTemplate>
diff --git a/TransactionMobile.Maui/Pages/Transactions/Admin/AdminPage.xaml b/TransactionMobile.Maui/Pages/Transactions/Admin/AdminPage.xaml
index 5cd7412bc..ec5e6b091 100644
--- a/TransactionMobile.Maui/Pages/Transactions/Admin/AdminPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/Admin/AdminPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout>
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" 
            CornerRadius="20" Opacity="0.9" BackgroundColor="#E5E9F0">
                 <VerticalStackLayout Spacing="10">
diff --git a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentFailedPage.xaml b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentFailedPage.xaml
index 6d4856755..84a42250c 100644
--- a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentFailedPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentFailedPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
                FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" CornerRadius="20"
                Opacity="0.9" BackgroundColor="#E5E9F0">
diff --git a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentGetAccountPage.xaml b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentGetAccountPage.xaml
index f4a642f3e..a4c89abbe 100644
--- a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentGetAccountPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentGetAccountPage.xaml
@@ -7,7 +7,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" 
            CornerRadius="20" Opacity="0.9" BackgroundColor="#E5E9F0">
                 <VerticalStackLayout Spacing="10">
diff --git a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentPayBillPage.xaml b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentPayBillPage.xaml
index 864642bdf..00be6eddd 100644
--- a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentPayBillPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentPayBillPage.xaml
@@ -7,7 +7,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"
                                      VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="50,20,50,20" Margin="10,0,0,10" VerticalOptions="CenterAndExpand" 
                    CornerRadius="20" Opacity="0.9" BackgroundColor="#f5f8fa">
diff --git a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSelectOperatorPage.xaml b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSelectOperatorPage.xaml
index 7ea016b80..ebeada487 100644
--- a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSelectOperatorPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSelectOperatorPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
                FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" CornerRadius="20"
                Opacity="0.9" BackgroundColor="#E5E9F0">
diff --git a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSelectProductPage.xaml b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSelectProductPage.xaml
index f2daf4ddd..218038eec 100644
--- a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSelectProductPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSelectProductPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
                FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" CornerRadius="20"
                Opacity="0.9" BackgroundColor="#E5E9F0">
diff --git a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSuccessPage.xaml b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSuccessPage.xaml
index e6b314fff..889119ca2 100644
--- a/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSuccessPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/BillPayment/BillPaymentSuccessPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
                FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" CornerRadius="20"
                Opacity="0.9" BackgroundColor="#E5E9F0">
diff --git a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupFailedPage.xaml b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupFailedPage.xaml
index a56c9121b..581643c5e 100644
--- a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupFailedPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupFailedPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
                FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" CornerRadius="20"
                Opacity="0.9" BackgroundColor="#E5E9F0">
diff --git a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupPerformTopupPage.xaml b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupPerformTopupPage.xaml
index c7884c717..aee1e2b64 100644
--- a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupPerformTopupPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupPerformTopupPage.xaml
@@ -7,7 +7,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" 
            CornerRadius="20" Opacity="0.9" BackgroundColor="#E5E9F0">
                 <VerticalStackLayout Spacing="10">
diff --git a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSelectProductPage.xaml b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSelectProductPage.xaml
index 99569403d..489c013c6 100644
--- a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSelectProductPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSelectProductPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" 
                CornerRadius="20" Opacity="0.9" BackgroundColor="#E5E9F0">
 
diff --git a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSuccessPage.xaml b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSuccessPage.xaml
index 1f276b66d..11d04b39c 100644
--- a/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSuccessPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/MobileTopup/MobileTopupSuccessPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
                FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" CornerRadius="20"
                Opacity="0.9" BackgroundColor="#E5E9F0">
diff --git a/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherIssueFailedPage.xaml b/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherIssueFailedPage.xaml
index 3b03467ee..9be514864 100644
--- a/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherIssueFailedPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherIssueFailedPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
                FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" CornerRadius="20"
                Opacity="0.9" BackgroundColor="#E5E9F0">
diff --git a/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherIssueSuccessPage.xaml b/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherIssueSuccessPage.xaml
index 6cabb5511..3f4096a1b 100644
--- a/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherIssueSuccessPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherIssueSuccessPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
                FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" CornerRadius="20"
                Opacity="0.9" BackgroundColor="#E5E9F0">
diff --git a/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherPerformIssuePage.xaml b/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherPerformIssuePage.xaml
index 710036efd..61dc68b69 100644
--- a/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherPerformIssuePage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherPerformIssuePage.xaml
@@ -7,7 +7,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center"  VerticalOptions="End" FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" 
            CornerRadius="20" Opacity="0.9" BackgroundColor="#E5E9F0">
                 <VerticalStackLayout Spacing="10">
diff --git a/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherSelectOperatorPage.xaml b/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherSelectOperatorPage.xaml
index 4cefb5fe1..e6093a6bd 100644
--- a/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherSelectOperatorPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherSelectOperatorPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
                FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" CornerRadius="20"
                Opacity="0.9" BackgroundColor="#E5E9F0">
diff --git a/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherSelectProductPage.xaml b/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherSelectProductPage.xaml
index 0694ff481..aba45f6f0 100644
--- a/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherSelectProductPage.xaml
+++ b/TransactionMobile.Maui/Pages/Transactions/Voucher/VoucherSelectProductPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False">
     <ScrollView>
         <VerticalStackLayout x:Name="MainLayout">
-            <userControls:TitleLabel Text="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
+            <userControls:TitleLabel Text="{Binding Title}" AutomationId="{Binding Title}" FontSize="20" HorizontalTextAlignment="Center" VerticalOptions="End"
                FontAttributes="Bold" Padding="20,0,0,20"/>
             <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" CornerRadius="20"
                Opacity="0.9" BackgroundColor="#E5E9F0">