Skip to content
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

fix: Selection gets removed after navigating to a single per diem option #56667

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Selection gets removed after navigating to a single per diem option #56667

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {useFocusEffect, useIsFocused} from '@react-navigation/native';
import {useFocusEffect} from '@react-navigation/native';
import lodashSortBy from 'lodash/sortBy';
import React, {useCallback, useEffect, useMemo, useState} from 'react';
import {ActivityIndicator, View} from 'react-native';
Expand All @@ -19,6 +19,7 @@ import SelectionListWithModal from '@components/SelectionListWithModal';
import TableListItemSkeleton from '@components/Skeletons/TableRowSkeleton';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
import useCleanupSelectedOptions from '@hooks/useCleanupSelectedOptions';
import useLocalize from '@hooks/useLocalize';
import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
import useNetwork from '@hooks/useNetwork';
Expand Down Expand Up @@ -120,7 +121,6 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
const [selectedPerDiem, setSelectedPerDiem] = useState<SubRateData[]>([]);
const [deletePerDiemConfirmModalVisible, setDeletePerDiemConfirmModalVisible] = useState(false);
const [isDownloadFailureModalVisible, setIsDownloadFailureModalVisible] = useState(false);
const isFocused = useIsFocused();
const policyID = route.params.policyID;
const backTo = route.params?.backTo;
const policy = usePolicy(policyID);
Expand Down Expand Up @@ -150,12 +150,8 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
}, [fetchPerDiem]),
);

useEffect(() => {
if (isFocused) {
return;
}
setSelectedPerDiem([]);
}, [isFocused]);
const cleanupSelectedOption = useCallback(() => setSelectedPerDiem([]), []);
useCleanupSelectedOptions(cleanupSelectedOption);

const subRatesList = useMemo<PolicyOption[]>(
() =>
Expand Down Expand Up @@ -233,6 +229,10 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
};

const openSubRateDetails = (rate: PolicyOption) => {
if (isSmallScreenWidth && selectionMode?.isEnabled) {
toggleSubRate(rate);
return;
}
Navigation.navigate(ROUTES.WORKSPACE_PER_DIEM_DETAILS.getRoute(policyID, rate.rateID, rate.subRateID));
};

Expand Down