Merge pull request #66 from vnma0/date-format

Clock : now shows no duplicate text upon contest ended
vnma0 · Mar 5, 2019 · 0ec518e · 0ec518e
2 parents 2c7e8e4 + 44646df
commit 0ec518e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/app/globalStatusBar/clock/clock.js b/src/app/globalStatusBar/clock/clock.js
@@ -39,8 +39,8 @@ class CountdownClock extends Component {
                 disabled
             >
                 <AccessTime style={{ marginRight: '10px' }} />
-                {this.props.children
-                    ? this.props.children : this.props.timeLeft + ' / ' + this.props.duration}
+                {this.props.ended
+                    ? 'ENDED' : (this.props.children ? this.props.children : this.props.timeLeft + ' / ' + this.props.duration)}
             </Button>
         )
     }

diff --git a/src/app/globalStatusBar/globalStatusBar.js b/src/app/globalStatusBar/globalStatusBar.js
@@ -46,7 +46,7 @@ class GlobalStatusBar extends Component {
         if (this.props.loggedIn)
             // if logged in, show the clock, otherwise hide it
             return (
-                <CountdownClock ended={this.props.contestEnded}>
+                <CountdownClock ended={this.props.ended}>
                     {this.props.started
                         ? `${this.props.contestTimeLeft} / ${this.props.contestDuration}`
                         : `${this.props.contestTimeLeft} before start`}