diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 4500d5320..7a84d2e31 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -200,6 +200,7 @@ class MessageCount extends Component { render() { const { projectsId, mergeId } = this.props.match.params; + const { data, SpinMerge, @@ -208,8 +209,7 @@ class MessageCount extends Component { ismesrge, SpinFlag, } = this.state; - const { current_user } = this.props; - + const { current_user, projectDetail } = this.props; const menu = ( this.getOption(e)}> @@ -353,10 +353,9 @@ class MessageCount extends Component {
- {current_user && + {current_user && projectDetail && pr_status !== 2 && - (data.issue.author_login === current_user.login || - data.issue.user_permission) && ( + projectDetail.permission !=="Reporter" && (