fix merge

src/renderer/components/item-list/helpers/item-list-infinite-loader.ts

@@ -10,7 +10,6 @@ import { queryKeys } from '/@/renderer/api/query-keys';
 import { useListContext } from '/@/renderer/context/list-context';
 import { eventEmitter } from '/@/renderer/events/event-emitter';
 import { UserFavoriteEventPayload, UserRatingEventPayload } from '/@/renderer/events/events';
-import { getServerById } from '/@/renderer/store';
 import { LibraryItem } from '/@/shared/types/domain-types';
 
 const getQueryKeyName = (itemType: LibraryItem): string => {
@@ -138,7 +137,7 @@ export const useItemListInfiniteLoader = ({
                     gcTime: 1000 * 15,
                     queryFn: async ({ signal }) => {
                         const result = await listQueryFn({
-                            apiClientProps: { server: getServerById(serverId), signal },
+                            apiClientProps: { serverId, signal },
                             query: queryParams,
                         });
 

src/renderer/features/albums/components/navidrome-album-filters.tsx

@@ -12,7 +12,7 @@ import { artistsQueries } from '/@/renderer/features/artists/api/artists-api';
 import { genresQueries } from '/@/renderer/features/genres/api/genres-api';
 import { sharedQueries } from '/@/renderer/features/shared/api/shared-api';
 import { useCurrentServer } from '/@/renderer/store';
-import { NDSongQueryFields } from '/@/shared/api/navidrome.types';
+import { NDSongQueryFields } from '/@/shared/api/navidrome/navidrome-types';
 import { hasFeature } from '/@/shared/api/utils';
 import { Divider } from '/@/shared/components/divider/divider';
 import { Group } from '/@/shared/components/group/group';

src/renderer/features/home/routes/home-route.tsx

@@ -45,8 +45,6 @@ const HomeRoute = () => {
     const { windowBarStyle } = useWindowSettings();
     const { homeFeature, homeItems } = useGeneralSettings();
 
-    const itemsPerPage = 10;
-
     const queriesEnabled = useMemo(() => {
         return homeItems.reduce(
             (previous: Record<HomeItem, boolean>, current) => ({
@@ -80,16 +78,6 @@ const HomeRoute = () => {
         return feature.data?.items?.filter((item) => item.imageUrl) ?? [];
     }, [feature.data?.items]);
 
-    const queriesEnabled = useMemo(() => {
-        return homeItems.reduce(
-            (previous: Record<HomeItem, boolean>, current) => ({
-                ...previous,
-                [current.id]: !current.disabled,
-            }),
-            {} as Record<HomeItem, boolean>,
-        );
-    }, [homeItems]);
-
     const random = useQuery(
         albumQueries.list({
             options: {

src/renderer/store/playlist.store.ts

@@ -6,7 +6,7 @@ import { PlaylistListFilter, SongListFilter } from '/@/renderer/store/list.store
 import { DataTableProps } from '/@/renderer/store/settings.store';
 import { mergeOverridingColumns } from '/@/renderer/store/utils';
 import { PlaylistListSort, SortOrder } from '/@/shared/types/domain-types';
-import { ListDisplayType, TableColumn, ListPagination } from '/@/shared/types/types';
+import { ListDisplayType, ListPagination, TableColumn } from '/@/shared/types/types';
 
 export interface PlaylistSlice extends PlaylistState {
     actions: {