Merge branch 'fix-selecting-status-emoji-twice' into 'master'

Fix invisible modal on status emoji selection

See merge request gitlab-org/gitlab!33398

app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue

@@ -82,7 +82,8 @@ export default {
         })
         .catch(() => createFlash(__('Failed to load emoji list.')));
     },
-    showEmojiMenu() {
+    showEmojiMenu(e) {
+      e.stopPropagation();
       this.isEmojiMenuVisible = true;
       this.emojiMenu.showEmojiMenu($(this.$refs.toggleEmojiMenuButton));
     },

changelogs/unreleased/fix-selecting-status-emoji-twice.yml

+---
+title: Fix invisible emoji modal on Set Status form when clicked the second time
+merge_request: 33398
+author:
+type: fixed

spec/features/profiles/user_edit_profile_spec.rb

@@ -245,6 +245,15 @@ describe 'User edit profile' do
         end
       end
 
+      it 'opens the emoji modal again after closing it' do
+        open_user_status_modal
+        select_emoji('biohazard', true)
+
+        find('.js-toggle-emoji-menu').click
+
+        expect(page).to have_selector('.emoji-menu')
+      end
+
       it 'does not update the awards panel emoji' do
         project.add_maintainer(user)
         visit(project_issue_path(project, issue))