Merge pull request #5143 from LLK/hotfix/automod-mar15

[Master] Hotfix - automod everyone (mar15)

src/components/modal/mute/modal.jsx

@@ -162,7 +162,7 @@ class MuteModal extends React.Component {
                                     )}}
                                 />
                             </p>
-                            {this.state.step === this.numSteps ? feedbackPrompt : null}
+                            {this.state.step === this.numSteps && this.props.showFeedback ? feedbackPrompt : null}
                         </MuteStep>
                         <MuteStep
                             header={this.props.intl.formatMessage({id: 'comments.muted.mistakeHeader'})}

src/views/preview/comment/compose-comment.jsx

@@ -23,6 +23,7 @@ require('./comment.scss');
 const onUpdate = update => update;
 
 const MAX_COMMENT_LENGTH = 500;
+const JUST_MUTED_ERROR = 'isBad';
 
 const ComposeStatus = keyMirror({
     EDITING: null,
@@ -369,7 +370,9 @@ class ComposeComment extends React.Component {
                         commentContent={this.state.message}
                         muteModalMessages={this.getMuteMessageInfo()}
                         shouldCloseOnOverlayClick={false}
-                        showFeedback={this.state.status === ComposeStatus.REJECTED_MUTE}
+                        showFeedback={
+                            this.state.status === ComposeStatus.REJECTED_MUTE && this.state.error === JUST_MUTED_ERROR
+                        }
                         showWarning={this.state.showWarning}
                         startStep={this.getMuteModalStartStep()}
                         timeMuted={formatTime.formatRelativeTime(this.state.muteExpiresAtMs, window._locale)}

test/unit/components/compose-comment.test.jsx

@@ -304,6 +304,59 @@ describe('Compose Comment test', () => {
         expect(component.find('MuteModal').props().showWarning).toBe(true);
     });
 
+    test('Mute Modal gets showFeedback props from state', () => {
+        const store = mockStore({
+            session: {
+                session: {
+                    user: {},
+                    permissions: {
+                        mute_status: {}
+                    }
+                }
+            }
+        });
+
+        const component = mountWithIntl(
+            <ComposeComment
+                {...defaultProps()}
+            />
+            , {context: {store}}
+        );
+
+        const commentInstance = component.find('ComposeComment').instance();
+        commentInstance.setState({
+            status: 'REJECTED_MUTE',
+            error: 'isBad',
+            muteOpen: true
+        });
+
+        component.update();
+        expect(component.find('MuteModal').exists()).toEqual(true);
+        expect(component.find('MuteModal').props().showFeedback).toBe(true);
+
+        commentInstance.setState({
+            status: 'REJECTED_MUTE',
+            error: 'isMute',
+            showWarning: true,
+            muteOpen: true
+        });
+
+        component.update();
+        expect(component.find('MuteModal').exists()).toEqual(true);
+        expect(component.find('MuteModal').props().showFeedback).toBe(false);
+
+        commentInstance.setState({
+            status: 'REJECTED',
+            error: 'isBad',
+            showWarning: true,
+            muteOpen: true
+        });
+
+        component.update();
+        expect(component.find('MuteModal').exists()).toEqual(true);
+        expect(component.find('MuteModal').props().showFeedback).toBe(false);
+    });
+
     test('shouldShowMuteModal is false when muteStatus is undefined ', () => {
         const commentInstance = getComposeCommentWrapper({}).instance();
         expect(commentInstance.shouldShowMuteModal()).toBe(false);

test/unit/components/mute-modal.test.jsx

@@ -160,6 +160,23 @@ describe('MuteModalTest', () => {
         expect(component.find('p.feedback-prompt').exists()).toEqual(true);
     });
 
+    test('Mute modal does not for feedback on extra showWarning step if not showFeedback', () => {
+        const component = mountWithIntl(
+            <MuteModal
+                showWarning
+                muteModalMessages={defaultMessages}
+            />
+        );
+        component.find('MuteModal').instance()
+            .setState({step: 1});
+        component.update();
+        expect(component.find('p.feedback-prompt').exists()).toEqual(false);
+        component.find('MuteModal').instance()
+            .setState({step: 2});
+        component.update();
+        expect(component.find('p.feedback-prompt').exists()).toEqual(false);
+    });
+
     test('Mute modal handle go to feedback', () => {
         const component = shallowWithIntl(
             <MuteModal