From 4f8cd5307cf5f387bbf14bd4647ef3324facc90f Mon Sep 17 00:00:00 2001
From: Caio Cotts <caio@cotts.com.br>
Date: Wed, 18 Dec 2024 17:57:42 -0500
Subject: [PATCH] fix(ui): fix play queue for play button and context menus
 (#3559)

---
 ui/src/common/ContextMenus.jsx | 4 ++--
 ui/src/common/PlayButton.jsx   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/common/ContextMenus.jsx b/ui/src/common/ContextMenus.jsx
index 6ee5f93ca..dfa6f875c 100644
--- a/ui/src/common/ContextMenus.jsx
+++ b/ui/src/common/ContextMenus.jsx
@@ -203,7 +203,7 @@ export const AlbumContextMenu = (props) =>
       resource={'album'}
       songQueryParams={{
         pagination: { page: 1, perPage: -1 },
-        sort: { field: 'trackNumber', order: 'ASC' },
+        sort: { field: 'album', order: 'ASC' },
         filter: {
           album_id: props.record.id,
           release_date: props.releaseDate,
@@ -234,7 +234,7 @@ export const ArtistContextMenu = (props) =>
       songQueryParams={{
         pagination: { page: 1, perPage: 200 },
         sort: {
-          field: 'trackNumber',
+          field: 'album',
           order: 'ASC',
         },
         filter: { album_artist_id: props.record.id },
diff --git a/ui/src/common/PlayButton.jsx b/ui/src/common/PlayButton.jsx
index 0df3125a6..04b36ef5b 100644
--- a/ui/src/common/PlayButton.jsx
+++ b/ui/src/common/PlayButton.jsx
@@ -21,7 +21,7 @@ export const PlayButton = ({ record, size, className }) => {
     dataProvider
       .getList('song', {
         pagination: { page: 1, perPage: -1 },
-        sort: { field: 'trackNumber', order: 'ASC' },
+        sort: { field: 'album', order: 'ASC' },
         filter: {
           album_id: record.id,
           release_date: record.releaseDate,