diff --git a/src/ROUTES.js b/src/ROUTES.js index bbe1883d441..71145f71864 100644 --- a/src/ROUTES.js +++ b/src/ROUTES.js @@ -55,12 +55,14 @@ export default { SEARCH: 'search', SET_PASSWORD_WITH_VALIDATE_CODE: 'setpassword/:accountID/:validateCode', DETAILS: 'details', - DETAILS_WITH_LOGIN: 'details/:login', - getDetailsRoute: login => `details/${login}`, + getDetailsRoute: login => `details?login=${encodeURIComponent(login)}`, REPORT_PARTICIPANTS: 'r/:reportID/participants', getReportParticipantsRoute: reportID => `r/${reportID}/participants`, - REPORT_PARTICIPANT: 'r/:reportID/participants/:login', - getReportParticipantRoute: (reportID, login) => `r/${reportID}/participants/${login}`, + REPORT_PARTICIPANT: 'r/:reportID/participants/details', + getReportParticipantRoute: ( + reportID, + login, + ) => `r/${reportID}/participants/details?login=${encodeURIComponent(login)}`, REPORT_WITH_ID_DETAILS: 'r/:reportID/details', getReportDetailsRoute: reportID => `r/${reportID}/details`, VALIDATE_LOGIN: 'v', diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js index cf3c57b07ac..a6ba11123df 100644 --- a/src/libs/Navigation/linkingConfig.js +++ b/src/libs/Navigation/linkingConfig.js @@ -91,7 +91,7 @@ export default { }, Details: { screens: { - Details_Root: ROUTES.DETAILS_WITH_LOGIN, + Details_Root: ROUTES.DETAILS, }, }, Participants: { diff --git a/src/pages/home/report/ReportActionItemSingle.js b/src/pages/home/report/ReportActionItemSingle.js index 84befd28f4c..2df76401ffa 100644 --- a/src/pages/home/report/ReportActionItemSingle.js +++ b/src/pages/home/report/ReportActionItemSingle.js @@ -39,7 +39,7 @@ const defaultProps = { }; const showUserDetails = (email) => { - Navigation.navigate(`${ROUTES.DETAILS}/${email}`); + Navigation.navigate(ROUTES.getDetailsRoute(email)); }; const ReportActionItemSingle = ({