diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-15 11:05:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-15 11:05:43 -0400 |
commit | 528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c (patch) | |
tree | 71fa9b677ce72050dca3abc3c9243e6cf39e0278 /webapp/components/quick_switch_modal/quick_switch_modal.jsx | |
parent | c0a0065472c199166d32b052dd328b0212f5b693 (diff) | |
download | chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.gz chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.bz2 chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.zip |
Merge release-3.10 into master (#6654)
* PLT-6787 Fixed being able to send a post before files finished uploading (#6617)
* Fix quick switcher for channels/users not stored locally (#6610)
* Fix button text on confirm mention modal (#6609)
* fix post delete permission of channel admin (#6608)
* open comment thread for the most recent reply-able message (#6605)
* Use mutex flag with yarn to prevent concurrent builds interfering (#6619)
* Use mutex flag with yarn to prevent concurrent builds interfering
* Remove yarn mutex file with clean
* Minor bug fixes (#6615)
* PLT-6774 - Fixing color for offline icon
* PLT-6784 - Fixing status icon
* Fixing icon margin
* Updating caret position
* PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620)
* Fixing JS error (#6623)
* Minor bug fixes (#6622)
* PLT-6808 - Updating channel switcher on mobile
* PLT-6743 - Updating scrollbar styling
* Login instead of failing if user exists in OAuth sign-up flow (#6627)
* PLT-6802 Disable team switcher (#6626)
* Disable team switcher
* Fix ESLint errors
* PLT-6807 Ensured select teams page can scroll on iOS (#6630)
* Do not redirect from account switch pages on 401 (#6631)
* Fixing loadtest command and renaming to /test (#6624)
* PLT-6820 Update mattermost-redux dependency (#6632)
* translations PR 20170612 (#6629)
* Bump HTTP client timeout to 30 seconds (#6633)
* For team unreads return empty array instead of null (#6636)
* PLT-6831 Fix status modal localization IDs (#6637)
* Fix status modal localization IDs
* Update test snapshot
Diffstat (limited to 'webapp/components/quick_switch_modal/quick_switch_modal.jsx')
-rw-r--r-- | webapp/components/quick_switch_modal/quick_switch_modal.jsx | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/webapp/components/quick_switch_modal/quick_switch_modal.jsx b/webapp/components/quick_switch_modal/quick_switch_modal.jsx index 24eb8fcba..aed274510 100644 --- a/webapp/components/quick_switch_modal/quick_switch_modal.jsx +++ b/webapp/components/quick_switch_modal/quick_switch_modal.jsx @@ -22,7 +22,6 @@ import store from 'stores/redux_store.jsx'; const getState = store.getState; import {getChannel} from 'mattermost-redux/selectors/entities/channels'; -import {getUserByUsername} from 'mattermost-redux/selectors/entities/users'; const CHANNEL_MODE = 'channel'; const TEAM_MODE = 'team'; @@ -141,24 +140,22 @@ export default class QuickSwitchModal extends React.PureComponent { if (this.state.mode === CHANNEL_MODE) { const selectedChannel = selected.channel; if (selectedChannel.type === Constants.DM_CHANNEL) { - const user = getUserByUsername(getState(), selectedChannel.name); - - if (user) { - openDirectChannelToUser( - user.id, - (ch) => { - channel = ch; - this.switchToChannel(channel); - }, - () => { - channel = null; - this.switchToChannel(channel); - } - ); - } - } else { + openDirectChannelToUser( + selectedChannel.id, + (ch) => { + channel = ch; + this.switchToChannel(channel); + }, + () => { + channel = null; + this.switchToChannel(channel); + } + ); + } else if (selectedChannel.type === Constants.GM_CHANNEL) { channel = getChannel(getState(), selectedChannel.id); this.switchToChannel(channel); + } else { + this.switchToChannel(selectedChannel); } } else { browserHistory.push('/' + selected.name); @@ -287,7 +284,7 @@ export default class QuickSwitchModal extends React.PureComponent { help = ( <FormattedMessage id='quick_switch_modal.help_no_team' - defaultMessage='Start typing then use ↑↓ to browse, ↵ to select, and ESC to dismiss.' + defaultMessage='Type to find a channel. Use ↑↓ to browse, ↵ to select, ESC to dismiss.' /> ); } |