Merge pull request #2139 from frappe/develop

chore(release): dev to main

desk/src/components/ticket/TicketAgentActivities.vue

@@ -2,10 +2,14 @@
   <ActivityHeader :title="title" />
   <div class="flex flex-col flex-1 overflow-y-auto">
     <div v-if="activities.length" class="activities flex-1 h-full mt-1">
-      <div v-for="(activity, i) in activities" :key="activity.key">
+      <div
+        v-for="(activity, i) in activities"
+        :key="activity.key"
+        class="activity"
+      >
         <!-- single activity -->
         <div
-          class="w-full activity px-3 sm:px-10 grid grid-cols-[30px_minmax(auto,_1fr)] gap-2 sm:gap-4"
+          class="w-full px-3 sm:px-10 grid grid-cols-[30px_minmax(auto,_1fr)] gap-2 sm:gap-4"
         >
           <div
             class="relative flex justify-center after:absolute after:left-[50%] after:top-0 after:-z-10 after:border-l after:border-gray-200"

desk/src/pages/TicketAgent.vue

@@ -46,28 +46,26 @@
     <div v-if="ticket.data" class="flex h-full overflow-hidden">
       <div class="flex flex-1 flex-col">
         <!-- ticket activities -->
-        <div class="overflow-y-auto flex-1">
-          <Tabs
-            v-model="tabIndex"
-            v-slot="{ tab }"
-            :tabs="tabs"
-            class="!h-full"
-          >
-            <TicketAgentActivities
-              ref="ticketAgentActivitiesRef"
-              :activities="filterActivities(tab.name)"
-              :title="tab.label"
-              @update="
-                () => {
-                  ticket.reload();
-                }
-              "
-              @email:reply="
-                (e) => {
-                  communicationAreaRef.replyToEmail(e);
-                }
-              "
-            />
+        <div class="overflow-y-hidden flex flex-1 !h-full flex-col">
+          <Tabs v-model="tabIndex" :tabs="tabs">
+            <TabList />
+            <TabPanel v-slot="{ tab }" class="h-full">
+              <TicketAgentActivities
+                ref="ticketAgentActivitiesRef"
+                :activities="filterActivities(tab.name)"
+                :title="tab.label"
+                @update="
+                  () => {
+                    ticket.reload();
+                  }
+                "
+                @email:reply="
+                  (e) => {
+                    communicationAreaRef.replyToEmail(e);
+                  }
+                "
+              />
+            </TabPanel>
           </Tabs>
         </div>
         <CommunicationArea
@@ -135,6 +133,8 @@ import {
   Dialog,
   FormControl,
   Tabs,
+  TabPanel,
+  TabList,
 } from "frappe-ui";
 
 import {