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/27165: don't allow go to next step if empty waypoint #28308

Merged
merged 15 commits into from
Nov 4, 2023
Merged

Fix/27165: don't allow go to next step if empty waypoint #28308

Changes from 6 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e14ba5d
don't allow go to next step if empty waypoint
DylanDylann Sep 27, 2023
fe3a3f1
merge main
DylanDylann Sep 27, 2023
0e23a7b
fix lint
DylanDylann Sep 27, 2023
537af3d
fix lint issue
DylanDylann Sep 27, 2023
add0863
fix cannot read property undefined transactionID
DylanDylann Sep 27, 2023
bab3fc8
fix optional chaining
DylanDylann Sep 27, 2023
f4ee68b
merge main
DylanDylann Sep 28, 2023
8c3526d
make logic more accurate
DylanDylann Sep 28, 2023
7dfeba7
merge main
DylanDylann Oct 19, 2023
808f9da
Merge branch 'main' into fix/27165-after-revert
DylanDylann Oct 20, 2023
cf69f71
merge main
DylanDylann Oct 27, 2023
3f34924
merge main
DylanDylann Oct 30, 2023
0719a89
fix lint
DylanDylann Oct 30, 2023
087f909
fix lint
DylanDylann Oct 30, 2023
80d1013
fix lint
DylanDylann Oct 30, 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
20 changes: 15 additions & 5 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 transactionPropTypes from '../../../../components/transactionPropTypes';

const propTypes = {
/** React Navigation route */
Expand All @@ -36,13 +37,17 @@ const propTypes = {

/** The current tab we have navigated to in the request modal. String that corresponds to the request type. */
selectedTab: PropTypes.oneOf([CONST.TAB.DISTANCE, CONST.TAB.MANUAL, CONST.TAB.SCAN]).isRequired,

/** Transaction that stores the distance request data */
transaction: transactionPropTypes,
};

const defaultProps = {
iou: iouDefaultProps,
transaction: {},
};

function MoneyRequestParticipantsPage({iou, selectedTab, route}) {
function MoneyRequestParticipantsPage({iou, selectedTab, route, transaction}) {
const {translate} = useLocalize();
const prevMoneyRequestId = useRef(iou.id);
const isNewReportIDSelectedLocally = useRef(false);
Expand All @@ -53,7 +58,7 @@ 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 isEmptyWaypoint = _.isEmpty(lodashGet(transaction, 'comment.waypoints.waypoint0', {}));
DylanDylann marked this conversation as resolved.
Show resolved Hide resolved
useEffect(() => {
if (isDistanceRequest) {
setHeaderTitle(translate('common.distance'));
Expand Down Expand Up @@ -85,10 +90,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 +107,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 Expand Up @@ -150,4 +157,7 @@ export default withOnyx({
selectedTab: {
key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
},
transaction: {
key: ({iou}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${iou ? iou.transactionID : ''}`,
},
})(MoneyRequestParticipantsPage);
Loading