4 files changed, 14 insertions, 9 deletions
diff --git a/app/containers/LoginPage.js b/app/containers/LoginPage.js
index dbd49dea03..807c141799 100644
--- a/app/containers/LoginPage.js
+++ b/app/containers/LoginPage.js
@@ -11,7 +11,9 @@ import { openLink } from '../lib/platform';
 import type { ReduxState, ReduxDispatch } from '../redux/store';
 import type { SharedRouteProps } from '../routes';
 
-const mapStateToProps = (state: ReduxState) => state;
+const mapStateToProps = (state: ReduxState) => ({
+  account: state.account,
+});
 const mapDispatchToProps = (dispatch: ReduxDispatch, props: SharedRouteProps) => {
   const { push: pushHistory } = bindActionCreators({ push }, dispatch);
   const { login, resetLoginError, updateAccountToken } = bindActionCreators(
diff --git a/app/containers/SelectLocationPage.js b/app/containers/SelectLocationPage.js
index 05b4205dfa..b2ae476912 100644
--- a/app/containers/SelectLocationPage.js
+++ b/app/containers/SelectLocationPage.js
@@ -10,7 +10,9 @@ import { log } from '../lib/platform';
 import type { ReduxState, ReduxDispatch } from '../redux/store';
 import type { SharedRouteProps } from '../routes';
 
-const mapStateToProps = (state: ReduxState) => state;
+const mapStateToProps = (state: ReduxState) => ({
+  settings: state.settings,
+});
 const mapDispatchToProps = (dispatch: ReduxDispatch, props: SharedRouteProps) => {
   const { push: pushHistory } = bindActionCreators({ push }, dispatch);
   const { backend } = props;
diff --git a/app/containers/SettingsPage.js b/app/containers/SettingsPage.js
index 24b718485b..2bcef79730 100644
--- a/app/containers/SettingsPage.js
+++ b/app/containers/SettingsPage.js
@@ -11,12 +11,11 @@ import { openLink, exit } from '../lib/platform';
 import type { ReduxState, ReduxDispatch } from '../redux/store';
 import type { SharedRouteProps } from '../routes';
 
-const mapStateToProps = (state: ReduxState) => {
-  return {
-    ...state,
-    version: version,
-  };
-};
+const mapStateToProps = (state: ReduxState) => ({
+  account: state.account,
+  settings: state.settings,
+  version: version,
+});
 const mapDispatchToProps = (dispatch: ReduxDispatch, _props: SharedRouteProps) => {
   const { push: pushHistory } = bindActionCreators({ push }, dispatch);
   return {
diff --git a/app/containers/SupportPage.js b/app/containers/SupportPage.js
index 5d67ddce31..d9ce8ad6ec 100644
--- a/app/containers/SupportPage.js
+++ b/app/containers/SupportPage.js
@@ -9,7 +9,9 @@ import { collectProblemReport, sendProblemReport } from '../lib/problem-report';
 import type { ReduxState, ReduxDispatch } from '../redux/store';
 import type { SharedRouteProps } from '../routes';
 
-const mapStateToProps = (state: ReduxState) => state;
+const mapStateToProps = (state: ReduxState) => ({
+  account: state.account,
+});
 
 const mapDispatchToProps = (dispatch: ReduxDispatch, _props: SharedRouteProps) => {
   const { push: pushHistory } = bindActionCreators({ push }, dispatch);