Merge pull request #2499 from thornbill/fix-alert-promises

Fix dialog helper not resolving

src/components/dialogHelper/dialogHelper.js

@@ -106,6 +106,15 @@ import '../../assets/css/scrollstyles.css';
                     tryRemoveElement(dlg);
                 }
             }
+
+            //resolve();
+            // if we just called history.back(), then use a timeout to allow the history events to fire first
+            setTimeout(() => {
+                resolve({
+                    element: dlg,
+                    closedByBack: self.closedByBack
+                });
+            }, 1);
         }
 
         dlg.addEventListener('close', onDialogClosed);