Skip to content

83367 migrate reports core part 2 #92040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjasikowski merged 19 commits into from
Jun 15, 2026
Merged

83367 migrate reports core part 2 #92040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
831f3a0
migrate participants
huult May 29, 2026
1cae66d
migrate REPORT_SETTINGS
huult May 29, 2026
9da9f1e
update page name
huult May 29, 2026
7b8ab00
update route path
huult May 29, 2026
c2a271d
update oldRoutes
huult May 29, 2026
22621f9
update old route
huult May 29, 2026
a4e9ce8
remove code test unused
huult May 29, 2026
feb1c88
Merge remote-tracking branch 'upstream/main' into 83367-migrate-repor…
huult Jun 1, 2026
876d85c
Merge remote-tracking branch 'upstream/main' into 83367-migrate-repor…
huult Jun 2, 2026
3b7ad1f
Merge remote-tracking branch 'upstream/main' into 83367-migrate-repor…
huult Jun 3, 2026
efdae3d
Merge remote-tracking branch 'upstream/main' into 83367-migrate-repor…
huult Jun 4, 2026
847e76f
Merge remote-tracking branch 'upstream/main' into 83367-migrate-repor…
huult Jun 8, 2026
9954f98
Merge branch 'main' into 83367-migrate-reports-core-part-2
huult Jun 9, 2026
d4b7d7f
Merge remote-tracking branch 'upstream/main' into 83367-migrate-repor…
huult Jun 9, 2026
f3d2e46
update seatbelt
huult Jun 10, 2026
10d9bc5
Merge remote-tracking branch 'upstream/main' into 83367-migrate-repor…
huult Jun 10, 2026
0d34339
Merge remote-tracking branch 'upstream/main' into 83367-migrate-repor…
huult Jun 11, 2026
989ce65
remove backTo unused
huult Jun 11, 2026
7d9543b
Merge remote-tracking branch 'upstream/main' into 83367-migrate-repor…
huult Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/eslint/eslint.seatbelt.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,8 +1092,8 @@
"../../src/pages/ReimbursementAccount/utils/getSubStepValues.ts" "@typescript-eslint/no-unsafe-type-assertion" 4
"../../src/pages/ReportDescriptionPage.tsx" "no-restricted-imports" 1
"../../src/pages/ReportDescriptionPage.tsx" "no-restricted-syntax" 1
"../../src/pages/ReportParticipantDetailsPage.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
"../../src/pages/ReportParticipantDetailsPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/DynamicReportParticipantDetailsPage.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
"../../src/pages/DynamicReportParticipantDetailsPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/ScheduleCall/ScheduleCallPage.tsx" "react-hooks/preserve-manual-memoization" 1
"../../src/pages/Search/AdvancedSearchFilters.tsx" "@typescript-eslint/no-unsafe-type-assertion" 17
"../../src/pages/Search/EmptySearchView.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
Expand Down
59 changes: 31 additions & 28 deletions src/ROUTES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ const DYNAMIC_ROUTES = {
path: 'imported-members-role',
entryScreens: [SCREENS.WORKSPACE.MEMBERS_IMPORTED_CONFIRMATION],
},
REPORT_SETTINGS: {
path: 'report-settings',
entryScreens: [SCREENS.REPORT_DETAILS.DYNAMIC_ROOT],
},
PAYMENT_CARD_CURRENCY_SELECTOR: {
path: 'payment-card-currency',
entryScreens: [SCREENS.SETTINGS.SUBSCRIPTION.CHANGE_BILLING_CURRENCY, SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD, SCREENS.WORKSPACE.OWNER_CHANGE_CHECK],
Expand All @@ -141,11 +145,11 @@ const DYNAMIC_ROUTES = {
},
REPORT_SETTINGS_WRITE_CAPABILITY: {
path: 'who-can-post',
entryScreens: [SCREENS.REPORT_SETTINGS.ROOT],
entryScreens: [SCREENS.REPORT_SETTINGS.DYNAMIC_ROOT],
},
REPORT_SETTINGS_VISIBILITY: {
path: 'visibility',
entryScreens: [SCREENS.REPORT_SETTINGS.ROOT],
entryScreens: [SCREENS.REPORT_SETTINGS.DYNAMIC_ROOT],
},
CHANGE_POLICY_EDUCATIONAL: {
path: 'change-workspace-educational',
Expand Down Expand Up @@ -523,7 +527,7 @@ const DYNAMIC_ROUTES = {
},
NOTIFICATION_PREFERENCES: {
path: 'notification-preferences',
entryScreens: [SCREENS.REPORT_SETTINGS.ROOT, SCREENS.DYNAMIC_PROFILE],
entryScreens: [SCREENS.REPORT_SETTINGS.DYNAMIC_ROOT, SCREENS.DYNAMIC_PROFILE],
getRoute: (reportID: string) => getUrlWithParams('notification-preferences', {reportID}),
queryParams: ['reportID'],
},
Expand Down Expand Up @@ -724,6 +728,30 @@ const DYNAMIC_ROUTES = {
getRoute: (reportID: string) => getUrlWithParams('details', {reportID}),
queryParams: ['reportID'],
},
REPORT_PARTICIPANTS: {
path: 'participants',
entryScreens: [
SCREENS.REPORT,
SCREENS.RIGHT_MODAL.SEARCH_REPORT,
SCREENS.RIGHT_MODAL.EXPENSE_REPORT,
SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT,
SCREENS.SEARCH.ROOT,
SCREENS.REPORT_DETAILS.DYNAMIC_ROOT,
],
},
REPORT_PARTICIPANTS_INVITE: {
path: 'participants-invite',
entryScreens: [SCREENS.REPORT_PARTICIPANTS.DYNAMIC_ROOT],
},
REPORT_PARTICIPANTS_DETAILS: {
path: 'participants-details/:accountID',
entryScreens: [SCREENS.REPORT_PARTICIPANTS.DYNAMIC_ROOT],
getRoute: (accountID: number) => `participants-details/${accountID}` as const,
},
REPORT_PARTICIPANTS_ROLE: {
path: 'participants-role',
entryScreens: [SCREENS.REPORT_PARTICIPANTS.DYNAMIC_DETAILS],
},
REPORT_DETAILS_SHARE_CODE: {
path: 'share-code',
entryScreens: [
Expand Down Expand Up @@ -1491,31 +1519,6 @@ const ROUTES = {
route: `e/:reportID/${VERIFY_ACCOUNT}`,
getRoute: (reportID: string) => `e/${reportID}/${VERIFY_ACCOUNT}` as const,
},
REPORT_PARTICIPANTS: {
route: 'r/:reportID/participants',

getRoute: (reportID: string, backTo?: string) => getUrlWithBackToParam(`r/${reportID}/participants` as const, backTo),
},
REPORT_PARTICIPANTS_INVITE: {
route: 'r/:reportID/participants/invite',

getRoute: (reportID: string, backTo?: string) => getUrlWithBackToParam(`r/${reportID}/participants/invite` as const, backTo),
},
REPORT_PARTICIPANTS_DETAILS: {
route: 'r/:reportID/participants/:accountID',

getRoute: (reportID: string, accountID: number, backTo?: string) => getUrlWithBackToParam(`r/${reportID}/participants/${accountID}` as const, backTo),
},
REPORT_PARTICIPANTS_ROLE_SELECTION: {
route: 'r/:reportID/participants/:accountID/role',

getRoute: (reportID: string, accountID: number, backTo?: string) => getUrlWithBackToParam(`r/${reportID}/participants/${accountID}/role` as const, backTo),
},
REPORT_SETTINGS: {
route: 'r/:reportID/settings',

getRoute: (reportID: string, backTo?: string) => getUrlWithBackToParam(`r/${reportID}/settings` as const, backTo),
},
REPORT_CHANGE_APPROVER_ADD_APPROVER: {
route: 'r/:reportID/change-approver/add',
getRoute: (reportID: string) => `r/${reportID}/change-approver/add` as const,
Expand Down
10 changes: 5 additions & 5 deletions src/SCREENS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ const SCREENS = {
},

REPORT_SETTINGS: {
ROOT: 'Report_Settings_Root',
DYNAMIC_ROOT: 'Dynamic_Report_Settings_Root',
DYNAMIC_NOTIFICATION_PREFERENCES: 'Dynamic_Report_Settings_Notification_Preferences',
DYNAMIC_SETTINGS_NAME: 'Dynamic_Report_Settings_Name',
DYNAMIC_SETTINGS_WRITE_CAPABILITY: 'Dynamic_Report_Settings_Write_Capability',
Expand Down Expand Up @@ -1001,10 +1001,10 @@ const SCREENS = {
REPORT_DESCRIPTION_ROOT: 'Report_Description_Root',
CHRONOS_SCHEDULE_OOO_ROOT: 'Chronos_Schedule_OOO_Root',
REPORT_PARTICIPANTS: {
ROOT: 'ReportParticipants_Root',
INVITE: 'ReportParticipants_Invite',
DETAILS: 'ReportParticipants_Details',
ROLE: 'ReportParticipants_Role',
DYNAMIC_ROOT: 'Dynamic_ReportParticipants_Root',
DYNAMIC_INVITE: 'Dynamic_ReportParticipants_Invite',
DYNAMIC_DETAILS: 'Dynamic_ReportParticipants_Details',
DYNAMIC_ROLE: 'Dynamic_ReportParticipants_Role',
},
ROOM_MEMBERS: {
DYNAMIC_ROOT: 'Dynamic_RoomMembers_Root',
Expand Down
4 changes: 2 additions & 2 deletions src/components/AvatarWithDisplayName.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import {
import variables from '@styles/variables';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
import {DYNAMIC_ROUTES} from '@src/ROUTES';
import type {Report} from '@src/types/onyx';
import {getButtonRole} from './Button/utils';
import DisplayNames from './DisplayNames';
Expand Down Expand Up @@ -251,7 +251,7 @@ function AvatarWithDisplayName({
}

if (isIOUReport(report) && report?.reportID) {
Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(report.reportID));
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_PARTICIPANTS.path));
return;
}

Expand Down
10 changes: 5 additions & 5 deletions src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ const ReportChangeApproverModalStackNavigator = createModalStackNavigator<Report
});

const ReportSettingsModalStackNavigator = createModalStackNavigator<ReportSettingsNavigatorParamList>({
[SCREENS.REPORT_SETTINGS.ROOT]: () => require<ReactComponentModule>('../../../../pages/settings/Report/ReportSettingsPage').default,
[SCREENS.REPORT_SETTINGS.DYNAMIC_ROOT]: () => require<ReactComponentModule>('../../../../pages/settings/Report/DynamicReportSettingsPage').default,
[SCREENS.REPORT_SETTINGS.DYNAMIC_NOTIFICATION_PREFERENCES]: () => require<ReactComponentModule>('../../../../pages/settings/Report/DynamicNotificationPreferencePage').default,
[SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_NAME]: () => require<ReactComponentModule>('../../../../pages/settings/Report/DynamicNamePage').default,
[SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_WRITE_CAPABILITY]: () => require<ReactComponentModule>('../../../../pages/settings/Report/DynamicWriteCapabilityPage').default,
Expand Down Expand Up @@ -360,10 +360,10 @@ const DomainCardModalStackNavigator = createModalStackNavigator({
});

const ReportParticipantsModalStackNavigator = createModalStackNavigator<ParticipantsNavigatorParamList>({
[SCREENS.REPORT_PARTICIPANTS.ROOT]: () => require<ReactComponentModule>('../../../../pages/ReportParticipantsPage').default,
[SCREENS.REPORT_PARTICIPANTS.INVITE]: () => require<ReactComponentModule>('../../../../pages/InviteReportParticipantsPage').default,
[SCREENS.REPORT_PARTICIPANTS.DETAILS]: () => require<ReactComponentModule>('../../../../pages/ReportParticipantDetailsPage').default,
[SCREENS.REPORT_PARTICIPANTS.ROLE]: () => require<ReactComponentModule>('../../../../pages/ReportParticipantRoleSelectionPage').default,
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_ROOT]: () => require<ReactComponentModule>('../../../../pages/DynamicReportParticipantsPage').default,
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_INVITE]: () => require<ReactComponentModule>('../../../../pages/DynamicReportParticipantsInvitePage').default,
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_DETAILS]: () => require<ReactComponentModule>('../../../../pages/DynamicReportParticipantDetailsPage').default,
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_ROLE]: () => require<ReactComponentModule>('../../../../pages/DynamicReportParticipantRoleSelectionPage').default,
});

const RoomMembersModalStackNavigator = createModalStackNavigator<RoomMembersNavigatorParamList>({
Expand Down
3 changes: 3 additions & 0 deletions src/libs/Navigation/linkingConfig/OldRoutes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ const oldRoutes: Record<string, string> = {
'/workspaces/*/category/*': '/workspaces/$1/categories/category/$2',
'/settings/workspaces/*': '/workspaces/$1',
'/settings/workspaces': '/workspaces',
'/r/*/settings': '/r/$1/details/report-settings',
'/r/*/settings/name': '/r/$1/details/settings/name',
'/r/*/participants/invite': '/r/$1/participants/participants-invite',
'/r/*/participants/*/role': '/r/$1/participants/participants-details/$2/participants-role',
'/r/*/title': '/r/$1/title',
'/r/*/description': '/r/$1/description',
'/r/*/assignee': '/r/$1/assignee',
Expand Down
12 changes: 5 additions & 7 deletions src/libs/Navigation/linkingConfig/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1523,9 +1523,7 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
},
[SCREENS.RIGHT_MODAL.REPORT_SETTINGS]: {
screens: {
[SCREENS.REPORT_SETTINGS.ROOT]: {
path: ROUTES.REPORT_SETTINGS.route,
},
[SCREENS.REPORT_SETTINGS.DYNAMIC_ROOT]: DYNAMIC_ROUTES.REPORT_SETTINGS.path,
[SCREENS.REPORT_SETTINGS.DYNAMIC_NOTIFICATION_PREFERENCES]: DYNAMIC_ROUTES.NOTIFICATION_PREFERENCES.path,
[SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_NAME]: DYNAMIC_ROUTES.REPORT_SETTINGS_NAME.path,
[SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_WRITE_CAPABILITY]: DYNAMIC_ROUTES.REPORT_SETTINGS_WRITE_CAPABILITY.path,
Expand Down Expand Up @@ -1683,10 +1681,10 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
},
[SCREENS.RIGHT_MODAL.PARTICIPANTS]: {
screens: {
[SCREENS.REPORT_PARTICIPANTS.ROOT]: ROUTES.REPORT_PARTICIPANTS.route,
[SCREENS.REPORT_PARTICIPANTS.INVITE]: ROUTES.REPORT_PARTICIPANTS_INVITE.route,
[SCREENS.REPORT_PARTICIPANTS.DETAILS]: ROUTES.REPORT_PARTICIPANTS_DETAILS.route,
[SCREENS.REPORT_PARTICIPANTS.ROLE]: ROUTES.REPORT_PARTICIPANTS_ROLE_SELECTION.route,
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_ROOT]: DYNAMIC_ROUTES.REPORT_PARTICIPANTS.path,
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_INVITE]: DYNAMIC_ROUTES.REPORT_PARTICIPANTS_INVITE.path,
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_DETAILS]: DYNAMIC_ROUTES.REPORT_PARTICIPANTS_DETAILS.path,
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_ROLE]: DYNAMIC_ROUTES.REPORT_PARTICIPANTS_ROLE.path,
},
},
[SCREENS.RIGHT_MODAL.ROOM_MEMBERS]: {
Expand Down
20 changes: 5 additions & 15 deletions src/libs/Navigation/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1780,10 +1780,8 @@ type ReportChangeWorkspaceNavigatorParamList = {
};

type ReportSettingsNavigatorParamList = {
[SCREENS.REPORT_SETTINGS.ROOT]: {
[SCREENS.REPORT_SETTINGS.DYNAMIC_ROOT]: {
reportID: string;
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
backTo?: Routes;
};
[SCREENS.REPORT_SETTINGS.DYNAMIC_SETTINGS_NAME]: {
reportID: string;
Expand Down Expand Up @@ -1815,27 +1813,19 @@ type ChronosScheduleOOONavigatorParamList = {
};

type ParticipantsNavigatorParamList = {
[SCREENS.REPORT_PARTICIPANTS.ROOT]: {
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_ROOT]: {
reportID: string;
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
backTo?: Routes;
};
[SCREENS.REPORT_PARTICIPANTS.INVITE]: {
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_INVITE]: {
reportID: string;
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
backTo?: Routes;
};
[SCREENS.REPORT_PARTICIPANTS.DETAILS]: {
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_DETAILS]: {
reportID: string;
accountID: string;
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
backTo?: Routes;
};
[SCREENS.REPORT_PARTICIPANTS.ROLE]: {
[SCREENS.REPORT_PARTICIPANTS.DYNAMIC_ROLE]: {
reportID: string;
accountID: string;
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
backTo?: Routes;
};
};

Expand Down
3 changes: 2 additions & 1 deletion src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5913,7 +5913,8 @@ function goBackToDetailsPage(report: OnyxEntry<Report>, backTo?: Route, shouldGo
if (shouldGoBackToDetailsPage) {
Navigation.goBack(backTo ?? createDynamicRoute(DYNAMIC_ROUTES.REPORT_DETAILS.path, ROUTES.REPORT_WITH_ID.getRoute(report.reportID)));
} else {
Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report.reportID, backTo));
const reportDetailsPath = createDynamicRoute(DYNAMIC_ROUTES.REPORT_DETAILS.path, ROUTES.REPORT_WITH_ID.getRoute(report.reportID));
Comment thread
huult marked this conversation as resolved.
Navigation.goBack(createDynamicRoute(DYNAMIC_ROUTES.REPORT_SETTINGS.path, reportDetailsPath));
}
} else {
Log.warn('Missing reportID during navigation back to the details page');
Expand Down
4 changes: 2 additions & 2 deletions src/pages/DynamicReportDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
if (shouldOpenRoomMembersPage) {
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.ROOM_MEMBERS.path));
} else {
Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(report?.reportID, Navigation.getActiveRoute()));
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_PARTICIPANTS.path));
}
},
});
Expand All @@ -480,7 +480,7 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
isAnonymousAction: false,
shouldShowRightIcon: true,
action: () => {
Navigation.navigate(ROUTES.REPORT_SETTINGS.getRoute(report?.reportID, Navigation.getActiveRoute()));
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_SETTINGS.path));
},
});
}
Expand Down
19 changes: 10 additions & 9 deletions src/pages/ReportParticipantDetailsPage.tsx → ...s/DynamicReportParticipantDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useDynamicBackPath from '@hooks/useDynamicBackPath';
import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
Expand All @@ -26,16 +27,16 @@ import Navigation from '@navigation/Navigation';
import type {ParticipantsNavigatorParamList} from '@navigation/types';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
import {DYNAMIC_ROUTES} from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {PersonalDetails} from '@src/types/onyx';
import NotFoundPage from './ErrorPage/NotFoundPage';
import withReportOrNotFound from './inbox/report/withReportOrNotFound';
import type {WithReportOrNotFoundProps} from './inbox/report/withReportOrNotFound';

