fix: set hasErrors useState default to null, use explicit hasErrors==…

…=false for condition check
bcgov · Aug 5, 2020 · 68943d5 · 68943d5
1 parent 6da89b5
commit 68943d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/components/Application/ApplicationOverrideJustification.tsx b/app/components/Application/ApplicationOverrideJustification.tsx
@@ -11,7 +11,7 @@ interface Props {
   applicationOverrideJustification: string;
   revisionId: string;
   relay: RelayProp;
-  hasErrors: boolean;
+  hasErrors: any;
 }
 
 export const ApplicationOverrideJustificationComponent: React.FunctionComponent<Props> = ({
@@ -80,7 +80,7 @@ export const ApplicationOverrideJustificationComponent: React.FunctionComponent<
   };
 
   useEffect(() => {
-    if (overrideJustification && !hasErrors) handleOverrideDelete();
+    if (overrideJustification && hasErrors === false) handleOverrideDelete();
   });
 
   const errorsWithOverrideActive = (
@@ -188,7 +188,7 @@ export const ApplicationOverrideJustificationComponent: React.FunctionComponent<
   );
 
   const renderOverride = () => {
-    if (!hasErrors) return null;
+    if (hasErrors === false) return null;
     if (hasErrors && overrideActive) return errorsWithOverrideActive;
     return errorsWithoutOverrideActive;
   };

diff --git a/app/containers/Applications/ApplicationWizardConfirmation.tsx b/app/containers/Applications/ApplicationWizardConfirmation.tsx
@@ -52,7 +52,8 @@ export const ApplicationWizardConfirmationComponent: React.FunctionComponent<Pro
   const [copySuccess, setCopySuccess] = useState('');
   const [url, setUrl] = useState<string>();
   const [isChecked, toggleChecked] = useState(true);
-  const [hasErrors, setHasErrors] = useState(false);
+  // State of hasErrors is set to null until the child component ApplicationDetailsContainer returns a valid true/false decision
+  const [hasErrors, setHasErrors] = useState(null);
   const copyArea = useRef(null);
   const revision = props.application.latestDraftRevision;
   const [overrideActive, setOverrideActive] = useState(