Merge branch 'rm/361316' into 'master'

pass id of draft from props instead of draftFromChannel const

See merge request kchat/webapp!936

webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx

@@ -537,7 +537,7 @@ class AdvancedCreatePost extends React.PureComponent<Props, State> {
             const updatedDraft = {
                 ...this.props.draft,
                 ...this.draftsForChannel[channelId],
-                id: this.draftsForChannel[channelId]?.id ?? this.props.draft.id,
+                id: this.props.draft.id,
                 timestamp: scheduleUTCTimestamp,
                 channelId,
                 remote: false,