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

IOU - RBR is present in LHN with transaction thread #40460

Merged
merged 14 commits into from
Jun 3, 2024
Merged

IOU - RBR is present in LHN with transaction thread #40460

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d7420d6
Show error message with thread
kaushiktd Apr 30, 2024
c3d09af
Resolve merge conflict in MoneyRequestView.tsx
kaushiktd May 2, 2024
b44cab3
Combine Assignment
kaushiktd May 2, 2024
3a38ae5
Combine Assignment
kaushiktd May 2, 2024
b5f47c0
Solved Lint Error
kaushiktd May 2, 2024
42745fd
Merge branch 'Expensify:main' into error-message
kaushiktd May 14, 2024
d99ad12
show error message with thred
kaushiktd May 14, 2024
404e2b9
show error message with thread
kaushiktd May 14, 2024
9f6b462
show error message with thread
kaushiktd May 14, 2024
0042b55
Merge remote-tracking branch 'origin/main' into error-message
kaushiktd May 17, 2024
93fcd22
Resolve merge conflict in MoneyRequestView.tsx
kaushiktd May 17, 2024
f2897f4
Resolve merge conflict in MoneyRequestView.tsx
kaushiktd May 17, 2024
1f26b59
Merge branch 'Expensify:main' into error-message
kaushiktd May 23, 2024
e1e196d
Resolve
kaushiktd May 23, 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
51 changes: 30 additions & 21 deletions src/components/ReportActionItem/MoneyRequestView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import * as IOU from '@userActions/IOU';
import * as Transaction from '@userActions/Transaction';
import CONST from '@src/CONST';
import type {TranslationPaths} from '@src/languages/types';
import * as ReportActions from '@src/libs/actions/ReportActions';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type * as OnyxTypes from '@src/types/onyx';
Expand Down Expand Up @@ -322,6 +323,11 @@ function MoneyRequestView({
const noticeTypeViolations = transactionViolations?.filter((violation) => violation.type === 'notice').map((v) => ViolationsUtils.getViolationTranslation(v, translate)) ?? [];
const shouldShowNotesViolations = !isReceiptBeingScanned && canUseViolations && ReportUtils.isPaidGroupPolicy(report);

const errors = {
kaushiktd marked this conversation as resolved.
Show resolved Hide resolved
...(transaction?.errorFields?.route ?? transaction?.errors),
...parentReportAction?.errors,
};

return (
<View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth, true, shouldShowAnimatedBackground)]}>
{shouldShowAnimatedBackground && <AnimatedEmptyStateBackground />}
Expand All @@ -332,37 +338,40 @@ function MoneyRequestView({
shouldShowAuditMessage={Boolean(shouldShowNotesViolations && didRceiptScanSucceed)}
/>
)}
{shouldShowMapOrReceipt && (
{(shouldShowMapOrReceipt || errors) && (
<OfflineWithFeedback
pendingAction={pendingAction}
errors={transaction?.errorFields?.route ?? transaction?.errors}
errors={errors}
errorRowStyles={[styles.mh4]}
onClose={() => {
if (!transaction?.transactionID) {
return;
}
Transaction.clearError(transaction.transactionID);
ReportActions.clearAllRelatedReportActionErrors(report.reportID, parentReportAction);
}}
>
<View style={styles.moneyRequestViewImage}>
{showMapAsImage ? (
<ConfirmedRoute
transaction={transaction}
interactive={false}
/>
) : (
<ReportActionItemImage
thumbnail={receiptURIs?.thumbnail}
fileExtension={receiptURIs?.fileExtension}
isThumbnail={receiptURIs?.isThumbnail}
image={receiptURIs?.image}
isLocalFile={receiptURIs?.isLocalFile}
filename={receiptURIs?.filename}
transaction={transaction}
enablePreviewModal
/>
)}
</View>
{shouldShowMapOrReceipt && (
<View style={styles.moneyRequestViewImage}>
{showMapAsImage ? (
<ConfirmedRoute
transaction={transaction}
interactive={false}
/>
) : (
<ReportActionItemImage
thumbnail={receiptURIs?.thumbnail}
fileExtension={receiptURIs?.fileExtension}
isThumbnail={receiptURIs?.isThumbnail}
image={receiptURIs?.image}
isLocalFile={receiptURIs?.isLocalFile}
filename={receiptURIs?.filename}
transaction={transaction}
enablePreviewModal
/>
)}
</View>
)}
</OfflineWithFeedback>
)}
{shouldShowReceiptEmptyState && (
Expand Down
Loading