livestream > isLivestream, Reverted change in QueueItem.tsx (change i…

…s in components/PlayQueue)

packages/app/app/components/Seekbar/index.js

@@ -11,7 +11,6 @@ const Seekbar = ({ seek, queue, fill, children }) => {
     seek(percent * duration);
   }, [queue.queueItems, queue.currentSong, seek]);
 
-
   return (
     <div onClick={handleClick} className={styles.seekbar_container}>
       <div style={{width: fill}} className={styles.seekbar_fill} />

packages/ui/lib/components/PlayerBar/index.tsx

@@ -10,8 +10,10 @@ import VolumePopUp, { VolumePopUpProps } from './VolumePopUp';
 import common from '../../common.scss';
 import styles from './styles.scss';
 import { formatDuration } from '../../utils';
+
 import useWindowSize from '../../hooks/useWindowSize';
 
+
 export type PlayerBarProps = PlayerControlsProps &
   Omit<SeekbarProps, 'children'> &
   TrackInfoProps &
@@ -24,7 +26,7 @@ export type PlayerBarProps = PlayerControlsProps &
 
 const VOLUME_POPUP_BREAKPOINT = 570;
 
-let livestream = false;
+let isLivestream = false;
 
 const PlayerBar: React.FC<PlayerBarProps> = ({
   cover,
@@ -64,15 +66,11 @@ const PlayerBar: React.FC<PlayerBarProps> = ({
 }) => {
   const { width: windowWidth } = useWindowSize();
   const livestreamCheck = timeToEnd;
-  // fixes small bug where seekbar will progress before song is fully loaded
-  if (isNaN(livestreamCheck)) {
-    livestream = true;
-  }
-  if (typeof timeToEnd === 'string') {
-    livestream = true;
+  if (livestreamCheck <= 0) {
+    isLivestream = true;
     fill = 100;
   } else {
-    livestream = false;
+    isLivestream = false;
   }
   return (
     <div className={cx(
@@ -91,8 +89,8 @@ const PlayerBar: React.FC<PlayerBarProps> = ({
         {hasTracks &&
           renderTrackDuration &&
           <div className={styles.track_duration}>
-            <div>{livestream ? timePlayed : formatDuration(timePlayed)}</div>
-            <div>{livestream ? timeToEnd : '-'+formatDuration(timeToEnd)}</div>
+            <div>{isLivestream ? timePlayed : formatDuration(timePlayed)}</div>
+            <div>{isLivestream ? timeToEnd : '-'+formatDuration(timeToEnd)}</div> 
           </div>}
       </Seekbar>
       <div className={styles.player_bar_bottom}>

packages/ui/lib/components/QueueItem/index.jsx

@@ -62,7 +62,7 @@ export const QueueItem = ({
 
         <div className={styles.item_duration_container}>
           <div className={styles.item_duration}>
-            {duration === '00:00' && !isLoading ? 'LIVE' : duration}
+            {duration}
           </div>
         </div>
       </>