Merge branch 'main' into feature/flatten-recently-played-tracks-into-albums

Author: anultravioletaurora

.github/workflows/build-android.yml

@@ -43,7 +43,7 @@ jobs:
           fi
 
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v5
         with:
           path: |
             node_modules
@@ -68,7 +68,7 @@ jobs:
 
 
       - name: 📦 Upload APK for testing
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: always()
         with:
           name: jellify-android-pr-${{ github.event.number }}-${{ env.VERSION_NUMBER }}

.github/workflows/build-ios.yml

@@ -54,7 +54,7 @@ jobs:
           zip -r Jellify-Release-Simulator.zip Jellify.app
 
       - name: 📦 Upload IPA for testing
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: always()
         with:
           name: jellify-ios-pr-${{ github.event.number }}-${{ env.VERSION_NUMBER }}

.github/workflows/maestro-test.yml

@@ -24,7 +24,7 @@ jobs:
         with:
           bun-version: 1.3.4
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           path: |
             node_modules
@@ -40,7 +40,7 @@ jobs:
           java-version: '17'
 
       - name: 🐘 Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v5
 
       - name: 🍎 Run bun init-android
         run: bun i
@@ -58,7 +58,7 @@ jobs:
         run: bun run android-build
 
       - name: 📤 Upload Android Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: android-artifacts
           path: ./android/app/build/outputs/apk/release/*.apk
@@ -90,7 +90,7 @@ jobs:
         with:
           bun-version: 1.3.4
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v5
         with:
           path: |
             node_modules
@@ -104,13 +104,13 @@ jobs:
         run: export MAESTRO_VERSION=1.40.0; curl -Ls "https://get.maestro.mobile.dev" | bash
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'zulu'
 
       - name: ⬇️ Download Android Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: android-artifacts
           path: artifacts/
@@ -154,7 +154,7 @@ jobs:
           DISCORD_WEBHOOK_URL: ${{ secrets.MAESTRO_WEBHOOK_RESULTS }}
 
       - name: Store tests result
-        uses: actions/upload-artifact@v4.3.4
+        uses: actions/upload-artifact@v6
         if: always()
         with:
           name: TestResult

.github/workflows/publish-beta.yml

@@ -163,7 +163,7 @@ jobs:
           KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
 
       - name: 📤 Upload Android Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: android-artifacts
           path: ./android/app/build/outputs/apk/release/*.apk
@@ -240,7 +240,7 @@ jobs:
           MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}"
 
       - name: 📤 Upload iOS Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: ios-artifacts
           path: ./ios/Jellify.ipa
@@ -251,7 +251,7 @@ jobs:
     runs-on: macos-15
     steps:
       - name: 🛒 Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.SIGNING_REPO_PAT }}
 
@@ -290,14 +290,14 @@ jobs:
 
       - name: ⬇️ Download Android Artifacts
         if: ${{ github.event.inputs['build-platform'] == 'Android' || github.event.inputs['build-platform'] == 'Both' }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: android-artifacts
           path: artifacts/
 
       - name: ⬇️ Download iOS Artifacts
         if: ${{ github.event.inputs['build-platform'] == 'iOS' || github.event.inputs['build-platform'] == 'Both' }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: ios-artifacts
           path: artifacts/

.github/workflows/run-jest-test-suite.yml

@@ -22,7 +22,7 @@ jobs:
           bun-version: 1.3.4
 
       - name: 📦 Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             ~/.bun/install/cache

src/api/queries/playlist/utils/index.ts

@@ -133,7 +133,12 @@ export async function fetchPlaylistTracks(
 			Recursive: false,
 			Limit: ApiLimits.Library,
 			StartIndex: pageParam * ApiLimits.Library,
-			Fields: [ItemFields.MediaSources, ItemFields.ParentId, ItemFields.Path],
+			Fields: [
+				ItemFields.MediaSources,
+				ItemFields.ParentId,
+				ItemFields.Path,
+				ItemFields.SortName,
+			],
 		},
 	)
 

src/components/Player/components/song-info.tsx

@@ -106,13 +106,21 @@ export default function SongInfo({ swipeX }: SongInfoProps = {}): React.JSX.Elem
 	return (
 		<XStack>
 			<YStack justifyContent='flex-start' flex={1} gap={'$0.25'}>
-				<TextTicker {...TextTickerConfig} style={{ height: getToken('$9') }}>
+				<TextTicker
+					{...TextTickerConfig}
+					style={{ height: getToken('$9') }}
+					key={`${nowPlaying!.item.Id}-title`}
+				>
 					<Text bold fontSize={'$6'}>
 						{trackTitle}
 					</Text>
 				</TextTicker>
 
-				<TextTicker {...TextTickerConfig} style={{ height: getToken('$8') }}>
+				<TextTicker
+					{...TextTickerConfig}
+					style={{ height: getToken('$8') }}
+					key={`${nowPlaying!.item.Id}-artist`}
+				>
 					<Text fontSize={'$6'} color={'$color'} onPress={handleArtistPress}>
 						{nowPlaying?.artist ?? 'Unknown Artist'}
 					</Text>

src/components/Player/mini-player.tsx

@@ -118,7 +118,7 @@ export default function Miniplayer(): React.JSX.Element {
 							<Animated.View
 								entering={FadeIn}
 								exiting={FadeOut}
-								key={`${nowPlaying!.item.AlbumId}-mini-player-song-info`}
+								key={`${nowPlaying!.item.Id}-mini-player-song-info`}
 								style={{
 									width: '100%',
 								}}

src/providers/Player/hooks/mutations.ts

@@ -225,12 +225,19 @@ export const useRemoveFromQueue = () => {
 
 	return async (index: number) => {
 		trigger('impactMedium')
-		TrackPlayer.remove([index])
+		await TrackPlayer.remove([index])
 
 		const prevQueue = usePlayerQueueStore.getState().queue
 		const newQueue = prevQueue.filter((_, i) => i !== index)
 
 		usePlayerQueueStore.getState().setQueue(newQueue)
+
+		// If queue is now empty, reset player state to hide miniplayer
+		if (newQueue.length === 0) {
+			usePlayerQueueStore.getState().setCurrentTrack(undefined)
+			usePlayerQueueStore.getState().setCurrentIndex(undefined)
+			await TrackPlayer.reset()
+		}
 	}
 }
 
@@ -240,6 +247,13 @@ export const useRemoveUpcomingTracks = () => {
 		const newQueue = await TrackPlayer.getQueue()
 
 		usePlayerQueueStore.getState().setQueue(newQueue as JellifyTrack[])
+
+		// If queue is now empty, reset player state to hide miniplayer
+		if (newQueue.length === 0) {
+			usePlayerQueueStore.getState().setCurrentTrack(undefined)
+			usePlayerQueueStore.getState().setCurrentIndex(undefined)
+			await TrackPlayer.reset()
+		}
 	}
 }