Upgrade to react16

__tests__/setupTests.js

@@ -1,4 +1,6 @@
+// @flow
+import 'raf/polyfill'
 import { configure } from 'enzyme'
-import Adapter from 'enzyme-adapter-react-15'
+import Adapter from 'enzyme-adapter-react-16'
 
 configure({ adapter: new Adapter() })

app/containers/CreateWallet/CreateWallet.jsx

@@ -66,7 +66,7 @@ export default class CreateWallet extends Component<Props, State> {
           value={passphrase2}
           onChange={(e) => this.setState({ passphrase2: e.target.value })}
         />
-        <button disabled={disabledButton} className={disabledButton && 'disabled'} onClick={this.generateNewWallet}> Generate keys </button>
+        <button disabled={disabledButton} className={disabledButton ? 'disabled' : ''} onClick={this.generateNewWallet}> Generate keys </button>
         <HomeButtonLink />
       </div>
     )

app/containers/EncryptKey/EncryptKey.jsx

@@ -76,7 +76,7 @@ export default class EncryptKey extends Component<Props, State> {
           onChange={(e) => this.setState({ wif: e.target.value })}
           placeholder='Enter existing WIF here'
         />
-        <button disabled={disabledButton} className={disabledButton && 'disabled'} onClick={this.generateWalletFromWif}> Generate encrypted key </button>
+        <button disabled={disabledButton} className={disabledButton ? 'disabled' : ''} onClick={this.generateWalletFromWif}> Generate encrypted key </button>
         <HomeButtonLink />
       </div>
     )

app/containers/LoginLedgerNanoS/LoginLedgerNanoS.jsx

@@ -38,7 +38,7 @@ export default class LoginLedgerNanoS extends Component<Props> {
         <div className={loginStyles.title}>Login using the Ledger Nano S:</div>
         <div className={loginStyles.loginForm}>
           <div>
-            <button className={!publicKey && 'disabled'} onClick={this.onLedgerNanoSChange}>Use Ledger Nano S</button>
+            <button className={!publicKey ? 'disabled' : ''} onClick={this.onLedgerNanoSChange}>Use Ledger Nano S</button>
             <HomeButtonLink />
           </div>
           <p>{hardwareDeviceInfo}</p>

app/containers/LoginLocalStorage/LoginLocalStorage.jsx

@@ -75,7 +75,7 @@ export default class LoginLocalStorage extends Component<Props, State> {
         </div>
         <div>
           <button
-            className={loginButtonDisabled && 'disabled'}
+            className={loginButtonDisabled ? 'disabled' : ''}
             onClick={() => loginNep2(passphrase, wif, history)}
             disabled={loginButtonDisabled}>Login</button>
           <HomeButtonLink />

app/containers/LoginPrivateKey/LoginPrivateKey.jsx

@@ -53,7 +53,7 @@ export default class LoginPrivateKey extends Component<Props, State> {
           <button
             onClick={() => loginWithPrivateKey(wif, history)}
             disabled={loginButtonDisabled}
-            className={loginButtonDisabled && 'disabled'}>Login</button>
+            className={loginButtonDisabled ? 'disabled' : ''}>Login</button>
           <HomeButtonLink />
         </div>
       </Page>

app/containers/LoginTokenSale/LoginTokenSale.jsx

@@ -40,7 +40,7 @@ export default class LoginTokenSale extends Component<Props, State> {
           <button
             onClick={() => loginWithPrivateKey(wif, history, ROUTES.TOKEN_SALE)}
             disabled={loginButtonDisabled}
-            className={loginButtonDisabled && 'disabled'}>Login</button>
+            className={loginButtonDisabled ? 'disabled' : ''}>Login</button>
           <HomeButtonLink />
         </div>
       </Page>

app/containers/TokenSale/TokenSale.jsx

@@ -92,11 +92,11 @@ export default class TokenSale extends Component<Props, State> {
             />
           </div>
           <button
-            className={submitSaleButtonDisabled && 'disabled'}
+            className={submitSaleButtonDisabled ? 'disabled' : ''}
             onClick={this.participateInSale}
             disabled={submitSaleButtonDisabled}>Submit for Sale</button>
           <button
-            className={refreshTokenBalanceButtonDisabled && 'disabled'}
+            className={refreshTokenBalanceButtonDisabled ? 'disabled' : ''}
             onClick={() => refreshTokenBalance(scriptHash)}
             disabled={refreshTokenBalanceButtonDisabled}>Refresh Token Balance</button>
         </div>

app/index.js

@@ -1,3 +1,4 @@
+import 'raf/polyfill'
 import React from 'react'
 import { render } from 'react-dom'
 import { AppContainer } from 'react-hot-loader'

package.json

@@ -84,18 +84,19 @@
     "neon-js": "git+https://github.com/CityOfZion/neon-js.git#02bdca256b5a112ab6d657401be5951ecf9e54f5",
     "node-hid": "0.5.7",
     "qrcode": "0.9.0",
-    "react": "15.6.2",
+    "raf": "3.4.0",
+    "react": "16.1.1",
     "react-addons-test-utils": "15.6.2",
     "react-data-grid": "2.0.73",
-    "react-dom": "15.6.2",
+    "react-dom": "16.1.1",
     "react-hot-loader": "3.1.1",
     "react-icons": "2.2.7",
-    "react-modal": "^3.1.2",
+    "react-modal": "3.1.2",
     "react-redux": "5.0.6",
     "react-router-dom": "4.2.2",
     "react-split-pane": "0.1.68",
     "react-syntax-highlighter": "5.8.0",
-    "react-test-renderer": "15.6.1",
+    "react-test-renderer": "16.1.1",
     "react-tooltip": "3.4.0",
     "redux": "3.7.2",
     "redux-logger": "3.0.6",
@@ -126,7 +127,7 @@
     "electron-packager": "9.1.0",
     "electron-rebuild": "1.6.0",
     "enzyme": "3.1.1",
-    "enzyme-adapter-react-15": "1.0.5",
+    "enzyme-adapter-react-16": "1.1.0",
     "enzyme-to-json": "3.2.1",
     "eslint": "4.10.0",
     "eslint-config-standard": "10.2.1",