From d750d95f70d3296ba1a6199f760905b838be62be Mon Sep 17 00:00:00 2001
From: Nursoltan Saipolda <nursoltan.s@gmail.com>
Date: Thu, 7 Apr 2022 08:56:35 +0800
Subject: [PATCH] fix issue 1358

---
 src/components/ChallengeEditor/index.js | 6 +++---
 src/components/PhaseInput/index.js      | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/ChallengeEditor/index.js b/src/components/ChallengeEditor/index.js
index 25b6faae..ac35a431 100644
--- a/src/components/ChallengeEditor/index.js
+++ b/src/components/ChallengeEditor/index.js
@@ -836,9 +836,9 @@ class ChallengeEditor extends Component {
             newChallenge.phases[phaseIndex]['scheduledEndDate'] = lastDate
           }
 
-          if (moment(newChallenge.phases[phaseIndex]['scheduledEndDate']).isAfter(phases[phaseIndex]['scheduledStartDate'])) {
-            newChallenge.phases[phaseIndex]['scheduledStartDate'] = moment(newChallenge.phases[phaseIndex]['scheduledEndDate']).subtract('1', 'hour').format('MM/DD/YYYY HH:mm')
-          }
+          // if (moment(newChallenge.phases[phaseIndex]['scheduledEndDate']).isAfter(phases[phaseIndex]['scheduledStartDate'])) {
+          //   newChallenge.phases[phaseIndex]['scheduledStartDate'] = moment(newChallenge.phases[phaseIndex]['scheduledEndDate']).subtract('1', 'hour').format('MM/DD/YYYY HH:mm')
+          // }
 
           newChallenge.phases[phaseIndex]['duration'] =
           moment(newChallenge.phases[phaseIndex]['scheduledEndDate']).diff(newChallenge.phases[phaseIndex]['scheduledStartDate'], 'hours')
diff --git a/src/components/PhaseInput/index.js b/src/components/PhaseInput/index.js
index 10086d45..18ad1a9f 100644
--- a/src/components/PhaseInput/index.js
+++ b/src/components/PhaseInput/index.js
@@ -27,6 +27,13 @@ const PhaseInput = ({ onUpdatePhase, phase, readOnly, phaseIndex, isActive }) =>
       setEndDate(phase.scheduledEndDate)
       setDuration(moment(phase.scheduledEndDate).diff(phase.scheduledStartDate, 'hours'))
     }
+  }, [])
+
+  useEffect(() => {
+    if (phase) {
+      setStartDate(phase.scheduledStartDate)
+      setEndDate(phase.scheduledEndDate)
+    }
   }, [phase])
 
   useEffect(() => {