TC-907

bcgov · Jan 18, 2025 · 3a0d61d · 3a0d61d
1 parent d38add9
commit 3a0d61d
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/frontend/src/components/recommitment/RecommitmentFormBase.tsx b/frontend/src/components/recommitment/RecommitmentFormBase.tsx
@@ -248,11 +248,6 @@ export const RecommitmentFormBase = ({
             onUpdate={setUnableToJoinReasons}
             key="unable"
           />,
-          <Assertions
-            program={Program.ALL}
-            onUpdate={setAssertionsChecked}
-            key="assertions"
-          />,
         ];
       default:
         return [
@@ -345,7 +340,10 @@ export const RecommitmentFormBase = ({
       }
     }
 
-    if (currentComponentType === Assertions) {
+    if (
+      currentComponentType === Assertions ||
+      currentComponentType === UnableToJoin && recommitmentAnswer === 'no'
+    ) {
       setButtonLoading(true);
       handleSubmitRecommitment();
     }
@@ -460,7 +458,10 @@ export const RecommitmentFormBase = ({
 
   const getButtonText = () => {
     const currentComponentType = currentComponent.type;
-    if (currentComponentType === Assertions) {
+    if (
+      currentComponentType === Assertions ||
+      currentComponentType === UnableToJoin && recommitmentAnswer === 'no'
+    ) {
       return 'Submit Decision';
     }
     if (currentComponentType === ParQBase && currentParQStep === 3) {