diff --git a/app/components/channel_drawer_list/unread_indicator.js b/app/components/channel_drawer_list/unread_indicator.js
index 7810d5890..0fd1147b3 100644
--- a/app/components/channel_drawer_list/unread_indicator.js
+++ b/app/components/channel_drawer_list/unread_indicator.js
@@ -1,8 +1,7 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
-import PureRenderMixin from 'react-addons-pure-render-mixin';
+import React, {PropTypes, PureComponent} from 'react';
 import {StyleSheet, Text, View} from 'react-native';
 
 const Styles = StyleSheet.create({
@@ -17,19 +16,13 @@ const Styles = StyleSheet.create({
     }
 });
 
-export default class UnreadIndicator extends React.Component {
+export default class UnreadIndicator extends PureComponent {
     static propTypes = {
         style: View.propTypes.style,
         textStyle: Text.propTypes.style,
-        text: React.PropTypes.node.isRequired
+        text: PropTypes.node.isRequired
     };
 
-    constructor(props) {
-        super(props);
-
-        this.shouldComponentUpdate = PureRenderMixin.shouldComponentUpdate.bind(this);
-    }
-
     render() {
         return (
             <View
diff --git a/app/components/push_notification/push_notification.js b/app/components/push_notification/push_notification.js
index 0d549bf18..82e679256 100644
--- a/app/components/push_notification/push_notification.js
+++ b/app/components/push_notification/push_notification.js
@@ -14,17 +14,19 @@ import {Constants} from 'mattermost-redux/constants';
 
 export default class PushNotification extends PureComponent {
     static propTypes = {
-        currentTeamId: PropTypes.string,
-        currentChannelId: PropTypes.string,
-        teams: PropTypes.object,
         actions: PropTypes.shape({
             goToNotification: PropTypes.func.isRequired,
             queueNotification: PropTypes.func.isRequired,
             setDeviceToken: PropTypes.func.isRequired
-        }).isRequired
+        }).isRequired,
+        currentTeamId: PropTypes.string,
+        currentChannelId: PropTypes.string,
+        mentionCount: PropTypes.number,
+        teams: PropTypes.object
     };
 
     static defaultProps: {
+        mentionCount: 0,
         teams: {}
     };
 
@@ -46,7 +48,7 @@ export default class PushNotification extends PureComponent {
 
     componentWillReceiveProps(props) {
         if (this.isConfigured) {
-            DeviceNotification.setApplicationIconBadgeNumber(props.mentionCount || 0);
+            DeviceNotification.setApplicationIconBadgeNumber(props.mentionCount);
         }
     }
 
diff --git a/app/navigation/navigation_modal.js b/app/navigation/navigation_modal.js
index b7533fa2c..2f454faaa 100644
--- a/app/navigation/navigation_modal.js
+++ b/app/navigation/navigation_modal.js
@@ -20,6 +20,7 @@ export default class NavigationModal extends PureComponent {
             ANIMATION_TYPES.SlideFromBottom,
             ANIMATION_TYPES.Fade
         ]),
+        children: PropTypes.node,
         deviceHeight: PropTypes.number.isRequired,
         deviceWidth: PropTypes.number.isRequired,
         duration: PropTypes.number,
diff --git a/package.json b/package.json
index 270bcff16..9ef165eed 100644
--- a/package.json
+++ b/package.json
@@ -8,60 +8,56 @@
     "deep-equal": "1.0.1",
     "harmony-reflect": "1.5.1",
     "intl": "1.2.5",
-    "isomorphic-fetch": "2.2.1",
     "mattermost-redux": "mattermost/mattermost-redux#release-3.7",
-    "react": "15.4.1",
-    "react-addons-pure-render-mixin": "15.4.1",
-    "react-intl": "2.2.2",
-    "react-native": "0.42.0",
+    "react": "15.4.2",
+    "react-intl": "2.2.3",
+    "react-native": "0.42.3",
     "react-native-bottom-sheet": "1.0.1",
-    "react-native-button": "1.7.1",
+    "react-native-button": "1.8.2",
     "react-native-cookies": "2.0.0",
     "react-native-device-info": "0.10.1",
     "react-native-drawer": "2.3.0",
-    "react-native-image-crop-picker": "0.12.8",
-    "react-native-keyboard-aware-scroll-view": "0.2.7",
-    "react-native-keyboard-spacer": "0.3.1",
+    "react-native-image-crop-picker": "0.12.9",
+    "react-native-keyboard-aware-scroll-view": "0.2.8",
     "react-native-linear-gradient": "2.0.0",
     "react-native-message-bar": "1.6.0",
     "react-native-orientation": "enahum/react-native-orientation.git",
     "react-native-push-notification": "2.2.1",
     "react-native-search-bar": "enahum/react-native-search-bar.git",
     "react-native-smart-splash-screen": "2.3.3",
-    "react-native-svg": "4.5.0",
+    "react-native-svg": "5.1.6",
     "react-native-tooltip": "5.0.0",
     "react-native-vector-icons": "4.0.0",
-    "react-redux": "5.0.1",
+    "react-redux": "5.0.3",
     "redux": "3.6.0",
     "redux-batched-actions": "0.1.5",
-    "redux-thunk": "2.1.0",
-    "reselect": "2.5.4",
+    "redux-thunk": "2.2.0",
+    "reselect": "3.0.0",
     "semver": "5.3.0"
   },
   "devDependencies": {
-    "babel-cli": "6.23.0",
-    "babel-eslint": "7.1.1",
-    "babel-plugin-module-resolver": "2.4.0",
-    "babel-preset-es2015": "6.18.0",
+    "babel-cli": "6.24.0",
+    "babel-eslint": "7.2.1",
+    "babel-plugin-module-resolver": "2.7.0",
+    "babel-preset-es2015": "6.24.0",
     "babel-preset-react-native": "1.9.1",
-    "babel-register": "6.18.0",
+    "babel-register": "6.24.0",
     "chai": "3.5.0",
     "chai-enzyme": "0.6.1",
     "deep-freeze": "0.0.1",
-    "enzyme": "2.7.1",
-    "eslint": "3.15.0",
-    "eslint-plugin-mocha": "4.8.0",
-    "eslint-plugin-react": "6.8.0",
-    "fetch-mock": "5.8.1",
+    "enzyme": "2.8.0",
+    "eslint": "3.19.0",
+    "eslint-plugin-mocha": "4.9.0",
+    "eslint-plugin-react": "6.10.3",
+    "fetch-mock": "5.9.4",
     "form-data": "2.1.2",
     "mocha": "3.2.0",
     "mocha-react-native": "0.5.0",
     "react-addons-test-utils": "15.4.2",
     "react-dom": "15.4.2",
-    "react-native-mock": "0.2.9",
+    "react-native-mock": "0.3.1",
     "react-native-svg-mock": "1.0.2",
-    "react-test-renderer": "15.4.1",
-    "redux-logger": "2.7.4",
+    "react-test-renderer": "15.4.2",
     "remote-redux-devtools": "0.5.7",
     "remote-redux-devtools-on-debugger": "0.7.0"
   },
diff --git a/test/mocha.opts b/test/mocha.opts
index a611bc998..17b996254 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -5,5 +5,4 @@
 --require react-native-mock/mock.js
 --require react-native-svg-mock/mock
 --require babel-polyfill
---require isomorphic-fetch
 --recursive
diff --git a/test/sanity.test.js b/test/sanity.test.js
index b378bed4e..ba1278b71 100644
--- a/test/sanity.test.js
+++ b/test/sanity.test.js
@@ -26,13 +26,4 @@ describe('Sanity test', () => {
     it('async/await', async () => {
         await Promise.resolve(true);
     });
-
-    it('fetch', (done) => {
-        fetch('http://example.com').then(() => {
-            done();
-        }).catch(() => {
-            // No internet connection, but fetch still returned at least
-            done();
-        });
-    });
 });