Skip to content

Fix/33976: Workspace name in request flow is wrong color and navigating back #35594

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
merged 14 commits into from
Feb 14, 2024
Merged

Fix/33976: Workspace name in request flow is wrong color and navigating back #35594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0332039
FIxing workspace color and navigating back from the workspace details
Tony-MK Feb 1, 2024
71e9ada
Merge branch 'Expensify:main' into fix/33976
Tony-MK Feb 1, 2024
4795269
fmt: optimize conditions and lint
Tony-MK Feb 2, 2024
bd86225
fixing onBackButton callback function and added backTo parameter in t…
Tony-MK Feb 2, 2024
3ca92e6
Merge branch 'main' of https://github.com/Expensify/App into fix/33976
Tony-MK Feb 2, 2024
57e75a5
Merge branch 'main' of https://github.com/Expensify/App into fix/33976
Tony-MK Feb 4, 2024
a60cb2e
lint
Tony-MK Feb 4, 2024
a64ab19
merge upstream main
Tony-MK Feb 9, 2024
93c66ce
Revert "merge upstream main"
Tony-MK Feb 9, 2024
c8ca9bf
Merge branch 'main' of https://github.com/Expensify/App into fix/33976
Tony-MK Feb 9, 2024
2e492e3
import useRoute hook
Tony-MK Feb 9, 2024
f8e7fe5
route errors fixing
Tony-MK Feb 10, 2024
00b08d2
migrated changes to ReportDetailsPage.js to ReportDetailsPage.tsx. Re…
Tony-MK Feb 10, 2024
4b15c17
Merge branch 'main' of https://github.com/Expensify/App into fix/33976
Tony-MK Feb 10, 2024
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
2 changes: 1 addition & 1 deletion src/ROUTES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ const ROUTES = {
},
REPORT_WITH_ID_DETAILS: {
route: 'r/:reportID/details',
getRoute: (reportID: string) => `r/${reportID}/details` as const,
getRoute: (reportID: string, backTo?: string) => getUrlWithBackToParam(`r/${reportID}/details`, backTo),
},
REPORT_SETTINGS: {
route: 'r/:reportID/settings',
Expand Down
8 changes: 4 additions & 4 deletions src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
} else {
const formattedSelectedParticipants = _.map(selectedParticipants, (participant) => ({
...participant,
isDisabled: ReportUtils.isOptimisticPersonalDetail(participant.accountID),
isDisabled: !participant.isPolicyExpenseChat && ReportUtils.isOptimisticPersonalDetail(participant.accountID),
}));
sections.push({
title: translate('common.to'),
Expand Down Expand Up @@ -504,12 +504,12 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
* @param {Object} option
*/
const navigateToReportOrUserDetail = (option) => {
if (option.accountID) {
const activeRoute = Navigation.getActiveRouteWithoutParams();
const activeRoute = Navigation.getActiveRouteWithoutParams();

if (option.accountID) {
Navigation.navigate(ROUTES.PROFILE.getRoute(option.accountID, activeRoute));
} else if (option.reportID) {
Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(option.reportID));
Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(option.reportID, activeRoute));
}
};

Expand Down
9 changes: 4 additions & 5 deletions src/pages/ReportDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {useRoute} from '@react-navigation/native';
import type {StackScreenProps} from '@react-navigation/stack';
import React, {useEffect, useMemo} from 'react';
import {ScrollView, View} from 'react-native';
Expand Down Expand Up @@ -60,6 +61,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
const {translate} = useLocalize();
const {isOffline} = useNetwork();
const styles = useThemeStyles();
const route = useRoute();
const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? ''}`], [policies, report?.policyID]);
const isPolicyAdmin = useMemo(() => PolicyUtils.isPolicyAdmin(policy ?? null), [policy]);
const isPolicyMember = useMemo(() => PolicyUtils.isPolicyMember(report?.policyID ?? '', policies), [report?.policyID, policies]);
Expand Down Expand Up @@ -184,11 +186,8 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
<FullPageNotFoundView shouldShow={isEmptyObject(report)}>
<HeaderWithBackButton
title={translate('common.details')}
shouldNavigateToTopMostReport
onBackButtonPress={() => {
Navigation.goBack();
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? ''));
}}
onBackButtonPress={Navigation.goBack}
shouldNavigateToTopMostReport={!(route.params && 'backTo' in route.params)}
/>
<ScrollView style={[styles.flex1]}>
<View style={styles.reportDetailsTitleContainer}>
Expand Down