From 8282e09949eb9f96fa677f2a37a4d488f9fb7bf0 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 22 Apr 2025 12:57:20 +0530
Subject: [PATCH 1/2] fix: contact page not loading

(cherry picked from commit cef20e37c23ffbf36991f50fa7eade41edf10a11)
---
 crm/api/contact.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/crm/api/contact.py b/crm/api/contact.py
index b8d8f578..6a812d5f 100644
--- a/crm/api/contact.py
+++ b/crm/api/contact.py
@@ -30,15 +30,7 @@ def get_contact(name):
 
 	if not len(contact):
 		frappe.throw(_("Contact not found"), frappe.DoesNotExistError)
-	contact = contact.pop()
 
-	contact["doctype"] = "Contact"
-	contact["email_ids"] = frappe.get_all(
-		"Contact Email", filters={"parent": name}, fields=["name", "email_id", "is_primary"]
-	)
-	contact["phone_nos"] = frappe.get_all(
-		"Contact Phone", filters={"parent": name}, fields=["name", "phone", "is_primary_mobile_no"]
-	)
 	return contact
 
 

From 161f3bbf87ac60e0bcc634918d885a2632f8afd4 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 22 Apr 2025 12:59:24 +0530
Subject: [PATCH 2/2] fix: do not show error page while loading

(cherry picked from commit c009373a43a71709bfd81313c5cf8f6ee06b20ad)
---
 frontend/src/pages/Contact.vue      | 6 +++++-
 frontend/src/pages/Organization.vue | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index bfe7ea76..18fccd2d 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -168,7 +168,11 @@
       </template>
     </Tabs>
   </div>
-  <ErrorPage v-else :errorTitle="errorTitle" :errorMessage="errorMessage" />
+  <ErrorPage
+    v-else-if="errorTitle"
+    :errorTitle="errorTitle"
+    :errorMessage="errorMessage"
+  />
   <AddressModal v-model="showAddressModal" v-model:address="_address" />
 </template>
 
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index bd0e9c49..3c1ce8b4 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -160,7 +160,11 @@
       </template>
     </Tabs>
   </div>
-  <ErrorPage v-else :errorTitle="errorTitle" :errorMessage="errorMessage" />
+  <ErrorPage
+    v-else-if="errorTitle"
+    :errorTitle="errorTitle"
+    :errorMessage="errorMessage"
+  />
   <QuickEntryModal
     v-if="showQuickEntryModal"
     v-model="showQuickEntryModal"