IssueNotesRefactor: Fix adding main note awards.

1 files changed, 8 insertions, 2 deletions

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index d6e5a1d3b57..0c884f40963 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -235,7 +235,9 @@ class AwardsHandler {
   }
 
   addAward(votesBlock, awardUrl, emoji, checkMutuality, callback) {
-    if (this.isInIssuePage()) {
+    const isMainAwardsBlock = votesBlock.closest('.js-issue-note-awards').length;
+
+    if (this.isInIssuePage() && !isMainAwardsBlock) {
       const id = votesBlock[0].id.replace('note_', '');
 
       $('.emoji-menu').removeClass('is-visible');
@@ -288,7 +290,11 @@ class AwardsHandler {
 
   getVotesBlock() {
     if (this.isInIssuePage()) {
-      return $('.js-add-award.is-active').closest('.note.timeline-entry');
+      const $el = $('.js-add-award.is-active').closest('.note.timeline-entry');
+
+      if ($el.length) {
+        return $el;
+      }
     }
 
     const currentBlock = $('.js-awards-block.current');