Skip to content
19 changes: 15 additions & 4 deletions src/libs/actions/IOU/MoneyRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ type MoneyRequestStepDistanceNavigationParams = {
selfDMReport: OnyxEntry<Report>;
gpsCoordinates?: string;
gpsDistance?: number;
odometerStart?: number;
odometerEnd?: number;
odometerDistance?: number;
betas: OnyxEntry<Beta[]>;
};

Expand Down Expand Up @@ -522,13 +525,17 @@ function handleMoneyRequestStepDistanceNavigation({
gpsCoordinates,
gpsDistance,
policyForMovingExpenses,
odometerStart,
odometerEnd,
odometerDistance,
Comment thread
jakubkalinski0 marked this conversation as resolved.
Resolved
betas,
}: MoneyRequestStepDistanceNavigationParams) {
const isManualDistance = manualDistance !== undefined;
const isOdometerDistance = odometerDistance !== undefined;
const isGPSDistance = gpsDistance !== undefined && gpsCoordinates !== undefined;
const recentWaypoints = getRecentWaypoints();

if (transaction?.splitShares && !isManualDistance) {
if (transaction?.splitShares && !isManualDistance && !isOdometerDistance) {
resetSplitShares(transaction);
}
if (backTo) {
Expand Down Expand Up @@ -560,7 +567,7 @@ function handleMoneyRequestStepDistanceNavigation({
transactionReportID: transaction?.reportID,
});

const validWaypoints = !isManualDistance ? getValidWaypoints(waypoints, true, isGPSDistance) : undefined;
const validWaypoints = !isManualDistance && !isOdometerDistance ? getValidWaypoints(waypoints, true, isGPSDistance) : undefined;

if (isCreatingTrackExpense && participant) {
trackExpense({
Expand All @@ -576,7 +583,7 @@ function handleMoneyRequestStepDistanceNavigation({
},
transactionParams: {
amount: 0,
distance: manualDistance ?? gpsDistance,
distance: manualDistance ?? gpsDistance ?? odometerDistance,
currency: transaction?.currency ?? 'USD',
created: transaction?.created ?? '',
merchant: translate('iou.fieldPending'),
Expand All @@ -587,6 +594,8 @@ function handleMoneyRequestStepDistanceNavigation({
customUnitRateID,
attendees: transaction?.comment?.attendees,
gpsCoordinates,
odometerStart,
odometerEnd,
},
isASAPSubmitBetaEnabled,
currentUserAccountIDParam: currentUserAccountID,
Expand All @@ -609,7 +618,7 @@ function handleMoneyRequestStepDistanceNavigation({
existingTransaction: transaction,
transactionParams: {
amount: 0,
distance: manualDistance ?? gpsDistance,
distance: manualDistance ?? gpsDistance ?? odometerDistance,
comment: '',
created: transaction?.created ?? '',
currency: transaction?.currency ?? 'USD',
Expand All @@ -621,6 +630,8 @@ function handleMoneyRequestStepDistanceNavigation({
splitShares: transaction?.splitShares,
attendees: transaction?.comment?.attendees,
gpsCoordinates,
odometerStart,
odometerEnd,
},
backToReport,
isASAPSubmitBetaEnabled,
Expand Down
201 changes: 45 additions & 156 deletions src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,28 @@ import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import usePersonalPolicy from '@hooks/usePersonalPolicy';
import usePolicy from '@hooks/usePolicy';
import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useSelfDMReport from '@hooks/useSelfDMReport';
import useStyleUtils from '@hooks/useStyleUtils';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import {
createDistanceRequest,
getMoneyRequestParticipantsFromReport,
setCustomUnitRateID,
setMoneyRequestDistance,
setMoneyRequestMerchant,
setMoneyRequestOdometerReading,
setMoneyRequestParticipantsFromReport,
setMoneyRequestPendingFields,
trackExpense,
updateMoneyRequestDistance,
} from '@libs/actions/IOU';
import {setTransactionReport} from '@libs/actions/Transaction';
import {setMoneyRequestDistance, setMoneyRequestOdometerReading, updateMoneyRequestDistance} from '@libs/actions/IOU';
import {handleMoneyRequestStepDistanceNavigation} from '@libs/actions/IOU/MoneyRequest';
import DistanceRequestUtils from '@libs/DistanceRequestUtils';
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
import {navigateToParticipantPage, shouldUseTransactionDraft} from '@libs/IOUUtils';
import {shouldUseTransactionDraft} from '@libs/IOUUtils';
import Navigation from '@libs/Navigation/Navigation';
import {roundToTwoDecimalPlaces} from '@libs/NumberUtils';
import {getParticipantsOption, getReportOption} from '@libs/OptionsListUtils';
import {getPolicyExpenseChat, isArchivedReport, isPolicyExpenseChat as isPolicyExpenseChatUtils} from '@libs/ReportUtils';
import {isArchivedReport, isPolicyExpenseChat as isPolicyExpenseChatUtils} from '@libs/ReportUtils';
import shouldUseDefaultExpensePolicyUtil from '@libs/shouldUseDefaultExpensePolicy';
import {getRateID} from '@libs/TransactionUtils';
import variables from '@styles/variables';
import CONST from '@src/CONST';
import type {OdometerImageType} from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import SCREENS from '@src/SCREENS';
import type {ReportAttributesDerivedValue} from '@src/types/onyx/DerivedValues';
import type Transaction from '@src/types/onyx/Transaction';
import type {FileObject} from '@src/types/utils/Attachment';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
Expand Down Expand Up @@ -117,6 +107,8 @@ function IOURequestStepDistanceOdometer({
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`, {canBeMissing: true});
const personalPolicy = usePersonalPolicy();
const defaultExpensePolicy = useDefaultExpensePolicy();
const selfDMReport = useSelfDMReport();
const {policyForMovingExpenses} = usePolicyForMovingExpenses();
const [selectedTab, selectedTabResult] = useOnyx(`${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.DISTANCE_REQUEST_TYPE}`, {canBeMissing: true});
const isLoadingSelectedTab = isLoadingOnyxValue(selectedTabResult);

Expand All @@ -130,6 +122,7 @@ function IOURequestStepDistanceOdometer({
const [shouldEnableDiscardConfirmation, setShouldEnableDiscardConfirmation] = useState(!isEditingConfirmation && !isEditing);

const shouldUseDefaultExpensePolicy = useMemo(() => shouldUseDefaultExpensePolicyUtil(iouType, defaultExpensePolicy), [iouType, defaultExpensePolicy]);
const customUnitRateID = getRateID(transaction);

const unit = DistanceRequestUtils.getRate({transaction, policy: shouldUseDefaultExpensePolicy ? defaultExpensePolicy : policy}).unit;

Expand Down Expand Up @@ -331,20 +324,6 @@ function IOURequestStepDistanceOdometer({
[reportID, transactionID, action, iouType],
);

// Navigate to confirmation page helper - following Manual tab pattern
const navigateToConfirmationPage = () => {
if (!transactionID || !reportID) {
return;
}
switch (iouType) {
case CONST.IOU.TYPE.REQUEST:
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.SUBMIT, transactionID, reportID, backToReport));
break;
default:
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID, backToReport));
}
};

const navigateBack = () => {
if (isEditingConfirmation) {
Navigation.goBack(confirmationRoute);
Expand Down Expand Up @@ -407,133 +386,43 @@ function IOURequestStepDistanceOdometer({
return;
}

// If a reportID exists in the report object, use it to set participants and navigate to confirmation
// Following Manual tab pattern
if (report?.reportID && !isArchived && iouType !== CONST.IOU.TYPE.CREATE) {
const selectedParticipants = getMoneyRequestParticipantsFromReport(report, currentUserPersonalDetails.accountID);
const derivedReports = (reportAttributesDerived as ReportAttributesDerivedValue | undefined)?.reports;
const participants = selectedParticipants.map((participant) => {
const participantAccountID = participant?.accountID ?? CONST.DEFAULT_NUMBER_ID;
return participantAccountID
? getParticipantsOption(participant, personalDetails)
: getReportOption(participant, reportNameValuePairs?.private_isArchived, policy, currentUserPersonalDetails.accountID, personalDetails, derivedReports);
});

if (shouldSkipConfirmation) {
setShouldEnableDiscardConfirmation(false);
setMoneyRequestPendingFields(transactionID, {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
setMoneyRequestMerchant(transactionID, translate('iou.fieldPending'), false);

const participant = participants.at(0);
const customUnitRateID = DistanceRequestUtils.getCustomUnitRateID({
reportID: report.reportID,
isPolicyExpenseChat: !!participant?.isPolicyExpenseChat,
policy,
lastSelectedDistanceRates,
});

if (iouType === CONST.IOU.TYPE.TRACK && participant) {
trackExpense({
report,
isDraftPolicy: false,
participantParams: {
payeeEmail: currentUserEmailParam,
payeeAccountID: currentUserAccountIDParam,
participant,
},
policyParams: {
policy,
},
transactionParams: {
amount: 0,
distance: calculatedDistance,
currency: transaction?.currency ?? 'USD',
created: transaction?.created ?? '',
merchant: translate('iou.fieldPending'),
receipt: {},
billable: false,
customUnitRateID,
attendees: transaction?.comment?.attendees,
odometerStart: start,
odometerEnd: end,
},
isASAPSubmitBetaEnabled: false,
currentUserAccountIDParam,
currentUserEmailParam,
introSelected,
activePolicyID,
quickAction,
recentWaypoints,
betas,
});
return;
}

createDistanceRequest({
report,
participants,
currentUserLogin: currentUserEmailParam,
currentUserAccountID: currentUserAccountIDParam,
iouType,
existingTransaction: transaction,
transactionParams: {
amount: 0,
distance: calculatedDistance,
comment: '',
created: transaction?.created ?? '',
currency: transaction?.currency ?? 'USD',
merchant: translate('iou.fieldPending'),
billable: !!policy?.defaultBillable,
customUnitRateID,
splitShares: transaction?.splitShares,
attendees: transaction?.comment?.attendees,
odometerStart: start,
odometerEnd: end,
},
backToReport,
isASAPSubmitBetaEnabled: false,
transactionViolations,
quickAction,
policyRecentlyUsedCurrencies: policyRecentlyUsedCurrencies ?? [],
recentWaypoints,
betas,
});
return;
}

setMoneyRequestParticipantsFromReport(transactionID, report, currentUserPersonalDetails.accountID).then(() => {
navigateToConfirmationPage();
});
return;
if (shouldSkipConfirmation) {
setShouldEnableDiscardConfirmation(false);
}

// If there was no reportID, then that means the user started this flow from the global menu
// and an optimistic reportID was generated. In that case, the next step is to select the participants for this expense.
if (shouldUseDefaultExpensePolicy) {
const activePolicyExpenseChat = getPolicyExpenseChat(currentUserAccountIDParam, defaultExpensePolicy?.id);
const shouldAutoReport = !!defaultExpensePolicy?.autoReporting || !!personalPolicy?.autoReporting;
const transactionReportID = shouldAutoReport ? activePolicyExpenseChat?.reportID : CONST.REPORT.UNREPORTED_REPORT_ID;
const rateID = DistanceRequestUtils.getCustomUnitRateID({
reportID: transactionReportID,
isPolicyExpenseChat: true,
policy: defaultExpensePolicy,
lastSelectedDistanceRates,
});
setTransactionReport(transactionID, {reportID: transactionReportID}, true);
setCustomUnitRateID(transactionID, rateID, transaction, policy);
setMoneyRequestParticipantsFromReport(transactionID, activePolicyExpenseChat, currentUserPersonalDetails.accountID).then(() => {
Navigation.navigate(
ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(
CONST.IOU.ACTION.CREATE,
iouType === CONST.IOU.TYPE.CREATE ? CONST.IOU.TYPE.SUBMIT : iouType,
transactionID,
activePolicyExpenseChat?.reportID,
),
);
});
} else if (transactionID && reportID) {
navigateToParticipantPage(iouType, transactionID, reportID);
}
handleMoneyRequestStepDistanceNavigation({
iouType,
report,
policy,
transaction,
reportID,
transactionID,
reportAttributesDerived,
personalDetails,
customUnitRateID,
currentUserLogin: currentUserEmailParam,
currentUserAccountID: currentUserAccountIDParam,
backToReport,
shouldSkipConfirmation,
defaultExpensePolicy,
isArchivedExpenseReport: isArchived,
isAutoReporting: !!personalPolicy?.autoReporting,
isASAPSubmitBetaEnabled: false,
transactionViolations,
lastSelectedDistanceRates,
translate,
quickAction,
policyRecentlyUsedCurrencies,
introSelected,
activePolicyID,
privateIsArchived: reportNameValuePairs?.private_isArchived,
selfDMReport,
policyForMovingExpenses,
odometerStart: start,
odometerEnd: end,
odometerDistance: calculatedDistance,
betas,
});
};

// Handle form submission with validation
Expand Down
Loading