Merge branch 'develop' into design/conversation-action-order

design: Changes conversation actions order
2022-04-01 21:08:04 +05:30 · 2022-03-30 15:02:40 +05:30 · 2022-03-30 12:36:24 +05:30
1 changed files with 5 additions and 5 deletions
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
@ -31,6 +31,11 @@
        @click="onClickAssignAgent"
      />
    </div>
+    <contact-details-item
+      compact
+      :title="$t('CONVERSATION_SIDEBAR.ACCORDION.CONVERSATION_LABELS')"
+    />
+    <conversation-labels :conversation-id="conversationId" />
    <div class="multiselect-wrap--small">
      <contact-details-item
        compact
@ -50,11 +55,6 @@
        @click="onClickAssignTeam"
      />
    </div>
-    <contact-details-item
-      compact
-      :title="$t('CONVERSATION_SIDEBAR.ACCORDION.CONVERSATION_LABELS')"
-    />
-    <conversation-labels :conversation-id="conversationId" />
  </div>
 </template>
Author	SHA1	Message	Date
Sivin Varghese	2374e5870d	Merge branch 'develop' into design/conversation-action-order	2022-04-01 21:08:04 +05:30
Sivin Varghese	9f4e0f82a5	Merge branch 'develop' into design/conversation-action-order	2022-03-30 15:02:40 +05:30
Nithin David	5de354af8a	design: Changes conversation actions order	2022-03-30 12:36:24 +05:30