diff --git a/lib/packages/shared-types/forms.ts b/lib/packages/shared-types/forms.ts
index ea0630740a..95c9897a94 100644
--- a/lib/packages/shared-types/forms.ts
+++ b/lib/packages/shared-types/forms.ts
@@ -206,7 +206,8 @@ type Effects =
     }
   | {
       type: "setValue";
-      newValue: unknown;
+      newValue: string | string[];
+      fieldName: string;
     };
 
 export interface DependencyRule {
diff --git a/react-app/src/components/RHF/SlotField.tsx b/react-app/src/components/RHF/SlotField.tsx
index 0fda2f0b61..c6a4e9569d 100644
--- a/react-app/src/components/RHF/SlotField.tsx
+++ b/react-app/src/components/RHF/SlotField.tsx
@@ -95,8 +95,6 @@ export const SlotField = ({
           : a.label.localeCompare(b.label),
       );
 
-      console.log("props.customSort", props?.customSort);
-
       return (
         <Select
           {...props}
diff --git a/react-app/src/components/RHF/dependencyWrapper.tsx b/react-app/src/components/RHF/dependencyWrapper.tsx
index 929017de8c..6e654a5d6c 100644
--- a/react-app/src/components/RHF/dependencyWrapper.tsx
+++ b/react-app/src/components/RHF/dependencyWrapper.tsx
@@ -9,7 +9,11 @@ const checkTriggeringValue = (
   return !!dependency?.conditions?.every((d, i) => {
     switch (d.type) {
       case "expectedValue":
-        return dependentValue[i] === d?.expectedValue;
+        if (Array.isArray(dependentValue[i])) {
+          return (dependentValue[i] as unknown[]).includes(d.expectedValue);
+        } else {
+          return dependentValue[i] === d?.expectedValue;
+        }
       case "valueExists":
         return (
           (Array.isArray(dependentValue[i]) &&
@@ -48,22 +52,36 @@ const DependencyWrapperHandler = ({
   parentValue,
   changeMethod,
 }: PropsWithChildren<DependencyWrapperProps>) => {
-  const { watch, setValue } = useFormContext();
+  const { watch, setValue, getValues } = useFormContext();
   const [wasSetLast, setWasSetLast] = useState(false);
   const dependentValues = watch(
     dependency?.conditions?.map((c) => c.name) ?? [],
   );
   const isTriggered =
     dependency && checkTriggeringValue(dependentValues, dependency);
-
   useEffect(() => {
     if (
       !wasSetLast &&
       dependency?.effect.type === "setValue" &&
       isTriggered &&
-      !!name
+      !!dependency?.effect.fieldName
     ) {
-      setValue(name, dependency.effect.newValue);
+      const value = getValues(dependency.effect.fieldName);
+      if (Array.isArray(value)) {
+        if (Array.isArray(dependency.effect.newValue)) {
+          setValue(dependency.effect.fieldName, [
+            ...value,
+            ...dependency.effect.newValue,
+          ]);
+        } else {
+          setValue(dependency.effect.fieldName, [
+            ...value,
+            dependency.effect.newValue,
+          ]);
+        }
+      } else {
+        setValue(dependency.effect.fieldName, dependency.effect.newValue);
+      }
       setWasSetLast(true);
     } else if (!isTriggered && wasSetLast) {
       setWasSetLast(false);
diff --git a/react-app/src/components/RHF/tests/depedencyWrapper.test.tsx b/react-app/src/components/RHF/tests/depedencyWrapper.test.tsx
new file mode 100644
index 0000000000..96d4174275
--- /dev/null
+++ b/react-app/src/components/RHF/tests/depedencyWrapper.test.tsx
@@ -0,0 +1,137 @@
+import { describe, test, expect } from "vitest";
+import { render } from "@testing-library/react";
+import { useForm, FormProvider } from "react-hook-form";
+import { DependencyWrapper } from "../dependencyWrapper";
+import { PropsWithChildren } from "react";
+import { DependencyRule } from "shared-types";
+
+const TestComp = ({
+  name,
+  dependency,
+  parentValue,
+  changeMethod,
+  children,
+}: PropsWithChildren<{
+  name: string;
+  dependency: DependencyRule;
+  parentValue: string[];
+  changeMethod: (values: string[]) => void;
+}>) => {
+  const methods = useForm({
+    defaultValues: {
+      [name]: parentValue,
+      field1: "test",
+      field2: "",
+    },
+  });
+
+  return (
+    <FormProvider {...methods}>
+      <DependencyWrapper
+        name={name}
+        dependency={dependency}
+        parentValue={parentValue}
+        changeMethod={changeMethod}
+      >
+        {children}
+      </DependencyWrapper>
+    </FormProvider>
+  );
+};
+
+describe("DependencyWrapper Tests", () => {
+  test("test show effect", () => {
+    const dependency: DependencyRule = {
+      conditions: [
+        { type: "expectedValue", expectedValue: "test", name: "field1" },
+      ],
+      effect: { type: "show" },
+    };
+    const { getByText } = render(
+      <TestComp
+        name="testField"
+        dependency={dependency}
+        parentValue={["testField"]}
+        changeMethod={(value) => {
+          console.log(value);
+        }}
+      >
+        <div>Child Component</div>
+      </TestComp>,
+    );
+
+    expect(getByText("Child Component")).toBeTruthy();
+  });
+
+  test("test hide effect", () => {
+    const dependency: DependencyRule = {
+      conditions: [
+        { type: "expectedValue", expectedValue: "test", name: "field1" },
+      ],
+      effect: { type: "hide" },
+    };
+    const { queryByText } = render(
+      <TestComp
+        name="testField"
+        dependency={dependency}
+        parentValue={["testField"]}
+        changeMethod={(value) => {
+          console.log(value);
+        }}
+      >
+        <div>Child Component</div>
+      </TestComp>,
+    );
+
+    expect(queryByText("Child Component")).toBeNull();
+  });
+
+  test("test set value effect", () => {
+    const dependency: DependencyRule = {
+      conditions: [
+        { type: "expectedValue", expectedValue: "test", name: "field1" },
+      ],
+      effect: { type: "setValue", fieldName: "field2", newValue: "newValue" },
+    };
+
+    let methods: any;
+
+    const TestCompWithMethods = (
+      props: PropsWithChildren<{
+        name: string;
+        dependency: DependencyRule;
+        parentValue: string[];
+        changeMethod: (values: string[]) => void;
+      }>,
+    ) => {
+      methods = useForm({
+        defaultValues: {
+          [props.name]: props.parentValue,
+          field1: "test",
+          field2: "",
+        },
+      });
+
+      return (
+        <FormProvider {...methods}>
+          <DependencyWrapper {...props}>{props.children}</DependencyWrapper>
+        </FormProvider>
+      );
+    };
+
+    render(
+      <TestCompWithMethods
+        name="testField"
+        dependency={dependency}
+        parentValue={["testField"]}
+        changeMethod={(value) => {
+          console.log(value);
+        }}
+      >
+        <div>Child Component</div>
+      </TestCompWithMethods>,
+    );
+
+    expect(methods.getValues("field2")).toBe("newValue");
+  });
+});