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

Update mattermost-redux (#2775)

Browse source
This commit is contained in:
Joram Wilander 2019-05-07 18:52:11 -04:00 committed by Christopher Speller
parent e086d66ec2
commit 189d2eb607
3 changed files with 553 additions and 553 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1102
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -18,7 +18,7 @@
"intl": "1.2.5",
"jail-monkey": "2.0.0",
"jsc-android": "236355.1.1",
"mattermost-redux": "github:mattermost/mattermost-redux#0df3ec0182e9d9ec67397157611d887f5fbc1bf1",
"mattermost-redux": "github:mattermost/mattermost-redux#eeaf49df2660577a1491d472858f7f01ea76660f",
"mime-db": "1.40.0",
"moment-timezone": "0.5.23",
"prop-types": "15.7.2",

2
share_extension/common/selectors/index.js
View file

@ -129,7 +129,7 @@ export const getExtensionSortedDirectChannels = createSelector(
if (channel.type === General.GM_CHANNEL) {
return completeDirectGroupInfo(currentUser.id, profiles, profilesInChannel, settings, channel);
}
return completeDirectChannelDisplayName(currentUser.id, profiles, settings, channel);
return completeDirectChannelDisplayName(currentUser.id, profiles, profilesInChannel[id], settings, channel);
}).sort(sortChannelsByDisplayName.bind(null, locale));
return directChannels;
}