mirror of
https://github.com/vector-im/element-web.git
synced 2025-08-31 03:11:02 +02:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
b098538837
@ -1261,8 +1261,8 @@ export default React.createClass({
|
||||
// its own dispatch).
|
||||
dis.dispatch({action: 'sync_state', prevState, state});
|
||||
|
||||
if (state === "ERROR") {
|
||||
self.setState({syncError: data.error});
|
||||
if (state === "ERROR" || state === "RECONNECTING") {
|
||||
self.setState({syncError: data.error || true});
|
||||
} else if (self.state.syncError) {
|
||||
self.setState({syncError: null});
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user