3 files changed, 10 insertions, 20 deletions
diff --git a/src/content/actions/index.ts b/src/content/actions/index.ts
index 18d0a69..a259211 100644
--- a/src/content/actions/index.ts
+++ b/src/content/actions/index.ts
@@ -1,4 +1,5 @@
 import Redux from 'redux';
+import Settings from '../../shared/Settings';
 
 // Enable/disable
 export const ADDON_SET_ENABLED = 'addon.set.enabled';
@@ -45,7 +46,7 @@ export interface FindSetKeywordAction extends Redux.Action {
 
 export interface SettingSetAction extends Redux.Action {
   type: typeof SETTING_SET;
-  value: any;
+  settings: Settings,
 }
 
 export interface InputKeyPressAction extends Redux.Action {
diff --git a/src/content/actions/operation.ts b/src/content/actions/operation.ts
index 6acb407..41e080b 100644
--- a/src/content/actions/operation.ts
+++ b/src/content/actions/operation.ts
@@ -8,7 +8,6 @@ import * as urls from '../urls';
 import * as consoleFrames from '../console-frames';
 import * as addonActions from './addon';
 import * as markActions from './mark';
-import * as properties from '../../shared/settings/properties';
 
 // eslint-disable-next-line complexity, max-lines-per-function
 const exec = (
@@ -16,8 +15,7 @@ const exec = (
   settings: any,
   addonEnabled: boolean,
 ): Promise<actions.Action> | actions.Action => {
-  let smoothscroll = settings.properties.smoothscroll ||
-    properties.defaults.smoothscroll;
+  let smoothscroll = settings.properties.smoothscroll;
   switch (operation.type) {
   case operations.ADDON_ENABLE:
     return addonActions.enable();
diff --git a/src/content/actions/setting.ts b/src/content/actions/setting.ts
index a8f049a..92f8559 100644
--- a/src/content/actions/setting.ts
+++ b/src/content/actions/setting.ts
@@ -1,29 +1,20 @@
 import * as actions from './index';
-import * as keyUtils from '../../shared/utils/keys';
 import * as operations from '../../shared/operations';
 import * as messages from '../../shared/messages';
+import Settings, { Keymaps } from '../../shared/Settings';
 
-const reservedKeymaps = {
+const reservedKeymaps: Keymaps = {
   '<Esc>': { type: operations.CANCEL },
   '<C-[>': { type: operations.CANCEL },
 };
 
-const set = (value: any): actions.SettingAction => {
-  let entries: any[] = [];
-  if (value.keymaps) {
-    let keymaps = { ...value.keymaps, ...reservedKeymaps };
-    entries = Object.entries(keymaps).map((entry) => {
-      return [
-        keyUtils.fromMapKeys(entry[0]),
-        entry[1],
-      ];
-    });
-  }
-
+const set = (settings: Settings): actions.SettingAction => {
   return {
     type: actions.SETTING_SET,
-    value: { ...value,
-      keymaps: entries, }
+    settings: {
+      ...settings,
+      keymaps: { ...settings.keymaps, ...reservedKeymaps },
+    }
   };
 };