From 05ead9f734fea30c78a4643befbb18a72e90d75d Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 30 Jun 2021 19:04:47 -0400
Subject: [PATCH] MM-34619 post draft to use the channelId prop when assigned
 (#5488)

---
 app/components/post_draft/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/components/post_draft/index.js b/app/components/post_draft/index.js
index c72c8f347..ab04bbc7c 100644
--- a/app/components/post_draft/index.js
+++ b/app/components/post_draft/index.js
@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 
 import {isMinimumServerVersion} from '@mm-redux/utils/helpers';
 import {General, Permissions} from '@mm-redux/constants';
-import {getCurrentChannel, getChannel, isCurrentChannelReadOnly} from '@mm-redux/selectors/entities/channels';
+import {getCurrentChannel, getChannel, isChannelReadOnlyById} from '@mm-redux/selectors/entities/channels';
 import {haveIChannelPermission} from '@mm-redux/selectors/entities/roles';
 import {getTheme} from '@mm-redux/selectors/entities/preferences';
 import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
@@ -14,7 +14,7 @@ import {getChannelMembersForDm} from '@selectors/channel';
 import PostDraft from './post_draft';
 
 export function mapStateToProps(state, ownProps) {
-    const channel = ownProps.rootId ? getChannel(state) : getCurrentChannel(state);
+    const channel = ownProps.rootId ? getChannel(state, ownProps.channelId) : getCurrentChannel(state);
     const currentUserId = getCurrentUserId(state);
     const channelId = ownProps.channelId || (channel ? channel.id : '');
     let canPost = true;
@@ -41,7 +41,7 @@ export function mapStateToProps(state, ownProps) {
 
     let channelIsReadOnly = false;
     if (currentUserId && channelId) {
-        channelIsReadOnly = isCurrentChannelReadOnly(state) || false;
+        channelIsReadOnly = isChannelReadOnlyById(state, channelId) || false;
     }
 
     return {