use destructuring, relates #158

fac-14 · Oct 19, 2018 · b06d26a · b06d26a
1 parent 7e88429
commit b06d26a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/components/Pages/Revision/RevisionPage.js b/src/components/Pages/Revision/RevisionPage.js
@@ -75,21 +75,15 @@ export default class RevisionPage extends React.Component {
         id="revision"
         markComplete={this.markComplete}
         swipe={this.swipe}
-        caseTitle={this.state.caseTitle}
-        caseDetails={this.state.caseDetails}
-        caseDetailsDisplayed={this.state.caseDetailsDisplayed}
-        markSchemeElements={this.state.markSchemeElements}
-        markSchemeCompleted={this.state.markSchemeCompleted}
+        {...this.state}
       />
     );
 
     const resultsContainer = (
       <ResultsContainer
         markSchemeTotal={this.state.markSchemeElements.length}
-        markSchemeCompleted={this.state.markSchemeCompleted}
-        markSchemeElements={this.state.markSchemeElements}
-        caseTitle={this.state.caseTitle}
         timeElapsed={this.state.time}
+        {...this.state}
       />
     );
     const { exam, station } = this.props.match.params;
@@ -98,11 +92,9 @@ export default class RevisionPage extends React.Component {
         <TopBar
           id="topbar"
           backLink={`${exam}/${station}`}
-          stationName={this.state.stationName}
           submitCase={this.submitCase}
-          tickDisplayed={this.state.tickDisplayed}
           timer
-          time={this.state.time}
+          {...this.state}
         />
         {this.state.resultsDisplayed ? resultsContainer : revisionContainer}
       </React.Fragment>

diff --git a/src/components/TopBar/TopBar.js b/src/components/TopBar/TopBar.js
@@ -51,11 +51,9 @@ export default class TopBar extends React.Component {
           )}
           {this.props.tickDisplayed && (
             <CompleteButton
-              addNewFlow={this.props.addNewFlow}
               exam={this.props.backLink}
-              station={this.props.station}
               onClick={this.props.submitCase}
-              tickDisplayed={this.props.tickDisplayed}
+              {...this.props}
             />
           )}
         </TopBarContainer>