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

Jump to bottom

fix: display warning popup in all cases #38929

Merged
merged 6 commits into from
Mar 25, 2024
Merged

fix: display warning popup in all cases #38929

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f7dbbf
fix: checks if something can be disabled or deleted now do not take i…
MrMuzyk Mar 25, 2024
c34a731
fix: delete case fix
MrMuzyk Mar 25, 2024
0df2dcd
Merge branch 'main' of https://github.com/Expensify/App into fix/no-p…
MrMuzyk Mar 25, 2024
d4b3c46
Merge branch 'main' of https://github.com/Expensify/App into fix/no-p…
MrMuzyk Mar 25, 2024
2d5b673
fix: revert check change
MrMuzyk Mar 25, 2024
36250b0
fix: wrap with usememo
MrMuzyk Mar 25, 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
16 changes: 8 additions & 8 deletions src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,12 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
[policy?.customUnits],
);
const customUnitRates: Record<string, Rate> = useMemo(() => customUnit?.rates ?? {}, [customUnit]);
const canDeleteSelectedRates = selectedDistanceRates.length !== Object.values(customUnitRates).length;
const canDisableSelectedRates = Object.values(customUnitRates)
.filter((rate: Rate) => !selectedDistanceRates.includes(rate))
.some((rate) => rate.enabled);
// Filter out rates that will be deleted
const allSelectableRates = useMemo(() => Object.values(customUnitRates).filter((rate) => rate.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE), [customUnitRates]);
const canDisableOrDeleteSelectedRates = useMemo(
() => allSelectableRates.filter((rate: Rate) => !selectedDistanceRates.some((selectedRate) => selectedRate.customUnitRateID === rate.customUnitRateID)).some((rate) => rate.enabled),
[allSelectableRates, selectedDistanceRates],
);

function fetchDistanceRates() {
Policy.openPolicyDistanceRatesPage(policyID);
Expand Down Expand Up @@ -179,8 +181,6 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
};

const toggleAllRates = () => {
const allSelectableRates = Object.values(customUnitRates).filter((rate) => rate.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);

if (selectedDistanceRates.length === allSelectableRates.length) {
setSelectedDistanceRates([]);
} else {
Expand All @@ -201,7 +201,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
text: translate('workspace.distanceRates.deleteRates', {count: selectedDistanceRates.length}),
value: CONST.POLICY.DISTANCE_RATES_BULK_ACTION_TYPES.DELETE,
icon: Expensicons.Trashcan,
onSelected: () => (canDeleteSelectedRates ? setIsDeleteModalVisible(true) : setIsWarningModalVisible(true)),
onSelected: () => (canDisableOrDeleteSelectedRates ? setIsDeleteModalVisible(true) : setIsWarningModalVisible(true)),
},
];

Expand All @@ -211,7 +211,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
text: translate('workspace.distanceRates.disableRates', {count: enabledRates.length}),
value: CONST.POLICY.DISTANCE_RATES_BULK_ACTION_TYPES.DISABLE,
icon: Expensicons.DocumentSlash,
onSelected: () => (canDisableSelectedRates ? disableRates() : setIsWarningModalVisible(true)),
onSelected: () => (canDisableOrDeleteSelectedRates ? disableRates() : setIsWarningModalVisible(true)),
});
}

Expand Down
Loading