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: Distance - The route is cut off in the receipt in the split. #55505

Merged
merged 3 commits into from
Jan 27, 2025
Merged

fix: Distance - The route is cut off in the receipt in the split. #55505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45405c2
fix: Distance - The route is cut off in the receipt in the split.
Krishna2323 Jan 21, 2025
bb27186
fix lint issues.
Krishna2323 Jan 21, 2025
ee3c7b3
Merge branch 'main' into krishna2323/issue/55079
Krishna2323 Jan 25, 2025
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
3 changes: 2 additions & 1 deletion src/components/MoneyRequestConfirmationListFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ function MoneyRequestConfirmationListFooter({
accessibilityRole={CONST.ROLE.BUTTON}
accessibilityLabel={translate('accessibilityHints.viewAttachment')}
disabledStyle={styles.cursorDefault}
style={styles.flex1}
style={[styles.h100, styles.flex1]}
>
<ReceiptImage
isThumbnail={isThumbnail}
Expand All @@ -733,6 +733,7 @@ function MoneyRequestConfirmationListFooter({
[
styles.moneyRequestImage,
styles.cursorDefault,
styles.h100,
styles.flex1,
isLocalFile,
receiptFilename,
Expand Down
2 changes: 1 addition & 1 deletion src/libs/PhoneNumber.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function parsePhoneNumber(phoneNumber: string, options?: PhoneNumberParseOptions
/**
* Adds expensify SMS domain (@expensify.sms) if login is a phone number and if it's not included yet
*/
function addSMSDomainIfPhoneNumber(login: string): string {
function addSMSDomainIfPhoneNumber(login = ''): string {
const parsedPhoneNumber = parsePhoneNumber(login);
if (parsedPhoneNumber.possible && !Str.isValidEmail(login)) {
return `${parsedPhoneNumber.number?.e164}${CONST.SMS.DOMAIN}`;
Expand Down
13 changes: 11 additions & 2 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5741,7 +5741,13 @@ function startSplitBill({
* @param sessionAccountID - accountID of the current user
* @param sessionEmail - email of the current user
*/
function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportAction, updatedTransaction: OnyxEntry<OnyxTypes.Transaction>, sessionAccountID: number, sessionEmail: string) {
function completeSplitBill(
chatReportID: string,
reportAction: OnyxTypes.ReportAction,
updatedTransaction: OnyxEntry<OnyxTypes.Transaction>,
sessionAccountID: number,
sessionEmail?: string,
) {
const currentUserEmailForIOUSplit = addSMSDomainIfPhoneNumber(sessionEmail);
const transactionID = updatedTransaction?.transactionID;
const unmodifiedTransaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
Expand Down Expand Up @@ -5980,7 +5986,10 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
notifyNewAction(chatReportID, sessionAccountID);
}

function setDraftSplitTransaction(transactionID: string, transactionChanges: TransactionChanges = {}, policy?: OnyxEntry<OnyxTypes.Policy>) {
function setDraftSplitTransaction(transactionID: string | undefined, transactionChanges: TransactionChanges = {}, policy?: OnyxEntry<OnyxTypes.Policy>) {
if (!transactionID) {
return undefined;
}
let draftSplitTransaction = allDraftSplitTransactions[`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`];

if (!draftSplitTransaction) {
Expand Down
110 changes: 57 additions & 53 deletions src/pages/iou/SplitBillDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,25 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import {ImageBehaviorContextProvider} from '@components/Image/ImageBehaviorContextProvider';
import MoneyRequestConfirmationList from '@components/MoneyRequestConfirmationList';
import MoneyRequestHeaderStatusBar from '@components/MoneyRequestHeaderStatusBar';
import ScreenWrapper from '@components/ScreenWrapper';
import useLocalize from '@hooks/useLocalize';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import {completeSplitBill, setDraftSplitTransaction} from '@libs/actions/IOU';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SplitDetailsNavigatorParamList} from '@libs/Navigation/types';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
import * as ReportUtils from '@libs/ReportUtils';
import * as TransactionUtils from '@libs/TransactionUtils';
import {getParticipantsOption, getPolicyExpenseReportOption} from '@libs/OptionsListUtils';
import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
import {getTransactionDetails, isPolicyExpenseChat} from '@libs/ReportUtils';
import type {OptionData} from '@libs/ReportUtils';
import {areRequiredFieldsEmpty, hasReceipt, isDistanceRequest, isReceiptBeingScanned} from '@libs/TransactionUtils';
import withReportAndReportActionOrNotFound from '@pages/home/report/withReportAndReportActionOrNotFound';
import type {WithReportAndReportActionOrNotFoundProps} from '@pages/home/report/withReportAndReportActionOrNotFound';
import variables from '@styles/variables';
import * as IOU from '@userActions/IOU';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type SCREENS from '@src/SCREENS';
Expand All @@ -35,34 +37,34 @@ function SplitBillDetailsPage({route, report, reportAction}: SplitBillDetailsPag
const {translate} = useLocalize();
const theme = useTheme();

const reportID = report?.reportID ?? '-1';
const originalMessage = reportAction && ReportActionsUtils.isMoneyRequestAction(reportAction) ? ReportActionsUtils.getOriginalMessage(reportAction) : undefined;
const IOUTransactionID = originalMessage?.IOUTransactionID ? originalMessage.IOUTransactionID : '-1';
const reportID = report?.reportID;
const originalMessage = reportAction && isMoneyRequestAction(reportAction) ? getOriginalMessage(reportAction) : undefined;
const IOUTransactionID = originalMessage?.IOUTransactionID;
const participantAccountIDs = originalMessage?.participantAccountIDs ?? [];

const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${IOUTransactionID}`);
const [draftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${IOUTransactionID}`);
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${IOUTransactionID ?? CONST.DEFAULT_NUMBER_ID}`);
const [draftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${IOUTransactionID ?? CONST.DEFAULT_NUMBER_ID}`);
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
const [session] = useOnyx(ONYXKEYS.SESSION);

// In case this is workspace split expense, we manually add the workspace as the second participant of the split expense
// because we don't save any accountID in the report action's originalMessage other than the payee's accountID
let participants: Array<Participant | ReportUtils.OptionData>;
if (ReportUtils.isPolicyExpenseChat(report)) {
let participants: Array<Participant | OptionData>;
if (isPolicyExpenseChat(report)) {
participants = [
OptionsListUtils.getParticipantsOption({accountID: participantAccountIDs.at(0), selected: true, reportID: ''}, personalDetails),
OptionsListUtils.getPolicyExpenseReportOption({...report, selected: true, reportID}),
getParticipantsOption({accountID: participantAccountIDs.at(0), selected: true, reportID: ''}, personalDetails),
getPolicyExpenseReportOption({...report, selected: true, reportID}),
];
} else {
participants = participantAccountIDs.map((accountID) => OptionsListUtils.getParticipantsOption({accountID, selected: true, reportID: ''}, personalDetails));
participants = participantAccountIDs.map((accountID) => getParticipantsOption({accountID, selected: true, reportID: ''}, personalDetails));
}
const actorAccountID = reportAction?.actorAccountID ?? -1;
const actorAccountID = reportAction?.actorAccountID ?? CONST.DEFAULT_NUMBER_ID;
const payeePersonalDetails = personalDetails?.[actorAccountID];
const participantsExcludingPayee = participants.filter((participant) => participant.accountID !== reportAction?.actorAccountID);

const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
const hasSmartScanFailed = TransactionUtils.hasReceipt(transaction) && transaction?.receipt?.state === CONST.IOU.RECEIPT_STATE.SCANFAILED;
const isEditingSplitBill = session?.accountID === actorAccountID && TransactionUtils.areRequiredFieldsEmpty(transaction);
const isScanning = hasReceipt(transaction) && isReceiptBeingScanned(transaction);
const hasSmartScanFailed = hasReceipt(transaction) && transaction?.receipt?.state === CONST.IOU.RECEIPT_STATE.SCANFAILED;
const isEditingSplitBill = session?.accountID === actorAccountID && areRequiredFieldsEmpty(transaction);
const [isConfirmed, setIsConfirmed] = useState(false);

const {
Expand All @@ -73,11 +75,11 @@ function SplitBillDetailsPage({route, report, reportAction}: SplitBillDetailsPag
created: splitCreated,
category: splitCategory,
billable: splitBillable,
} = ReportUtils.getTransactionDetails(isEditingSplitBill && draftTransaction ? draftTransaction : transaction) ?? {};
} = getTransactionDetails(isEditingSplitBill && draftTransaction ? draftTransaction : transaction) ?? {};

const onConfirm = useCallback(() => {
setIsConfirmed(true);
IOU.completeSplitBill(reportID, reportAction, draftTransaction, session?.accountID ?? -1, session?.email ?? '');
completeSplitBill(reportID, reportAction, draftTransaction, session?.accountID ?? CONST.DEFAULT_NUMBER_ID, session?.email);
}, [reportID, reportAction, draftTransaction, session?.accountID, session?.email]);

return (
Expand All @@ -104,38 +106,40 @@ function SplitBillDetailsPage({route, report, reportAction}: SplitBillDetailsPag
/>
</View>
)}
{!!participants.length && (
<MoneyRequestConfirmationList
payeePersonalDetails={payeePersonalDetails}
selectedParticipants={participantsExcludingPayee}
iouAmount={splitAmount ?? 0}
iouCurrencyCode={splitCurrency}
iouComment={splitComment}
iouCreated={splitCreated}
shouldDisplayReceipt
iouMerchant={splitMerchant}
iouCategory={splitCategory}
iouIsBillable={splitBillable}
iouType={CONST.IOU.TYPE.SPLIT}
isReadOnly={!isEditingSplitBill}
shouldShowSmartScanFields
receiptPath={transaction?.receipt?.source}
receiptFilename={transaction?.filename}
isEditingSplitBill={isEditingSplitBill}
hasSmartScanFailed={hasSmartScanFailed}
reportID={reportID}
reportActionID={reportAction?.reportActionID}
transaction={isEditingSplitBill && draftTransaction ? draftTransaction : transaction}
onConfirm={onConfirm}
isPolicyExpenseChat={ReportUtils.isPolicyExpenseChat(report)}
policyID={ReportUtils.isPolicyExpenseChat(report) ? report?.policyID : undefined}
action={isEditingSplitBill ? CONST.IOU.ACTION.EDIT : CONST.IOU.ACTION.CREATE}
onToggleBillable={(billable) => {
IOU.setDraftSplitTransaction(transaction?.transactionID ?? '-1', {billable});
}}
isConfirmed={isConfirmed}
/>
)}
<ImageBehaviorContextProvider shouldSetAspectRatioInStyle={!isDistanceRequest(transaction)}>
{!!participants.length && (
<MoneyRequestConfirmationList
payeePersonalDetails={payeePersonalDetails}
selectedParticipants={participantsExcludingPayee}
iouAmount={splitAmount ?? 0}
iouCurrencyCode={splitCurrency}
iouComment={splitComment}
iouCreated={splitCreated}
shouldDisplayReceipt
iouMerchant={splitMerchant}
iouCategory={splitCategory}
iouIsBillable={splitBillable}
iouType={CONST.IOU.TYPE.SPLIT}
isReadOnly={!isEditingSplitBill}
shouldShowSmartScanFields
receiptPath={transaction?.receipt?.source}
receiptFilename={transaction?.filename}
isEditingSplitBill={isEditingSplitBill}
hasSmartScanFailed={hasSmartScanFailed}
reportID={reportID}
reportActionID={reportAction?.reportActionID}
transaction={isEditingSplitBill && draftTransaction ? draftTransaction : transaction}
onConfirm={onConfirm}
isPolicyExpenseChat={isPolicyExpenseChat(report)}
policyID={isPolicyExpenseChat(report) ? report?.policyID : undefined}
action={isEditingSplitBill ? CONST.IOU.ACTION.EDIT : CONST.IOU.ACTION.CREATE}
onToggleBillable={(billable) => {
setDraftSplitTransaction(transaction?.transactionID, {billable});
}}
isConfirmed={isConfirmed}
/>
)}
</ImageBehaviorContextProvider>
</View>
</FullPageNotFoundView>
</ScreenWrapper>
Expand Down
Loading