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

Jump to bottom

🍒 Cherry pick PR #40648 to staging 🍒 #40673

Merged
merged 3 commits into from
Apr 22, 2024
Merged

🍒 Cherry pick PR #40648 to staging 🍒 #40673

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8045c2e
Update version to 1.4.63-19
OSBotify Apr 22, 2024
e1560fd
Merge pull request #40648 from ishpaul777/fix/40549
Beamanator Apr 22, 2024
8c099fd
Remove unneeded change
Beamanator Apr 22, 2024
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: 0 additions & 20 deletions src/components/MoneyRequestConfirmationList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,6 @@ function MoneyRequestConfirmationList({
<ConfirmedRoute transaction={transaction} />
</View>
)}
<<<<<<< HEAD
{/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing */}
{receiptImage || receiptThumbnail ? (
<ReceiptImage
Expand Down Expand Up @@ -684,25 +683,6 @@ function MoneyRequestConfirmationList({
interactive={!isReadOnly}
numberOfLinesTitle={2}
/>
=======
{!isDistanceRequest &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI from my testing, this was not needed -> Also, this change comes right next to a LOT of code that was updated in #38543, which is not in staging yet - so I don't believe this is needed in staging YET. I made sure the other changes did fix the issue #40549

// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
(receiptImage || receiptThumbnail
? receiptThumbnailContent
: // The empty receipt component should only show for IOU Requests of a paid policy ("Team" or "Corporate")
PolicyUtils.isPaidGroupPolicy(policy) &&
!isDistanceRequest &&
iouType === CONST.IOU.TYPE.REQUEST && (
<ReceiptEmptyState
onPress={() =>
Navigation.navigate(
ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
)
}
/>
))}
{primaryFields}
>>>>>>> 4e922f14 (Merge pull request #40648 from ishpaul777/fix/40549)
{!shouldShowAllFields && (
<ShowMoreButton
containerStyle={[styles.mt1, styles.mb2]}
Expand Down
Loading