type ReportParticipantDetailsPageProps = WithReportOrNotFoundProps & PlatformStackScreenProps<ParticipantsNavigatorParamList, typeof SCREENS.REPORT_PARTICIPANTS.DETAILS>;
type DynamicReportParticipantDetailsPageProps = WithReportOrNotFoundProps & PlatformStackScreenProps<ParticipantsNavigatorParamList, typeof SCREENS.REPORT_PARTICIPANTS.DYNAMIC_DETAILS>;

function ReportParticipantDetails({report, route}: ReportParticipantDetailsPageProps) {
function DynamicReportParticipantDetails({report, route}: DynamicReportParticipantDetailsPageProps) {
const icons = useMemoizedLazyExpensifyIcons(['RemoveMembers', 'Info']);
const isInLandscapeMode = useIsInLandscapeMode();
const styles = useThemeStyles();
Expand All @@ -47,7 +48,7 @@ function ReportParticipantDetails({report, route}: ReportParticipantDetailsPageP
const [isRemoveMemberConfirmModalVisible, setIsRemoveMemberConfirmModalVisible] = React.useState(false);

const accountID = Number(route.params.accountID);
const backTo = ROUTES.REPORT_PARTICIPANTS.getRoute(report?.reportID, route.params.backTo);
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.REPORT_PARTICIPANTS_DETAILS.path);

const member = report?.participants?.[accountID];
const details = personalDetails?.[accountID] ?? ({} as PersonalDetails);
Expand All @@ -58,26 +59,26 @@ function ReportParticipantDetails({report, route}: ReportParticipantDetailsPageP
const removeUser = () => {
setIsRemoveMemberConfirmModalVisible(false);
removeFromGroupChat(report, [accountID]);
Navigation.goBack(backTo);
Navigation.goBack(backPath);
};

const navigateToProfile = () => {
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.PROFILE.getRoute(accountID)));
};

const openRoleSelectionModal = () => {
Navigation.navigate(ROUTES.REPORT_PARTICIPANTS_ROLE_SELECTION.getRoute(report.reportID, accountID, route.params.backTo));
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_PARTICIPANTS_ROLE.path));
};

if (!member) {
return <NotFoundPage />;
}

return (
<ScreenWrapper testID="ReportParticipantDetails">
<ScreenWrapper testID="DynamicReportParticipantDetails">
<HeaderWithBackButton
title={displayName}
onBackButtonPress={() => Navigation.goBack(backTo)}
onBackButtonPress={() => Navigation.goBack(backPath)}
/>
<ScrollView contentContainerStyle={[!isInLandscapeMode && [styles.containerWithSpaceBetween, styles.justifyContentStart], styles.pointerEventsBoxNone]}>
<View style={[styles.avatarSectionWrapper, styles.pb0]}>
Expand Down Expand Up @@ -145,4 +146,4 @@ function ReportParticipantDetails({report, route}: ReportParticipantDetailsPageP
);
}

export default withReportOrNotFound()(ReportParticipantDetails);
export default withReportOrNotFound()(DynamicReportParticipantDetails);
Loading
Loading