persist adjusted filters in next task review workflow (#2319)

* fix selected next filtered challenge issue in review workflow

* make Next Filtered Task filters persist between tasks

src/components/TaskConfirmationModal/TaskConfirmationModal.js

@@ -103,20 +103,30 @@ export class TaskConfirmationModal extends Component {
     this.props.setTags(value)
   }
 
-  filterChange = (key, value, invert=false) => {
-    const criteria = _cloneDeep(this.currentFilters())
-    criteria.filters = criteria.filters || {}
-    criteria.filters[key] = value
-
-    if (key === "challenge") {
-      // If we are using a challenge filter then we need to cleanup
-      // the challengeId filter as it gets priority.
-      criteria.filters.challengeId = null
-    }
-
-    criteria.invertFields = criteria.invertFields || {}
-    criteria.invertFields[key] = invert
-    this.setState({criteria})
+  filterChange = (key, value, invert = false) => {
+    this.setState(prevState => {
+      const criteria = _cloneDeep(prevState.criteria)
+      criteria.filters = criteria.filters || {}
+      criteria.filters[key] = value
+
+      if (key === "challenge") {
+        // If we are using a challenge filter then we need to cleanup
+        // the challengeId filter as it gets priority.
+        criteria.filters.challengeId = null
+      }
+
+      criteria.invertFields = criteria.invertFields || {}
+      criteria.invertFields[key] = invert
+
+      return { criteria }
+    }, this.updateHistory)
+  }
+
+  updateHistory = () => {
+    const { criteria } = this.state
+    const currentState = _get(this.props.history, 'location.state', {})
+    const newState = _merge({}, currentState, criteria)
+    this.props.history.replace({ ...this.props.history.location, state: newState })
   }
 
   currentFilters = () => {