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

Polish for one-transaction view #39472

Merged
merged 26 commits into from
May 3, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
255255b
fix reversed actions logic
NikkiWines Apr 3, 2024
fba77cf
Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…
NikkiWines Apr 4, 2024
1d256b9
Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…
NikkiWines Apr 4, 2024
853f71b
Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…
NikkiWines Apr 4, 2024
f9d5eaa
don't display report as one-transaction report if it has previously d…
NikkiWines Apr 4, 2024
a0a3ff0
only include deleted IOUs if they have visible child actions we need …
NikkiWines Apr 4, 2024
2e030d9
move combined reportAction logic into ReportActionUtils
NikkiWines Apr 5, 2024
1ca6f0d
ensure lastMessageText is correct for oneTransaction reports
NikkiWines Apr 5, 2024
7936ff1
clarifying comment
NikkiWines Apr 5, 2024
50a275c
minor style change and also use isMessageDeleted instead of originalM…
NikkiWines Apr 5, 2024
0e73e03
Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…
NikkiWines Apr 8, 2024
38adc1b
Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…
NikkiWines Apr 11, 2024
48976d7
update stray function to pass correct params
NikkiWines Apr 11, 2024
6423f2b
use const
NikkiWines Apr 11, 2024
f4b4ecc
Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…
NikkiWines Apr 16, 2024
8b0e251
Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…
NikkiWines Apr 17, 2024
ddcd727
Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…
NikkiWines Apr 22, 2024
f9149cc
fix typing
NikkiWines Apr 22, 2024
6d31950
lint
NikkiWines Apr 22, 2024
b1e1957
lint 2
NikkiWines Apr 22, 2024
d241ff4
Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…
NikkiWines Apr 29, 2024
3714c38
prettier
NikkiWines Apr 30, 2024
9fc9010
Comment update
NikkiWines May 3, 2024
125c725
Merge branch 'main' of github.com:Expensify/App into nikki-load-oldes…
NikkiWines May 3, 2024
f7cdd3f
add exception for checking report type
NikkiWines May 3, 2024
007011d
lint/style
NikkiWines May 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
Prev Previous commit
Next Next commit
prettier
NikkiWines committed Apr 30, 2024
commit 3714c389c35ae3c075bc8404d73fb94a7ca42d15
1 change: 0 additions & 1 deletion src/libs/ReportActionsUtils.ts
Original file line number Diff line number Diff line change
@@ -805,7 +805,6 @@ function isTaskAction(reportAction: OnyxEntry<ReportAction>): boolean {
* Returns a reportID if there is exactly one transaction thread for the report, and null otherwise.
*/
function getOneTransactionThreadReportID(reportID: string, reportActions: OnyxEntry<ReportActions> | ReportAction[], isOffline: boolean | undefined = undefined): string | null {

// If the report is not an IOU, Expense report, or Invoice, it shouldn't be treated as one-transaction report.
const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
if (report?.type !== CONST.REPORT.TYPE.IOU && report?.type !== CONST.REPORT.TYPE.EXPENSE && report?.type !== CONST.REPORT.TYPE.INVOICE) {