Fix submission phase display on 2 round challenge

Author: jmgasper

src/components/ChallengeEditor/index.js

@@ -840,7 +840,7 @@ class ChallengeEditor extends Component {
       for (let index = 0; index < phases.length; ++index) {
         newChallenge.phases[index].isDurationActive =
           moment(newChallenge.phases[index]['scheduledEndDate']).isAfter()
-        if (newChallenge.phases[index].name === 'Submission') {
+        if (newChallenge.phases[index].name === 'Submission' || newChallenge.phases[index].name === 'Checkpoint Submission') {
           newChallenge.phases[index].isStartTimeActive = true
         } else {
           newChallenge.phases[index].isStartTimeActive = index <= 0

src/reducers/challenges.js

@@ -32,7 +32,8 @@ import {
   CREATE_CHALLENGE_RESOURCE_FAILURE,
   DELETE_CHALLENGE_SUCCESS,
   DELETE_CHALLENGE_FAILURE,
-  DELETE_CHALLENGE_PENDING
+  DELETE_CHALLENGE_PENDING,
+  MULTI_ROUND_CHALLENGE_TEMPLATE_ID
 } from '../config/constants'
 
 const initialState = {
@@ -108,7 +109,7 @@ export default function (state = initialState, action) {
         ...state,
         challengeDetails: { ...action.payload,
           // change the phase order for the design challenge with multiple phases
-          phases: (action.payload.legacy.subTrack === 'WEB_DESIGNS' && action.payload.phases.length === 8) ? [
+          phases: (action.payload.timelineTemplateId === MULTI_ROUND_CHALLENGE_TEMPLATE_ID && action.payload.phases.length === 8) ? [
             action.payload.phases.find(x => x.name === 'Registration'),
             action.payload.phases.find(x => x.name === 'Checkpoint Submission'),
             action.payload.phases.find(x => x.name === 'Checkpoint Screening'),
@@ -161,7 +162,18 @@ export default function (state = initialState, action) {
       return {
         ...state,
         challenges: updatedChallenges,
-        challengeDetails: action.challengeDetails,
+        challengeDetails: { ...action.challengeDetails,
+          // change the phase order for the design challenge with multiple phases
+          phases: (action.challengeDetails.timelineTemplateId === MULTI_ROUND_CHALLENGE_TEMPLATE_ID && action.challengeDetails.phases.length === 8) ? [
+            action.challengeDetails.phases.find(x => x.name === 'Registration'),
+            action.challengeDetails.phases.find(x => x.name === 'Checkpoint Submission'),
+            action.challengeDetails.phases.find(x => x.name === 'Checkpoint Screening'),
+            action.challengeDetails.phases.find(x => x.name === 'Checkpoint Review'),
+            action.challengeDetails.phases.find(x => x.name === 'Submission'),
+            action.challengeDetails.phases.find(x => x.name === 'Screening'),
+            action.challengeDetails.phases.find(x => x.name === 'Review'),
+            action.challengeDetails.phases.find(x => x.name === 'Approval')] : action.challengeDetails.phases
+        },
         isLoading: false,
         attachments: _.has(action.challengeDetails, 'attachments') ? action.challengeDetails.attachments : [],
         failedToLoad: false