MRNotesRefactor: Fix adding emojis from non Vue discussions.

1 files changed, 7 insertions, 2 deletions

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 4d6e875c7f0..f93b98a28f2 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -241,7 +241,7 @@ class AwardsHandler {
   addAward(votesBlock, awardUrl, emoji, checkMutuality, callback) {
     const isMainAwardsBlock = votesBlock.closest('.js-issue-note-awards').length;
 
-    const vueDiscussions = isInIssuePage() || (isInMRPage && Cookies.get('vue_mr_discussions'));
+    const vueDiscussions = isInIssuePage() || this.isVueMRDiscussions();
     if (vueDiscussions && !isMainAwardsBlock) {
       const id = votesBlock.attr('id').replace('note_', '');
 
@@ -294,8 +294,13 @@ class AwardsHandler {
     }
   }
 
+  isVueMRDiscussions() {
+    return isInMRPage() && Cookies.get('vue_mr_discussions') && !$('#diffs:visible').length;
+  }
+
   getVotesBlock() {
-    const vueDiscussions = isInIssuePage() || (isInMRPage && Cookies.get('vue_mr_discussions'));
+    const vueDiscussions = isInIssuePage() || this.isVueMRDiscussions();
+
     if (vueDiscussions) {
       const $el = $('.js-add-award.is-active').closest('.note.timeline-entry');