From 43d8cc7fa73f12cfacf7740e22b578929c362670 Mon Sep 17 00:00:00 2001
From: austinried <4966622+austinried@users.noreply.github.com>
Date: Sun, 22 Aug 2021 12:00:22 +0900
Subject: [PATCH] reset list when changing filter

---
 app/hooks/list.ts             | 12 ++++++++----
 app/screens/LibraryAlbums.tsx |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/hooks/list.ts b/app/hooks/list.ts
index 172f50b..994fc87 100644
--- a/app/hooks/list.ts
+++ b/app/hooks/list.ts
@@ -42,11 +42,15 @@ export const useFetchPaginatedList = <T>(
     })
   }, [fetchList, pageSize])
 
+  const reset = useCallback(() => {
+    setList([])
+    refresh()
+  }, [refresh])
+
   useActiveServerRefresh(
     useCallback(() => {
-      setList([])
-      refresh()
-    }, [refresh]),
+      reset()
+    }, [reset]),
   )
 
   const fetchNextPage = useCallback(() => {
@@ -65,5 +69,5 @@ export const useFetchPaginatedList = <T>(
     })
   }, [offset, pageSize, fetchList, list])
 
-  return { list, refreshing, refresh, fetchNextPage }
+  return { list, refreshing, refresh, reset, fetchNextPage }
 }
diff --git a/app/screens/LibraryAlbums.tsx b/app/screens/LibraryAlbums.tsx
index ead4504..6086e07 100644
--- a/app/screens/LibraryAlbums.tsx
+++ b/app/screens/LibraryAlbums.tsx
@@ -64,7 +64,7 @@ const filterOptions: OptionData[] = [
 
 const AlbumsList = () => {
   const fetchAlbums = useStore(selectMusic.fetchAlbums)
-  const { list, refreshing, refresh, fetchNextPage } = useFetchPaginatedList(fetchAlbums, 300)
+  const { list, refreshing, refresh, reset, fetchNextPage } = useFetchPaginatedList(fetchAlbums, 300)
   const filter = useStore(selectSettings.libraryAlbumFilter)
   const setFilter = useStore(selectSettings.setLibraryAlbumFilter)
 
@@ -74,8 +74,8 @@ const AlbumsList = () => {
   const height = size + 36
 
   useEffect(() => {
-    refresh()
-  }, [refresh, filter])
+    reset()
+  }, [reset, filter])
 
   return (
     <View style={styles.container}>