[C-3821] Fix native double save (#7609)

AudiusProject · Feb 15, 2024 · 862c9e6 · 862c9e6
1 parent 75925a9
commit 862c9e6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/packages/mobile/src/screens/favorites-screen/TracksTab.tsx b/packages/mobile/src/screens/favorites-screen/TracksTab.tsx
@@ -123,6 +123,7 @@ export const TracksTab = () => {
     // Need to fetch saves when the filterValue or selectedCategory (by way of fetchSaves) changes
     if (isReachable) {
       fetchSaves()
+      setFetchPage((fetchPage) => fetchPage + 1)
     }
   }, [isReachable, fetchSaves])
 

diff --git a/packages/web/src/common/store/pages/saved/lineups/sagas.ts b/packages/web/src/common/store/pages/saved/lineups/sagas.ts
@@ -60,9 +60,10 @@ function* getTracks({ offset, limit }: { offset: number; limit: number }) {
   }, {})
 
   const localLibraryAdditions = yield* select(getSelectedCategoryLocalTrackAdds)
-  const localLibraryAdditionsTrackIds = Object.keys(
-    localLibraryAdditions
-  ).filter((savedTrackId) => !savedTrackTimestamps[savedTrackId])
+  const localLibraryAdditionsTrackIds = Object.keys(localLibraryAdditions)
+    .filter((savedTrackId) => !savedTrackTimestamps[savedTrackId])
+    .map((trackId) => Number(trackId))
+
   const localLibraryAdditionsTimestamps = localLibraryAdditionsTrackIds.reduce(
     (map, saveId) => {
       map[saveId] = Date.now()
@@ -71,10 +72,19 @@ function* getTracks({ offset, limit }: { offset: number; limit: number }) {
     {}
   )
 
-  const allSavedTrackIds = uniq([
-    ...localLibraryAdditionsTrackIds,
-    ...savedTrackIds
-  ])
+  let allSavedTrackIds: (number | string)[] = []
+
+  if (isNativeMobile && offset !== 0) {
+    allSavedTrackIds = savedTrackIds.filter(
+      (s) => !localLibraryAdditionsTrackIds.includes(s)
+    )
+  } else {
+    allSavedTrackIds = uniq([
+      ...localLibraryAdditionsTrackIds,
+      ...savedTrackIds
+    ])
+  }
+
   const allSavedTrackTimestamps = {
     ...localLibraryAdditionsTimestamps,
     ...savedTrackTimestamps