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: update distance rates when changing currency offline #39046

Merged
merged 1 commit into from
Mar 28, 2024
Merged

fix: update distance rates when changing currency offline #39046

Show file tree
Hide file tree
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
66 changes: 41 additions & 25 deletions src/libs/actions/Policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,13 +1499,35 @@ function clearAvatarErrors(policyID: string) {
*/
function updateGeneralSettings(policyID: string, name: string, currency: string) {
const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
const distanceUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
const customUnitID = distanceUnit?.customUnitID;

if (!policy) {
if (!policy || !customUnitID) {
return;
}

const distanceUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
const distanceRate = Object.values(distanceUnit?.rates ?? {}).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
const currentRates = distanceUnit?.rates ?? {};
const optimisticRates: Record<string, Rate> = {};
const finallyRates: Record<string, Rate> = {};
const failureRates: Record<string, Rate> = {};

for (const rateID of Object.keys(currentRates)) {
optimisticRates[rateID] = {
...currentRates[rateID],
pendingFields: {currency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
currency,
};
finallyRates[rateID] = {
...currentRates[rateID],
pendingFields: {currency: null},
currency,
};
failureRates[rateID] = {
...currentRates[rateID],
pendingFields: {currency: null},
errorFields: {currency: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
};
}

const optimisticData: OnyxUpdate[] = [
{
Expand All @@ -1526,21 +1548,12 @@ function updateGeneralSettings(policyID: string, name: string, currency: string)
},
name,
outputCurrency: currency,
...(distanceUnit?.customUnitID && distanceRate?.customUnitRateID
? {
customUnits: {
[distanceUnit?.customUnitID]: {
...distanceUnit,
rates: {
[distanceRate?.customUnitRateID]: {
...distanceRate,
currency,
},
},
},
},
}
: {}),
customUnits: {
[customUnitID]: {
...distanceUnit,
rates: optimisticRates,
},
},
},
},
];
Expand All @@ -1552,6 +1565,11 @@ function updateGeneralSettings(policyID: string, name: string, currency: string)
pendingFields: {
generalSettings: null,
},
customUnits: {
[customUnitID]: {
rates: finallyRates,
},
},
},
},
];
Expand All @@ -1564,13 +1582,11 @@ function updateGeneralSettings(policyID: string, name: string, currency: string)
errorFields: {
generalSettings: ErrorUtils.getMicroSecondOnyxError('workspace.editor.genericFailureMessage'),
},
...(distanceUnit?.customUnitID
? {
customUnits: {
[distanceUnit.customUnitID]: distanceUnit,
},
}
: {}),
customUnits: {
[customUnitID]: {
rates: failureRates,
},
},
},
},
];
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ function PolicyDistanceRateDetailsPage({policy, route}: PolicyDistanceRateDetail
</OfflineWithFeedback>
<OfflineWithFeedback
errors={ErrorUtils.getLatestErrorField(rate, 'rate')}
pendingAction={rate?.pendingFields?.rate}
pendingAction={rate?.pendingFields?.rate ?? rate?.pendingFields?.currency}
errorRowStyles={styles.mh5}
onClose={() => clearErrorFields('rate')}
>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
keyForList: value.customUnitRateID ?? '',
isSelected: selectedDistanceRates.find((rate) => rate.customUnitRateID === value.customUnitRateID) !== undefined,
isDisabled: value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
pendingAction: value.pendingAction ?? value.pendingFields?.rate ?? value.pendingFields?.enabled,
pendingAction: value.pendingAction ?? value.pendingFields?.rate ?? value.pendingFields?.enabled ?? value.pendingFields?.currency,
errors: value.errors ?? undefined,
rightElement: (
<View style={styles.flexRow}>
Expand Down
Loading