Merge branch 'master' of github.com:transloadit/uppy

packages/@uppy/aws-s3-multipart/src/index.js

@@ -153,6 +153,7 @@ module.exports = class AwsS3Multipart extends Plugin {
         this.uppy.emit('upload-error', file, err)
         err.message = `Failed because: ${err.message}`
 
+        queuedRequest.done()
         this.resetUploaderReferences(file.id)
         reject(err)
       }
@@ -162,6 +163,7 @@ module.exports = class AwsS3Multipart extends Plugin {
           uploadURL: result.location
         }
 
+        queuedRequest.done()
         this.resetUploaderReferences(file.id)
 
         this.uppy.emit('upload-success', file, uploadResp)

packages/@uppy/dashboard/src/components/FileItem/index.js

@@ -27,7 +27,7 @@ module.exports = pure(function FileItem (props) {
     { 'is-processing': isProcessing },
     { 'is-complete': isUploaded },
     { 'is-paused': isPaused },
-    { 'is-error': error },
+    { 'is-error': !!error },
     { 'is-resumable': props.resumableUploads },
     { 'is-noIndividualCancellation': !props.individualCancellation }
   )
@@ -40,9 +40,10 @@ module.exports = pure(function FileItem (props) {
           showLinkToFileUploadResult={props.showLinkToFileUploadResult}
         />
         <FileProgress
+          {...props}
+          file={file}
           error={error}
           isUploaded={isUploaded}
-          {...props}
         />
       </div>