fix(condo): close #5464 no more useless warnings (#5468)

open-condo-software · Nov 11, 2024 · b4ef6db · b4ef6db
1 parent 2fb65fc
commit b4ef6db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/apps/condo/domains/common/components/UseDeskWidget.tsx b/apps/condo/domains/common/components/UseDeskWidget.tsx
@@ -33,10 +33,12 @@ const UseDeskWidget: React.FC = () => {
     const userIdentify = useMemo(() => get(messenger, 'userIdentify', null), [messenger])
 
     useEffect(() => {
+        if (!UseDeskWidgetId) return
+
         const userId = get(user, 'id')
 
         try {
-            if (UseDeskWidgetId && isFunction(userIdentify) && typeof window !== 'undefined') {
+            if (isFunction(userIdentify) && typeof window !== 'undefined') {
                 const name = get(link, 'name')
                 const email = get(user, 'email')
                 const phone = get(user, 'phone')
@@ -74,7 +76,7 @@ const UseDeskWidget: React.FC = () => {
                 })
             }
 
-            messenger.setAdditionalFields([
+            if (messenger) messenger.setAdditionalFields([
                 {
                     id: useDeskFieldsIdsMap.tin, value: get(link, ['organization', 'tin'], null),
                 },

diff --git a/apps/condo/pages/_app.tsx b/apps/condo/pages/_app.tsx
@@ -454,7 +454,7 @@ const MyApp = ({ Component, pageProps }) => {
     useHotCodeReload()
     dayjs.locale(intl.locale)
     const router = useRouter()
-    const { publicRuntimeConfig: { yandexMetrikaID, popupSmartConfig } } = getConfig()
+    const { publicRuntimeConfig: { yandexMetrikaID, popupSmartConfig, UseDeskWidgetId } } = getConfig()
 
     const LayoutComponent = Component.container || BaseLayout
     // TODO(Dimitreee): remove this mess later
@@ -520,9 +520,9 @@ const MyApp = ({ Component, pageProps }) => {
                     </LayoutContextProvider>
                     {yandexMetrikaID && <YandexMetrika />}
                     {!isEmpty(popupSmartConfig) && <PopupSmart />}
+                    {UseDeskWidgetId && <UseDeskWidget/>}
                 </CacheProvider>
             </ConfigProvider>
-            <UseDeskWidget/>
         </>
     )
 }