Merge branch 'search-hotkey' into 'develop'

Add `/` as a hotkey for search

See merge request soapbox-pub/soapbox!2517

app/soapbox/features/ui/components/modals/hotkeys-modal.tsx

@@ -113,7 +113,7 @@ const HotkeysModal: React.FC<IHotkeysModal> = ({ onClose }) => {
               <TableCell><FormattedMessage id='keyboard_shortcuts.back' defaultMessage='to navigate back' /></TableCell>
             </tr>
             <tr>
-              <TableCell><Hotkey>s</Hotkey></TableCell>
+              <TableCell><Hotkey>s</Hotkey>, <Hotkey>/</Hotkey></TableCell>
               <TableCell><FormattedMessage id='keyboard_shortcuts.search' defaultMessage='to focus search' /></TableCell>
             </tr>
             <tr>

app/soapbox/features/ui/index.tsx

@@ -156,7 +156,7 @@ const EmptyPage = HomePage;
 const keyMap = {
   help: '?',
   new: 'n',
-  search: 's',
+  search: ['s', '/'],
   forceNew: 'option+n',
   reply: 'r',
   favourite: 'f',