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

Fixes "Not here" page briefly showing when last member leaves group chat. #50846

Merged
merged 6 commits into from
Oct 28, 2024
+33 −3
Merged

Fixes "Not here" page briefly showing when last member leaves group chat. #50846

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
480c4b4
Resolve not found page briefly appeared when remove leave the group
wildan-m Oct 15, 2024
0e77f38
Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…
wildan-m Oct 16, 2024
63b49be
revert unnecessary changes
wildan-m Oct 16, 2024
6eb346a
Add comment
wildan-m Oct 16, 2024
1f52c29
Revert unnecessary change
wildan-m Oct 16, 2024
0851b74
Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…
wildan-m Oct 28, 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
36 changes: 33 additions & 3 deletions src/libs/actions/Report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2759,11 +2759,22 @@ function leaveGroupChat(reportID: string) {
return;
}

// Use merge instead of set to avoid deleting the report too quickly, which could cause a brief "not found" page to appear.
// The remaining parts of the report object will be removed after the API call is successful.
const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.SET,
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: null,
value: {
reportID: null,
stateNum: CONST.REPORT.STATE_NUM.APPROVED,
statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
Comment on lines +2785 to +2786
Copy link
Member

Choose a reason for hiding this comment

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

Do we need to pass these?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@parasharrajat I think some places use that to determine archive mode. Seems we'll need that especially when the user offline

participants: {
[currentUserAccountID]: {
notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
},
},
},
},
];
// Clean up any quick actions for the report we're leaving from
Expand All @@ -2775,8 +2786,27 @@ function leaveGroupChat(reportID: string) {
});
}

const successData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: Object.keys(report).reduce<Record<string, null>>((acc, key) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

This block led to the following issue:

which was fixed by setting value to null - more details in the selected proposal.

acc[key] = null;
return acc;
}, {}),
},
];
Copy link
Member

Choose a reason for hiding this comment

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

Does the Success response delete this report from API?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Based on the network inspect in this video -- yes

#49468 (comment)

Copy link
Member

Choose a reason for hiding this comment

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

Then do we need this?

Copy link
Member

Choose a reason for hiding this comment

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

@wildan-m

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@parasharrajat I think we don't really need that, but do you think applying https updates can be paused for some reason?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@parasharrajat I'm afraid remove request from the server will be pending, I think we'll still need this successData

https://github.com/Expensify/App/blob/main/src%2Flibs%2Factions%2FOnyxUpdates.ts#L30


const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: report,
},
];

navigateToMostRecentReport(report);
API.write(WRITE_COMMANDS.LEAVE_GROUP_CHAT, {reportID}, {optimisticData});
API.write(WRITE_COMMANDS.LEAVE_GROUP_CHAT, {reportID}, {optimisticData, successData, failureData});
}

/** Leave a report by setting the state to submitted and closed */
Expand Down
Loading