Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 2 deletions

diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue b/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
index 3d96405896d..643b5aca89c 100644
--- a/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
+++ b/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
@@ -59,6 +59,9 @@ export default {
     collapsedButtonIcon() {
       return this.isTodo ? 'todo-done' : 'todo-add';
     },
+    collapsedButtonIconVisible() {
+      return this.collapsed && !this.isActionActive;
+    },
   },
   methods: {
     handleButtonClick() {
@@ -82,8 +85,12 @@ export default {
     data-boundary="viewport"
     @click="handleButtonClick"
   >
-    <icon v-show="collapsed" :class="collapsedButtonIconClasses" :name="collapsedButtonIcon" />
-    <span v-show="!collapsed" class="issuable-todo-inner"> {{ buttonLabel }} </span>
+    <icon
+      v-show="collapsedButtonIconVisible"
+      :class="collapsedButtonIconClasses"
+      :name="collapsedButtonIcon"
+    />
+    <span v-show="!collapsed" class="issuable-todo-inner">{{ buttonLabel }}</span>
     <gl-loading-icon v-show="isActionActive" :inline="true" />
   </button>
 </template>