@velocitycareerlabs/velocity-registrar-app 1.25.0-dev-build.1ffdaffeb → 1.25.0-dev-build.19bb85136

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/velocity-registrar-app",
-  "version": "1.25.0-dev-build.1ffdaffeb",
+  "version": "1.25.0-dev-build.19bb85136",
   "description": "Velocity Registrar",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -59,5 +59,5 @@
     "not ie <= 11",
     "not op_mini all"
   ],
-  "gitHead": "7de2c807fa0972674b42dd5baeaa56ca3de9793f"
+  "gitHead": "36c3692cba550b579912ada72e41ce048449dfe8"
 }

package/src/pages/services/components/SecureIntegrationPopup/index.jsx

@@ -1,5 +1,4 @@
-import React, { useEffect } from 'react';
-import { useGetOne } from 'react-admin';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelectedOrganization } from '@velocitycareerlabs/components-organizations-registrar';
 import { Popup } from '@velocitycareerlabs/components-organizations-registrar/components/common';
@@ -7,7 +6,7 @@ import { Loading } from '@velocitycareerlabs/components-organizations-registrar/
 
 import { SecureMessageURL } from '../SecureMessageUrl/index.jsx';
 import { SecureTransfer } from '../SecureTransfer/index.jsx';
-import { dataResources } from '../../../../utils/remoteDataProvider';
+import { useSecureSkip } from '../../hooks/useSecureSkip';
 
 export const SecureIntegrationPopup = ({
   isInterceptOnCreateOpen,
@@ -19,25 +18,18 @@ export const SecureIntegrationPopup = ({
 }) => {
   const [did] = useSelectedOrganization();
 
-  const { data: secureMessageTransfer, isLoading: isCheckingCAOSecureTranferSupport } = useGetOne(
-    dataResources.SECURE_MESSAGE_SUPPORTED,
-    {
-      id: selectedCAO,
-    },
-    {
-      enabled: !!selectedCAO && isIssueOrInspection,
-    },
-  );
+  const { isLoading } = useSecureSkip({
+    isInterceptOnCreateOpen,
+    isIssueOrInspection,
+    selectedCAO,
+    onClose,
+  });
 
-  useEffect(() => {
-    if (secureMessageTransfer && !secureMessageTransfer?.supported) {
-      onClose();
-    }
-  }, [secureMessageTransfer, onClose]);
+  if (isInterceptOnCreateOpen && isIssueOrInspection && isLoading) {
+    return <Loading sx={styles.loading} />;
+  }
 
-  return isIssueOrInspection && isCheckingCAOSecureTranferSupport ? (
-    <Loading sx={styles.loading} />
-  ) : (
+  return (
     <Popup
       onClose={() => {}}
       title=""

package/src/pages/services/hooks/useSecureSkip.js

@@ -0,0 +1,24 @@
+import { useEffect } from 'react';
+import { useGetOne } from 'react-admin';
+import { dataResources } from '../../../utils/remoteDataProvider';
+
+export const useSecureSkip = ({
+  isInterceptOnCreateOpen,
+  isIssueOrInspection,
+  selectedCAO,
+  onClose,
+}) => {
+  const { data, isLoading } = useGetOne(
+    dataResources.SECURE_MESSAGE_SUPPORTED,
+    { id: selectedCAO },
+    { enabled: !!selectedCAO && isIssueOrInspection },
+  );
+
+  useEffect(() => {
+    if (isInterceptOnCreateOpen && data?.supported === false) {
+      onClose();
+    }
+  }, [isInterceptOnCreateOpen, data?.supported, onClose]);
+
+  return { isLoading };
+};