diff --git a/src/Accounts/Accounts.js b/src/Accounts/Accounts.js index 9e215bf1e545c89cb09fe0f14d265266b4a2d9c5..1d8e50d1b4797536d4f67611edde7027f5e9274b 100644 --- a/src/Accounts/Accounts.js +++ b/src/Accounts/Accounts.js @@ -3,7 +3,7 @@ // // SPDX-License-Identifier: MIT -import React, { PureComponent } from 'react'; +import React, { Component } from 'react'; import { accountsInfo$ } from '@parity/light.js'; import Blockies from 'react-blockies'; import { inject, observer } from 'mobx-react'; @@ -12,18 +12,18 @@ import { Link, Route, Switch } from 'react-router-dom'; import CreateAccount from './CreateAccount/CreateAccount'; import light from '../hoc'; -@inject('parityStore') -@observer @light({ accountsInfo: accountsInfo$ }) -class Accounts extends PureComponent { +@inject('parityStore') +@observer +class Accounts extends Component { handleClick = ({ currentTarget: { dataset: { address } } }) => { - const { parityStore: { api } } = this.props; + const { history, parityStore: { api } } = this.props; // Set default account to the clicked one, and go to Tokens on complete this.subscription = api.parity .setNewDappsDefaultAddress(address) - .then(() => this.props.history.push('/tokens')); + .then(() => history.push('/tokens')); }; render () { diff --git a/src/Accounts/CreateAccount/CreateAccountStep1/CreateAccountStep1.js b/src/Accounts/CreateAccount/CreateAccountStep1/CreateAccountStep1.js index a1fb32601e12a682bba594f2613c4c7da69f7ac9..88213fbeeb36da570b4a34b54bb22e9cf6cf7b3f 100644 --- a/src/Accounts/CreateAccount/CreateAccountStep1/CreateAccountStep1.js +++ b/src/Accounts/CreateAccount/CreateAccountStep1/CreateAccountStep1.js @@ -3,14 +3,14 @@ // // SPDX-License-Identifier: MIT -import React, { PureComponent } from 'react'; +import React, { Component } from 'react'; import Blockie from 'react-blockies'; import { inject, observer } from 'mobx-react'; import { Link } from 'react-router-dom'; @inject('createAccountStore') @observer -class CreateAccountStep1 extends PureComponent { +class CreateAccountStep1 extends Component { componentDidMount () { this.props.createAccountStore.generateNewAccount(); } diff --git a/src/Accounts/CreateAccount/CreateAccountStep2/CreateAccountStep2.js b/src/Accounts/CreateAccount/CreateAccountStep2/CreateAccountStep2.js index c0e2aeb68c61db2f547c9d25c99c6af799d024d6..d788f2c808501932880d53186f935b10722314d5 100644 --- a/src/Accounts/CreateAccount/CreateAccountStep2/CreateAccountStep2.js +++ b/src/Accounts/CreateAccount/CreateAccountStep2/CreateAccountStep2.js @@ -3,13 +3,13 @@ // // SPDX-License-Identifier: MIT -import React, { PureComponent } from 'react'; +import React, { Component } from 'react'; import { inject, observer } from 'mobx-react'; import { Link } from 'react-router-dom'; @inject('createAccountStore') @observer -class CreateAccountStep2 extends PureComponent { +class CreateAccountStep2 extends Component { render () { const { createAccountStore: { phrase } } = this.props; diff --git a/src/Accounts/CreateAccount/CreateAccountStep3/CreateAccountStep3.js b/src/Accounts/CreateAccount/CreateAccountStep3/CreateAccountStep3.js index 320a3711f91c4143997a8c680e8cc1680a480bd7..d337ed5a82e1095592bf2c0f97af06218ce085bf 100644 --- a/src/Accounts/CreateAccount/CreateAccountStep3/CreateAccountStep3.js +++ b/src/Accounts/CreateAccount/CreateAccountStep3/CreateAccountStep3.js @@ -3,13 +3,13 @@ // // SPDX-License-Identifier: MIT -import React, { PureComponent } from 'react'; +import React, { Component } from 'react'; import { inject, observer } from 'mobx-react'; import { Link } from 'react-router-dom'; @inject('createAccountStore') @observer -class CreateAccountStep3 extends PureComponent { +class CreateAccountStep3 extends Component { state = { value: '' }; diff --git a/src/Accounts/CreateAccount/CreateAccountStep4/CreateAccountStep4.js b/src/Accounts/CreateAccount/CreateAccountStep4/CreateAccountStep4.js index d47d3eb5b8173f99f324b0e52241e045dbd446ba..6e4a00031c8d51daed0764f8044f9293152c1702 100644 --- a/src/Accounts/CreateAccount/CreateAccountStep4/CreateAccountStep4.js +++ b/src/Accounts/CreateAccount/CreateAccountStep4/CreateAccountStep4.js @@ -3,12 +3,12 @@ // // SPDX-License-Identifier: MIT -import React, { PureComponent } from 'react'; +import React, { Component } from 'react'; import { inject, observer } from 'mobx-react'; @inject('createAccountStore') @observer -class CreateAccountStep3 extends PureComponent { +class CreateAccountStep3 extends Component { state = { confirm: '', hint: '', diff --git a/src/Accounts/CreateAccount/CreateAccountStep5/CreateAccountStep5.js b/src/Accounts/CreateAccount/CreateAccountStep5/CreateAccountStep5.js index 3eb0754887b13860f844bd8f25fa5e6839a80965..2a688ac727feba44bf69a84c314984e5523fc9e7 100644 --- a/src/Accounts/CreateAccount/CreateAccountStep5/CreateAccountStep5.js +++ b/src/Accounts/CreateAccount/CreateAccountStep5/CreateAccountStep5.js @@ -3,12 +3,12 @@ // // SPDX-License-Identifier: MIT -import React, { PureComponent } from 'react'; +import React, { Component } from 'react'; import { inject, observer } from 'mobx-react'; @inject('createAccountStore') @observer -class CreateAccountStep5 extends PureComponent { +class CreateAccountStep5 extends Component { handleSubmit = () => { const { createAccountStore: { saveAccountToParity }, history } = this.props; saveAccountToParity().then(() => history.push('/accounts')); diff --git a/src/App/ProtectedRoute/ProtectedRoute.js b/src/App/ProtectedRoute/ProtectedRoute.js index 83584655bfd93b09d0498eb9011c2a33b6205384..3079dc9e899c1b0a4202dadda4e25e7e952e7cba 100644 --- a/src/App/ProtectedRoute/ProtectedRoute.js +++ b/src/App/ProtectedRoute/ProtectedRoute.js @@ -3,7 +3,7 @@ // // SPDX-License-Identifier: MIT -import React, { PureComponent } from 'react'; +import React, { Component } from 'react'; import { inject, observer } from 'mobx-react'; import { Redirect, Route, withRouter } from 'react-router-dom'; @@ -15,7 +15,7 @@ import { Redirect, Route, withRouter } from 'react-router-dom'; @withRouter @inject('parityStore') @observer -class ProtectedRoute extends PureComponent { +class ProtectedRoute extends Component { render () { const { component, parityStore, ...rest } = this.props; diff --git a/src/Loading/Loading.js b/src/Loading/Loading.js index fafa064b84a6f883f9ee147b9f44de590abc3d94..fb18067ee81dd38672d92c32d0fcfc8305ed2bca 100644 --- a/src/Loading/Loading.js +++ b/src/Loading/Loading.js @@ -3,13 +3,13 @@ // // SPDX-License-Identifier: MIT -import React, { PureComponent } from 'react'; +import React, { Component } from 'react'; import { inject, observer } from 'mobx-react'; import { Redirect } from 'react-router-dom'; @inject('parityStore') @observer -class Loading extends PureComponent { +class Loading extends Component { render () { const { parityStore: { downloadProgress, isApiConnected } } = this.props; diff --git a/src/Send/Signer/Signer.js b/src/Send/Signer/Signer.js index e20e6b5d83c3e435b956c1e128382ad4610454c5..2dad86d91d128904d06850d14a6066912ae99801 100644 --- a/src/Send/Signer/Signer.js +++ b/src/Send/Signer/Signer.js @@ -1,11 +1,16 @@ -import React, { PureComponent } from 'react'; +// Copyright 2015-2018 Parity Technologies (UK) Ltd. +// This file is part of Parity. +// +// SPDX-License-Identifier: MIT + +import React, { Component } from 'react'; import { fromWei } from '@parity/api/lib/util/wei'; import { inject, observer } from 'mobx-react'; import { post$ } from '@parity/light.js'; @inject('signerStore') @observer -class Signer extends PureComponent { +class Signer extends Component { state = { password: '', status: null diff --git a/src/Tokens/NewToken/NewToken.js b/src/Tokens/NewToken/NewToken.js index 785c47d2a74517ad5131a5fb3d3942048e838dd6..6b75b5806c5c3af93a228834396602fe40120de5 100644 --- a/src/Tokens/NewToken/NewToken.js +++ b/src/Tokens/NewToken/NewToken.js @@ -3,7 +3,7 @@ // // SPDX-License-Identifier: MIT -import React, { PureComponent } from 'react'; +import React, { Component } from 'react'; import { chainName$ } from '@parity/light.js'; import debounce from 'lodash/debounce'; import { inject, observer } from 'mobx-react'; @@ -11,12 +11,12 @@ import { inject, observer } from 'mobx-react'; import light from '../../hoc'; import NewTokenItem from './NewTokenItem'; -@inject('tokensStore') -@observer @light({ chainName: chainName$ }) -class NewToken extends PureComponent { +@inject('tokensStore') +@observer +class NewToken extends Component { state = { db: null, dbMap: null, diff --git a/src/Tokens/NewToken/NewTokenItem/NewTokenItem.js b/src/Tokens/NewToken/NewTokenItem/NewTokenItem.js index 42d7c3043364aa70361bda553442760082f0b85e..049622acd7635831b59422fc1ee8b33746b9213d 100644 --- a/src/Tokens/NewToken/NewTokenItem/NewTokenItem.js +++ b/src/Tokens/NewToken/NewTokenItem/NewTokenItem.js @@ -3,14 +3,14 @@ // // SPDX-License-Identifier: MIT -import React, { PureComponent } from 'react'; +import React, { Component } from 'react'; import { inject, observer } from 'mobx-react'; import { withRouter } from 'react-router-dom'; @inject('tokensStore') @observer @withRouter -class NewTokenItem extends PureComponent { +class NewTokenItem extends Component { handleAddToken = () => { const { history, token, tokensStore } = this.props; tokensStore.addToken(token.address, token); diff --git a/src/Tokens/Tokens.js b/src/Tokens/Tokens.js index 0aa2f5599ff16a15b9ba25ef16650f72658ac325..6a49ab613dec8ca06352095f698f332b1b8f16bb 100644 --- a/src/Tokens/Tokens.js +++ b/src/Tokens/Tokens.js @@ -4,14 +4,22 @@ // SPDX-License-Identifier: MIT import React, { PureComponent } from 'react'; +import { accountsInfo$, defaultAccount$ } from '@parity/light.js'; import { Link, Route, Switch } from 'react-router-dom'; import Health from '../Health'; +import light from '../hoc'; import NewToken from './NewToken'; import TokensList from './TokensList'; +@light({ + accountsInfo: accountsInfo$, + defaultAccount: defaultAccount$ +}) class Tokens extends PureComponent { render () { + const { accountsInfo, defaultAccount } = this.props; + return (