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: Infinite loading in policy expense chat when changing from auditor to employee #35923

Merged
merged 16 commits into from
Mar 18, 2024
Merged

Fix: Infinite loading in policy expense chat when changing from auditor to employee #35923

Changes from 8 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
21e3ec0
fix: app crashes when changing from auditor to employee
tienifr Feb 6, 2024
7f2ac51
Merge branch 'main' of https://github.com/tienifr/App into fix/34879
tienifr Feb 7, 2024
6f440f2
Merge branch 'main' of https://github.com/tienifr/App into fix/34879
tienifr Feb 8, 2024
a691831
Merge branch 'main' of https://github.com/tienifr/App into fix/34879
tienifr Feb 24, 2024
a78c3f8
remove redundant change
tienifr Feb 24, 2024
229e156
fix: infinite loading in policy expense chat when changing from audit…
tienifr Feb 24, 2024
feeceae
fix lint
tienifr Feb 24, 2024
6bdef36
Merge branch 'main' of https://github.com/tienifr/App into fix/34879
tienifr Feb 26, 2024
f7ec94a
change function name
tienifr Feb 26, 2024
53c791f
Merge branch 'main' of https://github.com/tienifr/App into fix/34879
tienifr Feb 29, 2024
58884aa
Merge branch 'main' of https://github.com/tienifr/App into fix/34879
tienifr Mar 1, 2024
f20772e
Merge branch 'main' of https://github.com/tienifr/App into fix/34879
tienifr Mar 11, 2024
b2c69c7
Merge branch 'main' into fix/34879
tienifr Mar 12, 2024
9b12bd1
Merge branch 'main' of https://github.com/tienifr/App into fix/34879
tienifr Mar 13, 2024
884b3ed
modify isEmpty logic
tienifr Mar 13, 2024
20b108b
fix lint
tienifr Mar 13, 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
14 changes: 13 additions & 1 deletion src/pages/home/ReportScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,18 @@ function getReportID(route) {
return String(lodashGet(route, 'params.reportID') || 0);
}

/**
* Check is the report is deleted.
* We currently use useMemo to memorize every properties of the report
* so we can't check using isEmpty.
*
* @param {Object} report
* @returns {Boolean}
*/
function isDeletedReport(report) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this still be true when report is real empty?
I suggest this return true when report is null, undefined, {} as well.
And function name can just be isEmpty

Copy link
Contributor Author

@tienifr tienifr Feb 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this still be true when report is real empty?

Yes it will still be true with null, undefined and {}.

And function name can just be isEmpty

Updated!

return _.every(report, _.isUndefined);
}

function ReportScreen({
betas,
route,
Expand Down Expand Up @@ -421,7 +433,7 @@ function ReportScreen({
!onyxReportID &&
prevReport.statusNum === CONST.REPORT.STATUS_NUM.OPEN &&
(report.statusNum === CONST.REPORT.STATUS_NUM.CLOSED || (!report.statusNum && !prevReport.parentReportID && prevReport.chatType === CONST.REPORT.CHAT_TYPE.POLICY_ROOM))) ||
((ReportUtils.isMoneyRequest(prevReport) || ReportUtils.isMoneyRequestReport(prevReport)) && _.isEmpty(report))
((ReportUtils.isMoneyRequest(prevReport) || ReportUtils.isMoneyRequestReport(prevReport) || ReportUtils.isPolicyExpenseChat(prevReport)) && isDeletedReport(report))
) {
Navigation.dismissModal();
if (Navigation.getTopmostReportId() === prevOnyxReportID) {
Expand Down
Loading