5 files changed, 165 insertions, 143 deletions

diff --git a/src/@types/stores.types.ts b/src/@types/stores.types.ts
index 30898a8a7..bf2dc8bd2 100644
--- a/src/@types/stores.types.ts
+++ b/src/@types/stores.types.ts
@@ -125,6 +125,7 @@ interface AppStore extends TypedStore {
   universalDarkMode: boolean;
   cacheSize: () => void;
   debugInfo: () => void;
+  enableLongPressServiceHint: boolean;
 }
 
 interface CommunityRecipesStore extends TypedStore {
diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
index a81229dca..c37447357 100644
--- a/src/components/layout/Sidebar.tsx
+++ b/src/components/layout/Sidebar.tsx
@@ -3,28 +3,28 @@ import ReactTooltip from 'react-tooltip';
 import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { inject, observer } from 'mobx-react';
 import {
+  mdiBell,
+  mdiBellOff,
   mdiCheckAll,
-  mdiViewGrid,
-  mdiPlusBox,
+  mdiChevronDown,
+  mdiChevronRight,
   mdiCog,
-  mdiBellOff,
-  mdiBell,
   mdiLock,
   mdiMenu,
-  mdiChevronDown,
-  mdiChevronRight,
+  mdiPlusBox,
+  mdiViewGrid,
   mdiViewSplitVertical,
 } from '@mdi/js';
 
 import Tabbar from '../services/tabs/Tabbar';
 import {
-  settingsShortcutKey,
+  addNewServiceShortcutKey,
   lockFerdiumShortcutKey,
+  muteFerdiumShortcutKey,
+  settingsShortcutKey,
+  splitModeToggleShortcutKey,
   todosToggleShortcutKey,
   workspaceToggleShortcutKey,
-  addNewServiceShortcutKey,
-  splitModeToggleShortcutKey,
-  muteFerdiumShortcutKey,
 } from '../../environment';
 import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
@@ -86,21 +86,25 @@ interface IProps extends WrappedComponentProps {
   actions?: Actions;
   stores?: RealStores;
 
-  deleteService: () => void;
-  updateService: () => void;
-  hibernateService: () => void;
-  wakeUpService: () => void;
   toggleMuteApp: () => void;
   toggleCollapseMenu: () => void;
   toggleWorkspaceDrawer: () => void;
-  openSettings: (arg: { path: string }) => void;
+  openSettings: (args: { path: string }) => void;
   closeSettings: () => void;
-  setActive: () => void;
-  reorder: () => void;
-  reload: () => void;
-  toggleNotifications: () => void;
-  toggleAudio: () => void;
-  toggleDarkMode: () => void;
+  setActive: (args: { serviceId: string }) => void;
+  reorder: (args: { oldIndex: number; newIndex: number }) => void;
+  reload: (args: { serviceId: string }) => void;
+  toggleNotifications: (args: { serviceId: string }) => void;
+  toggleAudio: (args: { serviceId: string }) => void;
+  toggleDarkMode: (args: { serviceId: string }) => void;
+  deleteService: (args: { serviceId: string }) => void;
+  hibernateService: (args: { serviceId: string }) => void;
+  wakeUpService: (args: { serviceId: string }) => void;
+  updateService: (args: {
+    serviceId: string;
+    serviceData: { isEnabled: boolean; isMediaPlaying: boolean };
+    redirect: boolean;
+  }) => void;
 }
 
 interface IState {
@@ -180,10 +184,28 @@ class Sidebar extends Component<IProps, IState> {
     return (
       <div className="sidebar">
         <Tabbar
-          {...this.props}
+          useHorizontalStyle={stores!.settings.all.app.useHorizontalStyle}
+          showMessageBadgeWhenMutedSetting={
+            this.props.showMessageBadgeWhenMutedSetting
+          }
+          showServiceNameSetting={this.props.showServiceNameSetting}
+          showMessageBadgesEvenWhenMuted={
+            this.props.showMessageBadgesEvenWhenMuted
+          }
+          services={this.props.services}
+          setActive={this.props.setActive}
+          openSettings={this.props.openSettings}
           enableToolTip={() => this.enableToolTip()}
           disableToolTip={() => this.disableToolTip()}
-          useHorizontalStyle={stores!.settings.all.app.useHorizontalStyle}
+          reorder={this.props.reorder}
+          reload={this.props.reload}
+          toggleNotifications={this.props.toggleNotifications}
+          toggleAudio={this.props.toggleAudio}
+          toggleDarkMode={this.props.toggleDarkMode}
+          deleteService={this.props.deleteService}
+          updateService={this.props.updateService}
+          hibernateService={this.props.hibernateService}
+          wakeUpService={this.props.wakeUpService}
         />
         <>
           {numberActiveButtons <= 1 || hideCollapseButton ? null : (
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.tsx
index e01461e5c..e04f6268d 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.tsx
@@ -1,29 +1,31 @@
 import { Component } from 'react';
-import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
 import { SortableContainer } from 'react-sortable-hoc';
 
 import TabItem from './TabItem';
+import Service from '../../../models/Service';
 
-class TabBarSortableList extends Component {
-  static propTypes = {
-    services: MobxPropTypes.arrayOrObservableArray.isRequired,
-    setActive: PropTypes.func.isRequired,
-    openSettings: PropTypes.func.isRequired,
-    reload: PropTypes.func.isRequired,
-    toggleNotifications: PropTypes.func.isRequired,
-    toggleAudio: PropTypes.func.isRequired,
-    toggleDarkMode: PropTypes.func.isRequired,
-    deleteService: PropTypes.func.isRequired,
-    disableService: PropTypes.func.isRequired,
-    enableService: PropTypes.func.isRequired,
-    hibernateService: PropTypes.func.isRequired,
-    wakeUpService: PropTypes.func.isRequired,
-    showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
-    showServiceNameSetting: PropTypes.bool.isRequired,
-    showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
-  };
+interface IProps {
+  showMessageBadgeWhenMutedSetting: boolean;
+  showServiceNameSetting: boolean;
+  showMessageBadgesEvenWhenMuted: boolean;
+  services: Service[];
 
+  setActive: (args: { serviceId: string }) => void;
+  openSettings: (args: { path: string }) => void;
+  reload: (args: { serviceId: string }) => void;
+  toggleNotifications: (args: { serviceId: string }) => void;
+  toggleAudio: (args: { serviceId: string }) => void;
+  toggleDarkMode: (args: { serviceId: string }) => void;
+  deleteService: (args: { serviceId: string }) => void;
+  disableService: (args: { serviceId: string }) => void;
+  enableService: (args: { serviceId: string }) => void;
+  hibernateService: (args: { serviceId: string }) => void;
+  wakeUpService: (args: { serviceId: string }) => void;
+}
+
+@observer
+class TabBarSortableList extends Component<IProps> {
   render() {
     const {
       services,
@@ -74,4 +76,4 @@ class TabBarSortableList extends Component {
   }
 }
 
-export default SortableContainer(observer(TabBarSortableList));
+export default SortableContainer(TabBarSortableList);
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.tsx
index 0aab82a6f..fae788764 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.tsx
@@ -1,20 +1,20 @@
-import { Menu, dialog, app } from '@electron/remote';
+import { app, dialog, Menu } from '@electron/remote';
 import { Component } from 'react';
-import { defineMessages, injectIntl } from 'react-intl';
-import PropTypes from 'prop-types';
+import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 import { inject, observer } from 'mobx-react';
 import classnames from 'classnames';
 import { SortableElement } from 'react-sortable-hoc';
-import injectSheet from 'react-jss';
+import injectSheet, { WithStylesProps } from 'react-jss';
 import ms from 'ms';
 
-import { observable, autorun, reaction, makeObservable } from 'mobx';
+import { autorun, makeObservable, observable, reaction } from 'mobx';
 import { mdiExclamation, mdiVolumeSource } from '@mdi/js';
-import ServiceModel from '../../../models/Service';
-import { cmdOrCtrlShortcutKey, shiftKey, altKey } from '../../../environment';
+import Service from '../../../models/Service';
+import { altKey, cmdOrCtrlShortcutKey, shiftKey } from '../../../environment';
 import globalMessages from '../../../i18n/globalMessages';
-import SettingsStore from '../../../stores/SettingsStore';
 import Icon from '../../ui/icon';
+import { Stores } from '../../../@types/stores.types';
+import MenuItemConstructorOptions = Electron.MenuItemConstructorOptions;
 
 const IS_SERVICE_DEBUGGING_ENABLED = (
   localStorage.getItem('debug') || ''
@@ -114,30 +114,34 @@ const styles = {
   },
 };
 
-class TabItem extends Component {
-  static propTypes = {
-    classes: PropTypes.object.isRequired,
-    service: PropTypes.instanceOf(ServiceModel).isRequired,
-    clickHandler: PropTypes.func.isRequired,
-    shortcutIndex: PropTypes.number.isRequired,
-    reload: PropTypes.func.isRequired,
-    toggleNotifications: PropTypes.func.isRequired,
-    toggleAudio: PropTypes.func.isRequired,
-    toggleDarkMode: PropTypes.func.isRequired,
-    openSettings: PropTypes.func.isRequired,
-    deleteService: PropTypes.func.isRequired,
-    disableService: PropTypes.func.isRequired,
-    enableService: PropTypes.func.isRequired,
-    hibernateService: PropTypes.func.isRequired,
-    wakeUpService: PropTypes.func.isRequired,
-    showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
-    showServiceNameSetting: PropTypes.bool.isRequired,
-    showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
-    stores: PropTypes.shape({
-      settings: PropTypes.instanceOf(SettingsStore).isRequired,
-    }).isRequired,
-  };
+interface IProps extends WrappedComponentProps, WithStylesProps<typeof styles> {
+  showMessageBadgeWhenMutedSetting: boolean;
+  showServiceNameSetting: boolean;
+  showMessageBadgesEvenWhenMuted: boolean;
+  service: Service;
+  shortcutIndex: number;
+  stores?: Stores;
+  reload: () => void;
+
+  clickHandler: () => void;
+  toggleNotifications: () => void;
+  toggleAudio: () => void;
+  toggleDarkMode: () => void;
+  openSettings: (args: { path: string }) => void;
+  deleteService: () => void;
+  disableService: () => void;
+  enableService: () => void;
+  hibernateService: () => void;
+  wakeUpService: () => void;
+}
+
+interface IState {
+  showShortcutIndex: boolean;
+}
 
+@inject('stores')
+@observer
+class TabItem extends Component<IProps, IState> {
   @observable isPolled = false;
 
   @observable isPollAnswered = false;
@@ -152,10 +156,10 @@ class TabItem extends Component {
     };
 
     reaction(
-      () => this.props.stores.settings.app.enableLongPressServiceHint,
+      () => this.props.stores!.settings.app.enableLongPressServiceHint,
       () => {
         this.checkForLongPress(
-          this.props.stores.settings.app.enableLongPressServiceHint,
+          this.props.stores!.settings.app.enableLongPressServiceHint,
         );
       },
     );
@@ -202,7 +206,7 @@ class TabItem extends Component {
       });
     }
 
-    this.checkForLongPress(stores.settings.app.enableLongPressServiceHint);
+    this.checkForLongPress(stores!.settings.app.enableLongPressServiceHint);
   }
 
   render() {
@@ -227,7 +231,7 @@ class TabItem extends Component {
     } = this.props;
     const { intl } = this.props;
 
-    const menuTemplate = [
+    const menuTemplate: Array<MenuItemConstructorOptions> = [
       {
         label: service.name || service.recipe.name,
         enabled: false,
@@ -299,6 +303,7 @@ class TabItem extends Component {
       {
         label: intl.formatMessage(messages.deleteService),
         click: () => {
+          // @ts-ignore
           const selection = dialog.showMessageBoxSync(app.mainWindow, {
             type: 'question',
             message: intl.formatMessage(messages.deleteService),
@@ -318,37 +323,10 @@ class TabItem extends Component {
     ];
     const menu = Menu.buildFromTemplate(menuTemplate);
 
-    let notificationBadge = null;
-    if (
+    const showNotificationBadge =
       (showMessageBadgeWhenMutedSetting || service.isNotificationEnabled) &&
       showMessageBadgesEvenWhenMuted &&
-      service.isBadgeEnabled
-    ) {
-      notificationBadge = (
-        <>
-          {service.unreadDirectMessageCount > 0 && (
-            <span className="tab-item__message-count">
-              {service.unreadDirectMessageCount}
-            </span>
-          )}
-          {service.unreadIndirectMessageCount > 0 &&
-            service.unreadDirectMessageCount === 0 &&
-            service.isIndirectMessageBadgeEnabled && (
-              <span className="tab-item__message-count is-indirect">•</span>
-            )}
-          {service.isHibernating && (
-            <span className="tab-item__message-count hibernating">•</span>
-          )}
-        </>
-      );
-    }
-
-    let errorBadge = null;
-    if (service.isError) {
-      errorBadge = (
-        <Icon icon={mdiExclamation} className="tab-item__error-icon" />
-      );
-    }
+      service.isBadgeEnabled;
 
     const showMediaBadge =
       service.isMediaBadgeEnabled &&
@@ -381,8 +359,26 @@ class TabItem extends Component {
         {showServiceNameSetting && (
           <span className="tab-item__label">{service.name}</span>
         )}
-        {notificationBadge}
-        {errorBadge}
+        {showNotificationBadge && (
+          <>
+            {service.unreadDirectMessageCount > 0 && (
+              <span className="tab-item__message-count">
+                {service.unreadDirectMessageCount}
+              </span>
+            )}
+            {service.unreadIndirectMessageCount > 0 &&
+              service.unreadDirectMessageCount === 0 &&
+              service.isIndirectMessageBadgeEnabled && (
+                <span className="tab-item__message-count is-indirect">•</span>
+              )}
+            {service.isHibernating && (
+              <span className="tab-item__message-count hibernating">•</span>
+            )}
+          </>
+        )}
+        {service.isError && (
+          <Icon icon={mdiExclamation} className="tab-item__error-icon" />
+        )}
         {showMediaBadge && mediaBadge}
         {IS_SERVICE_DEBUGGING_ENABLED && (
           <>
@@ -411,9 +407,5 @@ class TabItem extends Component {
 }
 
 export default injectIntl(
-  SortableElement(
-    injectSheet(styles, { injectTheme: true })(
-      inject('stores')(observer(TabItem)),
-    ),
-  ),
+  SortableElement(injectSheet(styles, { injectTheme: true })(TabItem)),
 );
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.tsx
index 0eaf641e3..64541cc8f 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.tsx
@@ -1,31 +1,36 @@
 import { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
+import { observer } from 'mobx-react';
 
 import TabBarSortableList from './TabBarSortableList';
+import Service from '../../../models/Service';
 
-class TabBar extends Component {
-  static propTypes = {
-    services: MobxPropTypes.arrayOrObservableArray.isRequired,
-    setActive: PropTypes.func.isRequired,
-    openSettings: PropTypes.func.isRequired,
-    enableToolTip: PropTypes.func.isRequired,
-    disableToolTip: PropTypes.func.isRequired,
-    reorder: PropTypes.func.isRequired,
-    reload: PropTypes.func.isRequired,
-    toggleNotifications: PropTypes.func.isRequired,
-    toggleAudio: PropTypes.func.isRequired,
-    toggleDarkMode: PropTypes.func.isRequired,
-    deleteService: PropTypes.func.isRequired,
-    updateService: PropTypes.func.isRequired,
-    hibernateService: PropTypes.func.isRequired,
-    wakeUpService: PropTypes.func.isRequired,
-    useHorizontalStyle: PropTypes.bool.isRequired,
-    showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
-    showServiceNameSetting: PropTypes.bool.isRequired,
-    showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
-  };
+interface IProps {
+  useHorizontalStyle: boolean;
+  showMessageBadgeWhenMutedSetting: boolean;
+  showServiceNameSetting: boolean;
+  showMessageBadgesEvenWhenMuted: boolean;
+  services: Service[];
+  setActive: (args: { serviceId: string }) => void;
+  openSettings: (args: { path: string }) => void;
+  enableToolTip: () => void;
+  disableToolTip: () => void;
+  reorder: (args: { oldIndex: number; newIndex: number }) => void;
+  reload: (args: { serviceId: string }) => void;
+  toggleNotifications: (args: { serviceId: string }) => void;
+  toggleAudio: (args: { serviceId: string }) => void;
+  toggleDarkMode: (args: { serviceId: string }) => void;
+  deleteService: (args: { serviceId: string }) => void;
+  hibernateService: (args: { serviceId: string }) => void;
+  wakeUpService: (args: { serviceId: string }) => void;
+  updateService: (args: {
+    serviceId: string;
+    serviceData: { isEnabled: boolean; isMediaPlaying: boolean };
+    redirect: boolean;
+  }) => void;
+}
 
+@observer
+class TabBar extends Component<IProps> {
   onSortEnd = ({ oldIndex, newIndex }) => {
     const { enableToolTip, reorder } = this.props;
 
@@ -35,14 +40,14 @@ class TabBar extends Component {
 
   shouldPreventSorting = event => event.target.tagName !== 'LI';
 
-  toggleService = ({ serviceId, isEnabled }) => {
+  toggleService = (args: { serviceId: string; isEnabled: boolean }) => {
     const { updateService } = this.props;
 
-    if (serviceId) {
+    if (args.serviceId) {
       updateService({
-        serviceId,
+        serviceId: args.serviceId,
         serviceData: {
-          isEnabled,
+          isEnabled: args.isEnabled,
           isMediaPlaying: false,
         },
         redirect: false,
@@ -120,4 +125,4 @@ class TabBar extends Component {
   }
 }
 
-export default observer(TabBar);
+export default TabBar;