From b1533c5ee2ec69c8f2ec9d92728cea8a1f6ed1d7 Mon Sep 17 00:00:00 2001
From: nukeop <12746779+nukeop@users.noreply.github.com>
Date: Tue, 21 May 2024 12:28:11 +0200
Subject: [PATCH] Fix #1609

---
 .../app/app/components/PlayQueue/index.tsx    | 13 +++--
 .../StreamVerificationContainer/index.tsx     | 49 +++++++++----------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/packages/app/app/components/PlayQueue/index.tsx b/packages/app/app/components/PlayQueue/index.tsx
index ff81c090a4..104698c836 100644
--- a/packages/app/app/components/PlayQueue/index.tsx
+++ b/packages/app/app/components/PlayQueue/index.tsx
@@ -143,7 +143,7 @@ const PlayQueue: React.FC<PlayQueueProps> = ({
     }
   };
 
-  const QueueRow = React.memo(({data, index, style}: QueueRowProps) => {
+  const QueueRow = React.memo(({ data, index, style }: QueueRowProps) => {
     const item = data.queue.queueItems[index] as QueueItemType;
     return (
       <Draggable
@@ -160,7 +160,7 @@ const PlayQueue: React.FC<PlayQueueProps> = ({
               style={style ? {
                 ...draggableProvided.draggableProps.style,
                 ...style
-              } :draggableProvided.draggableProps.style}
+              } : draggableProvided.draggableProps.style}
             >
               <QueuePopupContainer
                 trigger={
@@ -170,7 +170,7 @@ const PlayQueue: React.FC<PlayQueueProps> = ({
                     track={item}
                     onSelect={onSelectTrack(index)}
                     onRemove={onRemoveTrack(index)}
-                    duration={formatTrackDuration(t)(item)} 
+                    duration={formatTrackDuration(t)(item)}
                   />
                 }
                 isQueueItemCompact={data.settings.compactQueueBar}
@@ -209,7 +209,7 @@ const PlayQueue: React.FC<PlayQueueProps> = ({
           compact={Boolean(settings.compactQueueBar)}
         />
 
-        <Droppable 
+        <Droppable
           droppableId='play_queue'
           mode='virtual'
           renderClone={QueueItemClone({
@@ -247,7 +247,10 @@ const PlayQueue: React.FC<PlayQueueProps> = ({
             </div>
           )}
         </Droppable>
-        <StreamVerificationContainer />
+        {
+          settings?.useStreamVerification &&
+          <StreamVerificationContainer />
+        }
       </div>
     </DragDropContext>
   );
diff --git a/packages/app/app/containers/StreamVerificationContainer/index.tsx b/packages/app/app/containers/StreamVerificationContainer/index.tsx
index 6a4807333e..339fb98cce 100644
--- a/packages/app/app/containers/StreamVerificationContainer/index.tsx
+++ b/packages/app/app/containers/StreamVerificationContainer/index.tsx
@@ -113,29 +113,28 @@ export const StreamVerificationContainer: React.FC = () => {
     return null;
   }
 
-  return settings?.isReady && 
-  settings?.useStreamVerification && 
-  <StreamVerification 
-    status={verificationStatus}
-    isLoading={isLoading}
-    isDisabled={!currentTrack?.streams?.[0]?.stream}
-    onVerify={onVerify}
-    onUnverify={onUnverify}
-    tooltipStrings={{
-      unknown: t('stream-verification.tooltip.unknown'),
-      unverified: t('stream-verification.tooltip.unverified'),
-      weakly_verified: t('stream-verification.tooltip.weakly-verified'),
-      verified: t('stream-verification.tooltip.verified'),
-      verified_by_user: t('stream-verification.tooltip.verified-by-user')
-    }}
-    streamStatusStrings={{
-      unknown: t('stream-verification.stream-status.unknown'),
-      unverified: t('stream-verification.stream-status.unverified'),
-      weakly_verified: t('stream-verification.stream-status.weakly-verified'),
-      verified: t('stream-verification.stream-status.verified'),
-      verified_by_user: t('stream-verification.stream-status.verified-by-user')
-    }}
-    textVerify={t('stream-verification.verify')}
-    textUnverify={t('stream-verification.unverify')}
-  />;
+  return settings?.isReady &&
+    <StreamVerification
+      status={verificationStatus}
+      isLoading={isLoading}
+      isDisabled={!currentTrack?.streams?.[0]?.stream}
+      onVerify={onVerify}
+      onUnverify={onUnverify}
+      tooltipStrings={{
+        unknown: t('stream-verification.tooltip.unknown'),
+        unverified: t('stream-verification.tooltip.unverified'),
+        weakly_verified: t('stream-verification.tooltip.weakly-verified'),
+        verified: t('stream-verification.tooltip.verified'),
+        verified_by_user: t('stream-verification.tooltip.verified-by-user')
+      }}
+      streamStatusStrings={{
+        unknown: t('stream-verification.stream-status.unknown'),
+        unverified: t('stream-verification.stream-status.unverified'),
+        weakly_verified: t('stream-verification.stream-status.weakly-verified'),
+        verified: t('stream-verification.stream-status.verified'),
+        verified_by_user: t('stream-verification.stream-status.verified-by-user')
+      }}
+      textVerify={t('stream-verification.verify')}
+      textUnverify={t('stream-verification.unverify')}
+    />;
 };