Migrate to React 15.6

10 files changed, 20 insertions, 10 deletions

diff --git a/app/components/Account.js b/app/components/Account.js
index fe38439e7a..7aaec4f2e6 100644
--- a/app/components/Account.js
+++ b/app/components/Account.js
@@ -1,5 +1,6 @@
 import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { If, Then, Else } from 'react-if';
 import { Layout, Container, Header } from './Layout';
 import { formatAccount } from '../lib/formatters';
diff --git a/app/components/AccountInput.js b/app/components/AccountInput.js
index e933d52f79..3e6993a9bb 100644
--- a/app/components/AccountInput.js
+++ b/app/components/AccountInput.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { formatAccount } from '../lib/formatters';
 
 /**
diff --git a/app/components/Connect.js b/app/components/Connect.js
index 9904012b85..abbbb19db9 100644
--- a/app/components/Connect.js
+++ b/app/components/Connect.js
@@ -1,6 +1,7 @@
 import assert from 'assert';
 import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { If, Then, Else } from 'react-if';
 import ReactMapboxGl, { Marker } from 'react-mapbox-gl';
 import cheapRuler from 'cheap-ruler';
diff --git a/app/components/CustomScrollbars.js b/app/components/CustomScrollbars.js
index 605ec0024f..e74cbd7c65 100644
--- a/app/components/CustomScrollbars.js
+++ b/app/components/CustomScrollbars.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { Scrollbars } from 'react-custom-scrollbars';
 
 /**
diff --git a/app/components/Layout.js b/app/components/Layout.js
index 36d298b5b8..58af3d0813 100644
--- a/app/components/Layout.js
+++ b/app/components/Layout.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import HeaderBar from './HeaderBar';
 
 /**
diff --git a/app/components/Login.js b/app/components/Login.js
index 2bcf40950e..72ef933082 100644
--- a/app/components/Login.js
+++ b/app/components/Login.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { If, Then } from 'react-if';
 import { Layout, Container, Header } from './Layout';
 import AccountInput from './AccountInput';
diff --git a/app/components/SelectLocation.js b/app/components/SelectLocation.js
index eb4191518e..0dd52ab2bb 100644
--- a/app/components/SelectLocation.js
+++ b/app/components/SelectLocation.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { If, Then } from 'react-if';
 import { Layout, Container, Header } from './Layout';
 import { servers } from '../config';
diff --git a/app/components/Settings.js b/app/components/Settings.js
index cc8dc24f25..eaec0355f2 100644
--- a/app/components/Settings.js
+++ b/app/components/Settings.js
@@ -1,5 +1,6 @@
 import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { If, Then, Else } from 'react-if';
 import { Layout, Container, Header } from './Layout';
 import Switch from './Switch';
diff --git a/app/components/Switch.js b/app/components/Switch.js
index 7f19e275bb..4cb0ea34c3 100644
--- a/app/components/Switch.js
+++ b/app/components/Switch.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 const CLICK_TIMEOUT = 1000;
 const MOVE_THRESHOLD = 10;
diff --git a/app/components/WindowChrome.js b/app/components/WindowChrome.js
index e1df040d6c..16bdb70e28 100644
--- a/app/components/WindowChrome.js
+++ b/app/components/WindowChrome.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * A component used to chip out arrow in the app header using CSS mask