Merge pull request #7230 from RocketChat/fix-closing-file-upload-errors

[FIX] Fixes scope error preventing file upload errors from being dismissed
RocketChat · Jun 30, 2017 · e40379b · e40379b
2 parents 52b8cec + ec85fbb
commit e40379b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/rocketchat-ui/client/lib/fileUpload.js b/packages/rocketchat-ui/client/lib/fileUpload.js
@@ -135,7 +135,7 @@ fileUpload = function(filesToUpload) {
 				html: true
 			}, function(isConfirm) {
 				consume();
-				if (isConfirm !== true) {
+				if (!isConfirm) {
 					return;
 				}
 
@@ -175,10 +175,10 @@ fileUpload = function(filesToUpload) {
 							uploading = [];
 						}
 
-						const item = _.findWhere(uploading, { id: this.id });
+						const item = _.findWhere(uploading, { id: upload.id });
 
 						if (_.isObject(item)) {
-							item.error = error.error;
+							item.error = error.message;
 							item.percentage = 0;
 						} else {
 							uploading.push({