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/27383: Prevent request money if empty waypoint #27826

Merged
merged 12 commits into from
Sep 25, 2023
Merged

Fix/27383: Prevent request money if empty waypoint #27826

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b009310
prevent request money if waypoint is empty
DylanDylann Sep 20, 2023
3c1aa35
merge main
DylanDylann Sep 20, 2023
d133c4d
fix lint
DylanDylann Sep 20, 2023
7adde9f
fix lint
DylanDylann Sep 20, 2023
d88b6d8
fix lint
DylanDylann Sep 20, 2023
d031bd8
dry code
DylanDylann Sep 22, 2023
f51bdb4
merge main
DylanDylann Sep 22, 2023
6f96e15
clear name
DylanDylann Sep 22, 2023
d7ee1d2
clear name
DylanDylann Sep 22, 2023
812ea40
clean logic
DylanDylann Sep 22, 2023
d26408c
correct dependency
DylanDylann Sep 22, 2023
f50cff6
move isInvalidDistanceRequest to useEffect
DylanDylann Sep 22, 2023
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
12 changes: 8 additions & 4 deletions src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import * as IOU from '../../../../libs/actions/IOU';
import * as MoneyRequestUtils from '../../../../libs/MoneyRequestUtils';
import {iouPropTypes, iouDefaultProps} from '../../propTypes';
import useLocalize from '../../../../hooks/useLocalize';
import * as TransactionUtils from '../../../../libs/TransactionUtils';

const propTypes = {
/** React Navigation route */
Expand Down Expand Up @@ -53,7 +54,8 @@ function MoneyRequestParticipantsPage({iou, selectedTab, route}) {
const isScanRequest = MoneyRequestUtils.isScanRequest(selectedTab);
const isSplitRequest = iou.id === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT;
const [headerTitle, setHeaderTitle] = useState();

const transaction = TransactionUtils.getTransaction(iou.transactionID);
const isEmptyWaypoint = _.isEmpty(lodashGet(transaction, 'comment.waypoint.waypoint0', {}));
useEffect(() => {
if (isDistanceRequest) {
setHeaderTitle(translate('common.distance'));
Expand Down Expand Up @@ -85,10 +87,12 @@ function MoneyRequestParticipantsPage({iou, selectedTab, route}) {
};

useEffect(() => {
const isInvalidDistanceRequest = !isDistanceRequest || isEmptyWaypoint;

// ID in Onyx could change by initiating a new request in a separate browser tab or completing a request
if (prevMoneyRequestId.current !== iou.id) {
// The ID is cleared on completing a request. In that case, we will do nothing
if (iou.id && !isDistanceRequest && !isSplitRequest && !isNewReportIDSelectedLocally.current) {
if (iou.id && isInvalidDistanceRequest && !isSplitRequest && !isNewReportIDSelectedLocally.current) {
navigateBack(true);
}
return;
Expand All @@ -100,14 +104,14 @@ function MoneyRequestParticipantsPage({iou, selectedTab, route}) {
if (shouldReset) {
IOU.resetMoneyRequestInfo(moneyRequestId);
}
if (!isDistanceRequest && ((iou.amount === 0 && !iou.receiptPath) || shouldReset)) {
if (isInvalidDistanceRequest && ((iou.amount === 0 && !iou.receiptPath) || shouldReset)) {
navigateBack(true);
}

return () => {
prevMoneyRequestId.current = iou.id;
};
}, [iou.amount, iou.id, iou.receiptPath, isDistanceRequest, isSplitRequest]);
}, [iou.amount, iou.id, iou.receiptPath, isDistanceRequest, isSplitRequest, isEmptyWaypoint]);

return (
<ScreenWrapper
Expand Down