From a4892f1918f6f1351356d66a5a850e293ddae4e5 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 9 Jun 2025 14:03:07 +0530
Subject: [PATCH] fix: resolved conflicts

(cherry picked from commit c98beaee9c385ac26151845d765126d736b1ed40)

# Conflicts:
#	frontend/src/pages/Contact.vue
#	frontend/src/pages/Lead.vue
#	frontend/src/pages/MobileContact.vue
---
 frontend/src/pages/Contact.vue       |  4 ++++
 frontend/src/pages/Lead.vue          |  9 +++++++++
 frontend/src/pages/MobileContact.vue | 11 +++++++++++
 3 files changed, 24 insertions(+)

diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index 912a6d14..ac9b693a 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -184,7 +184,11 @@ import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import DealsIcon from '@/components/Icons/DealsIcon.vue'
 import DealsListView from '@/components/ListViews/DealsListView.vue'
+<<<<<<< HEAD
 import { formatDate, timeAgo } from '@/utils'
+=======
+import { formatDate, timeAgo, validateIsImageFile } from '@/utils'
+>>>>>>> c98beae (fix: resolved conflicts)
 import { showAddressModal, addressProps } from '@/composables/modals'
 import { getView } from '@/utils/view'
 import { getSettings } from '@/stores/settings'
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index f722054c..8f86ef8b 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -344,7 +344,16 @@ import SidePanelLayout from '@/components/SidePanelLayout.vue'
 import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
 import SLASection from '@/components/SLASection.vue'
 import CustomActions from '@/components/CustomActions.vue'
+<<<<<<< HEAD
 import { openWebsite, setupCustomizations, copyToClipboard } from '@/utils'
+=======
+import {
+  openWebsite,
+  setupCustomizations,
+  copyToClipboard,
+  validateIsImageFile,
+} from '@/utils'
+>>>>>>> c98beae (fix: resolved conflicts)
 import { showQuickEntryModal, quickEntryProps } from '@/composables/modals'
 import { getView } from '@/utils/view'
 import { getSettings } from '@/stores/settings'
diff --git a/frontend/src/pages/MobileContact.vue b/frontend/src/pages/MobileContact.vue
index 5f74ad89..18f72c00 100644
--- a/frontend/src/pages/MobileContact.vue
+++ b/frontend/src/pages/MobileContact.vue
@@ -11,7 +11,14 @@
     </header>
   </LayoutHeader>
   <div v-if="contact.data" class="flex flex-col h-full overflow-hidden">
+<<<<<<< HEAD
     <FileUploader @success="changeContactImage" :validateFile="validateFile">
+=======
+    <FileUploader
+      @success="changeContactImage"
+      :validateFile="validateIsImageFile"
+    >
+>>>>>>> c98beae (fix: resolved conflicts)
       <template #default="{ openFileSelector, error }">
         <div class="flex flex-col items-start justify-start gap-4 p-4">
           <div class="flex gap-4 items-center">
@@ -167,7 +174,11 @@ import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import DealsIcon from '@/components/Icons/DealsIcon.vue'
 import DealsListView from '@/components/ListViews/DealsListView.vue'
+<<<<<<< HEAD
 import { formatDate, timeAgo } from '@/utils'
+=======
+import { formatDate, timeAgo, validateIsImageFile } from '@/utils'
+>>>>>>> c98beae (fix: resolved conflicts)
 import { getView } from '@/utils/view'
 import { showAddressModal, addressProps } from '@/composables/modals'
 import { getSettings } from '@/stores/settings'