Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to react16 #326

Merged
merged 2 commits into from
Nov 16, 2017
Merged

Upgrade to react16 #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
224f197
Upgrade to react16
evgenyboxer Nov 16, 2017
42d77d2
Merge conflicts
evgenyboxer Nov 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion __tests__/setupTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() })
2 changes: 1 addition & 1 deletion app/containers/CreateWallet/CreateWallet.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)
Expand Down
2 changes: 1 addition & 1 deletion app/containers/EncryptKey/EncryptKey.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)
Expand Down
2 changes: 1 addition & 1 deletion app/containers/LoginLedgerNanoS/LoginLedgerNanoS.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/containers/LoginLocalStorage/LoginLocalStorage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand Down
2 changes: 1 addition & 1 deletion app/containers/LoginPrivateKey/LoginPrivateKey.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/containers/LoginTokenSale/LoginTokenSale.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions app/containers/TokenSale/TokenSale.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'raf/polyfill'
import React from 'react'
import { render } from 'react-dom'
import { AppContainer } from 'react-hot-loader'
Expand Down
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +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",
"react-addons-test-utils": "15.6.2",
"raf": "3.4.0",
"react": "16.1.1",
"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-notification-system": "^0.2.16",
"react-modal": "3.1.2",
"react-notification-system": "0.2.16",
"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",
Expand Down Expand Up @@ -127,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",
Expand Down
63 changes: 30 additions & 33 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.48.tgz#24bfdc0aa82e8f6dbd017159c58094a2e06d0abb"

"@types/react@^16.0.18":
version "16.0.23"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.23.tgz#f0f713b07912c6fd8e10c9ccc539443ceb06dbca"
version "16.0.24"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.24.tgz#a6fd8015892fe8ae3c17453615f7ebdd2301d818"

abab@^1.0.3:
version "1.0.4"
Expand Down Expand Up @@ -2356,7 +2356,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"

create-react-class@^15.5.1, create-react-class@^15.6.0:
create-react-class@^15.5.1:
version "15.6.2"
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
dependencies:
Expand Down Expand Up @@ -3163,15 +3163,16 @@ env-paths@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"

enzyme-adapter-react-15@1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15/-/enzyme-adapter-react-15-1.0.5.tgz#99f9a03ff2c2303e517342935798a6bdfbb75fac"
enzyme-adapter-react-16@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.0.tgz#86c5db7c10f0be6ec25d54ca41b59f2abb397cf4"
dependencies:
enzyme-adapter-utils "^1.1.0"
lodash "^4.17.4"
object.assign "^4.0.4"
object.values "^1.0.4"
prop-types "^15.5.10"
react-test-renderer "^16.0.0-0"

enzyme-adapter-utils@^1.1.0:
version "1.1.1"
Expand Down Expand Up @@ -7115,8 +7116,8 @@ public-encrypt@^4.0.0:
randombytes "^2.0.1"

pump@^1.0.0, pump@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51"
version "1.0.3"
resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
dependencies:
end-of-stream "^1.1.0"
once "^1.3.1"
Expand Down Expand Up @@ -7193,7 +7194,7 @@ rabin-bindings@~1.7.3:
nan "^2.7.0"
prebuild-install "^2.3.0"

raf@^3.3.2:
raf@3.4.0, raf@^3.3.2:
version "3.4.0"
resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
dependencies:
Expand Down Expand Up @@ -7256,10 +7257,6 @@ rcedit@^0.9.0:
version "0.9.0"
resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-0.9.0.tgz#3910df57345399e2b0325f4a519007f89e55ef1c"

react-addons-test-utils@15.6.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz#c12b6efdc2247c10da7b8770d185080a7b047156"

react-data-grid@2.0.73:
version "2.0.73"
resolved "https://registry.yarnpkg.com/react-data-grid/-/react-data-grid-2.0.73.tgz#8c718b2cc5f3c2f7e34485d55b08e7bdcabfbb20"
Expand All @@ -7268,14 +7265,14 @@ react-deep-force-update@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-2.1.1.tgz#8ea4263cd6455a050b37445b3f08fd839d86e909"

react-dom@15.6.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
react-dom@16.1.1:
version "16.1.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.1.tgz#b2e331b6d752faf1a2d31399969399a41d8d45f8"
dependencies:
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.10"
object-assign "^4.1.1"
prop-types "^15.6.0"

react-hot-loader@3.1.1:
version "3.1.1"
Expand All @@ -7297,14 +7294,14 @@ react-icons@2.2.7:
dependencies:
react-icon-base "2.1.0"

react-modal@^3.1.2:
react-modal@3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.2.tgz#6e1fd656315d6fc62a1edda2b5aecc9752ac6bca"
dependencies:
exenv "^1.2.0"
prop-types "^15.5.10"

react-notification-system@^0.2.16:
react-notification-system@0.2.16:
version "0.2.16"
resolved "https://registry.yarnpkg.com/react-notification-system/-/react-notification-system-0.2.16.tgz#9b9da20b0d34786b60057c52b42516ea1295374a"
dependencies:
Expand Down Expand Up @@ -7376,12 +7373,13 @@ react-syntax-highlighter@5.8.0:
highlight.js "~9.12.0"
lowlight "~1.9.1"

react-test-renderer@15.6.1:
version "15.6.1"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.6.1.tgz#026f4a5bb5552661fd2cc4bbcd0d4bc8a35ebf7e"
react-test-renderer@16.1.1, react-test-renderer@^16.0.0-0:
version "16.1.1"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.1.1.tgz#a05184688d564be799f212449262525d1e350537"
dependencies:
fbjs "^0.8.9"
object-assign "^4.1.0"
fbjs "^0.8.16"
object-assign "^4.1.1"
prop-types "^15.6.0"

react-tooltip@3.4.0:
version "3.4.0"
Expand All @@ -7390,15 +7388,14 @@ react-tooltip@3.4.0:
classnames "^2.2.5"
prop-types "^15.6.0"

react@15.6.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
react@16.1.1:
version "16.1.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.1.1.tgz#d5c4ef795507e3012282dd51261ff9c0e824fe1f"
dependencies:
create-react-class "^15.6.0"
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.10"
object-assign "^4.1.1"
prop-types "^15.6.0"

read-chunk@^1.0.1:
version "1.0.1"
Expand Down