Merge branch 'nightly' into release

1 files changed, 12 insertions, 13 deletions

diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 9bb64b6fe..e03c4c1d2 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -11,17 +11,19 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { workspaceStore } from '../../features/workspaces';
 import UIStore from '../../stores/UIStore';
 
-export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
+@inject('stores', 'actions')
+@observer
+class SettingsContainer extends Component {
   portalRoot = document.querySelector('#portalContainer');
 
   el = document.createElement('div');
 
   componentDidMount() {
-    this.portalRoot.appendChild(this.el);
+    this.portalRoot.append(this.el);
   }
 
   componentWillUnmount() {
-    this.portalRoot.removeChild(this.el);
+    this.el.remove();
   }
 
   render() {
@@ -36,16 +38,11 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex
     );
 
     return ReactDOM.createPortal(
-      (
-        <ErrorBoundary>
-          <Layout
-            navigation={navigation}
-            closeSettings={closeSettings}
-          >
-            {children}
-          </Layout>
-        </ErrorBoundary>
-      ),
+      <ErrorBoundary>
+        <Layout navigation={navigation} closeSettings={closeSettings}>
+          {children}
+        </Layout>
+      </ErrorBoundary>,
       this.el,
     );
   }
@@ -60,3 +57,5 @@ SettingsContainer.wrappedComponent.propTypes = {
     ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };
+
+export default SettingsContainer;