added fix to ensure survey answer persistence when moving to an alrea…

…dy answered question

js/scenes/Surveys/Pages/Surveys.js

@@ -16,6 +16,7 @@ const Surveys = ({
   question,
   questions,
   nextQuestion,
+  nextQuestionFunc,
   previousQuestionFunc,
   prevQuestion,
   selectedValue,
@@ -59,7 +60,7 @@ const Surveys = ({
             completePerc={questions.indexOf(question) + 1}
             totalSteps={questions.length + 1}
           />
-          <RightNavArrow navAction={() => nextQuestion()} />
+          <RightNavArrow navAction={() => nextQuestionFunc(nextQuestion.question)} />
         </View>
       </View>
     </ScrollView>
@@ -69,7 +70,8 @@ const Surveys = ({
 export default Surveys;
 
 Surveys.defaultProps = {
-  prevQuestion: null
+  prevQuestion: null,
+  nextQuestion: null
 };
 
 Surveys.propTypes = {
@@ -95,7 +97,15 @@ Surveys.propTypes = {
       value: PropTypes.number
     }))
   })).isRequired,
-  nextQuestion: PropTypes.func.isRequired,
+  nextQuestion: PropTypes.shape({
+    quality: PropTypes.string,
+    question: PropTypes.string,
+    answers: PropTypes.arrayOf(PropTypes.shape({
+      answer: PropTypes.string,
+      value: PropTypes.number
+    }))
+  }),
+  nextQuestionFunc: PropTypes.func.isRequired,
   previousQuestionFunc: PropTypes.func.isRequired,
   prevQuestion: PropTypes.shape({
     quality: PropTypes.string,

js/scenes/Surveys/SurveysContainer.js

@@ -64,11 +64,15 @@ class SurveysContainer extends Component {
     goToSurveyComplete();
   }
 
-  nextQuestion = () => {
+  nextQuestion = (nextQuestion) => {
+    const selectedAnswer = this.props.surveyAnswers[nextQuestion];
     if (this.state.selectedValue === -1) {
       this.setState({ showWarningModal: true });
     } else {
-      this.setState({ n: this.state.n + 1, selectedValue: -1 });
+      this.setState({ 
+        n: this.state.n + 1, 
+        selectedValue: (selectedAnswer) ? selectedAnswer.value : -1 
+      });
     }
   }
 
@@ -104,9 +108,10 @@ class SurveysContainer extends Component {
           displayGoalModal={this.displayGoalModal}
           questions={questions}
           question={questions[n]}
-          nextQuestion={this.nextQuestion}
+          nextQuestionFunc={this.nextQuestion}
           previousQuestionFunc={this.previousQuestion}
           prevQuestion={questions[n - 1]}
+          nextQuestion={questions[n + 1]}
           selectedValue={selectedValue}
         />
       );