From 09eb43826bcf5d2028f10fe23e3f1bc6a8fb5b35 Mon Sep 17 00:00:00 2001 From: Jakub Butkiewicz Date: Fri, 8 Mar 2024 09:53:55 +0100 Subject: [PATCH] fix: resolving comments --- src/components/MoneyRequestConfirmationList.tsx | 11 ++++++----- src/languages/types.ts | 2 +- src/libs/OptionsListUtils.ts | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx index d7342241ef06..d94933dc66b8 100755 --- a/src/components/MoneyRequestConfirmationList.tsx +++ b/src/components/MoneyRequestConfirmationList.tsx @@ -358,8 +358,7 @@ function MoneyRequestConfirmationList({ }, [isSplitBill, isTypeRequest, iouType, iouAmount, receiptPath, formattedAmount, isDistanceRequestWithPendingRoute, translate]); const selectedParticipants: Participant[] = useMemo(() => selectedParticipantsProp.filter((participant) => participant.selected), [selectedParticipantsProp]); - // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - const payeePersonalDetails = useMemo(() => payeePersonalDetailsProp || currentUserPersonalDetails, [payeePersonalDetailsProp, currentUserPersonalDetails]); + const payeePersonalDetails = useMemo(() => payeePersonalDetailsProp ?? currentUserPersonalDetails, [payeePersonalDetailsProp, currentUserPersonalDetails]); const canModifyParticipants = !isReadOnly && canModifyParticipantsProp && hasMultipleParticipants; const shouldDisablePaidBySection = canModifyParticipants; @@ -443,7 +442,7 @@ function MoneyRequestConfirmationList({ */ IOU.setMoneyRequestPendingFields(transactionID, {waypoints: isDistanceRequestWithPendingRoute ? CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD : null}); - const distanceMerchant = DistanceRequestUtils.getDistanceMerchant(hasRoute, distance, unit, rate ?? 0, currency ?? 'USD', translate, toLocaleDigit); + const distanceMerchant = DistanceRequestUtils.getDistanceMerchant(hasRoute, distance, unit, rate ?? 0, currency ?? CONST.CURRENCY.USD, translate, toLocaleDigit); IOU.setMoneyRequestMerchant(transactionID, distanceMerchant, false); }, [isDistanceRequestWithPendingRoute, hasRoute, distance, unit, rate, currency, translate, toLocaleDigit, isDistanceRequest, transactionID]); @@ -476,7 +475,7 @@ function MoneyRequestConfirmationList({ if (!selectedParticipants.length) { return; } - if (iouCategory && iouCategory.length > CONST.API_TRANSACTION_CATEGORY_MAX_LENGTH) { + if (iouCategory.length > CONST.API_TRANSACTION_CATEGORY_MAX_LENGTH) { setFormError('iou.error.invalidCategoryLength'); return; } @@ -609,7 +608,7 @@ function MoneyRequestConfirmationList({ shouldShowTextInput={false} shouldUseStyleForChildren={false} optionHoveredStyle={canModifyParticipants ? styles.hoveredComponentBG : {}} - footerContent={(!isEmpty(iou?.id) || isEditingSplitBill) && footerContent} + footerContent={(!!iou?.id || isEditingSplitBill) && footerContent} listStyles={listStyles} shouldAllowScrollingChildren > @@ -619,6 +618,8 @@ function MoneyRequestConfirmationList({ )} + {console.log('receiptImage', receiptImage)} + {console.log('receiptThumbnail', receiptThumbnail)} {receiptImage || receiptThumbnail ? ( , personalDetails: On /** * Build the IOUConfirmation options for showing the payee personalDetail */ -function getIOUConfirmationOptionsFromPayeePersonalDetail(personalDetail: PersonalDetails | Record, amountText?: string): PayeePersonalDetails { +function getIOUConfirmationOptionsFromPayeePersonalDetail(personalDetail: PersonalDetails | EmptyObject, amountText?: string): PayeePersonalDetails { const formattedLogin = LocalePhoneNumber.formatPhoneNumber(personalDetail.login ?? ''); return { text: PersonalDetailsUtils.getDisplayNameOrDefault(personalDetail, formattedLogin),