Merge branch 'convert-header-bar-from-reactxp'

3 files changed, 0 insertions, 25 deletions

diff --git a/gui/src/renderer/containers/ConnectPage.tsx b/gui/src/renderer/containers/ConnectPage.tsx
index 57f550d988..f09033ae43 100644
--- a/gui/src/renderer/containers/ConnectPage.tsx
+++ b/gui/src/renderer/containers/ConnectPage.tsx
@@ -76,9 +76,6 @@ const mapDispatchToProps = (dispatch: ReduxDispatch, props: IAppContext) => {
   const history = bindActionCreators({ push }, dispatch);
 
   return {
-    onSettings: () => {
-      history.push('/settings');
-    },
     onSelectLocation: () => {
       history.push('/select-location');
     },
diff --git a/gui/src/renderer/containers/LaunchPage.tsx b/gui/src/renderer/containers/LaunchPage.tsx
deleted file mode 100644
index aae7293bb1..0000000000
--- a/gui/src/renderer/containers/LaunchPage.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { push } from 'connected-react-router';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import Launch from '../components/Launch';
-import { IReduxState, ReduxDispatch } from '../redux/store';
-
-const mapStateToProps = (_state: IReduxState) => ({});
-const mapDispatchToProps = (dispatch: ReduxDispatch) => {
-  const history = bindActionCreators({ push }, dispatch);
-  return {
-    openSettings() {
-      history.push('/settings');
-    },
-  };
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Launch);
diff --git a/gui/src/renderer/containers/LoginPage.tsx b/gui/src/renderer/containers/LoginPage.tsx
index 2cadcca426..d3cc89caf6 100644
--- a/gui/src/renderer/containers/LoginPage.tsx
+++ b/gui/src/renderer/containers/LoginPage.tsx
@@ -1,4 +1,3 @@
-import { push } from 'connected-react-router';
 import { shell } from 'electron';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
@@ -17,12 +16,8 @@ const mapStateToProps = (state: IReduxState) => {
   };
 };
 const mapDispatchToProps = (dispatch: ReduxDispatch, props: IAppContext) => {
-  const history = bindActionCreators({ push }, dispatch);
   const { resetLoginError, updateAccountToken } = bindActionCreators(accountActions, dispatch);
   return {
-    openSettings: () => {
-      history.push('/settings');
-    },
     login: (account: string) => {
       consumePromise(props.app.login(account));
     },