3 files changed, 60 insertions, 1 deletions

diff --git a/src/containers/settings/EditSettingsScreen.tsx b/src/containers/settings/EditSettingsScreen.tsx
index a6c4561dd..fbbed629a 100644
--- a/src/containers/settings/EditSettingsScreen.tsx
+++ b/src/containers/settings/EditSettingsScreen.tsx
@@ -853,6 +853,7 @@ class EditSettingsScreen extends Component<EditSettingsScreenProps> {
     const { app } = this.props.stores;
     const {
       updateStatus,
+      updateVersion,
       updateStatusTypes,
       isClearingAllCache,
       lockingFeatureEnabled,
@@ -860,13 +861,13 @@ class EditSettingsScreen extends Component<EditSettingsScreenProps> {
     const { checkForUpdates, installUpdate, clearAllCache } =
       this.props.actions.app;
     const form = this.prepareForm();
-
     return (
       <ErrorBoundary>
         <EditSettingsForm
           form={form}
           checkForUpdates={checkForUpdates}
           installUpdate={installUpdate}
+          updateVersion={updateVersion}
           isCheckingForUpdates={updateStatus === updateStatusTypes.CHECKING}
           isUpdateAvailable={updateStatus === updateStatusTypes.AVAILABLE}
           noUpdateAvailable={updateStatus === updateStatusTypes.NOT_AVAILABLE}
diff --git a/src/containers/settings/ReleaseNotesScreen.tsx b/src/containers/settings/ReleaseNotesScreen.tsx
new file mode 100644
index 000000000..c3014d187
--- /dev/null
+++ b/src/containers/settings/ReleaseNotesScreen.tsx
@@ -0,0 +1,16 @@
+import { Component, ReactElement } from 'react';
+
+import ReleaseNotes from '../../components/settings/releaseNotes/ReleaseNotesDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
+
+class ReleaseNotesScreen extends Component {
+  render(): ReactElement {
+    return (
+      <ErrorBoundary>
+        <ReleaseNotes />
+      </ErrorBoundary>
+    );
+  }
+}
+
+export default ReleaseNotesScreen;
diff --git a/src/containers/settings/ReleaseNotesWindow.tsx b/src/containers/settings/ReleaseNotesWindow.tsx
new file mode 100644
index 000000000..3e43727d0
--- /dev/null
+++ b/src/containers/settings/ReleaseNotesWindow.tsx
@@ -0,0 +1,42 @@
+import { inject, observer } from 'mobx-react';
+import { Component, ReactPortal } from 'react';
+import ReactDOM from 'react-dom';
+import { Outlet } from 'react-router-dom';
+
+import { StoresProps } from '../../@types/ferdium-components.types';
+import Layout from '../../components/settings/releaseNotes/ReleaseNotesLayout';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
+
+class SettingsContainer extends Component<StoresProps> {
+  portalRoot: any;
+
+  el: HTMLDivElement;
+
+  constructor(props: StoresProps) {
+    super(props);
+
+    this.portalRoot = document.querySelector('#portalContainer');
+    this.el = document.createElement('div');
+  }
+
+  componentDidMount(): void {
+    this.portalRoot.append(this.el);
+  }
+
+  componentWillUnmount(): void {
+    this.el.remove();
+  }
+
+  render(): ReactPortal {
+    return ReactDOM.createPortal(
+      <ErrorBoundary>
+        <Layout {...this.props}>
+          <Outlet />
+        </Layout>
+      </ErrorBoundary>,
+      this.el,
+    );
+  }
+}
+
+export default inject('stores', 'actions')(observer(SettingsContainer));