fix: Unsubscribe from bookmarks on unmount

pct-org · Oct 7, 2020 · c162be1 · c162be1
1 parent d400282
commit c162be1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/mobile/screens/Home/BookmarksSlider/BookmarksSlider.js b/app/mobile/screens/Home/BookmarksSlider/BookmarksSlider.js
@@ -18,7 +18,7 @@ export const BookmarksSlider = ({ handleGoTo, onPress }) => {
   )
 
   useEffect(() => {
-    subscribeToMore({
+    const unsubscribe = subscribeToMore({
       document: BookmarkedSubscription,
       updateQuery: (prev, { subscriptionData }) => {
         if (!subscriptionData.data || !subscriptionData.data.bookmarked) {
@@ -37,12 +37,17 @@ export const BookmarksSlider = ({ handleGoTo, onPress }) => {
         } else {
           // Remove the bookmark
           return Object.assign({}, {
-            bookmarks: prev.bookmarks.filter(prevBookmark => prevBookmark._id !== bookmarked._id),
+            bookmarks: prev.bookmarks.filter((prevBookmark) => prevBookmark._id !== bookmarked._id),
           })
         }
       },
     })
 
+    return () => {
+      if (unsubscribe) {
+        unsubscribe()
+      }
+    }
   }, [])
 
   if (!loading && (!data || !data.bookmarks || data.bookmarks.length === 0)) {

diff --git a/app/mobile/screens/Home/HomeScreen.js b/app/mobile/screens/Home/HomeScreen.js
@@ -80,8 +80,8 @@ export const Home = ({ navigation }) => {
   const movies = noMoviesYet
     ? null
     : moviesData.movies
-      .filter(movie => !movie.bookmarked)
-      .filter(movie => !movie.watched.complete)
+      .filter((movie) => !movie.bookmarked)
+      .filter((movie) => !movie.watched.complete)
 
   return (
     <ScrollViewWithStatusBar>