Skip to content

Commit

Permalink
Fix #1609
Browse files Browse the repository at this point in the history
  • Loading branch information
nukeop committed May 21, 2024
1 parent 7c7b42a commit b1533c5
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 30 deletions.
13 changes: 8 additions & 5 deletions packages/app/app/components/PlayQueue/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -160,7 +160,7 @@ const PlayQueue: React.FC<PlayQueueProps> = ({
style={style ? {
...draggableProvided.draggableProps.style,
...style
} :draggableProvided.draggableProps.style}
} : draggableProvided.draggableProps.style}
>
<QueuePopupContainer
trigger={
Expand All @@ -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}
Expand Down Expand Up @@ -209,7 +209,7 @@ const PlayQueue: React.FC<PlayQueueProps> = ({
compact={Boolean(settings.compactQueueBar)}
/>

<Droppable
<Droppable
droppableId='play_queue'
mode='virtual'
renderClone={QueueItemClone({
Expand Down Expand Up @@ -247,7 +247,10 @@ const PlayQueue: React.FC<PlayQueueProps> = ({
</div>
)}
</Droppable>
<StreamVerificationContainer />
{
settings?.useStreamVerification &&
<StreamVerificationContainer />
}
</div>
</DragDropContext>
);
Expand Down
49 changes: 24 additions & 25 deletions packages/app/app/containers/StreamVerificationContainer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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')}
/>;
};

0 comments on commit b1533c5

Please sign in to comment.