toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

MM-22487 Fix race condition causing the user to logout (#3916)

Browse source
This commit is contained in:
Elias Nahum 2020-02-12 17:26:06 -03:00 committed by GitHub
parent 0109bedf41
commit d35c05ce05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/screens/channel/channel_base.js
View file

@ -91,6 +91,7 @@ export default class ChannelBase extends PureComponent {
if (this.props.currentChannelId) {
PushNotifications.clearChannelNotifications(this.props.currentChannelId);
this.props.actions.getChannelStats(this.props.currentChannelId);
}
if (tracker.initialLoad && !this.props.skipMetrics) {
@ -106,8 +107,6 @@ export default class ChannelBase extends PureComponent {
if (!this.props.skipMetrics) {
telemetry.end(['start:channel_screen']);
}
this.props.actions.getChannelStats(this.props.currentChannelId);
}
componentWillReceiveProps(nextProps) {

9
package-lock.json generated
View file

@ -9974,8 +9974,8 @@
}
},
"mattermost-redux": {
"version": "github:mattermost/mattermost-redux#af7a071de69e778a633ab182367568c21977f6b0",
"from": "github:mattermost/mattermost-redux#af7a071de69e778a633ab182367568c21977f6b0",
"version": "github:mattermost/mattermost-redux#a0e7a1cbedb2ec051e0d2411fd47ee19bb49d709",
"from": "github:mattermost/mattermost-redux#a0e7a1cbedb2ec051e0d2411fd47ee19bb49d709",
"requires": {
"core-js": "3.1.4",
"form-data": "2.5.1",
@ -9994,11 +9994,6 @@
"shallow-equals": "1.0.0"
},
"dependencies": {
"@react-native-community/netinfo": {
"version": "4.7.0",
"resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-4.7.0.tgz",
"integrity": "sha512-a/sDB+AsLEUNmhAUlAaTYeXKyQdFGBUfatqKkX5jluBo2CB3OAuTHfm7rSjcaLB9EmG5iSq3fOTpync2E7EYTA=="
},
"core-js": {
"version": "3.1.4",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz",

2
package.json
View file

@ -24,7 +24,7 @@
"intl": "1.2.5",
"jail-monkey": "2.3.1",
"jsc-android": "241213.2.0",
"mattermost-redux": "github:mattermost/mattermost-redux#af7a071de69e778a633ab182367568c21977f6b0",
"mattermost-redux": "github:mattermost/mattermost-redux#a0e7a1cbedb2ec051e0d2411fd47ee19bb49d709",
"mime-db": "1.43.0",
"moment-timezone": "0.5.27",
"prop-types": "15.7.2",