2 files changed, 11 insertions, 32 deletions
diff --git a/src/content/reducers/addon.js b/src/content/reducers/addon.js
index b881ca0..0def55a 100644
--- a/src/content/reducers/addon.js
+++ b/src/content/reducers/addon.js
@@ -6,15 +6,9 @@ const defaultState = {
 
 export default function reducer(state = defaultState, action = {}) {
   switch (action.type) {
-  case actions.ADDON_ENABLE:
+  case actions.ADDON_SET_ENABLED:
     return { ...state,
-      enabled: true, };
-  case actions.ADDON_DISABLE:
-    return { ...state,
-      enabled: false, };
-  case actions.ADDON_TOGGLE_ENABLED:
-    return { ...state,
-      enabled: !state.enabled, };
+      enabled: action.enabled, };
   default:
     return state;
   }
diff --git a/src/content/reducers/index.js b/src/content/reducers/index.js
index c3a474e..6e6a147 100644
--- a/src/content/reducers/index.js
+++ b/src/content/reducers/index.js
@@ -1,25 +1,10 @@
-import addonReducer from './addon';
-import findReducer from './find';
-import settingReducer from './setting';
-import inputReducer from './input';
-import followControllerReducer from './follow-controller';
+import { combineReducers } from 'redux';
+import addon from './addon';
+import find from './find';
+import setting from './setting';
+import input from './input';
+import followController from './follow-controller';
 
-// Make setting reducer instead of re-use
-const defaultState = {
-  addon: addonReducer(undefined, {}),
-  find: findReducer(undefined, {}),
-  setting: settingReducer(undefined, {}),
-  input: inputReducer(undefined, {}),
-  followController: followControllerReducer(undefined, {}),
-};
-
-export default function reducer(state = defaultState, action = {}) {
-  return {
-    ...state,
-    addon: addonReducer(state.addon, action),
-    find: findReducer(state.find, action),
-    setting: settingReducer(state.setting, action),
-    input: inputReducer(state.input, action),
-    followController: followControllerReducer(state.followController, action),
-  };
-}
+export default combineReducers({
+  addon, find, setting, input, followController,
+});