Merge branch 'make.strategies.default.tab' of github.com:corinnekrych/unleash-frontend into make.strategies.default.tab

frontend/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 The latest version of this document is always available in
 [releases][releases-url].
 
+
+## [Unrelesed]
+- fix(package): Upgrade react to version 16.2.0
+
 ## [3.0.0]
 - Nothing new, just locking down the version.
 

frontend/package.json

@@ -42,14 +42,14 @@
     "debug": "^3.1.0",
     "immutable": "^3.8.1",
     "normalize.css": "^8.0.0",
-    "prop-types": "^15.5.10",
-    "react": "^15.6.1",
+    "prop-types": "^15.6.0",
+    "react": "^16.2.0",
     "react-dnd": "^2.1.4",
     "react-dnd-html5-backend": "^2.1.2",
-    "react-dom": "^15.6.1",
+    "react-dom": "^16.2.0",
     "react-mdl": "^1.11.0",
-    "react-modal": "^1.6.4",
-    "react-redux": "^4.4.5",
+    "react-modal": "^3.1.13",
+    "react-redux": "^5.0.6",
     "react-router": "^3.0.0",
     "react-router-scroll": "^0.4.1",
     "redux": "^3.6.0",
@@ -78,7 +78,7 @@
     "jest": "^22.1.2",
     "node-sass": "^4.5.3",
     "prettier": "^1.8.2",
-    "react-test-renderer": "^15.6.1",
+    "react-test-renderer": "^16.2.0",
     "redux-devtools": "^3.3.1",
     "redux-mock-store": "^1.5.1",
     "sass-loader": "^6.0.6",

frontend/src/component/app.jsx

@@ -122,11 +122,14 @@ export default class App extends Component {
                     ? 'mdl-color-text--black'
                     : 'mdl-color-text--grey-600';
             return (
-                <Link to={path} className={isDrawerNavigation && [styles.navigationLink, linkColor].join(' ')}>
+                <Link
+                    to={path}
+                    className={isDrawerNavigation ? [styles.navigationLink, linkColor].join(' ') : undefined}
+                >
                     {icon && (
                         <Icon
                             name={icon}
-                            className={isDrawerNavigation && [styles.navigationIcon, iconColor].join(' ')}
+                            className={isDrawerNavigation ? [styles.navigationIcon, iconColor].join(' ') : undefined}
                         />
                     )}
                     {caption}