diff --git a/app/actions/views/channel.js b/app/actions/views/channel.js index 20238c9ee..dc3f6716a 100644 --- a/app/actions/views/channel.js +++ b/app/actions/views/channel.js @@ -144,8 +144,7 @@ export function loadProfilesAndTeamMembersForDMSidebar(teamId) { if (channel) { actions.push({ type: UserTypes.RECEIVED_PROFILE_IN_CHANNEL, - data: {user_id: members[i]}, - id: channel.id, + data: {id: channel.id, user_id: members[i]}, }); } } diff --git a/package-lock.json b/package-lock.json index 521f23849..2c84154a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5761,6 +5761,11 @@ } } }, + "eslint-plugin-header": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-1.2.0.tgz", + "integrity": "sha1-9wR3nG+8fGaPGA2DXeH0YrBGfDc=" + }, "eslint-plugin-jest": { "version": "21.15.1", "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-21.15.1.tgz", @@ -9864,9 +9869,10 @@ } }, "mattermost-redux": { - "version": "github:mattermost/mattermost-redux#8d3c0a648519af973525e9c3d04b236ab7ec35d0", + "version": "github:mattermost/mattermost-redux#50222617bbbe6381b4777c091720c6f6d833adbe", "requires": { "deep-equal": "1.0.1", + "eslint-plugin-header": "1.2.0", "form-data": "2.3.1", "harmony-reflect": "1.5.1", "isomorphic-fetch": "2.2.1", diff --git a/package.json b/package.json index 3eed9e9a3..5214e8519 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "fuse.js": "^3.2.0", "intl": "1.2.5", "jail-monkey": "1.0.0", - "mattermost-redux": "github:mattermost/mattermost-redux#8d3c0a648519af973525e9c3d04b236ab7ec35d0", + "mattermost-redux": "github:mattermost/mattermost-redux#50222617bbbe6381b4777c091720c6f6d833adbe", "prop-types": "15.6.1", "react": "16.3.2", "react-intl": "2.4.0",