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

Various Fixes (#1033)

Browse source 
* Fix crash Unread indicator scrollToTop

* Fix list when favorites change
This commit is contained in:
enahum 2017-10-17 17:33:21 -03:00 committed by GitHub
parent ea555763ab
commit b2d5887f95
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/components/channel_drawer/channels_list/list/index.js
View file

@ -12,7 +12,7 @@ import {
getSortedDirectChannelIds
} from 'mattermost-redux/selectors/entities/channels';
import {getCurrentUserId, getCurrentUserRoles} from 'mattermost-redux/selectors/entities/users';
import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
import {getTheme, getFavoritesPreferences} from 'mattermost-redux/selectors/entities/preferences';
import {showCreateOption} from 'mattermost-redux/utils/channel_utils';
import {isAdmin, isSystemAdmin} from 'mattermost-redux/utils/user_utils';
@ -43,8 +43,9 @@ function areStatesEqual(next, prev) {
const equalChannels = next.entities.channels === prev.entities.channels;
const equalConfig = next.entities.general.config === prev.entities.general.config;
const equalUsers = next.entities.users.profiles === prev.entities.users.profiles;
const equalFav = getFavoritesPreferences(next) === getFavoritesPreferences(prev);
return equalChannels && equalConfig && equalRoles && equalUsers;
return equalChannels && equalConfig && equalRoles && equalUsers && equalFav;
}
export default connect(mapStateToProps, null, null, {pure: true, areStatesEqual})(List);

2
app/components/channel_drawer/channels_list/list/list.js
View file

@ -285,7 +285,7 @@ class List extends PureComponent {
scrollToTop = () => {
if (this.refs.list) {
this.refs.list.scrollToOffset({
this.refs.list._wrapperListRef._listRef.scrollToOffset({ //eslint-disable-line no-underscore-dangle
x: 0,
y: 0,
animated: true