1 files changed, 10 insertions, 6 deletions

diff --git a/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue b/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
index 7871721f38b..5c6766bbe45 100644
--- a/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
+++ b/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
@@ -19,7 +19,6 @@ import MergeRequest from '~/merge_request';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import SidebarSubscriptionsWidget from '~/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue';
 import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_selector.vue';
-import NewHeaderActionsPopover from '~/issues/show/components/new_header_actions_popover.vue';
 import { TYPE_MERGE_REQUEST } from '~/issues/constants';
 
 Vue.use(VueApollo);
@@ -50,7 +49,6 @@ export default {
     GlDisclosureDropdownGroup,
     SidebarSubscriptionsWidget,
     AbuseCategorySelector,
-    NewHeaderActionsPopover,
     SummaryNotesToggle: () =>
       import('ee_component/merge_requests/components/summary_notes_toggle.vue'),
   },
@@ -143,6 +141,9 @@ export default {
     isMovedMrSidebar() {
       return this.glFeatures.movedMrSidebar;
     },
+    isNotificationsTodosButtons() {
+      return this.glFeatures.notificationsTodosButtons && this.glFeatures.movedMrSidebar;
+    },
     draftLabel() {
       return this.draft ? this.$options.i18n.markAsReady : this.$options.i18n.markAsDraft;
     },
@@ -250,7 +251,9 @@ export default {
           />
         </div>
       </template>
-      <gl-disclosure-dropdown-group v-if="isLoggedIn && isMovedMrSidebar">
+      <gl-disclosure-dropdown-group
+        v-if="isLoggedIn && isMovedMrSidebar && !isNotificationsTodosButtons"
+      >
         <sidebar-subscriptions-widget
           :iid="String(mr.iid)"
           :full-path="fullPath"
@@ -261,7 +264,10 @@ export default {
 
       <gl-disclosure-dropdown-group
         bordered
-        :class="{ 'gl-mt-0! gl-pt-0! gl-border-t-0!': !(isLoggedIn && isMovedMrSidebar) }"
+        :class="{
+          'gl-mt-0! gl-pt-0! gl-border-t-0!':
+            !(isLoggedIn && isMovedMrSidebar) || isNotificationsTodosButtons,
+        }"
       >
         <gl-disclosure-dropdown-item
           v-if="canUpdateMergeRequest"
@@ -358,8 +364,6 @@ export default {
       </gl-disclosure-dropdown-group>
     </gl-disclosure-dropdown>
 
-    <new-header-actions-popover v-if="isMovedMrSidebar" :issue-type="issuableType" />
-
     <abuse-category-selector
       v-if="!isCurrentUser && isReportAbuseDrawerOpen"
       :reported-user-id="reportedUserId"