Fixes broken merge conflicts

app/javascript/dashboard/components/layout/config/sidebarItems/conversations.js

@@ -43,14 +43,13 @@ const conversations = accountId => ({
       key: 'conversation_participating',
       toState: frontendURL(`accounts/${accountId}/participating/conversations`),
       toStateName: 'conversation_participating',
-     },
-     {
+    },
+    {
       icon: 'mail-unread',
       label: 'UNATTENDED_CONVERSATIONS',
       key: 'conversation_unattended',
       toState: frontendURL(`accounts/${accountId}/unattended/conversations`),
       toStateName: 'conversation_unattended',
-
     },
   ],
 });

app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue

@@ -257,9 +257,11 @@ export default {
 .actions {
   display: flex;
   justify-content: space-between;
+  align-items: center;
 }
 
 .message-text {
   margin: 0;
+  font-size: var(--font-size-small);
 }
 </style>

app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js

@@ -121,19 +121,6 @@ export default {
         conversationType: 'mention',
       }),
     },
-    {
-      path: frontendURL('accounts/:accountId/participating/conversations'),
-      name: 'conversation_participating',
-      roles: ['administrator', 'agent'],
-      component: ConversationView,
-      props: () => ({ conversationType: 'participating' }),
-    },
-    {
-      path: frontendURL(
-        'accounts/:accountId/participating/conversations/:conversationId'
-      ),
-      name: 'conversation_through_participating',
-
     {
       path: frontendURL('accounts/:accountId/unattended/conversations'),
       name: 'conversation_unattended',