From b083bdd10d47c4aabe8f994df31bfc37d6985d20 Mon Sep 17 00:00:00 2001
From: Arpitkumar Chaudhari <arpit@appcheck.in>
Date: Thu, 12 Aug 2021 11:54:35 +0530
Subject: [PATCH] #442

---
 .../components/SubmitContainer/index.jsx      | 14 +++++++-
 .../components/TeamDetailsModal/index.jsx     |  2 +-
 .../pages/CreateTaasPayment/index.jsx         | 33 +++++++++----------
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx b/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx
index a219a262..5f4a8483 100644
--- a/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx
+++ b/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx
@@ -112,9 +112,21 @@ function SubmitContainer({
       positions.push(position);
     }
     teamObject.positions = positions;
-
     setTeamDetailsOpen(false);
     setTeamObject(teamObject);
+
+    addedRoles.map((data) => {
+      if (_.has(formData, data.searchId)) {
+        const temp = {
+          ...data,
+          numberOfResources: formData[data.searchId].numberOfResources,
+          durationWeeks: formData[data.searchId].durationWeeks,
+          hoursPerWeek: formData[data.searchId].hoursPerWeek,
+        };
+        dispatch(editRoleAction({ ...temp, searchId: data.searchId }));
+      }
+    });
+
     requestTeam(teamObject);
   };
 
diff --git a/src/routes/CreateNewTeam/components/TeamDetailsModal/index.jsx b/src/routes/CreateNewTeam/components/TeamDetailsModal/index.jsx
index 451b07a5..26ae6504 100644
--- a/src/routes/CreateNewTeam/components/TeamDetailsModal/index.jsx
+++ b/src/routes/CreateNewTeam/components/TeamDetailsModal/index.jsx
@@ -242,7 +242,7 @@ function TeamDetailsModal({ open, onClose, submitForm, addedRoles }) {
                       <td>
                         <Field
                           name={`${id}.hoursPerWeek`}
-                          initialValue={hoursPerWeek || 40}
+                          initialValue={hoursPerWeek || "40"}
                         >
                           {(props) => (
                             <Select
diff --git a/src/routes/CreateNewTeam/pages/CreateTaasPayment/index.jsx b/src/routes/CreateNewTeam/pages/CreateTaasPayment/index.jsx
index 1c702253..117a7cbf 100644
--- a/src/routes/CreateNewTeam/pages/CreateTaasPayment/index.jsx
+++ b/src/routes/CreateNewTeam/pages/CreateTaasPayment/index.jsx
@@ -20,7 +20,7 @@ const CreateTassPayment = () => {
   const [calculatedAmount, setCalculatedAmount] = useState(0);
   const [error, setError] = useState(false);
   const [value, setValue] = useState([]);
-  const { addedRoles, teamObject } = useSelector((state) => state.searchedRoles );
+  const { addedRoles } = useSelector((state) => state.searchedRoles);
 
   useEffect(() => {
     const temp = [];
@@ -31,27 +31,30 @@ const CreateTassPayment = () => {
         imageUrl,
         name,
         rates: [rates],
-      } = role;
-      const {
         numberOfResources = 1,
         durationWeeks = 4,
-        hoursPerWeek,
-      } = _.find(teamObject.positions, p => p.roleSearchRequestId === role.searchId) || {}
+        hoursPerWeek = "40",
+      } = role;
       let rate;
+      let availability;
 
-      if (hoursPerWeek) {
-        if (hoursPerWeek === "30") rate = rates.rate30Global;
-        else if (hoursPerWeek === "20") rate = rates.rate20Global;
-        else if (hoursPerWeek === "40") rate = rates.global;
-      } else rate = rates.global;
-
+      if (hoursPerWeek === "30") {
+        rate = rates.rate30Global;
+        availability = "Part-Time Availability";
+      } else if (hoursPerWeek === "20") {
+        rate = rates.rate20Global;
+        availability = "Part-Time Availability";
+      } else if (hoursPerWeek === "40") {
+        rate = rates.global;
+        availability = "Full-Time Availability";
+      }
       temp.push({
         imageUrl,
         name,
         rate,
         numberOfResources,
         durationWeeks,
-        hoursPerWeek,
+        availability,
       });
       amount.push({ rate, numberOfResources });
     });
@@ -108,11 +111,7 @@ const CreateTassPayment = () => {
                               {data.numberOfResources} x ${data.rate}/ Week
                             </li>
                             <li>{data.durationWeeks} Week Duration</li>
-                            <li>
-                              {data.hoursPerWeek
-                                ? "Part-Time Availability"
-                                : "Full-Time Availability"}
-                            </li>
+                            <li>{data.availability}</li>
                           </ul>
                         </div>
                         <p styleName="amount">