minor code clean up and reverting the normalizeShortcutDescriptor cod…

…e snippet

components/keyboard_shortcuts/keyboard_shortcuts_modal/keyboard_shortcuts_modal.scss

@@ -54,16 +54,6 @@
  margin-right: 5px;
  }
  }
-
- // TODO: It probably makes sense to switch to <ShortcutKey> component
- // in order to have universal shortcut key appearance
- .shortcut-key {
- padding: 4px 6px;
- margin: 5px 0 5px 5px;
- border-radius: 3px;
- font-size: 12px;
- font-weight: 500;
- }
  }
  }
 

components/keyboard_shortcuts/keyboard_shortcuts_sequence/keyboard_shortcuts_sequence.tsx

@@ -19,15 +19,12 @@ type Props = {
  isInsideTooltip?: boolean;
 };
 
-const descriptorProperty = isMac() ? 'mac' : 'default';
-
 function normalizeShortcutDescriptor(shortcut: KeyboardShortcutDescriptor) {
  if (isMessageDescriptor(shortcut)) {
  return shortcut;
  }
-
- // return the default descriptor when there is no mac specific descriptor
- return shortcut[descriptorProperty] || shortcut.default;
+ const {default: standard, mac} = shortcut;
+ return isMac() && mac ? mac : standard;
 }
 
 const KEY_SEPARATOR = '|';

components/search_shortcut/search_shortcut.tsx

@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 import React from 'react';
 
-import {ShortcutKey, ShortcutKetVariant} from 'components/shortcut_key';
+import {ShortcutKey, ShortcutKeyVariant} from 'components/shortcut_key';
 
 import {isMac} from 'utils/utils.jsx';
 import {isDesktopApp} from 'utils/user_agent';
@@ -13,9 +13,9 @@ export const SearchShortcut = () => {
 
  return (
  <span className='search-shortcut'>
- <ShortcutKey variant={ShortcutKetVariant.Contrast}>{controlKey}</ShortcutKey>
- {!isDesktopApp() && <ShortcutKey variant={ShortcutKetVariant.Contrast}>{'Shift'}</ShortcutKey>}
- <ShortcutKey variant={ShortcutKetVariant.Contrast}>{'F'}</ShortcutKey>
+ <ShortcutKey variant={ShortcutKeyVariant.Contrast}>{controlKey}</ShortcutKey>
+ {!isDesktopApp() && <ShortcutKey variant={ShortcutKeyVariant.Contrast}>{'Shift'}</ShortcutKey>}
+ <ShortcutKey variant={ShortcutKeyVariant.Contrast}>{'F'}</ShortcutKey>
  </span>
  );
 };

components/shortcut_key/shortcut_key.test.tsx

@@ -3,7 +3,7 @@
 import React from 'react';
 import {shallow} from 'enzyme';
 
-import {ShortcutKey, ShortcutKetVariant} from './shortcut_key';
+import {ShortcutKey, ShortcutKeyVariant} from './shortcut_key';
 
 describe('components/ShortcutKey', () => {
  test('should match snapshot for regular key', () => {
@@ -12,7 +12,7 @@ describe('components/ShortcutKey', () => {
  });
 
  test('should match snapshot for contrast key', () => {
- const wrapper = shallow(<ShortcutKey variant={ShortcutKetVariant.Contrast}>{'Shift'}</ShortcutKey>);
+ const wrapper = shallow(<ShortcutKey variant={ShortcutKeyVariant.Contrast}>{'Shift'}</ShortcutKey>);
  expect(wrapper).toMatchSnapshot();
  });
 });