Merge pull request #695 from frappe/develop

chore: Merge develop to main

Author: shariquerik

crm/locale/main.pot

@@ -150,8 +150,7 @@ declare module 'vue' {
     MobileSidebar: typeof import('./src/components/Mobile/MobileSidebar.vue')['default']
     MoneyIcon: typeof import('./src/components/Icons/MoneyIcon.vue')['default']
     MultipleAvatar: typeof import('./src/components/MultipleAvatar.vue')['default']
-    MultiselectInput: typeof import('./src/components/Controls/MultiselectInput.vue')['default']
-    MultiValueInput: typeof import('./src/components/Controls/MultiValueInput.vue')['default']
+    MultiSelectEmailInput: typeof import('./src/components/Controls/MultiSelectEmailInput.vue')['default']
     MuteIcon: typeof import('./src/components/Icons/MuteIcon.vue')['default']
     NestedPopover: typeof import('./src/components/NestedPopover.vue')['default']
     NoteArea: typeof import('./src/components/Activities/NoteArea.vue')['default']
@@ -193,7 +192,6 @@ declare module 'vue' {
     SidePanelLayout: typeof import('./src/components/SidePanelLayout.vue')['default']
     SidePanelLayoutEditor: typeof import('./src/components/SidePanelLayoutEditor.vue')['default']
     SidePanelModal: typeof import('./src/components/Modals/SidePanelModal.vue')['default']
-    SignupBanner: typeof import('./src/components/SignupBanner.vue')['default']
     SLASection: typeof import('./src/components/SLASection.vue')['default']
     SmileIcon: typeof import('./src/components/Icons/SmileIcon.vue')['default']
     SortBy: typeof import('./src/components/SortBy.vue')['default']

crm/public/videos/changeDealStatus.mov

@@ -9,19 +9,15 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "@tiptap/extension-paragraph": "^2.4.0",
     "@twilio/voice-sdk": "^2.10.2",
-    "@vueuse/core": "^10.3.0",
     "@vueuse/integrations": "^10.3.0",
-    "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.118",
+    "frappe-ui": "^0.1.121",
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",
     "pinia": "^2.0.33",
     "socket.io-client": "^4.7.2",
     "sortablejs": "^1.15.0",
-    "tailwindcss": "^3.3.3",
     "vue": "^3.5.13",
     "vue-router": "^4.2.2",
     "vuedraggable": "^4.1.0"
@@ -31,6 +27,7 @@
     "@vitejs/plugin-vue-jsx": "^3.0.1",
     "autoprefixer": "^10.4.14",
     "postcss": "^8.4.5",
+    "tailwindcss": "^3.4.15",
     "vite": "^4.4.9",
     "vite-plugin-pwa": "^0.15.0"
   }

crm/public/videos/convertToDeal.mov

@@ -43,25 +43,29 @@
                 attachment.is_private ? __('Make public') : __('Make private')
               "
             >
-              <Button
-                class="!size-5"
-                @click.stop="
-                  togglePrivate(attachment.name, attachment.is_private)
-                "
-              >
-                <FeatherIcon
-                  :name="attachment.is_private ? 'lock' : 'unlock'"
-                  class="size-3 text-ink-gray-7"
-                />
-              </Button>
+              <div>
+                <Button
+                  class="!size-5"
+                  @click.stop="
+                    togglePrivate(attachment.name, attachment.is_private)
+                  "
+                >
+                  <FeatherIcon
+                    :name="attachment.is_private ? 'lock' : 'unlock'"
+                    class="size-3 text-ink-gray-7"
+                  />
+                </Button>
+              </div>
             </Tooltip>
             <Tooltip :text="__('Delete attachment')">
-              <Button
-                class="!size-5"
-                @click.stop="() => deleteAttachment(attachment.name)"
-              >
-                <FeatherIcon name="trash-2" class="size-3 text-ink-gray-7" />
-              </Button>
+              <div>
+                <Button
+                  class="!size-5"
+                  @click.stop="() => deleteAttachment(attachment.name)"
+                >
+                  <FeatherIcon name="trash-2" class="size-3 text-ink-gray-7" />
+                </Button>
+              </div>
             </Tooltip>
           </div>
         </div>

frappe-ui

@@ -1,9 +1,9 @@
 <template>
   <div
-    class="activity group flex h-48 cursor-pointer flex-col justify-between gap-2 rounded-md bg-surface-menu-bar px-4 py-3 hover:bg-surface-gray-2"
+    class="activity group flex h-48 cursor-pointer flex-col justify-between gap-2 rounded-md bg-surface-gray-1 px-4 py-3 hover:bg-surface-gray-2"
   >
     <div class="flex items-center justify-between">
-      <div class="truncate text-lg font-medium">
+      <div class="truncate text-lg font-medium text-ink-gray-8">
         {{ note.title }}
       </div>
       <Dropdown

frontend/components.d.ts

@@ -42,9 +42,11 @@
             @click.stop
           >
             <Tooltip :text="__('Change Status')">
-              <Button variant="ghosted" class="hover:bg-surface-gray-4">
-                <TaskStatusIcon :status="task.status" />
-              </Button>
+              <div>
+                <Button variant="ghosted" class="hover:bg-surface-gray-4">
+                  <TaskStatusIcon :status="task.status" />
+                </Button>
+              </div>
             </Tooltip>
           </Dropdown>
           <Dropdown

frontend/package.json

@@ -175,7 +175,11 @@ const commentEmpty = computed(() => {
 })
 
 const emailEmpty = computed(() => {
-  return !newEmail.value || newEmail.value === '<p></p>'
+  return (
+    !newEmail.value ||
+    newEmail.value === '<p></p>' ||
+    !newEmailEditor.value?.toEmails?.length
+  )
 })
 
 async function sendMail() {