Skip to content

Fix 19490 empty loading chats are shown in the half part of screen #19580

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

Merged
marcochavezf merged 6 commits into from
Jun 5, 2023
Merged

Fix 19490 empty loading chats are shown in the half part of screen #19580

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ba5acd
fix: 19490
tienifr May 24, 2023
08a63b1
Merge branch 'main' into fix/19490
tienifr May 25, 2023
e392af0
Fix 19490 empty loading chats are shown in the half part of screen
tienifr May 25, 2023
54f36fb
fix: add actorEmail to optimistic data
tienifr May 26, 2023
4721904
Merge branch 'main' into fix/19490
tienifr May 29, 2023
3b9c4d3
fix: remove actorEmail
tienifr May 29, 2023
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
29 changes: 13 additions & 16 deletions src/libs/actions/Report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,23 +383,20 @@ function openReport(reportID, participantList = [], newReportObject = {}, parent
isOptimisticReport: true,
};

// Add a created action, unless we are creating a thread
if (parentReportActionID === '0') {
const optimisticCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(newReportObject.ownerEmail);
onyxData.optimisticData.push({
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
value: {[optimisticCreatedAction.reportActionID]: optimisticCreatedAction},
});
onyxData.successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
value: {[optimisticCreatedAction.reportActionID]: {pendingAction: null}},
});
const optimisticCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(newReportObject.ownerEmail);
onyxData.optimisticData.push({
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
value: {[optimisticCreatedAction.reportActionID]: optimisticCreatedAction},
});
onyxData.successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
value: {[optimisticCreatedAction.reportActionID]: {pendingAction: null}},
});

// Add the createdReportActionID parameter to the API call
params.createdReportActionID = optimisticCreatedAction.reportActionID;
}
// Add the createdReportActionID parameter to the API call
params.createdReportActionID = optimisticCreatedAction.reportActionID;

// If we are creating a thread, ensure the report action has childReportID property added
if (newReportObject.parentReportID && parentReportActionID) {
Expand Down