From a973c7bc8ba3739334a38146c80986d50ed2a046 Mon Sep 17 00:00:00 2001 From: ahmedGaber93 Date: Tue, 1 Aug 2023 09:09:49 +0200 Subject: [PATCH 1/4] request money open workspace details when selected workspace clicked. --- src/components/MoneyRequestConfirmationList.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js index b376e02b1095..6cbf47e9929e 100755 --- a/src/components/MoneyRequestConfirmationList.js +++ b/src/components/MoneyRequestConfirmationList.js @@ -210,10 +210,13 @@ function MoneyRequestConfirmationList(props) { * @param {Object} option */ const navigateToUserDetail = (option) => { - if (!option.accountID) { + if (option.accountID) { + Navigation.navigate(ROUTES.getProfileRoute(option.accountID)); return; } - Navigation.navigate(ROUTES.getProfileRoute(option.accountID)); + if (option.reportID) { + Navigation.navigate(ROUTES.getReportDetailsRoute(option.reportID)); + } }; /** From 78b563ea985000fefc8bae123a4c92c0bab32a29 Mon Sep 17 00:00:00 2001 From: ahmedGaber93 Date: Tue, 1 Aug 2023 10:09:19 +0200 Subject: [PATCH 2/4] rename navigateToUserDetail --- src/components/MoneyRequestConfirmationList.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js index 6cbf47e9929e..c477749c8525 100755 --- a/src/components/MoneyRequestConfirmationList.js +++ b/src/components/MoneyRequestConfirmationList.js @@ -206,10 +206,10 @@ function MoneyRequestConfirmationList(props) { ); /** - * Navigate to profile of selected user + * Navigate to report details or profile of selected user * @param {Object} option */ - const navigateToUserDetail = (option) => { + const navigateToReportOrUserDetail = (option) => { if (option.accountID) { Navigation.navigate(ROUTES.getProfileRoute(option.accountID)); return; @@ -280,7 +280,7 @@ function MoneyRequestConfirmationList(props) { Date: Tue, 1 Aug 2023 14:03:24 +0200 Subject: [PATCH 3/4] remove return from navigateToReportOrUserDetail --- src/components/MoneyRequestConfirmationList.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js index c477749c8525..e595eb08f96a 100755 --- a/src/components/MoneyRequestConfirmationList.js +++ b/src/components/MoneyRequestConfirmationList.js @@ -212,7 +212,6 @@ function MoneyRequestConfirmationList(props) { const navigateToReportOrUserDetail = (option) => { if (option.accountID) { Navigation.navigate(ROUTES.getProfileRoute(option.accountID)); - return; } if (option.reportID) { Navigation.navigate(ROUTES.getReportDetailsRoute(option.reportID)); From 80eab4165ebab67ef8975a0b33710e4c99b3e332 Mon Sep 17 00:00:00 2001 From: ahmedGaber93 Date: Tue, 1 Aug 2023 15:12:51 +0200 Subject: [PATCH 4/4] update navigateToReportOrUserDetail --- src/components/MoneyRequestConfirmationList.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js index e595eb08f96a..5ed08be3f326 100755 --- a/src/components/MoneyRequestConfirmationList.js +++ b/src/components/MoneyRequestConfirmationList.js @@ -212,8 +212,7 @@ function MoneyRequestConfirmationList(props) { const navigateToReportOrUserDetail = (option) => { if (option.accountID) { Navigation.navigate(ROUTES.getProfileRoute(option.accountID)); - } - if (option.reportID) { + } else if (option.reportID) { Navigation.navigate(ROUTES.getReportDetailsRoute(option.reportID)); } };