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.

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

feat: surfacing potential duplicates #40153

Merged
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b7cdaf8
feat: surfacing potential duplicates
gijoe0295 Apr 11, 2024
513909a
revert mistake changes
gijoe0295 Apr 11, 2024
473adaa
Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…
gijoe0295 Apr 12, 2024
9aba989
Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…
gijoe0295 Apr 15, 2024
369585f
modify copy
gijoe0295 Apr 15, 2024
3843a61
resolve conflicts
gijoe0295 Apr 19, 2024
20b4048
show RBR on violation preview
gijoe0295 Apr 19, 2024
38c9188
resolve conflicts
gijoe0295 Apr 25, 2024
4a6a285
show hold message on iou preview
gijoe0295 Apr 25, 2024
462b3df
show rbr on report preview
gijoe0295 Apr 25, 2024
fd8e18c
resolve conflicts
gijoe0295 Apr 25, 2024
7e2d605
fix crash
gijoe0295 Apr 25, 2024
870b6ac
resolve conflicts
gijoe0295 Apr 30, 2024
7c3136f
Resolve conflicts
gijoe0295 May 2, 2024
e68f9f1
hide unhold expense for duplicate expenses
gijoe0295 May 2, 2024
3d844a0
revert unneccessary changes
gijoe0295 May 2, 2024
4947382
Update copy
gijoe0295 May 4, 2024
bd6693b
Merge main
gijoe0295 May 5, 2024
5e558a8
Merge branch 'gijoe/feat-surface-potential-duplicates' of https://git…
gijoe0295 May 5, 2024
22b6cd9
revert HoldBanner changes
gijoe0295 May 5, 2024
edafa52
Resolve conflicts
gijoe0295 May 7, 2024
8185218
Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…
gijoe0295 May 10, 2024
1e7acb4
Resolve conflicts
gijoe0295 May 10, 2024
795dc56
resolve conflicts
gijoe0295 May 14, 2024
951daeb
Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…
gijoe0295 May 15, 2024
742c12d
resolve conflicts
gijoe0295 May 16, 2024
fc07750
fix type error
gijoe0295 May 16, 2024
2c425b5
Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…
gijoe0295 May 16, 2024
796e531
Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…
gijoe0295 May 24, 2024
f934be5
Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…
gijoe0295 May 30, 2024
1060cc7
Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…
gijoe0295 Jun 1, 2024
10535a6
Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…
gijoe0295 Jun 6, 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
Prev Previous commit
Next Next commit
Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…
…at-surface-potential-duplicates
  • Loading branch information
gijoe0295 committed May 30, 2024
commit f934be5c42fb000c33040f9a2de9b5d6b015ac48
2 changes: 1 addition & 1 deletion src/components/MoneyRequestHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, shouldUseNarrow
const isDraft = ReportUtils.isOpenExpenseReport(moneyRequestReport);
const isOnHold = TransactionUtils.isOnHold(transaction);
const isDuplicate = TransactionUtils.isDuplicate(transaction?.transactionID ?? '');
const {windowWidth} = useWindowDimensions();
const {isSmallScreenWidth, windowWidth} = useWindowDimensions();

// Only the requestor can take delete the expense, admins can only edit it.
const isActionOwner = typeof parentReportAction?.actorAccountID === 'number' && typeof session?.accountID === 'number' && parentReportAction.actorAccountID === session?.accountID;
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.