diff --git a/src/Progress.js b/src/Progress.js index ba0f010..bcac970 100644 --- a/src/Progress.js +++ b/src/Progress.js @@ -628,7 +628,7 @@ export default withRouter(class Progress extends React.Component { const progressId = result.data; this.stopLoading(); this.props.history.push("/progress/" + progressId); - + this.setState({ incorrectAnswers: {}, }); @@ -742,33 +742,35 @@ export default withRouter(class Progress extends React.Component {
{ this.state.currentCorrect && this.state.currentCorrect.length > 0 - ? - <> -

- { - this.state.moreAnswers - ? + ? + <> +

+ { + this.state.moreAnswers + ? this.state.numberOfAnswers !== null ? `${this.state.currentCorrect.length} of ${this.state.numberOfAnswers} correct so far:` : - "Correct so far:" - : - "Answers:" - } -

+ "Correct so far:" + : + "Answers:" + } + + {this.state.currentCorrect.map((vocab, index) => {this.state.currentCorrect.map((vocab, index) => -

{vocab}

- )} - - : + {this.state.currentCorrect.map((vocab, index) => +

{vocab}

+ )} + + : this.state.numberOfAnswers !== null ?

{this.state.currentCorrect.length} of {this.state.numberOfAnswers} correct so far

: - "" + "" }