Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Don't show "can't redact" dialog on network error, with redaction having local echo & queuing now. #3058

Merged
merged 4 commits into from
Jun 5, 2019
Merged

Don't show "can't redact" dialog on network error, with redaction having local echo & queuing now. #3058

merged 4 commits into from
Jun 5, 2019

Conversation

bwindels
Copy link
Contributor

@bwindels bwindels commented Jun 3, 2019

@bwindels bwindels mentioned this pull request Jun 3, 2019
Merged
@bwindels
Copy link
Contributor Author

bwindels commented Jun 4, 2019

still trying to figure out if I can detect a network error when redacting, as ideally we shouldn't show the "cant redact" dialog as the redaction might go out later.

@bwindels
only show "can't redact" dialog when not a network error
a11deff 
as the redaction is queued now and might be sent later
@bwindels bwindels force-pushed the bwindels/redactions-local-echo branch from 0cb29e8 to a11deff Compare June 4, 2019 11:36
@bwindels bwindels changed the title Don't assume redaction has redacted_because (local echo doesn't) Don't show "can't redact" dialog on network error, with redaction having local echo & queuing now. Jun 4, 2019
@bwindels
Copy link
Contributor Author

bwindels commented Jun 4, 2019

ready for review now.

@bwindels bwindels requested a review from a team June 4, 2019 11:38
@jryans jryans requested review from jryans and removed request for a team June 4, 2019 11:42
jryans
jryans approved these changes Jun 4, 2019
View reviewed changes
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

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

I guess for the case of network errors, the redactions end up in detached queue and we show the room status bar to allow retry? Maybe expand the comments here to explain that.

Thanks for working on this! 😁

@bwindels bwindels requested a review from jryans June 4, 2019 14:12
jryans
jryans approved these changes Jun 4, 2019
View reviewed changes
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

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

Thanks! 😁

src/components/views/context_menus/MessageContextMenu.js Outdated Show resolved Hide resolved
@bwindels @jryans
spelling
62ad40d 
Co-Authored-By: J. Ryan Stinnett <[email protected]>
@bwindels
Copy link
Contributor Author

bwindels commented Jun 4, 2019

Waiting for js-sdk PR to merge.

@bwindels bwindels requested a review from jryans June 4, 2019 16:46
jryans
jryans approved these changes Jun 4, 2019
View reviewed changes
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

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

This is fine by itself, but did you want to also listen to the new JS SDK event here or in a separate change? (Or is not needed for React SDK at all...?)

@bwindels
Copy link
Contributor Author

bwindels commented Jun 4, 2019

This is fine by itself, but did you want to also listen to the new JS SDK event here or in a separate change? (Or is not needed for React SDK at all...?)

Yes, just noticed my push didn't go through because of the suggestion I merged here 😄 Should be good now.

@bwindels bwindels merged commit 940b2a7 into develop Jun 5, 2019
@jryans jryans mentioned this pull request Jun 5, 2019
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jryans jryans jryans approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bwindels @jryans