Merge pull request #585 from Enterprise-CMCS/master

Release to val
Enterprise-CMCS · Jun 18, 2024 · df630a1 · df630a1
2 parents cc186d5 + f639f0a
commit df630a1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/packages/shared-utils/package-actions/rules.ts b/src/packages/shared-utils/package-actions/rules.ts
@@ -96,7 +96,8 @@ const arUpdateId: ActionRule = {
 };
 const arCompleteIntake: ActionRule = {
   action: Action.COMPLETE_INTAKE,
-  check: (checker, user) => isCmsWriteUser(user) && checker.needsIntake,
+  check: (checker, user) =>
+    false && isCmsWriteUser(user) && checker.needsIntake,
 };
 
 // TODO: Add rule for remove-appk-child

diff --git a/src/services/ui/src/components/Inputs/radio-group.tsx b/src/services/ui/src/components/Inputs/radio-group.tsx
@@ -29,7 +29,7 @@ const RadioGroupItem = React.forwardRef<
     <RadioGroupPrimitive.Item
       ref={ref}
       className={cn(
-        "aspect-square h-6 w-6 my-2 rounded-full border-2 empty:border-black border-primary text-primary focus:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
+        "aspect-square h-6 my-2 rounded-full border-2 empty:border-black border-primary text-primary focus:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
         className,
       )}
       {...props}

diff --git a/src/services/ui/src/components/RHF/SlotField.tsx b/src/services/ui/src/components/RHF/SlotField.tsx
@@ -256,7 +256,7 @@ export const OptChildren = ({
               control={control}
               name={parentId + SLOT.name}
               {...(SLOT.rules && { rules: SLOT.rules })}
-              render={RHFSlot({ ...SLOT, control })}
+              render={RHFSlot({ ...SLOT, parentId, control })}
             />
           </div>
         ))}

diff --git a/src/services/ui/src/utils/labelMappers.ts b/src/services/ui/src/utils/labelMappers.ts
@@ -23,11 +23,7 @@ export const mapActionLabel = (a: Action) => {
     case Action.UPDATE_ID:
       return "Update ID";
     case Action.COMPLETE_INTAKE:
-      // Poor man's feature flag.
-      return config.cognito.REDIRECT_SIGNIN.includes("localhost") ||
-        config.cognito.REDIRECT_SIGNIN.includes("cloudfront")
-        ? "Complete Intake"
-        : "";
+      return "Complete Intake";
     default:
       return "";
   }