From b14c40dfd3a5161b4d1828a040ae6c5e57888e45 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Tue, 2 Jan 2024 21:31:37 +0100
Subject: [PATCH 1/5] fix: adding backTo param to ReportParticipantsPage.js

---
 src/pages/ReportParticipantsPage.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/ReportParticipantsPage.js b/src/pages/ReportParticipantsPage.js
index e04ffbb352fc..1e84bd3dcbbb 100755
--- a/src/pages/ReportParticipantsPage.js
+++ b/src/pages/ReportParticipantsPage.js
@@ -121,7 +121,12 @@ function ReportParticipantsPage(props) {
                                     },
                                 ]}
                                 onSelectRow={(option) => {
-                                    Navigation.navigate(ROUTES.PROFILE.getRoute(option.accountID));
+                                    Navigation.navigate(
+                                        ROUTES.PROFILE.getRoute(
+                                            option.accountID, 
+                                            ROUTES.REPORT_PARTICIPANTS.getRoute(props.report.reportID)
+                                        )
+                                    );
                                 }}
                                 hideSectionHeaders
                                 showTitleTooltip

From b7045ec7091f7aba9d94939ea654c3ba5cc59b06 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Fri, 12 Jan 2024 16:05:21 -0500
Subject: [PATCH 2/5] fix: adding backTo param to ReportParticipantsPage.js

---
 src/pages/ReportParticipantsPage.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/ReportParticipantsPage.js b/src/pages/ReportParticipantsPage.js
index 7dbc1c7036c4..9e480d2f0516 100755
--- a/src/pages/ReportParticipantsPage.js
+++ b/src/pages/ReportParticipantsPage.js
@@ -121,7 +121,12 @@ function ReportParticipantsPage(props) {
                                     },
                                 ]}
                                 onSelectRow={(option) => {
-                                    Navigation.navigate(ROUTES.PROFILE.getRoute(option.accountID));
+                                    Navigation.navigate(
+                                        ROUTES.PROFILE.getRoute(
+                                            option.accountID, 
+                                            ROUTES.REPORT_PARTICIPANTS.getRoute(props.report.reportID)
+                                        )
+                                    );
                                 }}
                                 hideSectionHeaders
                                 showTitleTooltip

From e7b85131efe677ac38f177262f3c51b512643b82 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Sat, 13 Jan 2024 04:50:32 +0100
Subject: [PATCH 3/5] fmt: prettier

---
 src/pages/ReportParticipantsPage.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pages/ReportParticipantsPage.js b/src/pages/ReportParticipantsPage.js
index 9e480d2f0516..3bc2783db981 100755
--- a/src/pages/ReportParticipantsPage.js
+++ b/src/pages/ReportParticipantsPage.js
@@ -121,12 +121,7 @@ function ReportParticipantsPage(props) {
                                     },
                                 ]}
                                 onSelectRow={(option) => {
-                                    Navigation.navigate(
-                                        ROUTES.PROFILE.getRoute(
-                                            option.accountID, 
-                                            ROUTES.REPORT_PARTICIPANTS.getRoute(props.report.reportID)
-                                        )
-                                    );
+                                    Navigation.navigate(ROUTES.PROFILE.getRoute(option.accountID, ROUTES.REPORT_PARTICIPANTS.getRoute(props.report.reportID)));
                                 }}
                                 hideSectionHeaders
                                 showTitleTooltip

From d1b5b355b1986240abe3e76c60977324efc24a1a Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Thu, 18 Jan 2024 23:55:12 +0100
Subject: [PATCH 4/5] fix: added onBackButtonPress prop

---
 src/pages/ReportParticipantsPage.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pages/ReportParticipantsPage.js b/src/pages/ReportParticipantsPage.js
index 9e480d2f0516..80253c1f1793 100755
--- a/src/pages/ReportParticipantsPage.js
+++ b/src/pages/ReportParticipantsPage.js
@@ -99,6 +99,7 @@ function ReportParticipantsPage(props) {
             {({safeAreaPaddingBottomStyle}) => (
                 <FullPageNotFoundView shouldShow={_.isEmpty(props.report) || ReportUtils.isArchivedRoom(props.report)}>
                     <HeaderWithBackButton
+                        onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(props.report.reportID))}
                         title={props.translate(
                             ReportUtils.isChatRoom(props.report) ||
                                 ReportUtils.isPolicyExpenseChat(props.report) ||
@@ -121,12 +122,7 @@ function ReportParticipantsPage(props) {
                                     },
                                 ]}
                                 onSelectRow={(option) => {
-                                    Navigation.navigate(
-                                        ROUTES.PROFILE.getRoute(
-                                            option.accountID, 
-                                            ROUTES.REPORT_PARTICIPANTS.getRoute(props.report.reportID)
-                                        )
-                                    );
+                                    Navigation.navigate(ROUTES.PROFILE.getRoute(option.accountID, ROUTES.REPORT_PARTICIPANTS.getRoute(props.report.reportID)));
                                 }}
                                 hideSectionHeaders
                                 showTitleTooltip

From f4f1d630c67695c74b423f0a9933d2a5f6e56a5b Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 31 Jan 2024 18:05:25 +0100
Subject: [PATCH 5/5] fix

---
 src/pages/ReportParticipantsPage.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/ReportParticipantsPage.tsx b/src/pages/ReportParticipantsPage.tsx
index 694284a900d0..b09eb1a4d9ef 100755
--- a/src/pages/ReportParticipantsPage.tsx
+++ b/src/pages/ReportParticipantsPage.tsx
@@ -87,6 +87,7 @@ function ReportParticipantsPage({report, personalDetails}: ReportParticipantsPag
             {({safeAreaPaddingBottomStyle}) => (
                 <FullPageNotFoundView shouldShow={!report || ReportUtils.isArchivedRoom(report)}>
                     <HeaderWithBackButton
+                        onBackButtonPress={report ? () => Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report.reportID)) : undefined}
                         title={translate(
                             ReportUtils.isChatRoom(report) ||
                                 ReportUtils.isPolicyExpenseChat(report) ||
@@ -112,7 +113,7 @@ function ReportParticipantsPage({report, personalDetails}: ReportParticipantsPag
                                     if (!option.accountID) {
                                         return;
                                     }
-                                    Navigation.navigate(ROUTES.PROFILE.getRoute(option.accountID));
+                                    Navigation.navigate(ROUTES.PROFILE.getRoute(option.accountID, report ? ROUTES.REPORT_PARTICIPANTS.getRoute(report.reportID) : undefined));
                                 }}
                                 hideSectionHeaders
                                 showTitleTooltip