Move settings visibility to global state

Fixes #95
2019-04-10 19:53:10 +02:00
parent b6d6575543
commit dcff2ae336
9 changed files with 36 additions and 38 deletions
--- a/app/src/components/App.tsx
+++ b/app/src/components/App.tsx
@@ -138,12 +138,12 @@ const mapDispatchToProps = (dispatch: any) => {

 const mapStateToProps = (state: AppState) => {
  return {
-    settingsVisible: state.settings.get('visible'),
+    settingsVisible: state.globalState.get('settingsVisible'),
    connectionId: state.connection.connectionId,
-    error: state.globalState.error,
-    notification: state.globalState.notification,
+    error: state.globalState.get('error'),
+    notification: state.globalState.get('notification'),
    highlightTopicUpdates: state.settings.get('highlightTopicUpdates'),
-    launching: state.globalState.launching,
+    launching: state.globalState.get('launching'),
  }
 }