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

Fix: Use different fallback receipt icon when displaying a Search row that has no receipt and isn't editable #44742

Merged
merged 17 commits into from
Aug 5, 2024
Merged

Fix: Use different fallback receipt icon when displaying a Search row that has no receipt and isn't editable #44742

Changes from 4 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9918425
Update fallback receipt logic
neonbhai Jul 2, 2024
817cbbd
Merge branch 'main' into receipt-fallback-update
neonbhai Jul 12, 2024
c9cd589
Merge branch 'Expensify:main' into receipt-fallback-update
neonbhai Jul 14, 2024
3886bb1
Prettier fix
neonbhai Jul 15, 2024
d355a3f
Update isClosedReport to accept reportID as param
neonbhai Jul 15, 2024
5abb0e3
Update canModifyReceipt
neonbhai Jul 15, 2024
fda2070
Merge branch 'Expensify:main' into receipt-fallback-update
neonbhai Jul 29, 2024
4c11ce6
Add util functions for isReportOpen and isReportSubmitted
neonbhai Jul 31, 2024
44bde03
Update logic for canModifyReceipt
neonbhai Jul 31, 2024
f0173c0
Prettier fix
neonbhai Jul 31, 2024
2540891
Merge branch 'Expensify:main' into receipt-fallback-update
neonbhai Jul 31, 2024
e507698
Remove comment
neonbhai Jul 31, 2024
34e1ebb
Merge branch 'Expensify:main' into receipt-fallback-update
neonbhai Aug 1, 2024
80a6874
Update logic for Receipt Cell
neonbhai Aug 2, 2024
d5904ba
lint fix
neonbhai Aug 2, 2024
83f8d9b
Revert ReportUtils changes
neonbhai Aug 3, 2024
ba0b977
Merge branch 'Expensify:main' into receipt-fallback-update
neonbhai Aug 3, 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
4 changes: 3 additions & 1 deletion src/components/SelectionList/Search/TransactionListItemRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
import * as CurrencyUtils from '@libs/CurrencyUtils';
import DateUtils from '@libs/DateUtils';
import * as ReportUtils from '@libs/ReportUtils';
import StringUtils from '@libs/StringUtils';
import * as TransactionUtils from '@libs/TransactionUtils';
import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
Expand Down Expand Up @@ -76,6 +77,7 @@ function ReceiptCell({transactionItem}: TransactionCellProps) {
const StyleUtils = useStyleUtils();

const backgroundStyles = transactionItem.isSelected ? StyleUtils.getBackgroundColorStyle(theme.buttonHoveredBG) : StyleUtils.getBackgroundColorStyle(theme.border);
const canModifyReceipt = !ReportUtils.isReportApproved(transactionItem.reportID) && !ReportUtils.isSettled(transactionItem.reportID);
neonbhai marked this conversation as resolved.
Show resolved Hide resolved

return (
<View
Expand All @@ -92,7 +94,7 @@ function ReceiptCell({transactionItem}: TransactionCellProps) {
transactionID={transactionItem.transactionID}
shouldUseThumbnailImage={!transactionItem?.receipt?.source}
isAuthTokenRequired
fallbackIcon={Expensicons.ReceiptPlus}
fallbackIcon={canModifyReceipt ? Expensicons.ReceiptPlus : Expensicons.ReceiptSlash}
fallbackIconSize={20}
fallbackIconColor={theme.icon}
fallbackIconBackground={transactionItem.isSelected ? theme.buttonHoveredBG : undefined}
Expand Down
Loading