Cleanup some code and fix alert dismiss not working

flarum · Nov 6, 2019 · 58f5d36 · 58f5d36
1 parent c9478ee
commit 58f5d36
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/js/src/common/Application.js b/js/src/common/Application.js
@@ -330,12 +330,14 @@ export default class Application {
           children = app.translator.trans('core.lib.error.generic_message');
       }
 
+      const isDebug = app.forum.attribute('debug');
+
       error.alert = new Alert({
         type: 'error',
         children,
-        controls: app.forum.attribute('debug') ? [
+        controls: isDebug && [
           <Button className="Button Button--link" onclick={this.showDebug.bind(this, error)}>Debug</Button>
-        ] : undefined
+        ]
       });
 
       try {
@@ -355,7 +357,7 @@ export default class Application {
    * @private
    */
   showDebug(error) {
-    this.alerts.dismiss(this.requestErrorAlert);
+    this.alerts.dismiss(this.requestError.alert);
 
     this.modal.show(new RequestErrorModal({error}));
   }