diff --git a/apps/callcenter b/apps/callcenter
index b4eac8bacb0..3abea92e844 160000
--- a/apps/callcenter
+++ b/apps/callcenter
@@ -1 +1 @@
-Subproject commit b4eac8bacb04dbcfe81cad852337d288e94e1f17
+Subproject commit 3abea92e84430379908138b7f4e0ca3d4ddb0184
diff --git a/apps/condo/pages/contact/[id]/index.tsx b/apps/condo/pages/contact/[id]/index.tsx
index d5333354b35..a6eabb50aa6 100644
--- a/apps/condo/pages/contact/[id]/index.tsx
+++ b/apps/condo/pages/contact/[id]/index.tsx
@@ -8,7 +8,7 @@ import get from 'lodash/get'
import Head from 'next/head'
import Link from 'next/link'
import { useRouter } from 'next/router'
-import React, { CSSProperties, useCallback } from 'react'
+import React, { CSSProperties, useCallback, useMemo } from 'react'
import { useCachePersistor } from '@open-condo/apollo'
import { getClientSideSenderInfo } from '@open-condo/codegen/utils/userId'
@@ -232,6 +232,7 @@ const ContactInfoPage: PageComponentType<{ id: string }> = ({ id: contactId }) =
})
const filteredContacts = data?.contacts?.filter(Boolean)
const contact = Array.isArray(filteredContacts) && filteredContacts.length > 0 ? filteredContacts[0] : null
+ const contactLoading = useMemo(() => loading || !persistor, [loading, persistor])
const [updateContactMutation] = useUpdateContactMutation({
variables: {
@@ -249,8 +250,8 @@ const ContactInfoPage: PageComponentType<{ id: string }> = ({ id: contactId }) =
await push('/contact')
}, [push, updateContactMutation])
- if (error || loading) {
- return
+ if (error || contactLoading) {
+ return
}
if (!contact) {
return