Draft channel indicator to ignore message with whitespaces only (matt…

…ermost#1819) * Draft channel indicator to ignore message with whitespaces only * feedback review
jespino · Oct 3, 2018 · 397d4db · 397d4db
1 parent 57e963c
commit 397d4db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/components/sidebar/sidebar_channel/index.js b/components/sidebar/sidebar_channel/index.js
@@ -109,7 +109,7 @@ function makeMapStateToProps() {
  channelTeammateId,
  channelTeammateUsername,
  channelTeammateDeletedAt,
- hasDraft: Boolean(draft.message || draft.fileInfos.length || draft.uploadsInProgress.length) && currentChannelId !== channel.id,
+ hasDraft: draft && Boolean(draft.message.trim() || draft.fileInfos.length || draft.uploadsInProgress.length) && currentChannelId !== channel.id,
  showTutorialTip: enableTutorial && tutorialStep === Constants.TutorialSteps.CHANNEL_POPOVER,
  townSquareDisplayName: channelsByName[Constants.DEFAULT_CHANNEL] && channelsByName[Constants.DEFAULT_CHANNEL].display_name,
  offTopicDisplayName: channelsByName[Constants.OFFTOPIC_CHANNEL] && channelsByName[Constants.OFFTOPIC_CHANNEL].display_name,

diff --git a/components/suggestion/switch_channel_provider.jsx b/components/suggestion/switch_channel_provider.jsx
@@ -116,11 +116,11 @@ class SwitchChannelSuggestion extends Suggestion {
 
 function mapStateToPropsForSwitchChannelSuggestion(state, ownProps) {
  const channelId = ownProps.item && ownProps.item.channel ? ownProps.item.channel.id : '';
- const draft = getPostDraft(state, StoragePrefixes.DRAFT, channelId);
+ const draft = channelId ? getPostDraft(state, StoragePrefixes.DRAFT, channelId) : false;
 
  return {
  channelMember: getMyChannelMemberships(state)[channelId],
- hasDraft: Boolean(draft.message || draft.fileInfos.length || draft.uploadsInProgress.length),
+ hasDraft: draft && Boolean(draft.message.trim() || draft.fileInfos.length || draft.uploadsInProgress.length),
  };
 }