From 62d190974b34948401564140eeacd80b9d662ba0 Mon Sep 17 00:00:00 2001
From: jadmsaadaot <91914654+jadmsaadaot@users.noreply.github.com>
Date: Mon, 8 Jan 2024 09:05:46 -0800
Subject: [PATCH] Fix controlled select disable prop (#1560)

* Fix controlled select disable prop

* Fix work plan staff view button
---
 .../myWorkplans/Card/CardFooter.tsx           | 20 ++-----------------
 .../ControlledSelectV2.tsx                    |  1 +
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/epictrack-web/src/components/myWorkplans/Card/CardFooter.tsx b/epictrack-web/src/components/myWorkplans/Card/CardFooter.tsx
index cae47793b..c0a199a8b 100644
--- a/epictrack-web/src/components/myWorkplans/Card/CardFooter.tsx
+++ b/epictrack-web/src/components/myWorkplans/Card/CardFooter.tsx
@@ -80,26 +80,10 @@ const CardFooter = ({ workplan }: CardProps) => {
       </Grid>
       <Grid item justifyContent={"flex-end"}>
         <Button
-          variant="text"
-          sx={{
-            backgroundColor: "inherit",
-            borderColor: "transparent",
-            borderRadius: "4px",
-            width: "80px",
-            border: "2px solid var(--Primary-Main, #036)",
-            ":hover": {
-              borderRadius: "4px",
-              border: "var(--Primary-Main, #036);",
-              backgroundColor: Palette.primary.main,
-              color: Palette.white,
-            },
-            ":active": {
-              backgroundColor: Palette.primary.dark,
-            },
-          }}
+          variant="outlined"
           onClick={() => navigate(`/work-plan?work_id=${workplan.id}`)}
         >
-          <ETCaption2 bold>View</ETCaption2>
+          View
         </Button>
       </Grid>
     </Grid>
diff --git a/epictrack-web/src/components/shared/controlledInputComponents/ControlledSelectV2.tsx b/epictrack-web/src/components/shared/controlledInputComponents/ControlledSelectV2.tsx
index d69b34da5..9417e62c3 100644
--- a/epictrack-web/src/components/shared/controlledInputComponents/ControlledSelectV2.tsx
+++ b/epictrack-web/src/components/shared/controlledInputComponents/ControlledSelectV2.tsx
@@ -68,6 +68,7 @@ const ControlledSelectV2: React.ForwardRefRenderFunction<
               if (onHandleChange !== undefined) onHandleChange(v);
               return onChange(v);
             }}
+            disabled={disabled}
             error={!!error}
             helperText={String(error?.message) || helperText}
           />