- updated notifications functionality;

src/components/FlowBuilder/index.js

@@ -8,7 +8,7 @@ import { isEmpty } from 'ramda';
 import '@xyflow/react/dist/style.css';
 
 // store
-import { useStore, storeSet, storeGet } from '../../store';
+import { useStore, storeSet } from '../../store';
 
 // nodes
 import NodeInitialForm from './components/NodeInitialForm';

src/components/FormField/components/DatepickerRange/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { classNames } from 'primereact/utils';
-import { isEmpty, isNil } from 'ramda';
+import { isNil } from 'ramda';
 
 // components
 import { Controller } from 'react-hook-form';

src/components/NotificationsSidebar/index.js

@@ -70,12 +70,12 @@ const NotificationsSidebar = () => {
         const role = pathOr('', ['role', 'roleType'], userData);
 
         if (currentSubscription) {
-            console.log('UNsubscribed')
+            //console.log('UNsubscribed')
             currentSubscription.unsubscribe();
             setCurrentSubscription(null);
         }
 
-        if (isConnected && userData.id && chosenCompanyId !== 0 && role === 'ROLE_BENEFICIARY') {
+        if (userData.id && chosenCompanyId !== 0 && role === 'ROLE_BENEFICIARY') {
             setLoading(true);
             NotificationService.getNotifications(
                 userData.id,
@@ -86,10 +86,10 @@ const NotificationsSidebar = () => {
                     ['companyId', chosenCompanyId]
                 ]
             );
-            if (socket.current) {
+            if (isConnected && socket.current) {
                 subscribeTo(`/topic/notifications_user_${userData.id}_company_${chosenCompanyId}`)
             }
-        } else if (isConnected && userData.id && role !== 'ROLE_BENEFICIARY') {
+        } else if (userData.id && role !== 'ROLE_BENEFICIARY') {
             setLoading(true);
             NotificationService.getNotifications(
                 userData.id,
@@ -99,7 +99,7 @@ const NotificationsSidebar = () => {
                     ['status', status]
                 ]
             );
-            if (socket.current) {
+            if (isConnected && socket.current) {
                 subscribeTo(`/topic/notifications_user_${userData.id}`)
             }
         }

src/helpers/set404FromErrorResponse.js

@@ -1,4 +1,4 @@
-import { storeSet } from '../store';
+//import { storeSet } from '../store';
 
 const set404FromErrorResponse = (data) => {
     if (data && data.status === 'NOT_FOUND') {

src/pages/BandoApplicationPreview/index.js

@@ -39,7 +39,7 @@ const BandoApplicationPreview = () => {
     const [formData, setFormData] = useState([]);
     const [formInitialData, setFormInitialData] = useState(null);
     const [bandoTitle, setBandoTitle] = useState('');
-    const [bandoId, setBandoId] = useState(0);
+    const [, setBandoId] = useState(0);
     const [formId, setFormId] = useState('');
     const [totalSteps, setTotalSteps] = useState(0);
     const [applicationStatus, setApplicationStatus] = useState('');
@@ -86,8 +86,8 @@ const BandoApplicationPreview = () => {
         ApplicationService.validateApplication(applId, {}, validateApplicationCallback, errValidateApplicationCallback);
     };
 
-    const onSubmit = () => {
-    };
+    /*const onSubmit = () => {
+    };*/
 
     const validateApplicationCallback = (data) => {
         if (data.status === 'SUCCESS') {