Fix setting custom keybindings

Fixes codesandbox#707

Author: Ives van Hoorne

packages/app/src/app/store/actions.js

@@ -235,7 +235,7 @@ export function setStoredSettings({ state, settingsStore }) {
 }
 
 export function setKeybindings({ state, keybindingManager }) {
-  keybindingManager.set(state.get('preferences.settings.keybindings'));
+  keybindingManager.set(state.get('preferences.settings.keybindings').toJSON());
 }
 
 export function startKeybindings({ keybindingManager }) {

packages/app/src/app/store/providers/KeybindingManager.js

@@ -137,19 +137,21 @@ let isStarted = false;
 
 export default Provider({
   set(userKeybindings = []) {
-    const keybindings = userKeybindings.concat(
-      Object.keys(KEYBINDINGS).reduce(
-        (currentKeybindings, key) =>
-          currentKeybindings.concat({
-            key,
-            bindings: KEYBINDINGS[key].bindings,
-          }),
-        []
-      )
-    );
+    const keybindings = [...userKeybindings];
+
+    Object.keys(KEYBINDINGS).forEach(bindingName => {
+      if (keybindings.find(x => x.key === bindingName)) {
+        return;
+      }
+
+      keybindings.push({
+        key: bindingName,
+        bindings: KEYBINDINGS[bindingName].bindings,
+      });
+    });
 
     state.keybindings = keybindings.filter(
-      binding => binding.bindings && binding.bindings.length
+      binding => binding.bindings && binding.bindings.filter(Boolean).length
     );
   },
   start() {