1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js
index fddb843bb52..da7c7809bed 100644
--- a/app/assets/javascripts/batch_comments/mixins/resolved_status.js
+++ b/app/assets/javascripts/batch_comments/mixins/resolved_status.js
@@ -25,11 +25,10 @@ export default {
     resolvedStatusMessage() {
       let message;
       const discussionResolved = this.isDiscussionResolved(
-        this.draft ? this.draft.discussion_id : this.discussionId,
+        'draft' in this ? this.draft.discussion_id : this.discussionId,
       );
-      const discussionToBeResolved = this.draft
-        ? this.draft.resolve_discussion
-        : this.resolveDiscussion;
+      const discussionToBeResolved =
+        'draft' in this ? this.draft.resolve_discussion : this.resolveDiscussion;
 
       if (discussionToBeResolved && discussionResolved && !this.$options.showStaysResolved) {
         return undefined;