fix wrap up mode bug

.gitpod.yml

@@ -0,0 +1,2 @@
+tasks:
+  - before: npm i -g firebase-tools

package.json

@@ -2,6 +2,8 @@
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
     "start": "expo start",
+    "start:tunnel": "expo start --tunnel",
+    "firelogin:tunnel": "firebase login --no-localhost",
     "android": "expo start --android",
     "ios": "expo start --ios",
     "web": "expo start --web",
@@ -49,6 +51,7 @@
     "babel-plugin-inline-dotenv": "^1.5.0",
     "babel-plugin-module-resolver": "^4.0.0",
     "babel-preset-expo": "~8.1.0",
+    "firebase-tools": "^8.4.3",
     "fs-extra": "^9.0.0",
     "jest-expo": "^37.0.0",
     "pre-commit": "^1.2.2",

src/features/reviews/useReviewSession.js

@@ -108,6 +108,7 @@ export default (reviews, subjects) => {
   }, [
     completedCards,
     completedReviews,
+    unfinishedReviews,
     incorrectCards,
     incorrectReviews,
   ]);
@@ -137,7 +138,8 @@ export default (reviews, subjects) => {
       setUnfinishedReviews(newUnfinishedReviews)
 
       // a card is surely complete when answered correctly
-      setCompletedCards(Object.assign({}, completedCards, { [id]: true }));
+      const newCompletedCards = Object.assign({}, completedCards, { [id]: true });
+      setCompletedCards(newCompletedCards);
     }
 
     if (!correct) {
@@ -152,12 +154,10 @@ export default (reviews, subjects) => {
     if (isReviewCompleted) {
 
       if (typeof onReviewComplete === 'function') {
-        const incorrectMeaningAnswers = incorrectMeanings[reviewId];
-        const incorrectReadingAnswers = incorrectReadings[reviewId];
         onReviewComplete({
           review,
-          incorrectMeanings: incorrectMeaningAnswers,
-          incorrectReadings: incorrectReadingAnswers,
+          incorrectMeanings: incorrectMeanings[reviewId],
+          incorrectReadings: incorrectReadings[reviewId],
         })
       }
 
@@ -172,17 +172,10 @@ export default (reviews, subjects) => {
     // need to find the reviewed item in the queue
 
     // find index of the removed item
-    const reviewedQueueItemIndex = queue.findIndex(i => (
+    const newQueue = queue.filter(i => !(
       i.id === id &&
       i.reviewType === reviewType
     ));
-
-    // this shouldn't happen
-    if (reviewedQueueItemIndex === -1) return;
-
-    // remove item from the the list
-    const newQueue = queue.slice();
-    newQueue.splice(reviewedQueueItemIndex, 1);
 
     // if answer was incorrect, put the item back
     // into the queue randomly
@@ -201,7 +194,7 @@ export default (reviews, subjects) => {
     }
 
     // set the new queue
-    setQueue(newQueue || []);
+    setQueue(newQueue);
   }
 
   return {
@@ -219,5 +212,4 @@ export default (reviews, subjects) => {
     incorrectMeanings,
     incorrectReadings,
   }
-
 }

src/mock/freeAssignments.js

@@ -55,6 +55,7 @@ export default [
       "srs_stage": 8,
     }
   },
+  /*
   {
     "id": 8,
     "data": {
@@ -79,4 +80,5 @@ export default [
       "srs_stage": 4,
     }
   },
+  */
 ];

src/screens/Review/Review.js

@@ -1,4 +1,4 @@
-import React, { useState, useMemo } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { StyleSheet, View, Text } from 'react-native';
@@ -50,7 +50,7 @@ const Review = ({ demo = false, stopDemo } = {}) => {
 
   // manage review session
   const {
-    queue: _queue,
+    queue,
     submitAnswer,
     subjectsDict,
     totalCards,
@@ -61,19 +61,18 @@ const Review = ({ demo = false, stopDemo } = {}) => {
     reviews,
     subjects,
   );
-  
-  // process queue
-  const queue = useMemo(() => _queue
-    // wrap up mode filter
-    .filter(i => wrapUpMode ? _.get(unfinishedReviews, i.review.id) : true)
-  , [
-    _queue,
+
+  const queueFiltered = useMemo(() => (
+    queue
+      // wrap up mode filter
+      .filter(i => wrapUpMode ? !_.isNil(_.get(unfinishedReviews, i.review.id)) : true)
+  ), [
+    queue,
     wrapUpMode,
-    unfinishedReviews,
   ])
 
   // are all queue items asked
-  const isQueueClear = !loadingReviews && queue.length === 0;
+  const isQueueClear = !loadingReviews && queueFiltered.length === 0;
 
   return (
     <>
@@ -122,15 +121,15 @@ const Review = ({ demo = false, stopDemo } = {}) => {
         />
 
         {/* render deck */}
-        {queue.length > 0 && (
+        {queueFiltered.length > 0 && (
           <Deck
             style={styles.deck}
-            cards={queue}
+            cards={queueFiltered}
             dismissCard={direction => {
               submitAnswer(
                 // item that was submitted: the top item
                 // of the processed queue list
-                queue.slice(0, 1)[0],
+                queueFiltered[0],
                 // right direction means correct answer
                 direction === 'right',
                 // callback for when the submit answer causes
@@ -184,7 +183,7 @@ const Review = ({ demo = false, stopDemo } = {}) => {
 
               return (
                 <Card
-                  key={id}
+                  key={`${id}_${reviewType}`}
                   deckProps={props}
                   subjectType={subjectType}
                   reviewType={reviewType}