Merge branch 'nightly' into release

1 files changed, 6 insertions, 10 deletions

diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js
index bd2af2296..dc6be10da 100644
--- a/src/components/ui/InfoBar.js
+++ b/src/components/ui/InfoBar.js
@@ -3,23 +3,21 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import Loader from 'react-loader';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
-// import { oneOrManyChildElements } from '../../prop-types';
 import Appear from './effects/Appear';
 
 const messages = defineMessages({
   hide: {
     id: 'infobar.hide',
-    defaultMessage: '!!!Hide',
+    defaultMessage: 'Hide',
   },
 });
 
-export default
 @observer
 class InfoBar extends Component {
   static propTypes = {
-    // eslint-disable-next-line
+    // eslint-disable-next-line react/forbid-prop-types
     children: PropTypes.any.isRequired,
     onClick: PropTypes.func,
     type: PropTypes.string,
@@ -42,10 +40,6 @@ class InfoBar extends Component {
     onHide: () => null,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   render() {
     const {
       children,
@@ -59,7 +53,7 @@ class InfoBar extends Component {
       onHide,
     } = this.props;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     let transitionName = 'slideUp';
     if (position === 'top') {
@@ -103,3 +97,5 @@ class InfoBar extends Component {
     );
   }
 }
+
+export default injectIntl(InfoBar);