From 4476ac8e54cc54532a8e1f2436dc912f97c68ddc Mon Sep 17 00:00:00 2001
From: Lei Nelissen <lei@codified.nl>
Date: Mon, 6 Jul 2020 16:56:23 +0200
Subject: [PATCH] Remove redundant logs and store tracks properly

---
 src/screens/Music/stacks/Album.tsx                          | 6 +++---
 src/screens/Music/stacks/Albums.tsx                         | 1 -
 src/screens/Music/stacks/RecentAlbums.tsx                   | 2 --
 .../SetJellyfinServer/components/CredentialGenerator.tsx    | 1 -
 src/store/music/index.ts                                    | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/screens/Music/stacks/Album.tsx b/src/screens/Music/stacks/Album.tsx
index b3d702b..1371d0f 100644
--- a/src/screens/Music/stacks/Album.tsx
+++ b/src/screens/Music/stacks/Album.tsx
@@ -45,16 +45,16 @@ const Album: React.FC = () => {
     const playAlbum = usePlayAlbum();
 
     // Setup callbacks
-    const selectAlbum = useCallback(() => { playAlbum(id); }, [playAlbum]);
+    const selectAlbum = useCallback(() => { playAlbum(id); }, [playAlbum, id]);
     const selectTrack = usePlayTrack();
-    const refresh = useCallback(() => { dispatch(fetchTracksByAlbum(id)); }, [id]);
+    const refresh = useCallback(() => { dispatch(fetchTracksByAlbum(id)); }, [id, dispatch]);
 
     // Retrieve album tracks on load
     useEffect(() => {
         if (!album?.lastRefreshed || differenceInDays(album?.lastRefreshed, new Date()) > ALBUM_CACHE_AMOUNT_OF_DAYS) {
             refresh();
         }
-    }, []);
+    }, [album?.lastRefreshed, refresh]);
 
     // GUARD: If there is no album, we cannot render a thing
     if (!album) {
diff --git a/src/screens/Music/stacks/Albums.tsx b/src/screens/Music/stacks/Albums.tsx
index 46797ab..a8bd5c1 100644
--- a/src/screens/Music/stacks/Albums.tsx
+++ b/src/screens/Music/stacks/Albums.tsx
@@ -193,7 +193,6 @@ const Albums: React.FC = () => {
                     getItemLayout={getItemLayout}
                     ref={listRef}
                     keyExtractor={(item, index) => `${item}_${index}`}
-                    onScrollToIndexFailed={console.log}
                     renderSectionHeader={generateSection}
                     renderItem={generateItem}
                 />
diff --git a/src/screens/Music/stacks/RecentAlbums.tsx b/src/screens/Music/stacks/RecentAlbums.tsx
index cb965f3..acba17b 100644
--- a/src/screens/Music/stacks/RecentAlbums.tsx
+++ b/src/screens/Music/stacks/RecentAlbums.tsx
@@ -42,8 +42,6 @@ const RecentAlbums: React.FC = () => {
     const retrieveData = useCallback(() => dispatch(fetchRecentAlbums()), [dispatch]);
     const selectAlbum = useCallback((id: string) => navigation.navigate('Album', { id, album: albums[id] as Album }), [navigation, albums]);
     
-    console.log(recentAlbums.map((d) => albums[d]?.DateCreated));
-    
     // Retrieve data on mount
     useEffect(() => { retrieveData(); }, [retrieveData]);
     
diff --git a/src/screens/modals/SetJellyfinServer/components/CredentialGenerator.tsx b/src/screens/modals/SetJellyfinServer/components/CredentialGenerator.tsx
index b7d29a6..c5cbc1d 100644
--- a/src/screens/modals/SetJellyfinServer/components/CredentialGenerator.tsx
+++ b/src/screens/modals/SetJellyfinServer/components/CredentialGenerator.tsx
@@ -30,7 +30,6 @@ class CredentialGenerator extends Component<Props> {
 
     handleMessage = (event: WebViewMessageEvent) => {
         // GUARD: Something must be returned for this thing to work
-        console.log(event.nativeEvent.data);
         if (!event.nativeEvent.data) {
             return;
         }
diff --git a/src/store/music/index.ts b/src/store/music/index.ts
index 4984216..3b7a17a 100644
--- a/src/store/music/index.ts
+++ b/src/store/music/index.ts
@@ -57,7 +57,7 @@ const music = createSlice({
          * Fetch tracks by album
          */
         builder.addCase(fetchTracksByAlbum.fulfilled, (state, { payload }) => {
-            trackAdapter.setAll(state.tracks, payload);
+            trackAdapter.upsertMany(state.tracks, payload);
 
             // Also store all the track ids in the album
             const album = state.albums.entities[payload[0].AlbumId];