Fix for the flash-shown class removaltz-fix-ide-bugs

2 files changed, 7 insertions, 4 deletions

diff --git a/app/assets/javascripts/flash.js b/app/assets/javascripts/flash.js
index 7c42dcafd6b..a0af2875ab5 100644
--- a/app/assets/javascripts/flash.js
+++ b/app/assets/javascripts/flash.js
@@ -10,7 +10,7 @@ const hideFlash = (flashEl, fadeTransition = true) => {
 
   flashEl.addEventListener('transitionend', () => {
     flashEl.remove();
-    if (document.body.classList.contains('flash-show')) document.body.classList.remove('flash-shown');
+    if (document.body.classList.contains('flash-shown')) document.body.classList.remove('flash-shown');
   }, {
     once: true,
     passive: true,
diff --git a/app/assets/javascripts/ide/stores/actions.js b/app/assets/javascripts/ide/stores/actions.js
index ed7d446e775..96a87744df5 100644
--- a/app/assets/javascripts/ide/stores/actions.js
+++ b/app/assets/javascripts/ide/stores/actions.js
@@ -93,7 +93,7 @@ export const commitChanges = (
     .then((data) => {
       const { branch } = payload;
       if (!data.short_id) {
-        flash(data.message);
+        flash(data.message, 'alert', document, null, false, true);
         return;
       }
 
@@ -114,7 +114,10 @@ export const commitChanges = (
       flash(
         commitMsg,
         'notice',
-      );
+        document,
+        null,
+        false,
+        true);
       window.dispatchEvent(new Event('resize'));
 
       if (newMr) {
@@ -147,7 +150,7 @@ export const commitChanges = (
       if (err.responseJSON && err.responseJSON.message) {
         errMsg += ` (${stripHtml(err.responseJSON.message)})`;
       }
-      flash(errMsg);
+      flash(errMsg, 'alert', document, null, false, true);
       window.dispatchEvent(new Event('resize'));
     });