From c5eddcb1ca3d5880876d3658d708b1a4c6a9ec1f Mon Sep 17 00:00:00 2001
From: Vishnu KS <yo@vishnuks.com>
Date: Thu, 16 Apr 2020 21:52:43 +0530
Subject: [PATCH] upload: Don't hide upload status if there are errors.

---
 frontend_tests/node_tests/upload.js | 7 +++++++
 static/js/upload.js                 | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend_tests/node_tests/upload.js b/frontend_tests/node_tests/upload.js
index 32c4a2165d..0ee5dd6abc 100644
--- a/frontend_tests/node_tests/upload.js
+++ b/frontend_tests/node_tests/upload.js
@@ -486,6 +486,7 @@ run_test('uppy_events', () => {
     upload.hide_upload_status = () => {
         hide_upload_status_called = true;
     };
+    $("#compose-send-status").removeClass("alert-error");
     files = [
         {
             id: "uppy-zulip/jpeg-1e-image/jpeg-163515-1578367331279",
@@ -504,6 +505,12 @@ run_test('uppy_events', () => {
     assert(hide_upload_status_called);
     assert.equal(files.length, 0);
 
+    hide_upload_status_called = false;
+    $("#compose-send-status").addClass("alert-error");
+    on_complete_callback();
+    assert(!hide_upload_status_called);
+
+    $("#compose-send-status").removeClass("alert-error");
     hide_upload_status_called = false;
     files = [
         {
diff --git a/static/js/upload.js b/static/js/upload.js
index 70f01c1c28..b665f79660 100644
--- a/static/js/upload.js
+++ b/static/js/upload.js
@@ -225,7 +225,8 @@ exports.setup_upload = function (config) {
             }
         });
 
-        if (!uploads_in_progress) {
+        const has_errors = exports.get_item("send_status", config).hasClass("alert-error");
+        if (!uploads_in_progress && !has_errors) {
             setTimeout(function () {
                 exports.hide_upload_status(config);
             }, 500);