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.

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: [P2P Distance] Split - Participants amount displayed 0.00 briefly on confirmation screen. #47370

Merged
merged 22 commits into from
Oct 15, 2024
Merged
Changes from 8 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cbc9815
fix: [P2P Distance] Split - Participants amount displayed 0.00 briefl…
Krishna2323 Aug 14, 2024
0d5d809
Merge branch 'Expensify:main' into krishna2323/issue/47100
Krishna2323 Aug 16, 2024
377be13
minor fixes.
Krishna2323 Aug 16, 2024
932a839
minor update.
Krishna2323 Aug 16, 2024
99f37b3
remove extra dependency.
Krishna2323 Aug 16, 2024
5e894bd
add suggested changes.
Krishna2323 Aug 18, 2024
30e13cc
define type for mileageRate.
Krishna2323 Aug 18, 2024
e9992b9
Merge branch 'Expensify:main' into krishna2323/issue/47100
Krishna2323 Sep 2, 2024
b343447
Merge branch 'Expensify:main' into krishna2323/issue/47100
Krishna2323 Sep 9, 2024
1d7dab0
remove redundant code.
Krishna2323 Sep 9, 2024
be91889
Merge branch 'Expensify:main' into krishna2323/issue/47100
Krishna2323 Sep 12, 2024
b2fcb63
revert useEffect to update the amount.
Krishna2323 Sep 15, 2024
fc1fe00
Merge branch 'Expensify:main' into krishna2323/issue/47100
Krishna2323 Sep 15, 2024
82e288d
Merge branch 'Expensify:main' into krishna2323/issue/47100
Krishna2323 Sep 24, 2024
f7e386d
Merge branch 'Expensify:main' into krishna2323/issue/47100
Krishna2323 Oct 1, 2024
b5293d1
move the logic to update amount for split in IOURequestStepDistance.
Krishna2323 Oct 2, 2024
35af9ce
fix: empty participants issue.
Krishna2323 Oct 2, 2024
98ca6ac
remove console log.
Krishna2323 Oct 2, 2024
3caf979
fix: lint issues.
Krishna2323 Oct 2, 2024
2558819
Merge branch 'Expensify:main' into krishna2323/issue/47100
Krishna2323 Oct 5, 2024
dfad015
Merge branch 'Expensify:main' into krishna2323/issue/47100
Krishna2323 Oct 15, 2024
22ada28
minor updates.
Krishna2323 Oct 15, 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
41 changes: 40 additions & 1 deletion src/pages/iou/request/step/IOURequestStepParticipants.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import usePermissions from '@hooks/usePermissions';
import useThemeStyles from '@hooks/useThemeStyles';
import {READ_COMMANDS} from '@libs/API/types';
import DistanceRequestUtils from '@libs/DistanceRequestUtils';
import type {MileageRate} from '@libs/DistanceRequestUtils';
import HttpUtils from '@libs/HttpUtils';
import * as IOUUtils from '@libs/IOUUtils';
import Navigation from '@libs/Navigation/Navigation';
import * as PolicyUtils from '@libs/PolicyUtils';
import * as ReportUtils from '@libs/ReportUtils';
import * as TransactionUtils from '@libs/TransactionUtils';
import MoneyRequestParticipantsSelector from '@pages/iou/request/MoneyRequestParticipantsSelector';
Expand Down Expand Up @@ -41,6 +43,7 @@ function IOURequestStepParticipants({
},
transaction,
skipConfirmation,
report,
}: IOURequestStepParticipantsProps) {
const participants = transaction?.participants;
const {translate} = useLocalize();
Expand All @@ -53,6 +56,7 @@ function IOURequestStepParticipants({
const numberOfParticipants = useRef(participants?.length ?? 0);
const iouRequestType = TransactionUtils.getRequestType(transaction);
const isSplitRequest = iouType === CONST.IOU.TYPE.SPLIT;
const isDistanceRequest = iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
const headerTitle = useMemo(() => {
if (action === CONST.IOU.ACTION.CATEGORIZE) {
return translate('iou.categorize');
Expand Down Expand Up @@ -115,6 +119,37 @@ function IOURequestStepParticipants({
[iouType, reportID, transactionID, canUseP2PDistanceRequests],
);

// Sets `amount` and `split` share data before moving to the next step to avoid briefly showing `0.00` as the split share for participants
const setDistanceRequestData = useCallback(
(isPolicyExpenseChat: boolean) => {
// Get policy report based on transaction participants
const policyReport = transaction?.participants?.[0] ? ReportUtils.getReport(selectedReportID.current) : report;

const policyID = IOU.getIOURequestPolicyID(transaction, policyReport);
const policy = PolicyUtils.getPolicy(report?.policyID ?? policyID);
const policyCurrency = policy?.outputCurrency ?? PolicyUtils.getPersonalPolicy()?.outputCurrency ?? CONST.CURRENCY.USD;

const customUnitRateID = TransactionUtils.getRateID(transaction) ?? '-1';
const mileageRates = DistanceRequestUtils.getMileageRates(policy);
const defaultMileageRate = DistanceRequestUtils.getDefaultMileageRate(policy);
const mileageRate: MileageRate = TransactionUtils.isCustomUnitRateIDForP2P(transaction)
? DistanceRequestUtils.getRateForP2P(policyCurrency)
: mileageRates?.[customUnitRateID] ?? defaultMileageRate;

const {unit, rate} = mileageRate ?? {};
const distance = TransactionUtils.getDistanceInMeters(transaction, unit);
const currency = mileageRate?.currency ?? policyCurrency;
const amount = DistanceRequestUtils.getDistanceRequestAmount(distance, unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES, rate ?? 0);
IOU.setMoneyRequestAmount(transactionID, amount, currency);

const participantAccountIDs: number[] | undefined = transaction?.participants?.map((participant) => participant.accountID ?? -1);
if (isSplitRequest && amount && currency && !isPolicyExpenseChat) {
IOU.setSplitShares(transaction, amount, currency ?? '', participantAccountIDs ?? []);
}
},
[report, transaction, transactionID, isSplitRequest],
);
Copy link
Member

@parasharrajat parasharrajat Sep 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we have to remove the similar logic from IOURequestStepConfirmation page after we added it here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@parasharrajat, yeah you are right. I was looking at the wrong code and thought that it should be there to avoid regressions but we have a similar logic which only runs once when the IOURequestStepConfirmation mounts.

I have removed the code on IOURequestStepConfirmation page, please check and let me know. Thanks


const goToNextStep = useCallback(() => {
const isCategorizing = action === CONST.IOU.ACTION.CATEGORIZE;
const isShareAction = action === CONST.IOU.ACTION.SHARE;
Expand All @@ -125,6 +160,10 @@ function IOURequestStepParticipants({
IOU.setSplitShares(transaction, transaction.amount, transaction.currency, participantAccountIDs);
}

if (isDistanceRequest) {
setDistanceRequestData(!!isPolicyExpenseChat);
}

IOU.setMoneyRequestTag(transactionID, '');
IOU.setMoneyRequestCategory(transactionID, '');
if ((isCategorizing || isShareAction) && numberOfParticipants.current === 0) {
Expand All @@ -138,7 +177,7 @@ function IOURequestStepParticipants({
} else {
Navigation.navigate(iouConfirmationPageRoute);
}
}, [iouType, transactionID, transaction, reportID, action, participants]);
}, [iouType, transactionID, transaction, reportID, action, participants, setDistanceRequestData, isDistanceRequest]);

const navigateBack = useCallback(() => {
IOUUtils.navigateToStartMoneyRequestStep(iouRequestType, iouType, transactionID, reportID, action);
Expand Down
Loading