From cbb15ac7eeccc3c35082cdd2bedd131ab536ad37 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Tue, 9 May 2023 02:25:57 -0700
Subject: [PATCH] Fix various issues

---
 src/renderer/features/albums/routes/album-list-route.tsx       | 2 +-
 .../features/now-playing/components/sidebar-play-queue.tsx     | 3 ++-
 src/renderer/features/player/components/right-controls.tsx     | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/renderer/features/albums/routes/album-list-route.tsx b/src/renderer/features/albums/routes/album-list-route.tsx
index ec2e83a7..91c78c65 100644
--- a/src/renderer/features/albums/routes/album-list-route.tsx
+++ b/src/renderer/features/albums/routes/album-list-route.tsx
@@ -1,3 +1,4 @@
+import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { AnimatedPage } from '/@/renderer/features/shared';
 import { AlbumListHeader } from '/@/renderer/features/albums/components/album-list-header';
 import { AlbumListContent } from '/@/renderer/features/albums/components/album-list-content';
@@ -7,7 +8,6 @@ import { useAlbumList } from '/@/renderer/features/albums/queries/album-list-que
 import { generatePageKey, useAlbumListFilter, useCurrentServer } from '/@/renderer/store';
 import { useParams, useSearchParams } from 'react-router-dom';
 import { AlbumListContext } from '/@/renderer/features/albums/context/album-list-context';
-import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 
 const AlbumListRoute = () => {
   const gridRef = useRef<VirtualInfiniteGridRef | null>(null);
diff --git a/src/renderer/features/now-playing/components/sidebar-play-queue.tsx b/src/renderer/features/now-playing/components/sidebar-play-queue.tsx
index eb9cdda2..c213563c 100644
--- a/src/renderer/features/now-playing/components/sidebar-play-queue.tsx
+++ b/src/renderer/features/now-playing/components/sidebar-play-queue.tsx
@@ -4,9 +4,10 @@ import { Stack } from '@mantine/core';
 import { PlayQueue } from '/@/renderer/features/now-playing/components/play-queue';
 import { PlayQueueListControls } from './play-queue-list-controls';
 import { Song } from '/@/renderer/api/types';
-import { PageHeader, Paper, VirtualGridContainer } from '/@/renderer/components';
+import { PageHeader, Paper } from '/@/renderer/components';
 import { useWindowSettings } from '/@/renderer/store/settings.store';
 import { Platform } from '/@/renderer/types';
+import { VirtualGridContainer } from '/@/renderer/components/virtual-grid';
 
 export const SidebarPlayQueue = () => {
   const queueRef = useRef<{ grid: AgGridReactType<Song> } | null>(null);
diff --git a/src/renderer/features/player/components/right-controls.tsx b/src/renderer/features/player/components/right-controls.tsx
index 75e47476..7753bcf9 100644
--- a/src/renderer/features/player/components/right-controls.tsx
+++ b/src/renderer/features/player/components/right-controls.tsx
@@ -44,6 +44,7 @@ export const RightControls = () => {
         id: [currentSong.id],
         type: LibraryItem.SONG,
       },
+      serverId: currentSong?.serverId,
     });
   };
 
@@ -79,6 +80,7 @@ export const RightControls = () => {
         id: [currentSong.id],
         type: LibraryItem.SONG,
       },
+      serverId: currentSong?.serverId,
     });
   };