From 5503702230d8ea780d2775052e95768685a24daa Mon Sep 17 00:00:00 2001
From: Cagdas U <cagdasugurlu01@gmail.com>
Date: Thu, 3 Sep 2020 20:17:39 +0300
Subject: [PATCH 1/2] fix(submission-management): add null checking for
 `currentPhase`

---
 .../SubmissionManagement/index.jsx                 | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
index 898ec91183..1282c6de66 100644
--- a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
+++ b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
@@ -49,7 +49,7 @@ export default function SubmissionManagement(props) {
     .sort((a, b) => moment(a.scheduledEndDate).diff(b.scheduledEndDate))[0];
 
   const now = moment();
-  const end = moment(currentPhase.scheduledEndDate);
+  const end = moment(currentPhase && currentPhase.scheduledEndDate);
   const diff = end.isAfter(now) ? end.diff(now) : 0;
   const timeLeft = moment.duration(diff);
 
@@ -78,9 +78,13 @@ export default function SubmissionManagement(props) {
           </a>
         </div>
         <div styleName="right-col">
-          <p styleName="round">
-            {currentPhase.name}
-          </p>
+          {
+            currentPhase && (
+            <p styleName="round">
+              {currentPhase.name}
+            </p>
+            )
+          }
           {
             challenge.status !== 'COMPLETED' ? (
               <div>
@@ -111,7 +115,7 @@ export default function SubmissionManagement(props) {
             Manage your submissions
           </p>
           {
-            isDesign && (
+            isDesign && currentPhase && (
               <p styleName="round-ends">
                 <span styleName="ends-label">
                   {currentPhase.name}

From 7a3c5130f530942d14c5a3c85b1ef6388057d612 Mon Sep 17 00:00:00 2001
From: Cagdas U <cagdasugurlu01@gmail.com>
Date: Fri, 4 Sep 2020 06:14:37 +0300
Subject: [PATCH 2/2] fix(submission-management): `challenge.status` at
 conditional check

Fix `challenge.status` at conditional check.
The status property of a completed challenge was `COMPLETED` before,
it's `Completed` anymore.
---
 .../SubmissionManagement/SubmissionManagement/index.jsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
index 1282c6de66..0e0edb7a26 100644
--- a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
+++ b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
@@ -86,7 +86,7 @@ export default function SubmissionManagement(props) {
             )
           }
           {
-            challenge.status !== 'COMPLETED' ? (
+            challenge.status !== 'Completed' ? (
               <div>
                 <p styleName="time-left">
                   {days > 0 && (`${days}D`)}