1 files changed, 17 insertions, 31 deletions

diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js
index ebc618a00..4916e4ecc 100644
--- a/src/components/settings/services/ServiceItem.js
+++ b/src/components/settings/services/ServiceItem.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
@@ -10,35 +10,32 @@ import ServiceModel from '../../../models/Service';
 const messages = defineMessages({
   tooltipIsDisabled: {
     id: 'settings.services.tooltip.isDisabled',
-    defaultMessage: '!!!Service is disabled',
+    defaultMessage: 'Service is disabled',
   },
   tooltipNotificationsDisabled: {
     id: 'settings.services.tooltip.notificationsDisabled',
-    defaultMessage: '!!!Notifications are disabled',
+    defaultMessage: 'Notifications are disabled',
   },
   tooltipIsMuted: {
     id: 'settings.services.tooltip.isMuted',
-    defaultMessage: '!!!All sounds are muted',
+    defaultMessage: 'All sounds are muted',
   },
 });
 
-export default @observer class ServiceItem extends Component {
+@observer
+class ServiceItem extends Component {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     goToServiceForm: PropTypes.func.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       service,
       // toggleAction,
       goToServiceForm,
     } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     return (
       <tr
@@ -47,10 +44,7 @@ export default @observer class ServiceItem extends Component {
           'service-table__row--disabled': !service.isEnabled,
         })}
       >
-        <td
-          className="service-table__column-icon"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-icon" onClick={goToServiceForm}>
           <img
             src={service.icon}
             className={classnames({
@@ -60,16 +54,10 @@ export default @observer class ServiceItem extends Component {
             alt=""
           />
         </td>
-        <td
-          className="service-table__column-name"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-name" onClick={goToServiceForm}>
           {service.name !== '' ? service.name : service.recipe.name}
         </td>
-        <td
-          className="service-table__column-info"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-info" onClick={goToServiceForm}>
           {service.isMuted && (
             <span
               className="mdi mdi-bell-off"
@@ -77,10 +65,7 @@ export default @observer class ServiceItem extends Component {
             />
           )}
         </td>
-        <td
-          className="service-table__column-info"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-info" onClick={goToServiceForm}>
           {!service.isEnabled && (
             <span
               className="mdi mdi-power"
@@ -88,14 +73,13 @@ export default @observer class ServiceItem extends Component {
             />
           )}
         </td>
-        <td
-          className="service-table__column-info"
-          onClick={goToServiceForm}
-        >
+        <td className="service-table__column-info" onClick={goToServiceForm}>
           {!service.isNotificationEnabled && (
             <span
               className="mdi mdi-message-bulleted-off"
-              data-tip={intl.formatMessage(messages.tooltipNotificationsDisabled)}
+              data-tip={intl.formatMessage(
+                messages.tooltipNotificationsDisabled,
+              )}
             />
           )}
           <ReactTooltip place="top" type="dark" effect="solid" />
@@ -104,3 +88,5 @@ export default @observer class ServiceItem extends Component {
     );
   }
 }
+
+export default injectIntl(ServiceItem);