Merge pull request #4658 from Clockwork-Rat/WV-881-redirect-when-election-countdown-clicked

Add onlcickandballotforward function

Author: DaleMcGrew

src/js/components/Ready/ElectionCountdown.jsx

@@ -107,6 +107,13 @@ class ElectionCountdown extends React.Component {
     }
   }
 
+  onClickFunctionAndBallotForward = () => {
+    if (this.props.onClickFunction) {
+      this.props.onClickFunction();
+    }
+    historyPush('/ballot');
+  }
+
   setNextElectionDateFromDayText = (nextElectionDayText) => {
     const daysUntilNextElection = daysUntil(nextElectionDayText);
     // console.log('setNextElectionDateFromDayText nextElectionDayText:', nextElectionDayText, ', daysUntilNextElection:', daysUntilNextElection);
@@ -166,19 +173,15 @@ class ElectionCountdown extends React.Component {
           <CardTitleUpcoming
             className="u-cursor--pointer"
             id="electionCountDownTitle"
-            onClick={() => this.onClickFunctionLocal()}
+            onClick={() => this.onClickFunctionAndBallotForward}
+            style={{cursor: 'pointer'}}
           >
             {daysUntilNextElection ? (
-              <div
-                onClick={() => historyPush('/ballot')}
-                style={{cursor: 'pointer'}}
-                >
                 <>
                   {daysUntilNextElection}
                   <SpaceBetweenNumberAndWord />
                   {daysUntilNextElection === 1 ? 'day' : 'days'}
                 </>
-              </div>
             ) : (
               <div style={{ margin: 26 }}>
                 { showButton ? (
@@ -226,13 +229,8 @@ class ElectionCountdown extends React.Component {
       <CardCountdownInternalWrapper>
         <div>
           <div>
-            <CardTitleToday className="u-cursor--pointer" id="electionCountDownTitle" onClick={() => this.onClickFunctionLocal()}>
-              <div
-                onClick={() => historyPush('/ballot')}
-                style={{cursor: 'pointer'}}
-              >
+            <CardTitleToday className="u-cursor--pointer" id="electionCountDownTitle" onClick={() => this.onClickFunctionAndBallotForward()} style={{cursor: 'pointer'}}>
                 Voting ends today!
-              </div>
             </CardTitleToday>
           </div>
           <div>
@@ -257,7 +255,7 @@ class ElectionCountdown extends React.Component {
               <div
                 onClick={() => historyPush('/ballot')}
                 style={{cursor: 'pointer'}}
-                >
+              >
                 <>
                   {daysUntilNextNationalElection}
                   <SpaceBetweenNumberAndWord />