From dc057620ad4a9b7c8a8ac35446676192fb35f5f3 Mon Sep 17 00:00:00 2001
From: diegolmello <diegolmello@gmail.com>
Date: Wed, 25 Sep 2019 10:35:57 -0300
Subject: [PATCH] [FIX] Cancel upload and check failed upload

---
 app/lib/methods/sendFileMessage.js   | 2 +-
 app/views/RoomView/UploadProgress.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/lib/methods/sendFileMessage.js b/app/lib/methods/sendFileMessage.js
index 12703afcad..2b5bdf45ba 100644
--- a/app/lib/methods/sendFileMessage.js
+++ b/app/lib/methods/sendFileMessage.js
@@ -14,7 +14,7 @@ export async function cancelUpload(item) {
 		uploadQueue[item.path].abort();
 		try {
 			const db = database.active;
-			await db.database.action(async() => {
+			await db.action(async() => {
 				await item.destroyPermanently();
 			});
 		} catch (e) {
diff --git a/app/views/RoomView/UploadProgress.js b/app/views/RoomView/UploadProgress.js
index d4f1c398bc..aa62f1b62a 100644
--- a/app/views/RoomView/UploadProgress.js
+++ b/app/views/RoomView/UploadProgress.js
@@ -122,7 +122,8 @@ class UploadProgress extends Component {
 		uploads.forEach(async(u) => {
 			if (!RocketChat.isUploadActive(u.path)) {
 				try {
-					await database.database.action(async() => {
+					const db = database.active;
+					await db.action(async() => {
 						await u.update(() => {
 							u.error = true;
 						});