Fix issue with recalling keyboard layouts for non-Kira boards

hexgears · Dec 28, 2018 · f81dc9e · f81dc9e
1 parent 5038cc1
commit f81dc9e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/common/device/keyboard.js b/src/common/device/keyboard.js
@@ -67,7 +67,7 @@ function buildKeyboardList() {
     },
     {
       display: names.KType,
-      names: ['K-Type', 'KType'],
+      names: ['KType', 'K-Type'],
       variants: [variants.Standard],
       visuals: true,
       layouts: layouts([variants.Standard, ['Standard', 'NoAnimations']]),

diff --git a/src/renderer/configure/buttons/layout-history.js b/src/renderer/configure/buttons/layout-history.js
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
+import _ from 'lodash';
 import { withStyles, Button, Menu, MenuItem, Divider, ListItemIcon } from '../../mui';
 import { HistoryIcon, StarBorderIcon, DownloadOutlineIcon } from '../../icons';
 import { loadRemoteConfig, loadLocalConfig, useCoreState, useSettingsState } from '../../state';
@@ -26,7 +27,7 @@ function LayoutHistoryButton(props) {
   const [recentDls] = useSettingsState('recentDls');
   const layouts = keyboard && variant ? keyboard.keyboard.layouts[variant] : [];
   /** @type import('../../local-storage/firmware').FirmwareResult[] */
-  const recent = keyboard && variant ? recentDls[`${keyboard.keyboard.display}__${variant}`] : [];
+  const recent = keyboard && variant ? recentDls[`${_.head(keyboard.keyboard.names)}__${variant}`] : [];
 
   const closeMenu = () => setAnchor(null);
   function loadRemote(layout) {