Skip to content

Fix - Expense - Paying the expense removed the amount violation, but it re-appeared later #69291

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

Merged
mollfpr merged 10 commits into from
Oct 2, 2025
Merged

Fix - Expense - Paying the expense removed the amount violation, but it re-appeared later #69291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
812b134
hide violations for settled reports
FitseTLT Aug 26, 2025
6ade374
Merge branch 'main' into fix-showing-rbr-for-settled-report
FitseTLT Aug 28, 2025
5412649
Merge branch 'main' into fix-showing-rbr-for-settled-report
FitseTLT Sep 1, 2025
e15455c
Merge branch 'main' into fix-showing-rbr-for-settled-report
FitseTLT Sep 2, 2025
53dac16
Merge branch 'main' into fix-showing-rbr-for-settled-report
FitseTLT Sep 2, 2025
b533282
add isSettled prop
FitseTLT Sep 2, 2025
306a77f
Merge branch 'main' into fix-showing-rbr-for-settled-report
FitseTLT Sep 12, 2025
485b212
Merge branch 'main' into fix-showing-rbr-for-settled-report
FitseTLT Sep 12, 2025
57a885a
Merge branch 'main' into fix-showing-rbr-for-settled-report
FitseTLT Sep 25, 2025
8457da8
revert unnecessary change
FitseTLT Sep 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
10 changes: 9 additions & 1 deletion src/components/TransactionItemRow/TransactionItemRowRBRWithOnyx.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import useOnyx from '@hooks/useOnyx';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils';
import {isSettled} from '@libs/ReportUtils';
import ViolationsUtils from '@libs/Violations/ViolationsUtils';
import variables from '@styles/variables';
import ONYXKEYS from '@src/ONYXKEYS';
Expand Down Expand Up @@ -45,7 +46,14 @@ function TransactionItemRowRBRWithOnyx({transaction, violations, report, contain
canBeMissing: true,
});

const RBRMessages = ViolationsUtils.getRBRMessages(transaction, violations ?? [], translate, missingFieldError, Object.values(transactionThreadActions ?? {}), policyTags);
const RBRMessages = ViolationsUtils.getRBRMessages(
transaction,
isSettled(report) ? [] : (violations ?? []),
translate,
missingFieldError,
Object.values(transactionThreadActions ?? {}),
policyTags,
);

return (
RBRMessages.length > 0 && (
Expand Down
7 changes: 6 additions & 1 deletion src/components/TransactionItemRow/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import useLocalize from '@hooks/useLocalize';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
import {isCategoryMissing} from '@libs/CategoryUtils';
import {isSettled} from '@libs/ReportUtils';
import StringUtils from '@libs/StringUtils';
import {
getDescription,
Expand Down Expand Up @@ -170,6 +171,10 @@ function TransactionItemRow({
const merchantOrDescription = merchant || description;

const missingFieldError = useMemo(() => {
if (isSettled(report)) {
return '';
}

const isCustomUnitOutOfPolicy = isUnreportedAndHasInvalidDistanceRateTransaction(transactionItem);
const hasFieldErrors = hasMissingSmartscanFields(transactionItem) || isCustomUnitOutOfPolicy;
if (hasFieldErrors) {
Expand All @@ -188,7 +193,7 @@ function TransactionItemRow({
}
return error;
}
}, [transactionItem, translate]);
}, [transactionItem, translate, report]);

const columnComponent: ColumnComponents = useMemo(
() => ({
Expand Down
Loading