Update RN to 0.44.0 and project dependencies (#546)

.eslintrc.json

@@ -209,7 +209,7 @@
         "react/jsx-no-target-blank": 2,
         "react/jsx-no-undef": 2,
         "react/jsx-pascal-case": 2,
-        "react/jsx-space-before-closing": [2, "never"],
+        "react/jsx-tag-spacing": [2, {"closingSlash": "never", "beforeSelfClosing": "never", "afterOpening": "never"}],
         "react/jsx-uses-react": 2,
         "react/jsx-uses-vars": 2,
         "react/jsx-no-comment-textnodes": 2,

app/components/at_mention/at_mention.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {Text} from 'react-native';
 
 import CustomPropTypes from 'app/constants/custom_prop_types';

app/components/autocomplete/at_mention/at_mention.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {Component, PropTypes} from 'react';
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {
     ListView,
     StyleSheet,

app/components/autocomplete/channel_mention/channel_mention.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {Component, PropTypes} from 'react';
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {
     ListView,
     StyleSheet,

app/components/autocomplete/index.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, Component} from 'react';
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     View

app/components/badge.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     PanResponder,
     StyleSheet,

app/components/button.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 
 import {ActivityIndicator, StyleSheet, TouchableHighlight, View} from 'react-native';
 
@@ -18,18 +19,18 @@ const styles = StyleSheet.create({
     }
 });
 
-export default class Button extends React.Component {
+export default class Button extends PureComponent {
     static propTypes = {
-        children: React.PropTypes.node,
-        loading: React.PropTypes.bool,
-        onPress: React.PropTypes.func.isRequired
-    }
+        children: PropTypes.node,
+        loading: PropTypes.bool,
+        onPress: PropTypes.func.isRequired
+    };
 
     onPress = () => {
         if (!this.props.loading) {
             this.props.onPress();
         }
-    }
+    };
 
     render() {
         let loading = null;

app/components/channel_drawer/channel_drawer.js

@@ -1,8 +1,9 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
-import {BackAndroid, InteractionManager, Keyboard} from 'react-native';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
+import {BackHandler, InteractionManager, Keyboard} from 'react-native';
 
 import Drawer from 'app/components/drawer';
 import ChannelDrawerList from 'app/components/channel_drawer_list';
@@ -39,13 +40,13 @@ export default class ChannelDrawer extends PureComponent {
     componentDidMount() {
         EventEmitter.on('open_channel_drawer', this.openChannelDrawer);
         EventEmitter.on('close_channel_drawer', this.closeChannelDrawer);
-        BackAndroid.addEventListener('hardwareBackPress', this.handleAndroidBack);
+        BackHandler.addEventListener('hardwareBackPress', this.handleAndroidBack);
     }
 
     componentWillUnmount() {
         EventEmitter.off('open_channel_drawer', this.openChannelDrawer);
         EventEmitter.off('close_channel_drawer', this.closeChannelDrawer);
-        BackAndroid.removeEventListener('hardwareBackPress', this.handleAndroidBack);
+        BackHandler.removeEventListener('hardwareBackPress', this.handleAndroidBack);
     }
 
     handleAndroidBack = () => {

app/components/channel_drawer_list/channel_drawer_item.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     TouchableHighlight,

app/components/channel_drawer_list/channel_drawer_list.js

@@ -2,7 +2,8 @@
 // See License.txt for license information.
 
 import deepEqual from 'deep-equal';
-import React, {PropTypes, Component} from 'react';
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {
     ListView,
     Platform,

app/components/channel_drawer_list/unread_indicator.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {StyleSheet, Text, View} from 'react-native';
 
 const Styles = StyleSheet.create({

app/components/channel_icon.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     Text,

app/components/channel_intro/channel_intro.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     Text,

app/components/channel_loader.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     View

app/components/checkmark.js

@@ -1,16 +1,15 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
-import Svg, {
-    Path
-} from 'react-native-svg';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
+import Svg, {Path} from 'react-native-svg';
 
-export default class CheckMark extends React.Component {
+export default class CheckMark extends PureComponent {
     static propTypes = {
-        width: React.PropTypes.number.isRequired,
-        height: React.PropTypes.number.isRequired,
-        color: React.PropTypes.string.isRequired
+        width: PropTypes.number.isRequired,
+        height: PropTypes.number.isRequired,
+        color: PropTypes.string.isRequired
     };
 
     render() {

app/components/custom_list/channel_list_row.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     Text,

app/components/custom_list/index.js

@@ -1,6 +1,7 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {ListView, Platform, StyleSheet, Text, View} from 'react-native';
 import FormattedText from 'app/components/formatted_text';
 import {makeStyleSheetFromTheme, changeOpacity} from 'app/utils/theme';

app/components/custom_list/member_list_row.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     Text,

app/components/drawer.js

@@ -1,14 +1,14 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import PropTypes from 'prop-types';
 import BaseDrawer from 'react-native-drawer';
 
 // Extends react-native-drawer to allow better control over the open/closed state from the parent
 export default class Drawer extends BaseDrawer {
     static propTypes = {
         ...BaseDrawer.propTypes,
-        onRequestClose: React.PropTypes.func.isRequired
+        onRequestClose: PropTypes.func.isRequired
     };
 
     processTapGestures = () => {

app/components/error_list/error_list.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Dimensions,
     StyleSheet,

app/components/error_list/general_error.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     View,

app/components/error_text.js

@@ -2,7 +2,8 @@
 // See License.txt for license information.
 
 import {connect} from 'react-redux';
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {StyleSheet, Text} from 'react-native';
 
 import FormattedText from 'app/components/formatted_text';

app/components/file_attachment_list/file_attachment.js

@@ -1,11 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {
-    PropTypes,
-    PureComponent
-} from 'react';
-
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Text,
     TouchableOpacity,

app/components/file_attachment_list/file_attachment_icon.js

@@ -1,11 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {
-    Component,
-    PropTypes
-} from 'react';
-
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {
     View,
     Image,

app/components/file_attachment_list/file_attachment_image.js

@@ -1,10 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {
-    PropTypes,
-    PureComponent
-} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     ActivityIndicator,
     Animated,

app/components/file_attachment_list/file_attachment_list.js

@@ -1,11 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {
-    Component,
-    PropTypes
-} from 'react';
-
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {
     View,
     TouchableOpacity

app/components/file_upload_preview/file_upload_preview.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Dimensions,
     Platform,

app/components/formatted_date.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {Component, PropTypes} from 'react';
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {Text} from 'react-native';
 

app/components/formatted_text.js

@@ -1,10 +1,9 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {Component, PropTypes} from 'react';
-
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {Text} from 'react-native';
-
 import {injectIntl, intlShape} from 'react-intl';
 
 class FormattedText extends Component {

app/components/formatted_time.js

@@ -1,16 +1,17 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {Text} from 'react-native';
 
-class FormattedTime extends React.Component {
+class FormattedTime extends Component {
     static propTypes = {
         intl: intlShape.isRequired,
-        value: React.PropTypes.any.isRequired,
-        format: React.PropTypes.string,
-        children: React.PropTypes.func
+        value: PropTypes.any.isRequired,
+        format: PropTypes.string,
+        children: PropTypes.func
     };
 
     render() {

app/components/layout/keyboard_layout.js

@@ -1,14 +1,15 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {KeyboardAvoidingView, Platform, View} from 'react-native';
 
-export default class KeyboardLayout extends React.Component {
+export default class KeyboardLayout extends Component {
     static propTypes = {
-        behaviour: React.PropTypes.string,
-        children: React.PropTypes.node,
-        keyboardVerticalOffset: React.PropTypes.number
+        behaviour: PropTypes.string,
+        children: PropTypes.node,
+        keyboardVerticalOffset: PropTypes.number
     };
 
     render() {

app/components/loading.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 
 import {ActivityIndicator, StyleSheet, View} from 'react-native';
 

app/components/markdown/index.js

@@ -3,7 +3,8 @@
 
 import {Parser} from 'commonmark';
 import Renderer from 'commonmark-react-renderer';
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     Text,

app/components/markdown/markdown_image.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {Image} from 'react-native';
 
 export default class MarkdownLink extends PureComponent {

app/components/markdown/markdown_link.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {Linking, Text} from 'react-native';
 
 import CustomPropTypes from 'app/constants/custom_prop_types';

app/components/markdown/markdown_list.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {View} from 'react-native';
 
 export default class MarkdownList extends PureComponent {

app/components/markdown/markdown_list_item.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     Text,

app/components/mattermost_icon.js

@@ -1,17 +1,18 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import Svg, {
     G,
     Path
 } from 'react-native-svg';
 
-export default class AwayStatus extends React.Component {
+export default class AwayStatus extends PureComponent {
     static propTypes = {
-        width: React.PropTypes.number.isRequired,
-        height: React.PropTypes.number.isRequired,
-        color: React.PropTypes.string.isRequired
+        width: PropTypes.number.isRequired,
+        height: PropTypes.number.isRequired,
+        color: PropTypes.string.isRequired
     };
 
     render() {

app/components/offline_indicator/offline_indicator.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     ActivityIndicator,
     Animated,

app/components/options_context/options_context.android.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {PropTypes, PureComponent} from 'react';
+import {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import RNBottomSheet from 'react-native-bottom-sheet';
 
 export default class OptionsContext extends PureComponent {

app/components/options_context/options_context.ios.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import ToolTip from 'react-native-tooltip';
 
 export default class OptionsContext extends PureComponent {

app/components/paper_plane.js

@@ -1,16 +1,15 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
-import Svg, {
-    Path
-} from 'react-native-svg';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
+import Svg, {Path} from 'react-native-svg';
 
-export default class PaperPlane extends React.Component {
+export default class PaperPlane extends PureComponent {
     static propTypes = {
-        width: React.PropTypes.number.isRequired,
-        height: React.PropTypes.number.isRequired,
-        color: React.PropTypes.string.isRequired
+        width: PropTypes.number.isRequired,
+        height: PropTypes.number.isRequired,
+        color: PropTypes.string.isRequired
     };
 
     render() {

app/components/post/post.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Alert,
     Image,

app/components/post_list/date_header.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {StyleSheet, View} from 'react-native';
 
 import FormattedDate from 'app/components/formatted_date';

app/components/post_list/load_more_posts.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PureComponent, PropTypes} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     View,
     StyleSheet,

app/components/post_list/post_list.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {Component, PropTypes} from 'react';
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {
     ListView,
     StyleSheet,

app/components/post_list_retry.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Platform,
     StyleSheet,

app/components/post_textbox/components/paper_clip_icon.js

@@ -1,14 +1,15 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import Svg, {G, Path} from 'react-native-svg';
 
-export default class PaperClipIcon extends React.Component {
+export default class PaperClipIcon extends Component {
     static propTypes = {
-        width: React.PropTypes.number.isRequired,
-        height: React.PropTypes.number.isRequired,
-        color: React.PropTypes.string.isRequired
+        width: PropTypes.number.isRequired,
+        height: PropTypes.number.isRequired,
+        color: PropTypes.string.isRequired
     };
 
     setNativeProps = (nativeProps) => {

app/components/post_textbox/post_textbox.js

@@ -1,17 +1,18 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Alert,
-    BackAndroid,
+    BackHandler,
     Keyboard,
     Platform,
     StyleSheet,
-    TouchableOpacity,
-    View,
     Text,
-    TextInput
+    TextInput,
+    TouchableOpacity,
+    View
 } from 'react-native';
 import Icon from 'react-native-vector-icons/Ionicons';
 import ImagePicker from 'react-native-image-picker';
@@ -70,7 +71,7 @@ class PostTextbox extends PureComponent {
     componentDidMount() {
         if (Platform.OS === 'android') {
             Keyboard.addListener('keyboardDidHide', this.handleAndroidKeyboard);
-            BackAndroid.addEventListener('hardwareBackPress', this.handleAndroidBack);
+            BackHandler.addEventListener('hardwareBackPress', this.handleAndroidBack);
         }
     }
 
@@ -107,7 +108,7 @@ class PostTextbox extends PureComponent {
     componentWillUnmount() {
         if (Platform.OS === 'android') {
             Keyboard.removeListener('keyboardDidHide', this.handleAndroidKeyboard);
-            BackAndroid.removeEventListener('hardwareBackPress', this.handleAndroidBack);
+            BackHandler.removeEventListener('hardwareBackPress', this.handleAndroidBack);
         }
     }
 
@@ -116,8 +117,12 @@ class PostTextbox extends PureComponent {
     };
 
     handleContentSizeChange = (e) => {
+        let height = e.nativeEvent.contentSize.height;
+        if (height < INITIAL_HEIGHT) {
+            height = INITIAL_HEIGHT;
+        }
         this.setState({
-            contentHeight: e.nativeEvent.contentSize.height
+            contentHeight: height
         });
     };
 
@@ -334,7 +339,7 @@ class PostTextbox extends PureComponent {
     };
 
     render() {
-        const {channelIsLoading, theme, value, intl} = this.props;
+        const {channelIsLoading, intl, theme, value} = this.props;
 
         const style = getStyleSheet(theme);
         const textInputHeight = Math.min(this.state.contentHeight, MAX_CONTENT_HEIGHT);
@@ -436,7 +441,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             paddingBottom: 8,
             paddingLeft: 12,
             paddingRight: 12,
-            paddingTop: 6,
+            paddingTop: 8,
             textAlignVertical: 'top'
         },
         inputContainer: {

app/components/profile_picture/profile_picture.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {Image, Platform, StyleSheet, View} from 'react-native';
 import Icon from 'react-native-vector-icons/FontAwesome';
 
@@ -21,17 +22,17 @@ const STATUS_BUFFER = Platform.select({
     android: 2
 });
 
-export default class ProfilePicture extends React.PureComponent {
+export default class ProfilePicture extends PureComponent {
     static propTypes = {
-        size: React.PropTypes.number,
-        statusBorderWidth: React.PropTypes.number,
-        statusSize: React.PropTypes.number,
-        statusIconSize: React.PropTypes.number,
-        user: React.PropTypes.object,
-        status: React.PropTypes.string,
-        theme: React.PropTypes.object.isRequired,
-        actions: React.PropTypes.shape({
-            getStatusForId: React.PropTypes.func.isRequired
+        size: PropTypes.number,
+        statusBorderWidth: PropTypes.number,
+        statusSize: PropTypes.number,
+        statusIconSize: PropTypes.number,
+        user: PropTypes.object,
+        status: PropTypes.string,
+        theme: PropTypes.object.isRequired,
+        actions: PropTypes.shape({
+            getStatusForId: PropTypes.func.isRequired
         })
     };
 

app/components/push_notification/index.js

@@ -1,36 +0,0 @@
-// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import {bindActionCreators} from 'redux';
-import {connect} from 'react-redux';
-
-import {goToNotification, queueNotification} from 'app/actions/views/root';
-import {setDeviceToken} from 'mattermost-redux/actions/general';
-import {getUnreads} from 'mattermost-redux/selectors/entities/channels';
-
-import PushNotification from './push_notification';
-
-function mapStateToProps(state, ownProps) {
-    const {currentTeamId, teams} = state.entities.teams;
-    const {currentChannelId} = state.entities.channels;
-
-    return {
-        ...ownProps,
-        currentTeamId,
-        currentChannelId,
-        teams,
-        ...getUnreads(state)
-    };
-}
-
-function mapDispatchToProps(dispatch) {
-    return {
-        actions: bindActionCreators({
-            goToNotification,
-            queueNotification,
-            setDeviceToken
-        }, dispatch)
-    };
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(PushNotification);

app/components/push_notification/push_notification.js

@@ -1,133 +0,0 @@
-// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import React, {PropTypes, PureComponent} from 'react';
-import {Platform} from 'react-native';
-import DeviceNotification from 'react-native-push-notification';
-import {MessageBar, MessageBarManager} from 'react-native-message-bar';
-
-import {changeOpacity} from 'app/utils/theme';
-import icon from 'assets/images/icon.png';
-import {GooglePlaySenderId} from 'assets/config.json';
-
-import {General} from 'mattermost-redux/constants';
-
-export default class PushNotification extends PureComponent {
-    static propTypes = {
-        actions: PropTypes.shape({
-            goToNotification: PropTypes.func.isRequired,
-            queueNotification: PropTypes.func.isRequired,
-            setDeviceToken: PropTypes.func.isRequired
-        }).isRequired,
-        currentTeamId: PropTypes.string,
-        currentChannelId: PropTypes.string,
-        mentionCount: PropTypes.number,
-        teams: PropTypes.object
-    };
-
-    static defaultProps: {
-        mentionCount: 0,
-        teams: {}
-    };
-
-    constructor(props) {
-        super(props);
-
-        this.isConfigured = false;
-    }
-
-    componentDidMount() {
-        MessageBarManager.registerMessageBar(this.refs.notification);
-        this.configurePushNotifications();
-    }
-
-    componentWillUnmount() {
-        MessageBarManager.unregisterMessageBar();
-        DeviceNotification.unregister();
-    }
-
-    componentWillReceiveProps(props) {
-        if (this.isConfigured) {
-            DeviceNotification.setApplicationIconBadgeNumber(props.mentionCount);
-        }
-    }
-
-    configurePushNotifications = () => {
-        DeviceNotification.configure({
-            onRegister: this.onRegisterDevice,
-            onNotification: this.onPushNotification,
-            senderID: GooglePlaySenderId,
-            popInitialNotification: true,
-            requestPermissions: true
-        });
-    };
-
-    onRegisterDevice = (data) => {
-        const prefix = Platform.OS === 'ios' ? General.PUSH_NOTIFY_APPLE_REACT_NATIVE : General.PUSH_NOTIFY_ANDROID_REACT_NATIVE;
-        this.props.actions.setDeviceToken(`${prefix}:${data.token}`);
-        this.isConfigured = true;
-    };
-
-    onPushNotification = (deviceNotification) => {
-        const {foreground, userInteraction, data, message} = deviceNotification;
-        let notification;
-
-        if (Platform.OS === 'android') {
-            notification = {
-                data: {
-                    channel_id: deviceNotification.channel_id,
-                    team_id: deviceNotification.team_id
-                },
-                message
-            };
-        } else {
-            notification = {
-                data,
-                message
-            };
-        }
-
-        if (foreground) {
-            this.handleInAppNotification(notification);
-        } else if (userInteraction) {
-            this.onNotificationTapped(notification);
-        }
-    };
-
-    onNotificationTapped = (notification) => {
-        const {currentTeamId, currentChannelId, teams} = this.props;
-
-        if (currentTeamId && currentChannelId && Object.keys(teams).length) {
-            // this means that the store has the necessary data
-            this.props.actions.goToNotification(notification);
-        } else {
-            this.props.actions.queueNotification(notification);
-        }
-    };
-
-    handleInAppNotification = (notification) => {
-        const {data, message} = notification;
-        const {currentChannelId} = this.props;
-
-        if (data.channel_id !== currentChannelId) {
-            MessageBarManager.showAlert({
-                alertType: 'extra',
-                avatar: icon,
-                avatarStyle: {borderRadius: 10, width: 20, height: 20},
-                message,
-                stylesheetExtra: {backgroundColor: changeOpacity('#000', 0.9)},
-                messageStyle: {color: 'white', fontSize: 13},
-                viewTopInset: 15,
-                viewBottomInset: 15,
-                duration: 5000,
-                onTapped: () => this.onNotificationTapped(notification)
-            });
-        }
-    };
-
-    render() {
-        return (
-            <MessageBar ref='notification'/>
-        );
-    }
-}

app/components/reply_icon.js

@@ -1,16 +1,17 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import Svg, {
     Path
 } from 'react-native-svg';
 
-export default class ReplyIcon extends React.Component {
+export default class ReplyIcon extends PureComponent {
     static propTypes = {
-        width: React.PropTypes.number.isRequired,
-        height: React.PropTypes.number.isRequired,
-        color: React.PropTypes.string.isRequired
+        width: PropTypes.number.isRequired,
+        height: PropTypes.number.isRequired,
+        color: PropTypes.string.isRequired
     };
 
     render() {

app/components/root/index.js

@@ -5,6 +5,7 @@ import {connect} from 'react-redux';
 
 import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels';
 
+import {getTheme} from 'app/selectors/preferences';
 import Config from 'assets/config.json';
 
 import Root from './root';
@@ -20,6 +21,7 @@ function mapStateToProps(state, ownProps) {
 
     return {
         ...ownProps,
+        theme: getTheme(state),
         currentChannelId: getCurrentChannelId(state),
         locale
     };

app/components/root/root.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {IntlProvider} from 'react-intl';
 
 import EventEmitter from 'mattermost-redux/utils/event_emitter';
@@ -14,15 +15,18 @@ export default class Root extends PureComponent {
         children: PropTypes.node,
         navigator: PropTypes.object,
         currentChannelId: PropTypes.string,
-        locale: PropTypes.string.isRequired
+        locale: PropTypes.string.isRequired,
+        theme: PropTypes.object.isRequired
     };
 
     componentWillMount() {
         EventEmitter.on(ViewTypes.NOTIFICATION_IN_APP, this.handleInAppNotification);
+        EventEmitter.on(ViewTypes.NOTIFICATION_TAPPED, this.handleNotificationTapped);
     }
 
     componentWillUnmount() {
         EventEmitter.off(ViewTypes.NOTIFICATION_IN_APP, this.handleInAppNotification);
+        EventEmitter.off(ViewTypes.NOTIFICATION_TAPPED, this.handleNotificationTapped);
     }
 
     handleInAppNotification = (notification) => {
@@ -42,6 +46,21 @@ export default class Root extends PureComponent {
         }
     };
 
+    handleNotificationTapped = () => {
+        const {navigator, theme} = this.props;
+
+        navigator.resetTo({
+            screen: 'Channel',
+            animated: true,
+            navigatorStyle: {
+                navBarHidden: true,
+                statusBarHidden: false,
+                statusBarHideWithNavBar: false,
+                screenBackgroundColor: theme.centerChannelBg
+            }
+        });
+    };
+
     render() {
         const locale = this.props.locale;
 

app/components/search_bar/search_bar.android.js

@@ -1,6 +1,7 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Keyboard,
     TextInput,

app/components/search_bar/search_bar.ios.js

@@ -1,6 +1,7 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import SearchBar from 'react-native-search-bar';
 
 export default class SearchBarIos extends PureComponent {

app/components/status_icons/away.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {View} from 'react-native';
 import Svg, {
     Ellipse,
@@ -9,11 +10,11 @@ import Svg, {
     Path
 } from 'react-native-svg';
 
-export default class AwayStatus extends React.Component {
+export default class AwayStatus extends PureComponent {
     static propTypes = {
-        width: React.PropTypes.number.isRequired,
-        height: React.PropTypes.number.isRequired,
-        color: React.PropTypes.string.isRequired
+        width: PropTypes.number.isRequired,
+        height: PropTypes.number.isRequired,
+        color: PropTypes.string.isRequired
     };
 
     render() {

app/components/status_icons/offline.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {View} from 'react-native';
 import Svg, {
     Ellipse,
@@ -9,11 +10,11 @@ import Svg, {
     Path
 } from 'react-native-svg';
 
-export default class OfflineStatus extends React.Component {
+export default class OfflineStatus extends PureComponent {
     static propTypes = {
-        width: React.PropTypes.number.isRequired,
-        height: React.PropTypes.number.isRequired,
-        color: React.PropTypes.string.isRequired
+        width: PropTypes.number.isRequired,
+        height: PropTypes.number.isRequired,
+        color: PropTypes.string.isRequired
     };
 
     render() {

app/components/status_icons/online.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {View} from 'react-native';
 import Svg, {
     Ellipse,
@@ -9,11 +10,11 @@ import Svg, {
     Path
 } from 'react-native-svg';
 
-export default class OnlineStatus extends React.Component {
+export default class OnlineStatus extends PureComponent {
     static propTypes = {
-        width: React.PropTypes.number.isRequired,
-        height: React.PropTypes.number.isRequired,
-        color: React.PropTypes.string.isRequired
+        width: PropTypes.number.isRequired,
+        height: PropTypes.number.isRequired,
+        color: PropTypes.string.isRequired
     };
 
     render() {

app/components/text_input_with_localized_placeholder.js

@@ -1,14 +1,15 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {TextInput} from 'react-native';
 
-class TextInputWithLocalizedPlaceholder extends React.PureComponent {
+class TextInputWithLocalizedPlaceholder extends PureComponent {
     static propTypes = {
         ...TextInput.propTypes,
-        placeholder: React.PropTypes.object.isRequired,
+        placeholder: PropTypes.object.isRequired,
         intl: intlShape.isRequired
     };
 

app/constants/custom_prop_types.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {PropTypes} from 'react';
+import PropTypes from 'prop-types';
 
 export const Children = PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf([PropTypes.node])]);
 

app/constants/view.js

@@ -16,6 +16,7 @@ const ViewTypes = keyMirror({
 
     NOTIFICATION_CHANGED: null,
     NOTIFICATION_IN_APP: null,
+    NOTIFICATION_TAPPED: null,
 
     CONNECTION_CHANGED: null,
 

app/mattermost.js

@@ -144,6 +144,7 @@ export default class Mattermost {
             if (!state.views.root.appInitializing) {
                 // go to notification if the app is initialized
                 goToNotification(notification)(dispatch, getState);
+                EventEmitter.emit(ViewTypes.NOTIFICATION_TAPPED);
             } else if (state.entities.general.credentials.token) {
                 // queue notification if app is not initialized but we are logged in
                 queueNotification(notification)(dispatch, getState);

app/screens/about/about.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Linking,
     ScrollView,

app/screens/account_notifications/account_notifications.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     Keyboard,

app/screens/account_notifications/section.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     View

app/screens/account_notifications/section_item.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     Switch,

app/screens/account_settings/account_settings.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     StyleSheet,

app/screens/channel/channel.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     Dimensions,

app/screens/channel/channel_drawer_button.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 import {
     PanResponder,
@@ -58,9 +59,7 @@ class ChannelDrawerButton extends PureComponent {
     }
 
     componentWillReceiveProps(nextProps) {
-        if (nextProps.mentionCount !== this.props.mentionCount) {
-            DeviceNotification.setApplicationIconBadgeNumber(nextProps.mentionCount);
-        }
+        DeviceNotification.setApplicationIconBadgeNumber(nextProps.mentionCount);
     }
 
     componentWillUnmount() {

app/screens/channel/channel_post_list/channel_post_list.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     Animated,

app/screens/channel/channel_title.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 import {
     Text,

app/screens/channel_add_members/channel_add_members.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     Alert,

app/screens/channel_info/channel_info.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     Alert,

app/screens/channel_info/channel_info_header.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     Text,

app/screens/channel_info/channel_info_row.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     Switch,

app/screens/channel_members/channel_members.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Alert,
     Keyboard,

app/screens/create_channel/create_channel.js

@@ -1,6 +1,7 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     Dimensions,

app/screens/edit_post/edit_post.js

@@ -1,6 +1,7 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     Dimensions,

app/screens/image_preview/image_preview.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Animated,
     Dimensions,

app/screens/image_preview/zoomable_image.js

@@ -2,7 +2,8 @@
 // http://stackoverflow.com/users/219449/leonti
 // http://stackoverflow.com/questions/36368919/scrollable-image-with-pinch-to-zoom
 
-import React, {Component, PropTypes} from 'react';
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {
   View,
   PanResponder

app/screens/load_team/load_team.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {StatusBar, View} from 'react-native';
 
 import {RequestStatus} from 'mattermost-redux/constants';

app/screens/login/login.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PureComponent, PropTypes} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     ActivityIndicator,
@@ -31,12 +32,12 @@ class Login extends PureComponent {
         intl: intlShape.isRequired,
         navigator: PropTypes.object,
         theme: PropTypes.object,
-        actions: React.PropTypes.shape({
-            handleLoginIdChanged: React.PropTypes.func.isRequired,
-            handlePasswordChanged: React.PropTypes.func.isRequired,
-            handleSuccessfulLogin: React.PropTypes.func.isRequired,
-            checkMfa: React.PropTypes.func.isRequired,
-            login: React.PropTypes.func.isRequired
+        actions: PropTypes.shape({
+            handleLoginIdChanged: PropTypes.func.isRequired,
+            handlePasswordChanged: PropTypes.func.isRequired,
+            handleSuccessfulLogin: PropTypes.func.isRequired,
+            checkMfa: PropTypes.func.isRequired,
+            login: PropTypes.func.isRequired
         }).isRequired,
         config: PropTypes.object.isRequired,
         license: PropTypes.object.isRequired,

app/screens/login_options/login_options.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     Image,

app/screens/mfa/mfa.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     ActivityIndicator,
     Image,

app/screens/more_channels/more_channels.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     Keyboard,

app/screens/more_dms/more_dms.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     Keyboard,

app/screens/notification/notification.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Dimensions,
     Image,

app/screens/options_modal/options_modal.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Animated,
     Dimensions,

app/screens/options_modal/options_modal_list.android.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     Text,

app/screens/options_modal/options_modal_list.ios.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     StyleSheet,
     Text,

app/screens/root/root.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 
 import {Client, Client4} from 'mattermost-redux/client';
 import {RequestStatus} from 'mattermost-redux/constants';

app/screens/saml/saml.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     InteractionManager,
     StatusBar,

app/screens/select_server/select_server.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     ActivityIndicator,

app/screens/select_team/select_team.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     Image,
     InteractionManager,

app/screens/settings/settings.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     InteractionManager,

app/screens/settings/settings_item.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {StyleSheet, TouchableOpacity, View} from 'react-native';
 import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome';
 import IonIcon from 'react-native-vector-icons/Ionicons';

app/screens/thread/thread.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {StatusBar, StyleSheet} from 'react-native';
 
 import KeyboardLayout from 'app/components/layout/keyboard_layout';
@@ -11,7 +12,7 @@ import {makeStyleSheetFromTheme} from 'app/utils/theme';
 
 export default class Thread extends PureComponent {
     static propTypes = {
-        actions: React.PropTypes.shape({
+        actions: PropTypes.shape({
             handleCommentDraftChanged: PropTypes.func.isRequired,
             selectPost: PropTypes.func.isRequired
         }).isRequired,

app/screens/user_profile/user_profile.js

@@ -1,7 +1,8 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React, {PropTypes, PureComponent} from 'react';
+import React, {PureComponent} from 'react';
+import PropTypes from 'prop-types';
 import {
     ScrollView,
     StyleSheet,