Created single reducer to handle settings

src/settings/RealTimeUpdates.js

@@ -4,14 +4,14 @@ import PropTypes from 'prop-types';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faInfoCircle } from '@fortawesome/free-solid-svg-icons';
 import Checkbox from '../utils/Checkbox';
-import { RealTimeUpdatesType } from './reducers/realTimeUpdates';
+import { SettingsType } from './reducers/settings';
 
 const propTypes = {
-  realTimeUpdates: RealTimeUpdatesType,
+  settings: SettingsType,
   setRealTimeUpdates: PropTypes.func,
 };
 
-const RealTimeUpdates = ({ realTimeUpdates, setRealTimeUpdates }) => (
+const RealTimeUpdates = ({ settings: { realTimeUpdates }, setRealTimeUpdates }) => (
   <Card>
     <CardHeader>Real-time updates</CardHeader>
     <CardBody>

src/settings/reducers/settings.js

@@ -3,16 +3,20 @@ import PropTypes from 'prop-types';
 
 export const LOAD_REAL_TIME_UPDATES = 'shlink/realTimeUpdates/LOAD_REAL_TIME_UPDATES';
 
-export const RealTimeUpdatesType = PropTypes.shape({
-  enabled: PropTypes.bool.isRequired,
+export const SettingsType = PropTypes.shape({
+  realTimeUpdates: PropTypes.shape({
+    enabled: PropTypes.bool.isRequired,
+  }),
 });
 
 const initialState = {
-  enabled: true,
+  realTimeUpdates: {
+    enabled: true,
+  },
 };
 
 export default handleActions({
-  [LOAD_REAL_TIME_UPDATES]: (state, { enabled }) => ({ ...state, enabled }),
+  [LOAD_REAL_TIME_UPDATES]: (state, { realTimeUpdates }) => ({ ...state, realTimeUpdates }),
 }, initialState);
 
 export const setRealTimeUpdates = ({ updateSettings }, loadRealTimeUpdatesAction) => (enabled) => {
@@ -23,10 +27,9 @@ export const setRealTimeUpdates = ({ updateSettings }, loadRealTimeUpdatesAction
 
 export const loadRealTimeUpdates = ({ loadSettings }) => () => {
   const { realTimeUpdates = {} } = loadSettings();
-  const { enabled = true } = realTimeUpdates;
 
   return {
     type: LOAD_REAL_TIME_UPDATES,
-    enabled,
+    realTimeUpdates,
   };
 };

src/settings/services/provideServices.js

@@ -1,6 +1,6 @@
 import RealTimeUpdates from '../RealTimeUpdates';
 import Settings from '../Settings';
-import { loadRealTimeUpdates, setRealTimeUpdates } from '../reducers/realTimeUpdates';
+import { loadRealTimeUpdates, setRealTimeUpdates } from '../reducers/settings';
 import SettingsService from './SettingsService';
 
 const provideServices = (bottle, connect) => {
@@ -8,7 +8,7 @@ const provideServices = (bottle, connect) => {
   bottle.serviceFactory('Settings', Settings, 'RealTimeUpdates');
 
   bottle.serviceFactory('RealTimeUpdates', () => RealTimeUpdates);
-  bottle.decorator('RealTimeUpdates', connect([ 'realTimeUpdates' ], [ 'setRealTimeUpdates' ]));
+  bottle.decorator('RealTimeUpdates', connect([ 'settings' ], [ 'setRealTimeUpdates' ]));
 
   // Services
   bottle.service('SettingsService', SettingsService, 'Storage');