refs 116536: refactor

packages/app/src/client/services/guest-questionnaire-answer-status.ts

@@ -65,11 +65,12 @@ const setStatus = (questionnaireOrderId: string, status: StatusType): void => {
   if (storage != null) {
     storage[questionnaireOrderId] = guestQuestionnaireAnswerStatus;
     localStorage.setItem(storageKey, JSON.stringify(storage));
+    return;
   }
-  else {
-    const initialStorage: GuestQuestionnaireAnswerStatusStorage = { [questionnaireOrderId]: guestQuestionnaireAnswerStatus };
-    localStorage.setItem(storageKey, JSON.stringify(initialStorage));
-  }
+
+  const initialStorage: GuestQuestionnaireAnswerStatusStorage = { [questionnaireOrderId]: guestQuestionnaireAnswerStatus };
+  localStorage.setItem(storageKey, JSON.stringify(initialStorage));
+
 };
 
 export const GuestQuestionnaireAnswerStatusService = {

packages/app/src/components/Questionnaire/QuestionnaireModalManager.tsx

@@ -17,7 +17,7 @@ const QuestionnaireModalManager = ():JSX.Element => {
 
   const questionnaireOrdersToShow = useCallback((questionnaireOrders: IQuestionnaireOrderHasId[] | undefined) => {
     const guestQuestionnaireAnswerStorage = GuestQuestionnaireAnswerStatusService.getStorage();
-    if (currentUser || !guestQuestionnaireAnswerStorage) {
+    if (currentUser != null || guestQuestionnaireAnswerStorage == null) {
       return questionnaireOrders;
     }