diff --git a/app/screens/channel_info/channel_info.js b/app/screens/channel_info/channel_info.js index 613e2d9fe..8bcc7ab21 100644 --- a/app/screens/channel_info/channel_info.js +++ b/app/screens/channel_info/channel_info.js @@ -27,6 +27,7 @@ import ChannelInfoRow from './channel_info_row'; export default class ChannelInfo extends PureComponent { static propTypes = { actions: PropTypes.shape({ + clearPinnedPosts: PropTypes.func.isRequired, closeDMChannel: PropTypes.func.isRequired, closeGMChannel: PropTypes.func.isRequired, deleteChannel: PropTypes.func.isRequired, @@ -151,10 +152,11 @@ export default class ChannelInfo extends PureComponent { goToPinnedPosts = preventDoubleTap(() => { const {formatMessage} = this.context.intl; - const {currentChannel, navigator, theme} = this.props; + const {actions, currentChannel, navigator, theme} = this.props; const id = t('channel_header.pinnedPosts'); const defaultMessage = 'Pinned Posts'; + actions.clearPinnedPosts(currentChannel.id); navigator.push({ backButtonTitle: '', screen: 'PinnedPosts', diff --git a/app/screens/channel_info/index.js b/app/screens/channel_info/index.js index f63d3086c..6006a797d 100644 --- a/app/screens/channel_info/index.js +++ b/app/screens/channel_info/index.js @@ -14,6 +14,7 @@ import { } from 'mattermost-redux/actions/channels'; import {getCustomEmojisInText} from 'mattermost-redux/actions/emojis'; import {selectFocusedPostId} from 'mattermost-redux/actions/posts'; +import {clearPinnedPosts} from 'mattermost-redux/actions/search'; import {General} from 'mattermost-redux/constants'; import {getTheme} from 'mattermost-redux/selectors/entities/preferences'; import { @@ -92,6 +93,7 @@ function mapStateToProps(state) { function mapDispatchToProps(dispatch) { return { actions: bindActionCreators({ + clearPinnedPosts, closeDMChannel, closeGMChannel, deleteChannel, diff --git a/package-lock.json b/package-lock.json index 6f246f96f..4f3bdf97e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3704,8 +3704,7 @@ "eslint-plugin-header": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-2.0.0.tgz", - "integrity": "sha512-vISfrajZaWRmToJ3GLULhnrwuaBmDap3arHf2+q0uMW2W+YSjFuCKzh/BcP3Ea5UPT8wN0S8uGz/I+QJkKBIoA==", - "dev": true + "integrity": "sha512-vISfrajZaWRmToJ3GLULhnrwuaBmDap3arHf2+q0uMW2W+YSjFuCKzh/BcP3Ea5UPT8wN0S8uGz/I+QJkKBIoA==" }, "eslint-plugin-jest": { "version": "22.0.0", @@ -4144,6 +4143,7 @@ "version": "2.3.2", "resolved": "http://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", + "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "1.0.6", @@ -4841,9 +4841,9 @@ } }, "harmony-reflect": { - "version": "1.6.0", - "resolved": "http://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.0.tgz", - "integrity": "sha512-0kZ1XcoelFOLEjEtvWAZyq/1S55eDSieWEJwme311MNVNcRpvjlr2zA66kBV6WAB8C1XI1p1cXCnFPqd1BxlPg==" + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.1.tgz", + "integrity": "sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA==" }, "has": { "version": "1.0.3", @@ -8376,51 +8376,37 @@ "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=" }, "mattermost-redux": { - "version": "github:mattermost/mattermost-redux#f09e976dcd2cce84e783f35c1bce0dd365535475", - "from": "github:mattermost/mattermost-redux#f09e976dcd2cce84e783f35c1bce0dd365535475", + "version": "github:mattermost/mattermost-redux#6771e0bd91b80e3a2e544144d3a71ed269a63236", + "from": "github:mattermost/mattermost-redux#6771e0bd91b80e3a2e544144d3a71ed269a63236", "requires": { "deep-equal": "1.0.1", - "eslint-plugin-header": "1.2.0", - "form-data": "2.3.2", + "eslint-plugin-header": "2.0.0", + "form-data": "2.3.3", "gfycat-sdk": "1.4.18", - "harmony-reflect": "1.6.0", + "harmony-reflect": "1.6.1", "isomorphic-fetch": "2.2.1", - "mime-db": "1.33.0", - "redux": "4.0.0", + "mime-db": "1.37.0", + "redux": "4.0.1", "redux-action-buffer": "1.2.0", - "redux-batched-actions": "0.3.0", + "redux-batched-actions": "0.4.1", "redux-offline": "git+https://github.com/enahum/redux-offline.git#4bd85e7e3b279a2b11fb4d587808d583d2b5e7b5", "redux-persist": "4.9.1", - "redux-thunk": "2.2.0", - "reselect": "3.0.1", - "serialize-error": "2.1.0", + "redux-thunk": "2.3.0", + "reselect": "4.0.0", + "serialize-error": "3.0.0", "shallow-equals": "1.0.0" }, "dependencies": { - "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=" - }, - "mime-db": { - "version": "1.33.0", - "resolved": "http://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" - }, - "redux": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.0.tgz", - "integrity": "sha512-NnnHF0h0WVE/hXyrB6OlX67LYRuaf/rJcbWvnHHEPCF/Xa/AZpwhs/20WyqzQae5x4SD2F9nPObgBh2rxAgLiA==", + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "requires": { - "loose-envify": "^1.1.0", - "symbol-observable": "^1.2.0" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" } }, - "redux-batched-actions": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/redux-batched-actions/-/redux-batched-actions-0.3.0.tgz", - "integrity": "sha512-RsXFTY6F7jXYFXTVC/8/Zb+A4Im2uk4/9Dx/hO7B0hxLGdACmm2WC5vIYUXgP9B+ZLp7bwJTaF/iALfeJV+/zg==" - }, "redux-persist": { "version": "4.9.1", "resolved": "https://registry.npmjs.org/redux-persist/-/redux-persist-4.9.1.tgz", @@ -8431,15 +8417,10 @@ "lodash-es": "^4.17.4" } }, - "redux-thunk": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.2.0.tgz", - "integrity": "sha1-5hWhbha0ehmlFXZhM9Hj6Zt4UuU=" - }, - "reselect": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz", - "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=" + "serialize-error": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-3.0.0.tgz", + "integrity": "sha512-+y3nkkG/go1Vdw+2f/+XUXM1DXX1XcxTl99FfiD/OEPUNw4uo0i6FKABfTAN5ZcgGtjTRZcEbxcE/jtXbEY19A==" } } }, diff --git a/package.json b/package.json index adfacacda..d5a7ad7aa 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "intl": "1.2.5", "jail-monkey": "1.0.0", "jsc-android": "236355.1.0", - "mattermost-redux": "github:mattermost/mattermost-redux#f09e976dcd2cce84e783f35c1bce0dd365535475", + "mattermost-redux": "github:mattermost/mattermost-redux#6771e0bd91b80e3a2e544144d3a71ed269a63236", "mime-db": "1.37.0", "moment-timezone": "0.5.23", "prop-types": "15.6.2",