fix:110,111,112

Author: dengjun

src/containers/MyGigs/JobListing/JobCard/ProgressBar/index.jsx

@@ -6,13 +6,7 @@ import * as constants from "../../../../../constants";
 
 import "./styles.scss";
 
-const ProgressBar = ({
-  phases,
-  currentPhase,
-  currentPhaseStatus,
-  note,
-  remark,
-}) => {
+const ProgressBar = ({ phases, currentPhase, currentPhaseStatus, note }) => {
   const isPassed = (phase) =>
     utils.myGig.isPassedPhase(phases, currentPhase, phase) ||
     (phase === currentPhase && utils.myGig.isLastPhase(phase)) ||
@@ -42,7 +36,7 @@ const ProgressBar = ({
           ))}
         </div>
       </div>
-      <p styleName="progress-note">{remark}</p>
+      <p styleName="progress-note">{note}</p>
     </div>
   );
 };

src/containers/MyGigs/JobListing/JobCard/index.jsx

@@ -124,7 +124,7 @@ const JobCard = ({ job }) => {
               <IconNote />
             </i>
           </NoteTooltip>
-          <span styleName="note">{job.note}</span>
+          <span styleName="note">{job.remark}</span>
           <span styleName={`${expanded ? "show-less" : "show-more"}`}>
             <Button
               isText
@@ -153,7 +153,6 @@ const JobCard = ({ job }) => {
               currentPhase={job.phase}
               currentPhaseStatus={job.phaseStatus}
               note={job.phaseNote}
-              remark={job.remark}
             />
           </div>
         )}

src/services/myGigs.js

@@ -5,8 +5,8 @@ import {
   AVAILABLE_REMARK_BY_JOB_STATUS,
   JOB_STATUS_MAPPER,
   JOB_STATUS_MESSAGE_MAPPER,
-  MY_GIG_PHASE,
   SORT_STATUS_ORDER,
+  PHASES_FOR_JOB_STATUS,
 } from "../constants";
 import data from "../assets/data/my-gigs.json";
 
@@ -16,7 +16,6 @@ import data from "../assets/data/my-gigs.json";
  * @returns
  */
 const mapMyGigsData = (serverResponse) => {
-  const jobKeys = values(MY_GIG_PHASE);
   const phaseActionKeys = keys(ACTIONS_AVAILABLE_FOR_MY_GIG_PHASE);
 
   return (
@@ -26,9 +25,12 @@ const mapMyGigsData = (serverResponse) => {
         const action = phaseActionKeys.find((key) =>
           ACTIONS_AVAILABLE_FOR_MY_GIG_PHASE[key].includes(gigPhase)
         );
-        const statusIndex = jobKeys.findIndex((key) => key === gigPhase);
-
-        const previousStatus = jobKeys[Math.max(0, statusIndex - 1)];
+        const phases = PHASES_FOR_JOB_STATUS[myGig.status];
+        const statusIndex = phases.findIndex((key) => key === gigPhase);
+        let previousStatus = null;
+        if (statusIndex >= 1) {
+          previousStatus = phases[statusIndex - 1];
+        }
         const sortPrio = SORT_STATUS_ORDER.findIndex(
           (status) => status === gigPhase
         );