Status Bar: Hide seconds if more than 1 hour (#1501)

Closes #1434

packages/@uppy/utils/src/prettyETA.js

@@ -8,9 +8,9 @@ module.exports = function prettyETA (seconds) {
   // Display a leading zero if the there is a preceding unit: 1m 05s, but 5s
   const hoursStr = time.hours ? time.hours + 'h ' : ''
   const minutesVal = time.hours ? ('0' + time.minutes).substr(-2) : time.minutes
-  const minutesStr = minutesVal ? minutesVal + 'm ' : ''
+  const minutesStr = minutesVal ? minutesVal + 'm' : ''
   const secondsVal = minutesVal ? ('0' + time.seconds).substr(-2) : time.seconds
-  const secondsStr = secondsVal + 's'
+  const secondsStr = time.hours ? '' : (minutesVal ? ' ' + secondsVal + 's' : secondsVal + 's')
 
   return `${hoursStr}${minutesStr}${secondsStr}`
 }

packages/@uppy/utils/src/prettyETA.test.js

@@ -7,6 +7,6 @@ describe('prettyETA', () => {
     expect(prettyETA(1)).toEqual('1s')
     expect(prettyETA(103)).toEqual('1m 43s')
     expect(prettyETA(1034.9)).toEqual('17m 14s')
-    expect(prettyETA(103984.1)).toEqual('4h 53m 04s')
+    expect(prettyETA(103984.1)).toEqual('4h 53m')
   })
 })