Repository navigation
Take 2: Add merge option when selecting transactions in the report page #78233
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
Merged
mollfpr
merged 43 commits into
main
from
revert-78228-revert-73248-youssef_merge_from_report_page
Dec 29, 2025
Merged
Changes from all commits
Commits
Show all changes
43 commits
Select commit
Hold shift + click to select a range
4c7c1bf
Revert "Revert "Add merge option when selecting transactions in the r…
bb69b49
Fix #78211: missing rate & distance field in confirmation page
e34dacc
Fix #78208: same receipt showing when previewing both receipts
46ee13a
Fix #78206: receipt not selected
3bee083
Fix #78182: Prevent two card transactions from being selected for mer…
09c00e7
Fix #78195: amount can be selected for merging in card transaction merge
4645592
Fix #78189: transactionID in path changes and cause not found page
570f8c0
Prevent overriding mergeTransaction values if we're selecting source …
abaf435
Clean up how we get data from search results
614b551
Fix #78179: Admins can select members expenses and their own for merging
a472f00
Merge branch 'main' into revert-78228-revert-73248-youssef_merge_from…
ab51686
Fix #78181: Allow merging negative expense from the "More" menu
e997ae0
Use utility and existing field to find out if card is coming form any…
6cbefc2
Fix #78190: Category field and Reimbursable toggle are missing in con…
771240b
Tidy up code
22f3569
Fix #78174: Fix navigating away from Reports page when merging from it
e740513
Merge branch 'main' into revert-78228-revert-73248-youssef_merge_from…
55906db
Fix TS
dde5865
Fix tests & lint
47f457b
Small perf improvement & test fix
9c91fbb
Add comment
9b97e43
Add some tests
21497de
Lint
93a61cd
Fix flakey test
199ca0e
Fix rate & distance not showing
0d6380b
Merge branch 'main' into revert-78228-revert-73248-youssef_merge_from…
6a2e49e
Fix #78209: Missing From field after merging
63f7317
Fix test
4d9ff20
Fetch report from search snapshot if not found in main collaction
1a72113
Lint
179304c
Spell fix
819bfa6
Fix navigation after merging from search for good
f10d2a7
TS fixes
4687f5b
Fix tax & attendees showing when policy has them disabled
59a31e2
Lint
5e3f6b2
Lint
4b7ebff
Use transactionThreadReportID set in search transactions
51b1156
Test forcing eslint ignore cache
7b661c4
Revert testing changes
093382a
TS
5bc6b91
Merge branch 'main' into revert-78228-revert-73248-youssef_merge_from…
28bfc6c
Fix test
a64a717
Add check in isFromCreditCardImport for transactions coming from search
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.