From 90e976fae3b200992c85a13143d29e8e602e21f0 Mon Sep 17 00:00:00 2001
From: Adam Brown <adam.brown41@nhs.net>
Date: Thu, 19 Mar 2026 12:01:50 +0000
Subject: [PATCH 1/2] [AEA-6360] add new log for role confirmation

---
 .../src/components/EpsRoleSelectionPage.tsx   |  9 ++++++++
 .../cpt-ui/src/pages/YourSelectedRolePage.tsx | 22 ++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/packages/cpt-ui/src/components/EpsRoleSelectionPage.tsx b/packages/cpt-ui/src/components/EpsRoleSelectionPage.tsx
index 57a5ca3392..d75576ccfe 100644
--- a/packages/cpt-ui/src/components/EpsRoleSelectionPage.tsx
+++ b/packages/cpt-ui/src/components/EpsRoleSelectionPage.tsx
@@ -253,6 +253,15 @@ export default function RoleSelectionPage({
 
   useEffect(() => {
     if (auth.hasSingleRoleAccess() && auth.isSignedIn) {
+      logger.debug("Role confirmed", {
+        sessionId: auth.sessionId,
+        pageName: location.pathname,
+        userId: auth.userDetails?.sub,
+        roleName: auth.selectedRole?.role_name,
+        roleId: auth.selectedRole?.role_id,
+        orgName: auth.selectedRole?.org_name,
+        orgCode: auth.selectedRole?.org_code
+      }, true)
       navigate(FRONTEND_PATHS.SEARCH_BY_PRESCRIPTION_ID)
     }
   }, [auth.hasSingleRoleAccess, auth.isSignedIn])
diff --git a/packages/cpt-ui/src/pages/YourSelectedRolePage.tsx b/packages/cpt-ui/src/pages/YourSelectedRolePage.tsx
index 6748b5c24b..481a32b10a 100644
--- a/packages/cpt-ui/src/pages/YourSelectedRolePage.tsx
+++ b/packages/cpt-ui/src/pages/YourSelectedRolePage.tsx
@@ -6,16 +6,18 @@ import {
   Row,
   SummaryList
 } from "nhsuk-react-components"
-import {Link} from "react-router-dom"
+import {Link, useNavigate} from "react-router-dom"
 
 import {YOUR_SELECTED_ROLE_STRINGS} from "@/constants/ui-strings/YourSelectedRoleStrings"
 import {useAuth} from "@/context/AuthProvider"
 import {Button} from "@/components/ReactRouterButton"
 import {FRONTEND_PATHS} from "@/constants/environment"
 import {usePageTitle} from "@/hooks/usePageTitle"
+import {logger} from "@/helpers/logger"
 
 export default function YourSelectedRolePage() {
-  const {selectedRole} = useAuth()
+  const {selectedRole, sessionId, userDetails} = useAuth()
+  const navigate = useNavigate()
   usePageTitle(YOUR_SELECTED_ROLE_STRINGS.pageTitle)
 
   const [roleName, setRoleName] = useState<string>(YOUR_SELECTED_ROLE_STRINGS.noRoleName)
@@ -36,6 +38,19 @@ export default function YourSelectedRolePage() {
     setOdsCode(selectedRole.org_code || YOUR_SELECTED_ROLE_STRINGS.noODSCode)
   }, [selectedRole])
 
+  const onConfirmRole = () => {
+    logger.debug("Role confirmed", {
+      sessionId: sessionId,
+      pageName: location.pathname,
+      userId: userDetails?.sub,
+      roleName: selectedRole?.role_name,
+      roleId: selectedRole?.role_id,
+      orgName: selectedRole?.org_name,
+      orgCode: selectedRole?.org_code
+    }, true)
+    navigate(FRONTEND_PATHS.SEARCH_BY_PRESCRIPTION_ID)
+  }
+
   const {
     heading,
     subheading,
@@ -113,7 +128,8 @@ export default function YourSelectedRolePage() {
         <Row>
           <Col width="two-thirds">
             <Button
-              to={FRONTEND_PATHS.SEARCH_BY_PRESCRIPTION_ID}
+              // to={FRONTEND_PATHS.SEARCH_BY_PRESCRIPTION_ID}
+              onClick={onConfirmRole}
               data-testid="confirm-and-continue"
             >
               {confirmButtonText}

From 43798c13b2f38e316445b1a85fadf4611e5adbe8 Mon Sep 17 00:00:00 2001
From: Adam Brown <adam.brown41@nhs.net>
Date: Thu, 19 Mar 2026 12:08:12 +0000
Subject: [PATCH 2/2] [AEA-6360] cleanup

---
 packages/cpt-ui/src/pages/YourSelectedRolePage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/cpt-ui/src/pages/YourSelectedRolePage.tsx b/packages/cpt-ui/src/pages/YourSelectedRolePage.tsx
index 481a32b10a..00f9796fea 100644
--- a/packages/cpt-ui/src/pages/YourSelectedRolePage.tsx
+++ b/packages/cpt-ui/src/pages/YourSelectedRolePage.tsx
@@ -128,7 +128,6 @@ export default function YourSelectedRolePage() {
         <Row>
           <Col width="two-thirds">
             <Button
-              // to={FRONTEND_PATHS.SEARCH_BY_PRESCRIPTION_ID}
               onClick={onConfirmRole}
               data-testid="confirm-and-continue"
             >