Merge branch...

Merge branch '52888-status-emoji-should-not-be-added-to-awards-section-on-issue-page-2' into 'master'

Resolve "Status emoji should not update awards section on issue page"

Closes #52888

See merge request gitlab-org/gitlab-ce!23470

app/assets/javascripts/set_status_modal/emoji_menu_in_modal.js

@@ -12,9 +12,8 @@ class EmojiMenuInModal extends AwardsHandler {
     this.bindEvents();
   }
 
-  postEmoji($emojiButton, awardUrl, selectedEmoji, callback) {
+  postEmoji($emojiButton, awardUrl, selectedEmoji) {
     this.selectEmojiCallback(selectedEmoji, this.emoji.glEmojiTag(selectedEmoji));
-    callback();
   }
 }
 

changelogs/unreleased/52888-status-emoji-should-not-be-added-to-awards-section-on-issue-page-2.yml

+---
+title: Prevent awards emoji being updated when updating status
+merge_request: 23470
+author:
+type: fixed

spec/features/profiles/user_edit_profile_spec.rb

@@ -147,6 +147,9 @@ describe 'User edit profile' do
     end
 
     context 'user menu' do
+      let(:issue) { create(:issue, project: project)}
+      let(:project) { create(:project) }
+
       def open_user_status_modal
         find('.header-user-dropdown-toggle').click
 
@@ -205,6 +208,17 @@ describe 'User edit profile' do
         end
       end
 
+      it 'does not update the awards panel emoji' do
+        project.add_maintainer(user)
+        visit(project_issue_path(project, issue))
+
+        emoji = 'biohazard'
+        open_user_status_modal
+        select_emoji(emoji, true)
+
+        expect(page.all('.award-control .js-counter')).to all(have_content('0'))
+      end
+
       it 'adds message to user status' do
         message = 'I have something to say'
         open_user_status_modal