From 08f80f269509ca921fafdcb1a7fe1196c3305c6d Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 18 Jan 2017 13:05:01 +0100 Subject: [PATCH] ESLint additional rules (#4186) * Add eslint rule for consistent block padding * Fix padding consistency issues * Eslint test for duplicate imports * Eslint closing bracket location * Fix eslint jsx closing bracket * missed a file * Formatting * Manual overrides for auto * Manual overrides for auto * More minor auto-override manual adjustments --- js/.eslintrc.json | 9 ++ .../basiccoin/AddressSelect/addressSelect.js | 6 +- .../basiccoin/Application/Header/header.js | 3 +- .../basiccoin/Deploy/Deployment/deployment.js | 15 ++- .../basiccoin/IdentityIcon/identityIcon.js | 3 +- .../dapps/basiccoin/Overview/Owner/owner.js | 6 +- js/src/dapps/basiccoin/Overview/overview.js | 3 +- .../dapps/basiccoin/Transfer/Events/events.js | 3 +- js/src/dapps/basiccoin/Transfer/Send/send.js | 12 ++- js/src/dapps/dappreg/Button/button.js | 3 +- js/src/dapps/dappreg/ButtonBar/buttonBar.js | 15 ++- js/src/dapps/dappreg/Dapp/dapp.js | 21 ++-- .../dapps/dappreg/ModalDelete/modalDelete.js | 12 ++- .../dappreg/ModalRegister/modalRegister.js | 12 ++- .../dapps/dappreg/ModalUpdate/modalUpdate.js | 12 ++- .../dappreg/SelectAccount/selectAccount.js | 3 +- js/src/dapps/dappreg/SelectDapp/selectDapp.js | 12 ++- .../githubhint/Application/application.js | 25 +++-- .../githubhint/IdentityIcon/identityIcon.js | 3 +- .../dapps/localtx/Application/application.js | 4 +- .../dapps/localtx/Transaction/transaction.js | 10 +- js/src/dapps/registry/Accounts/accounts.js | 1 - .../dapps/registry/Application/application.js | 1 - js/src/dapps/registry/Events/events.js | 1 - .../registry/IdentityIcon/identityIcon.js | 3 +- js/src/dapps/registry/Lookup/lookup.js | 1 - js/src/dapps/registry/Names/names.js | 1 - js/src/dapps/registry/Records/records.js | 1 - .../signaturereg/Application/application.js | 9 +- .../signaturereg/IdentityIcon/identityIcon.js | 3 +- .../AccountSelector/account-selector.js | 31 +++--- .../Accounts/AccountSelector/container.js | 13 ++- js/src/dapps/tokenreg/Actions/Query/query.js | 54 ++++++---- .../tokenreg/Actions/Register/register.js | 17 +-- js/src/dapps/tokenreg/Actions/component.js | 14 +-- js/src/dapps/tokenreg/Actions/container.js | 9 +- .../dapps/tokenreg/Application/application.js | 4 +- js/src/dapps/tokenreg/Chip/chip.js | 6 +- js/src/dapps/tokenreg/Container.js | 10 +- .../tokenreg/IdentityIcon/identityIcon.js | 3 +- .../dapps/tokenreg/Inputs/Text/container.js | 9 +- .../dapps/tokenreg/Inputs/Text/input-text.js | 5 +- js/src/dapps/tokenreg/Status/status.js | 3 +- .../dapps/tokenreg/Tokens/Token/add-meta.js | 25 +++-- js/src/dapps/tokenreg/Tokens/Token/token.js | 30 ++++-- js/src/modals/AddAddress/addAddress.js | 45 +++++--- js/src/modals/AddContract/addContract.js | 69 ++++++++---- js/src/modals/AddContract/addContract.spec.js | 3 +- js/src/modals/AddContract/types.js | 24 +++-- js/src/modals/AddDapps/addDapps.js | 30 ++++-- .../AccountDetails/accountDetails.js | 9 +- .../CreationType/creationType.js | 21 ++-- .../CreateAccount/NewAccount/newAccount.js | 30 ++++-- .../modals/CreateAccount/NewGeth/newGeth.js | 6 +- .../CreateAccount/NewImport/newImport.js | 18 ++-- js/src/modals/CreateAccount/RawKey/rawKey.js | 15 ++- .../RecoveryPhrase/recoveryPhrase.js | 15 ++- js/src/modals/CreateAccount/createAccount.js | 24 +++-- js/src/modals/CreateAccount/errors.js | 15 ++- js/src/modals/CreateWallet/createWallet.js | 1 - .../modals/DappPermissions/dappPermissions.js | 15 ++- js/src/modals/DeleteAccount/deleteAccount.js | 9 +- .../DeployContract/DetailsStep/detailsStep.js | 39 ++++--- .../ParametersStep/parametersStep.js | 6 +- .../modals/DeployContract/deployContract.js | 99 +++++++++++------ .../DeployContract/deployContract.spec.js | 3 +- js/src/modals/EditMeta/editMeta.js | 45 +++++--- js/src/modals/EditMeta/editMeta.spec.js | 3 +- .../AdvancedStep/advancedStep.js | 9 +- .../DetailsStep/detailsStep.js | 36 ++++--- .../DetailsStep/detailsStep.spec.js | 3 +- .../modals/ExecuteContract/executeContract.js | 75 ++++++++----- .../ExecuteContract/executeContract.spec.js | 3 +- js/src/modals/FirstRun/TnC/tnc.js | 3 +- js/src/modals/FirstRun/Welcome/welcome.js | 3 +- js/src/modals/FirstRun/firstRun.js | 21 ++-- js/src/modals/LoadContract/loadContract.js | 2 - .../modals/PasswordManager/passwordManager.js | 102 ++++++++++++------ .../PasswordManager/passwordManager.spec.js | 3 +- js/src/modals/SaveContract/saveContract.js | 2 - .../awaitingDepositStep.js | 9 +- .../awaitingDepositStep.spec.js | 3 +- .../awaitingExchangeStep.js | 6 +- .../awaitingExchangeStep.spec.js | 3 +- .../Shapeshift/CompletedStep/completedStep.js | 6 +- .../CompletedStep/completedStep.spec.js | 3 +- .../modals/Shapeshift/ErrorStep/errorStep.js | 3 +- .../Shapeshift/ErrorStep/errorStep.spec.js | 3 +- .../Shapeshift/OptionsStep/optionsStep.js | 39 ++++--- js/src/modals/Shapeshift/Price/price.js | 3 +- js/src/modals/Shapeshift/Price/price.spec.js | 3 +- js/src/modals/Shapeshift/shapeshift.js | 39 ++++--- js/src/modals/Shapeshift/shapeshift.spec.js | 3 +- js/src/modals/Transfer/Details/details.js | 18 ++-- js/src/modals/Transfer/Extras/extras.js | 21 ++-- js/src/modals/Transfer/transfer.js | 27 +++-- js/src/modals/UpgradeParity/upgradeParity.js | 63 +++++++---- .../modals/WalletSettings/walletSettings.js | 6 +- js/src/ui/AccountCard/accountCard.js | 1 - js/src/ui/Actionbar/Import/import.js | 2 - js/src/ui/Actionbar/Search/search.js | 6 +- js/src/ui/Actionbar/Sort/sort.js | 3 +- js/src/ui/Balance/balance.js | 6 +- js/src/ui/BlockStatus/blockStatus.js | 12 ++- js/src/ui/Button/button.js | 3 +- js/src/ui/ConfirmDialog/confirmDialog.js | 15 ++- js/src/ui/ConfirmDialog/confirmDialog.spec.js | 3 +- js/src/ui/Editor/editor.js | 2 - .../Form/AddressSelect/addressSelectStore.js | 2 - js/src/ui/Form/Input/input.js | 3 +- js/src/ui/Form/InputAddress/inputAddress.js | 3 +- js/src/ui/Form/InputChip/inputChip.js | 1 - js/src/ui/Form/InputInline/inputInline.js | 6 +- js/src/ui/Form/RadioButtons/radioButtons.js | 6 +- js/src/ui/Form/TypedInput/typedInput.js | 8 +- js/src/ui/Form/TypedInput/typedInput.spec.js | 3 +- js/src/ui/Form/form.js | 3 +- js/src/ui/GasPriceEditor/gasPriceEditor.js | 12 ++- .../ui/GasPriceSelector/gasPriceSelector.js | 26 +++-- js/src/ui/IdentityIcon/identityIcon.js | 9 +- js/src/ui/IdentityName/identityName.js | 6 +- js/src/ui/IdentityName/identityName.spec.js | 3 +- .../ui/LanguageSelector/languageSelector.js | 12 ++- js/src/ui/MethodDecoding/methodDecoding.js | 5 +- .../ui/MethodDecoding/methodDecodingStore.js | 2 - js/src/ui/Modal/Title/title.js | 6 +- js/src/ui/Modal/modal.js | 6 +- js/src/ui/Page/page.js | 3 +- js/src/ui/Portal/portal.js | 1 - js/src/ui/SignerIcon/signerIcon.js | 3 +- js/src/ui/Tooltips/Tooltip/tooltip.js | 12 ++- js/src/ui/TxHash/txHash.js | 12 ++- js/src/ui/TxHash/txHash.spec.js | 3 +- js/src/ui/TxList/TxRow/txRow.js | 17 ++- js/src/ui/TxList/TxRow/txRow.spec.js | 3 +- js/src/ui/TxList/txList.spec.js | 3 +- js/src/util/signer.js | 2 - js/src/util/solidity.js | 1 - js/src/util/wallets.js | 2 - js/src/views/Account/Header/header.js | 15 ++- .../Account/Transactions/transactions.js | 9 +- .../Account/Transactions/transactions.spec.js | 3 +- js/src/views/Account/account.js | 69 ++++++++---- js/src/views/Account/account.spec.js | 3 +- js/src/views/Accounts/accounts.js | 30 +++--- js/src/views/Address/Delete/delete.js | 6 +- js/src/views/Address/address.js | 9 +- js/src/views/Addresses/addresses.js | 21 ++-- .../views/Application/Container/container.js | 4 +- js/src/views/Application/Status/status.js | 18 ++-- js/src/views/Application/TabBar/tabBar.js | 18 ++-- js/src/views/Application/application.js | 6 +- js/src/views/Connection/connection.js | 21 ++-- js/src/views/Contract/Events/Event/event.js | 16 ++- js/src/views/Contract/Events/events.js | 3 +- js/src/views/Contract/Queries/inputQuery.js | 11 +- js/src/views/Contract/contract.js | 30 +++--- js/src/views/Contracts/contracts.js | 21 ++-- js/src/views/Dapp/dapp.js | 3 +- js/src/views/Dapps/UrlButton/urlButton.js | 6 +- js/src/views/Dapps/dapps.js | 24 +++-- js/src/views/ParityBar/parityBar.js | 16 +-- .../views/Settings/Background/background.js | 20 ++-- js/src/views/Settings/Parity/parity.js | 56 ++++++---- js/src/views/Settings/Proxy/proxy.js | 17 +-- js/src/views/Settings/Views/views.js | 65 +++++++---- js/src/views/Settings/settings.js | 6 +- .../Account/AccountLink/accountLink.js | 2 +- .../Signer/components/Account/account.js | 12 ++- .../RequestPending/requestPending.js | 6 +- .../components/SignRequest/signRequest.js | 8 +- .../transactionMainDetails.js | 15 ++- .../TransactionPending/transactionPending.js | 12 ++- .../transactionPendingFormConfirm.js | 12 ++- .../transactionPendingFormReject.js | 1 - .../transactionPendingForm.js | 6 +- .../components/TxHashLink/txHashLink.js | 4 +- .../containers/RequestsPage/requestsPage.js | 3 +- .../components/AutoComplete/AutoComplete.js | 2 - js/src/views/Status/components/Box/Box.js | 2 - js/src/views/Status/components/Call/Call.js | 4 +- js/src/views/Status/components/Calls/Calls.js | 4 +- .../components/CallsToolbar/CallsToolbar.js | 13 ++- .../components/EditableValue/EditableValue.js | 14 ++- .../components/JsonEditor/JsonEditor.js | 4 +- .../Status/components/Markdown/Markdown.js | 2 - .../Status/components/Response/Response.js | 2 - .../Status/components/RpcCalls/RpcCalls.js | 4 +- .../Status/components/RpcDocs/RpcDocs.js | 2 - .../views/Status/components/RpcNav/RpcNav.js | 1 - .../ScrollTopButton/ScrollTopButton.js | 5 +- .../views/Status/components/Status/status.js | 30 ++++-- .../views/Status/middleware/localstorage.js | 2 - js/src/views/Wallet/wallet.js | 21 ++-- js/src/views/Web/AddressBar/addressBar.js | 14 ++- js/src/views/Web/web.js | 4 +- js/src/views/WriteContract/writeContract.js | 47 +++++--- .../views/WriteContract/writeContractStore.js | 2 - 198 files changed, 1612 insertions(+), 921 deletions(-) diff --git a/js/.eslintrc.json b/js/.eslintrc.json index 686745982..42f9b0554 100644 --- a/js/.eslintrc.json +++ b/js/.eslintrc.json @@ -15,8 +15,17 @@ "jsx-quotes": ["error", "prefer-single"], "no-alert": "error", "no-debugger": "error", + "no-duplicate-imports": ["error", { + "includeExports": true + }], "object-curly-spacing": ["error", "always"], "object-property-newline": 0, + "padded-blocks": ["error", { + "blocks": "never", + "classes": "never", + "switches": "never" + }], + "react/jsx-closing-bracket-location": "error", "react/jsx-curly-spacing": ["error", "always"] } } diff --git a/js/src/dapps/basiccoin/AddressSelect/addressSelect.js b/js/src/dapps/basiccoin/AddressSelect/addressSelect.js index d29d078fe..24250ae94 100644 --- a/js/src/dapps/basiccoin/AddressSelect/addressSelect.js +++ b/js/src/dapps/basiccoin/AddressSelect/addressSelect.js @@ -67,7 +67,8 @@ export default class AddressSelect extends Component { ); @@ -80,7 +81,8 @@ export default class AddressSelect extends Component { return ( ); diff --git a/js/src/dapps/basiccoin/Application/Header/header.js b/js/src/dapps/basiccoin/Application/Header/header.js index 31674bd0f..10cd85277 100644 --- a/js/src/dapps/basiccoin/Application/Header/header.js +++ b/js/src/dapps/basiccoin/Application/Header/header.js @@ -56,7 +56,8 @@ export default class Header extends Component { style={ { background } } colSpan={ position ? 1 : 2 } rowSpan={ position ? 1 : 2 } - onClick={ this.onNavigate(page.path) }> + onClick={ this.onNavigate(page.path) } + >
{ page.title }
diff --git a/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js b/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js index c6b8e2152..63f0bbe21 100644 --- a/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js +++ b/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js @@ -146,7 +146,8 @@ export default class Deployment extends Component { + onChange={ this.onChangeFrom } + />
the owner account to deploy from
@@ -156,7 +157,8 @@ export default class Deployment extends Component { + onChange={ this.onChangeName } + />
{ nameError || 'an identifying name for the token' }
@@ -167,7 +169,8 @@ export default class Deployment extends Component { className={ styles.small } name='tla' value={ tla } - onChange={ this.onChangeTla } /> + onChange={ this.onChangeTla } + />
{ tlaError || 'unique network acronym for this token' }
@@ -180,7 +183,8 @@ export default class Deployment extends Component { max='999999999999' name='totalSupply' value={ totalSupply } - onChange={ this.onChangeSupply } /> + onChange={ this.onChangeSupply } + />
{ totalSupplyError || `number of tokens (base: ${baseText})` }
@@ -191,7 +195,8 @@ export default class Deployment extends Component {
+ onClick={ this.onDeploy } + > Deploy Token
diff --git a/js/src/dapps/basiccoin/IdentityIcon/identityIcon.js b/js/src/dapps/basiccoin/IdentityIcon/identityIcon.js index b22f62923..970778761 100644 --- a/js/src/dapps/basiccoin/IdentityIcon/identityIcon.js +++ b/js/src/dapps/basiccoin/IdentityIcon/identityIcon.js @@ -32,7 +32,8 @@ export default class IdentityIcon extends Component { return ( + src={ api.util.createIdentityImg(address, 3) } + /> ); } } diff --git a/js/src/dapps/basiccoin/Overview/Owner/owner.js b/js/src/dapps/basiccoin/Overview/Owner/owner.js index 35bac6160..55994da57 100644 --- a/js/src/dapps/basiccoin/Overview/Owner/owner.js +++ b/js/src/dapps/basiccoin/Overview/Owner/owner.js @@ -50,7 +50,8 @@ export default class Owner extends Component { { accounts[address].name } + address={ address } + /> @@ -67,7 +68,8 @@ export default class Owner extends Component {
+ tokenreg={ token.tokenreg } + />
{ token.address }
diff --git a/js/src/dapps/basiccoin/Overview/overview.js b/js/src/dapps/basiccoin/Overview/overview.js index 22a983387..4fd6bac11 100644 --- a/js/src/dapps/basiccoin/Overview/overview.js +++ b/js/src/dapps/basiccoin/Overview/overview.js @@ -88,7 +88,8 @@ export default class Overview extends Component { + address={ address } + /> )); } diff --git a/js/src/dapps/basiccoin/Transfer/Events/events.js b/js/src/dapps/basiccoin/Transfer/Events/events.js index 0bdca084f..c85898fc9 100644 --- a/js/src/dapps/basiccoin/Transfer/Events/events.js +++ b/js/src/dapps/basiccoin/Transfer/Events/events.js @@ -99,7 +99,8 @@ export default class Events extends Component { + event={ event } + /> ); }); diff --git a/js/src/dapps/basiccoin/Transfer/Send/send.js b/js/src/dapps/basiccoin/Transfer/Send/send.js index 459c58da2..74ef907a7 100644 --- a/js/src/dapps/basiccoin/Transfer/Send/send.js +++ b/js/src/dapps/basiccoin/Transfer/Send/send.js @@ -149,7 +149,8 @@ export default class Send extends Component { + onChange={ this.onSelectFrom } + />
account to transfer from
@@ -179,7 +180,8 @@ export default class Send extends Component { step='0.1' value={ amount } max={ fromBalance ? fromBalance.balance.div(1000000).toFixed(6) : 1 } - onChange={ this.onAmountChange } /> + onChange={ this.onAmountChange } + />
{ amountError || maxAmountHint }
@@ -190,7 +192,8 @@ export default class Send extends Component {
+ onClick={ this.onSend } + > Transfer Tokens
@@ -206,7 +209,8 @@ export default class Send extends Component { return tokens.map((token) => ( )); diff --git a/js/src/dapps/dappreg/Button/button.js b/js/src/dapps/dappreg/Button/button.js index f37a9fa47..ad11d2a11 100644 --- a/js/src/dapps/dappreg/Button/button.js +++ b/js/src/dapps/dappreg/Button/button.js @@ -36,7 +36,8 @@ export default class Button extends Component { className={ classes } data-warning={ warning } disabled={ disabled } - onClick={ this.onClick }> + onClick={ this.onClick } + > { label } ); diff --git a/js/src/dapps/dappreg/ButtonBar/buttonBar.js b/js/src/dapps/dappreg/ButtonBar/buttonBar.js index f885acb0f..b402daaa3 100644 --- a/js/src/dapps/dappreg/ButtonBar/buttonBar.js +++ b/js/src/dapps/dappreg/ButtonBar/buttonBar.js @@ -37,12 +37,14 @@ export default class ButtonBar extends Component { key='cancel' label='Cancel' warning - onClick={ this.onCancelClick } />, + onClick={ this.onCancelClick } + />, + onClick={ this.onClickTypeNormal } + > + File Link + + onClick={ this.onClickTypeContent } + > + Content Bundle +
@@ -148,7 +157,8 @@ export default class Application extends Component {
+ events={ this.state.events } + />
); } @@ -167,7 +177,8 @@ export default class Application extends Component { + disabled={ (contentHashError && contentHashOwner !== fromAddress) || urlError || repoError || commitError } + >register url ); } diff --git a/js/src/dapps/githubhint/IdentityIcon/identityIcon.js b/js/src/dapps/githubhint/IdentityIcon/identityIcon.js index 60012bc5d..aab44f3b1 100644 --- a/js/src/dapps/githubhint/IdentityIcon/identityIcon.js +++ b/js/src/dapps/githubhint/IdentityIcon/identityIcon.js @@ -30,7 +30,8 @@ export default class IdentityIcon extends Component { return ( + src={ api.util.createIdentityImg(address, 3) } + /> ); } } diff --git a/js/src/dapps/localtx/Application/application.js b/js/src/dapps/localtx/Application/application.js index 33c5d0558..0e2642657 100644 --- a/js/src/dapps/localtx/Application/application.js +++ b/js/src/dapps/localtx/Application/application.js @@ -167,7 +167,7 @@ export default class Application extends Component { transaction={ tx.transaction } stats={ tx.stats } blockNumber={ blockNumber } - /> + /> )) } @@ -198,7 +198,7 @@ export default class Application extends Component { status={ tx.status } stats={ tx.stats } details={ tx } - /> + /> )) } diff --git a/js/src/dapps/localtx/Transaction/transaction.js b/js/src/dapps/localtx/Transaction/transaction.js index 1756597ab..8eecaad45 100644 --- a/js/src/dapps/localtx/Transaction/transaction.js +++ b/js/src/dapps/localtx/Transaction/transaction.js @@ -25,7 +25,6 @@ import styles from './transaction.css'; import IdentityIcon from '../../githubhint/IdentityIcon'; class BaseTransaction extends Component { - shortHash (hash) { return `${hash.substr(0, 5)}..${hash.substr(hash.length - 3)}`; } @@ -47,7 +46,7 @@ class BaseTransaction extends Component {
+ />
); } @@ -89,7 +88,6 @@ class BaseTransaction extends Component { } export class Transaction extends BaseTransaction { - static propTypes = { idx: PropTypes.number.isRequired, transaction: PropTypes.object.isRequired, @@ -180,7 +178,6 @@ export class Transaction extends BaseTransaction { } export class LocalTransaction extends BaseTransaction { - static propTypes = { hash: PropTypes.string.isRequired, status: PropTypes.string.isRequired, @@ -361,12 +358,12 @@ export class LocalTransaction extends BaseTransaction { type='text' value={ gasPrice } onChange={ this.setGasPrice } - /> + /> + /> @@ -376,5 +373,4 @@ export class LocalTransaction extends BaseTransaction { ); } - } diff --git a/js/src/dapps/registry/Accounts/accounts.js b/js/src/dapps/registry/Accounts/accounts.js index 29bcb7add..26681f122 100644 --- a/js/src/dapps/registry/Accounts/accounts.js +++ b/js/src/dapps/registry/Accounts/accounts.js @@ -29,7 +29,6 @@ import { select } from './actions'; import styles from './accounts.css'; class Accounts extends Component { - static propTypes = { all: PropTypes.object.isRequired, selected: PropTypes.object, diff --git a/js/src/dapps/registry/Application/application.js b/js/src/dapps/registry/Application/application.js index a1d5c0ef2..47cc93900 100644 --- a/js/src/dapps/registry/Application/application.js +++ b/js/src/dapps/registry/Application/application.js @@ -98,5 +98,4 @@ export default class Application extends Component { ); } - } diff --git a/js/src/dapps/registry/Events/events.js b/js/src/dapps/registry/Events/events.js index d204822d1..58cfc120f 100644 --- a/js/src/dapps/registry/Events/events.js +++ b/js/src/dapps/registry/Events/events.js @@ -147,7 +147,6 @@ const eventTypes = { }; class Events extends Component { - static propTypes = { events: PropTypes.array.isRequired, pending: PropTypes.object.isRequired, diff --git a/js/src/dapps/registry/IdentityIcon/identityIcon.js b/js/src/dapps/registry/IdentityIcon/identityIcon.js index 873c2eb88..6cd6139e7 100644 --- a/js/src/dapps/registry/IdentityIcon/identityIcon.js +++ b/js/src/dapps/registry/IdentityIcon/identityIcon.js @@ -33,7 +33,8 @@ export default class IdentityIcon extends Component { + src={ api.util.createIdentityImg(address, 3) } + /> ); } } diff --git a/js/src/dapps/registry/Lookup/lookup.js b/js/src/dapps/registry/Lookup/lookup.js index f572cbb7d..c34b538f8 100644 --- a/js/src/dapps/registry/Lookup/lookup.js +++ b/js/src/dapps/registry/Lookup/lookup.js @@ -34,7 +34,6 @@ import { clear, lookup, ownerLookup, reverseLookup } from './actions'; import styles from './lookup.css'; class Lookup extends Component { - static propTypes = { result: nullableProptype(PropTypes.string.isRequired), diff --git a/js/src/dapps/registry/Names/names.js b/js/src/dapps/registry/Names/names.js index c34e172b9..f9ce24cd7 100644 --- a/js/src/dapps/registry/Names/names.js +++ b/js/src/dapps/registry/Names/names.js @@ -77,7 +77,6 @@ const renderQueue = (queue) => { }; class Names extends Component { - static propTypes = { error: nullableProptype(PropTypes.object.isRequired), fee: PropTypes.object.isRequired, diff --git a/js/src/dapps/registry/Records/records.js b/js/src/dapps/registry/Records/records.js index f9c9cea76..73e513342 100644 --- a/js/src/dapps/registry/Records/records.js +++ b/js/src/dapps/registry/Records/records.js @@ -29,7 +29,6 @@ import { clearError, update } from './actions'; import styles from './records.css'; class Records extends Component { - static propTypes = { error: nullableProptype(PropTypes.object.isRequired), pending: PropTypes.bool.isRequired, diff --git a/js/src/dapps/signaturereg/Application/application.js b/js/src/dapps/signaturereg/Application/application.js index afddbfcaf..e54f3dead 100644 --- a/js/src/dapps/signaturereg/Application/application.js +++ b/js/src/dapps/signaturereg/Application/application.js @@ -80,7 +80,8 @@ export default class Application extends Component { return (
+ totalSignatures={ totalSignatures } + /> ); } @@ -95,7 +96,8 @@ export default class Application extends Component { instance={ instance } visible={ showImport } onClose={ this.toggleImport } - onSetFromAddress={ this.setFromAddress } /> + onSetFromAddress={ this.setFromAddress } + /> ); } @@ -112,7 +114,8 @@ export default class Application extends Component { return ( + contract={ contract } + /> ); } diff --git a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js b/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js index 60012bc5d..aab44f3b1 100644 --- a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js +++ b/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js @@ -30,7 +30,8 @@ export default class IdentityIcon extends Component { return ( + src={ api.util.createIdentityImg(address, 3) } + /> ); } } diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js b/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js index 5cb84f5a9..6c71578a0 100644 --- a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js +++ b/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js @@ -24,7 +24,6 @@ import IdentityIcon from '../../IdentityIcon'; import styles from './account-selector.css'; class AccountSelectorItem extends Component { - static propTypes = { onSelectAccount: PropTypes.func.isRequired, account: PropTypes.object.isRequired @@ -37,15 +36,19 @@ class AccountSelectorItem extends Component { delete props.account; delete props.onSelectAccount; - const icon = ( + const icon = ( + ); - const avatar = ( + const avatar = ( + ); return ( @@ -55,18 +58,17 @@ class AccountSelectorItem extends Component { primaryText={ account.name } secondaryText={ account.address } leftAvatar={ avatar } - { ...props } /> + { ...props } + /> ); } onSelectAccount = () => { this.props.onSelectAccount(this.props.account.address); } - } export default class AccountSelector extends Component { - static propTypes = { list: PropTypes.array.isRequired, selected: PropTypes.object.isRequired, @@ -87,7 +89,8 @@ export default class AccountSelector extends Component { open={ this.state.open } onSelectAccount={ this.onToggleOpen } autoGenerateNestedIndicator={ false } - nestedListStyle={ { maxHeight: '14em', overflow: 'auto' } } /> + nestedListStyle={ { maxHeight: '14em', overflow: 'auto' } } + /> ); return ( @@ -106,7 +109,8 @@ export default class AccountSelector extends Component { + key={ index } + /> )); } @@ -122,5 +126,4 @@ export default class AccountSelector extends Component { this.props.handleSetSelected(address); this.onToggleOpen(); } - } diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js b/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js index 6cd0dcc3a..9711c05bf 100644 --- a/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js +++ b/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js @@ -23,9 +23,11 @@ import { setSelectedAccount } from '../actions'; class AccountSelectorContainer extends Component { render () { - return (); + return ( + + ); } } @@ -42,4 +44,7 @@ const mapDispatchToProps = (dispatch) => { }; }; -export default connect(mapStateToProps, mapDispatchToProps)(AccountSelectorContainer); +export default connect( + mapStateToProps, + mapDispatchToProps +)(AccountSelectorContainer); diff --git a/js/src/dapps/tokenreg/Actions/Query/query.js b/js/src/dapps/tokenreg/Actions/Query/query.js index 452b387a5..ba008bc0a 100644 --- a/js/src/dapps/tokenreg/Actions/Query/query.js +++ b/js/src/dapps/tokenreg/Actions/Query/query.js @@ -35,7 +35,6 @@ const initState = { }; export default class QueryAction extends Component { - static propTypes = { show: PropTypes.bool.isRequired, loading: PropTypes.bool.isRequired, @@ -56,7 +55,8 @@ export default class QueryAction extends Component { open={ this.props.show } className={ styles.dialog } onRequestClose={ this.onClose } - actions={ this.renderActions() } > + actions={ this.renderActions() } + > { this.renderContent() } ); @@ -70,7 +70,8 @@ export default class QueryAction extends Component { + disabled + /> ); } @@ -81,7 +82,8 @@ export default class QueryAction extends Component { + onTouchTap={ this.onClose } + /> ]); } @@ -91,12 +93,14 @@ export default class QueryAction extends Component { , + onTouchTap={ this.onClose } + />, + onTouchTap={ this.onQuery } + /> ]); } @@ -140,31 +144,38 @@ export default class QueryAction extends Component { floatingLabelText='Select which field to query' fullWidth value={ this.state.queryKey } - onChange={ this.onQueryKeyChange }> + onChange={ this.onQueryKeyChange } + > { this.state.queryKey !== 'tla' - ? () - : ( + ) + : ( + ) + validationType={ SIMPLE_TLA_TYPE } + onChange={ this.onChange } + onEnter={ this.onQuery } + /> + ) } ); @@ -203,5 +214,4 @@ export default class QueryAction extends Component { this.setState(initState); this.props.onClose(); } - } diff --git a/js/src/dapps/tokenreg/Actions/Register/register.js b/js/src/dapps/tokenreg/Actions/Register/register.js index ec1199f3d..2c084cec2 100644 --- a/js/src/dapps/tokenreg/Actions/Register/register.js +++ b/js/src/dapps/tokenreg/Actions/Register/register.js @@ -57,7 +57,6 @@ const initState = { }; export default class RegisterAction extends Component { - static propTypes = { show: PropTypes.bool.isRequired, sending: PropTypes.bool.isRequired, @@ -97,7 +96,8 @@ export default class RegisterAction extends Component { + onTouchTap={ this.onClose } + /> ); } @@ -106,7 +106,8 @@ export default class RegisterAction extends Component { + onTouchTap={ this.onClose } + /> ); } @@ -116,12 +117,14 @@ export default class RegisterAction extends Component { , + onTouchTap={ this.onClose } + />, + onTouchTap={ this.onRegister } + /> ]); } @@ -177,7 +180,8 @@ export default class RegisterAction extends Component { hintText={ field.hintText } validationType={ field.type } - onChange={ onChange } /> + onChange={ onChange } + /> ); }); } @@ -227,5 +231,4 @@ export default class RegisterAction extends Component { this.setState(initState); this.props.onClose(); } - } diff --git a/js/src/dapps/tokenreg/Actions/component.js b/js/src/dapps/tokenreg/Actions/component.js index c79f2563a..0152832c4 100644 --- a/js/src/dapps/tokenreg/Actions/component.js +++ b/js/src/dapps/tokenreg/Actions/component.js @@ -29,7 +29,6 @@ const REGISTER_ACTION = 'REGISTER_ACTION'; const QUERY_ACTION = 'QUERY_ACTION'; export default class Actions extends Component { - static propTypes = { handleRegisterToken: PropTypes.func.isRequired, handleRegisterClose: PropTypes.func.isRequired, @@ -62,26 +61,30 @@ export default class Actions extends Component { icon={ } label='Register Token' primary - onTouchTap={ this.onShowRegister } /> + onTouchTap={ this.onShowRegister } + /> } label='Search Token' primary - onTouchTap={ this.onShowQuery } /> + onTouchTap={ this.onShowQuery } + /> + { ...this.props.register } + /> + { ...this.props.query } + /> ); } @@ -113,5 +116,4 @@ export default class Actions extends Component { } }); } - } diff --git a/js/src/dapps/tokenreg/Actions/container.js b/js/src/dapps/tokenreg/Actions/container.js index 2a4800a67..eecca7ac8 100644 --- a/js/src/dapps/tokenreg/Actions/container.js +++ b/js/src/dapps/tokenreg/Actions/container.js @@ -22,11 +22,12 @@ import Actions from './component'; import { registerToken, registerReset, queryToken, queryReset } from './actions'; class TokensContainer extends Component { - render () { - return (); + return ( + + ); } } diff --git a/js/src/dapps/tokenreg/Application/application.js b/js/src/dapps/tokenreg/Application/application.js index 0ac784023..4ae405683 100644 --- a/js/src/dapps/tokenreg/Application/application.js +++ b/js/src/dapps/tokenreg/Application/application.js @@ -56,7 +56,8 @@ export default class Application extends Component {
+ fee={ contract.fee } + /> @@ -73,5 +74,4 @@ export default class Application extends Component { muiTheme }; } - } diff --git a/js/src/dapps/tokenreg/Chip/chip.js b/js/src/dapps/tokenreg/Chip/chip.js index b5407af11..6729670be 100644 --- a/js/src/dapps/tokenreg/Chip/chip.js +++ b/js/src/dapps/tokenreg/Chip/chip.js @@ -44,7 +44,8 @@ export default class CustomChip extends Component { background: '#27ae60', display: 'flex', flexDirection: 'column' - } }> + } } + > { this.renderIcon(isAddress, value) } { displayValue } @@ -64,7 +65,8 @@ export default class CustomChip extends Component { return ( + address={ address } + /> ); } } diff --git a/js/src/dapps/tokenreg/Container.js b/js/src/dapps/tokenreg/Container.js index 00f726cf9..d6e62ad92 100644 --- a/js/src/dapps/tokenreg/Container.js +++ b/js/src/dapps/tokenreg/Container.js @@ -36,10 +36,12 @@ class Container extends Component { render () { const { isLoading, contract } = this.props; - return (); + return ( + + ); } } diff --git a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js b/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js index 76dfb0079..5ceef1aca 100644 --- a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js +++ b/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js @@ -30,7 +30,8 @@ export default class IdentityIcon extends Component { return ( + src={ api.util.createIdentityImg(address, 4) } + /> ); } } diff --git a/js/src/dapps/tokenreg/Inputs/Text/container.js b/js/src/dapps/tokenreg/Inputs/Text/container.js index fe8ae4c26..77ebb9e5c 100644 --- a/js/src/dapps/tokenreg/Inputs/Text/container.js +++ b/js/src/dapps/tokenreg/Inputs/Text/container.js @@ -20,11 +20,12 @@ import { connect } from 'react-redux'; import InputText from './input-text'; class InputTextContainer extends Component { - render () { - return (); + return ( + + ); } } diff --git a/js/src/dapps/tokenreg/Inputs/Text/input-text.js b/js/src/dapps/tokenreg/Inputs/Text/input-text.js index 3ddd7591f..2184b6b50 100644 --- a/js/src/dapps/tokenreg/Inputs/Text/input-text.js +++ b/js/src/dapps/tokenreg/Inputs/Text/input-text.js @@ -35,7 +35,6 @@ const initState = { }; export default class InputText extends Component { - static propTypes = { validationType: PropTypes.string.isRequired, onChange: PropTypes.func.isRequired, @@ -64,7 +63,8 @@ export default class InputText extends Component { disabled={ disabled } errorText={ error } onChange={ this.onChange } - onKeyDown={ this.onKeyDown } /> + onKeyDown={ this.onKeyDown } + /> { this.renderLoading() } { this.renderIsValid() } @@ -146,5 +146,4 @@ export default class InputText extends Component { return this.props.onChange(false, value); } - } diff --git a/js/src/dapps/tokenreg/Status/status.js b/js/src/dapps/tokenreg/Status/status.js index 64ebba3b6..290d17206 100644 --- a/js/src/dapps/tokenreg/Status/status.js +++ b/js/src/dapps/tokenreg/Status/status.js @@ -38,7 +38,8 @@ export default class Status extends Component { + label='Fee' + />
); } diff --git a/js/src/dapps/tokenreg/Tokens/Token/add-meta.js b/js/src/dapps/tokenreg/Tokens/Token/add-meta.js index 3dc4bdbe1..b4b1a3cf1 100644 --- a/js/src/dapps/tokenreg/Tokens/Token/add-meta.js +++ b/js/src/dapps/tokenreg/Tokens/Token/add-meta.js @@ -56,7 +56,8 @@ export default class AddMeta extends Component { icon={ } primary fullWidth - onTouchTap={ this.onShowDialog } /> + onTouchTap={ this.onShowDialog } + /> + actions={ this.renderActions() } + > { this.renderContent() } ); @@ -78,7 +80,8 @@ export default class AddMeta extends Component { + onTouchTap={ this.onClose } + /> ); } @@ -88,12 +91,14 @@ export default class AddMeta extends Component { , + onTouchTap={ this.onClose } + />, + onTouchTap={ this.onAdd } + /> ]); } @@ -130,7 +135,8 @@ export default class AddMeta extends Component { floatingLabelText='Choose the meta-data to add' fullWidth value={ this.state.metaKeyIndex } - onChange={ this.onMetaKeyChange }> + onChange={ this.onMetaKeyChange } + > { this.renderMetaKeyItems() } @@ -142,7 +148,8 @@ export default class AddMeta extends Component { hintText={ `The value of the ${selectedMeta.label.toLowerCase()} (${selectedMeta.validation === ADDRESS_TYPE ? 'Address' : 'Url Hint'})` } validationType={ selectedMeta.validation } - onChange={ this.onChange } /> + onChange={ this.onChange } + /> ); } @@ -152,7 +159,8 @@ export default class AddMeta extends Component { + label={ key.label } primaryText={ key.label } + /> )); } @@ -194,5 +202,4 @@ export default class AddMeta extends Component { value: '' } }); } - } diff --git a/js/src/dapps/tokenreg/Tokens/Token/token.js b/js/src/dapps/tokenreg/Tokens/Token/token.js index 2b54306c2..1500d194e 100644 --- a/js/src/dapps/tokenreg/Tokens/Token/token.js +++ b/js/src/dapps/tokenreg/Tokens/Token/token.js @@ -99,7 +99,8 @@ export default class Token extends Component { return (
+ } } + >
{ this.renderContent() } @@ -128,7 +129,8 @@ export default class Token extends Component { floatingLabelText='Choose the meta-data to look-up' fullWidth value={ this.state.metaKeyIndex } - onChange={ this.onMetaKeyChange }> + onChange={ this.onMetaKeyChange } + > { this.renderMetaKeyItems() } @@ -139,7 +141,8 @@ export default class Token extends Component { icon={ } primary fullWidth - onTouchTap={ this.onMetaLookup } /> + onTouchTap={ this.onMetaLookup } + />
{ this.renderMeta(meta) } @@ -157,7 +160,8 @@ export default class Token extends Component { + label={ key.label } primaryText={ key.label } + /> )); } @@ -169,7 +173,8 @@ export default class Token extends Component { return ( + label='Decimals' + /> ); } @@ -182,7 +187,8 @@ export default class Token extends Component { + label='Address' + /> ); } @@ -192,7 +198,8 @@ export default class Token extends Component { return ( + label='Total' + /> ); } @@ -212,7 +219,8 @@ export default class Token extends Component { isAddress displayValue={ displayValue } value={ owner } - label='Owner' /> + label='Owner' + /> ); } @@ -237,7 +245,8 @@ export default class Token extends Component { + index={ this.props.index } + /> ); } @@ -253,7 +262,8 @@ export default class Token extends Component { icon={ } secondary fullWidth - onTouchTap={ this.onUnregister } /> + onTouchTap={ this.onUnregister } + /> ); } diff --git a/js/src/modals/AddAddress/addAddress.js b/js/src/modals/AddAddress/addAddress.js index 437b87663..567be169f 100644 --- a/js/src/modals/AddAddress/addAddress.js +++ b/js/src/modals/AddAddress/addAddress.js @@ -51,9 +51,11 @@ export default class AddAddress extends Component { title={ + defaultMessage='add saved address' + /> } - visible> + visible + > { this.renderFields() } ); @@ -68,20 +70,24 @@ export default class AddAddress extends Component { label={ + defaultMessage='Cancel' + /> } onClick={ this.onClose } - ref='closeButton' />, + ref='closeButton' + />,
diff --git a/js/src/modals/CreateAccount/NewGeth/newGeth.js b/js/src/modals/CreateAccount/NewGeth/newGeth.js index f8cd1fbe6..96e48fa25 100644 --- a/js/src/modals/CreateAccount/NewGeth/newGeth.js +++ b/js/src/modals/CreateAccount/NewGeth/newGeth.js @@ -54,7 +54,8 @@ export default class NewGeth extends Component {
+ address={ account.address } + />
{ account.address }
@@ -69,7 +70,8 @@ export default class NewGeth extends Component { checked={ account.checked } label={ label } data-address={ account.address } - onCheck={ this.onSelect } /> + onCheck={ this.onSelect } + /> ); }); diff --git a/js/src/modals/CreateAccount/NewImport/newImport.js b/js/src/modals/CreateAccount/NewImport/newImport.js index 91ef39d95..d1dfdc5d6 100644 --- a/js/src/modals/CreateAccount/NewImport/newImport.js +++ b/js/src/modals/CreateAccount/NewImport/newImport.js @@ -59,12 +59,14 @@ export default class NewImport extends Component { hint='a descriptive name for the account' error={ this.state.accountNameError } value={ this.state.accountName } - onChange={ this.onEditAccountName } /> + onChange={ this.onEditAccountName } + /> + onChange={ this.onEditpasswordHint } + />
+ onChange={ this.onEditPassword } + />
@@ -82,18 +85,21 @@ export default class NewImport extends Component { label='wallet file' hint='the wallet file for import' error={ this.state.walletFileError } - value={ this.state.walletFile } /> + value={ this.state.walletFile } + />
+ onTouchTap={ this.openFileDialog } + > + onChange={ this.onFileChange } + />
diff --git a/js/src/modals/CreateAccount/RawKey/rawKey.js b/js/src/modals/CreateAccount/RawKey/rawKey.js index d0b3a4c71..5a60fb5df 100644 --- a/js/src/modals/CreateAccount/RawKey/rawKey.js +++ b/js/src/modals/CreateAccount/RawKey/rawKey.js @@ -60,18 +60,21 @@ export default class RawKey extends Component { label='private key' error={ rawKeyError } value={ rawKey } - onChange={ this.onEditKey } /> + onChange={ this.onEditKey } + /> + onChange={ this.onEditAccountName } + /> + onChange={ this.onEditPasswordHint } + />
+ onChange={ this.onEditPassword1 } + />
+ onChange={ this.onEditPassword2 } + />
diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js index 9d76cebfa..da91b4ba2 100644 --- a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js +++ b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js @@ -57,18 +57,21 @@ export default class RecoveryPhrase extends Component { hint='the account recovery phrase' label='account recovery phrase' value={ recoveryPhrase } - onChange={ this.onEditPhrase } /> + onChange={ this.onEditPhrase } + /> + onChange={ this.onEditAccountName } + /> + onChange={ this.onEditPasswordHint } + />
+ onChange={ this.onEditPassword1 } + />
+ onChange={ this.onEditPassword2 } + />
+ steps={ steps } + > { this.renderWarning() } { this.renderPage() } @@ -162,11 +163,13 @@ export default class CreateAccount extends Component {
- } /> + } + /> ); }); } diff --git a/js/src/modals/DeleteAccount/deleteAccount.js b/js/src/modals/DeleteAccount/deleteAccount.js index f5b988a8e..664f94d88 100644 --- a/js/src/modals/DeleteAccount/deleteAccount.js +++ b/js/src/modals/DeleteAccount/deleteAccount.js @@ -49,14 +49,16 @@ class DeleteAccount extends Component { title='confirm removal' visible onDeny={ this.closeDeleteDialog } - onConfirm={ this.onDeleteConfirmed }> + onConfirm={ this.onDeleteConfirmed } + >
Are you sure you want to permanently delete the following account?
+ address={ account.address } + />
@@ -75,7 +77,8 @@ class DeleteAccount extends Component { hint='provide the account password to confirm the account deletion' type='password' value={ password } - onChange={ this.onChangePassword } /> + onChange={ this.onChangePassword } + />
); diff --git a/js/src/modals/DeployContract/DetailsStep/detailsStep.js b/js/src/modals/DeployContract/DetailsStep/detailsStep.js index cfb8aa40f..041f71527 100644 --- a/js/src/modals/DeployContract/DetailsStep/detailsStep.js +++ b/js/src/modals/DeployContract/DetailsStep/detailsStep.js @@ -99,12 +99,14 @@ export default class DetailsStep extends Component { hint={ + defaultMessage='the owner account for this contract' + /> } label={ + defaultMessage='from account (contract owner)' + /> } onChange={ this.onFromAddressChange } value={ fromAddress } @@ -115,12 +117,14 @@ export default class DetailsStep extends Component { hint={ + defaultMessage='a name for the deployed contract' + /> } label={ + defaultMessage='contract name' + /> } onChange={ this.onNameChange } value={ name || '' } @@ -131,12 +135,14 @@ export default class DetailsStep extends Component { hint={ + defaultMessage='a description for the contract' + /> } label={ + defaultMessage='contract description (optional)' + /> } onChange={ this.onDescriptionChange } value={ description } @@ -149,12 +155,14 @@ export default class DetailsStep extends Component { hint={ + defaultMessage='the abi of the contract to deploy or solc combined-output' + /> } label={ + defaultMessage='abi / solc combined-output' + /> } onChange={ this.onSolcChange } onSubmit={ this.onSolcSubmit } @@ -166,12 +174,14 @@ export default class DetailsStep extends Component { hint={ + defaultMessage='the compiled code of the contract to deploy' + /> } label={ + defaultMessage='code' + /> } onSubmit={ this.onCodeChange } readOnly={ readOnly || solc } @@ -196,7 +206,8 @@ export default class DetailsStep extends Component { + value={ index } + > { name } )); @@ -206,10 +217,12 @@ export default class DetailsStep extends Component { label={ + defaultMessage='select a contract' + /> } onChange={ this.onContractChange } - value={ selectedContractIndex }> + value={ selectedContractIndex } + > { contractsItems } ); diff --git a/js/src/modals/DeployContract/ParametersStep/parametersStep.js b/js/src/modals/DeployContract/ParametersStep/parametersStep.js index 8e557a95a..952ddbc34 100644 --- a/js/src/modals/DeployContract/ParametersStep/parametersStep.js +++ b/js/src/modals/DeployContract/ParametersStep/parametersStep.js @@ -84,7 +84,8 @@ export default class ParametersStep extends Component { label={ label } onChange={ onChange } param={ param } - value={ value } /> + value={ value } + />
); }); @@ -94,7 +95,8 @@ export default class ParametersStep extends Component {

+ defaultMessage='Choose the contract parameters' + />

{ inputsComponents }
diff --git a/js/src/modals/DeployContract/deployContract.js b/js/src/modals/DeployContract/deployContract.js index 701c689ad..d3db3937f 100644 --- a/js/src/modals/DeployContract/deployContract.js +++ b/js/src/modals/DeployContract/deployContract.js @@ -37,14 +37,16 @@ const STEPS = { title: ( + defaultMessage='contract details' + /> ) }, CONTRACT_PARAMETERS: { title: ( + defaultMessage='contract parameters' + /> ) }, DEPLOYMENT: { @@ -52,14 +54,16 @@ const STEPS = { title: ( + defaultMessage='deployment' + /> ) }, COMPLETED: { title: ( + defaultMessage='completed' + /> ) } }; @@ -149,10 +153,12 @@ class DeployContract extends Component { : (deployError ? + defaultMessage='deployment failed' + /> : + defaultMessage='rejected' + /> ); const waiting = realSteps @@ -170,7 +176,8 @@ class DeployContract extends Component { } title={ title } visible - waiting={ waiting }> + waiting={ waiting } + > { this.renderExceptionWarning() } { this.renderStep() } @@ -188,7 +195,8 @@ class DeployContract extends Component { return ( + warning={ errorEstimated } + /> ); } @@ -202,9 +210,11 @@ class DeployContract extends Component { label={ + defaultMessage='Cancel' + /> } - onClick={ this.onClose } /> + onClick={ this.onClose } + /> ); const closeBtn = ( @@ -213,9 +223,11 @@ class DeployContract extends Component { label={ + defaultMessage='Close' + /> } - onClick={ this.onClose } /> + onClick={ this.onClose } + /> ); const closeBtnOk = ( @@ -224,9 +236,11 @@ class DeployContract extends Component { label={ + defaultMessage='Done' + /> } - onClick={ this.onClose } /> + onClick={ this.onClose } + /> ); if (deployError) { @@ -242,14 +256,17 @@ class DeployContract extends Component { icon={ + button + /> } label={ + defaultMessage='Next' + /> } - onClick={ this.onParametersStep } /> + onClick={ this.onParametersStep } + /> ]; case 'CONTRACT_PARAMETERS': @@ -259,14 +276,17 @@ class DeployContract extends Component { icon={ + button + /> } label={ + defaultMessage='Create' + /> } - onClick={ this.onDeployStart } /> + onClick={ this.onDeployStart } + /> ]; case 'DEPLOYMENT': @@ -293,13 +313,16 @@ class DeployContract extends Component { title={ + defaultMessage='The deployment has been rejected' + /> } state={ - } /> + defaultMessage='You can safely close this window, the contract deployment will not occur.' + /> + } + /> ); } @@ -340,9 +363,11 @@ class DeployContract extends Component { title={ + defaultMessage='The deployment is currently in progress' + /> } - state={ deployState }> + state={ deployState } + > { body } ); @@ -353,7 +378,8 @@ class DeployContract extends Component {
+ defaultMessage='Your contract has been deployed at' + />
@@ -361,7 +387,8 @@ class DeployContract extends Component { address={ address } center className={ styles.identityicon } - inline /> + inline + />
{ address }
@@ -420,7 +447,8 @@ class DeployContract extends Component { : ( + defaultMessage='a valid account as the contract owner needs to be selected' + /> ); this.setState({ fromAddress, fromAddressError }, this.estimateGas); @@ -510,7 +538,8 @@ class DeployContract extends Component { deployState: ( + defaultMessage='Preparing transaction for network transmission' + /> ) }); return; @@ -520,7 +549,8 @@ class DeployContract extends Component { deployState: ( + defaultMessage='Waiting for confirmation of the transaction in the Parity Secure Signer' + /> ) }); return; @@ -531,7 +561,8 @@ class DeployContract extends Component { deployState: ( + defaultMessage='Waiting for the contract deployment transaction receipt' + /> ) }); return; @@ -542,7 +573,8 @@ class DeployContract extends Component { deployState: ( + defaultMessage='Validating the deployed contract code' + /> ) }); return; @@ -552,7 +584,8 @@ class DeployContract extends Component { deployState: ( + defaultMessage='The contract deployment has been completed' + /> ) }); return; diff --git a/js/src/modals/DeployContract/deployContract.spec.js b/js/src/modals/DeployContract/deployContract.spec.js index d61ada393..145248a43 100644 --- a/js/src/modals/DeployContract/deployContract.spec.js +++ b/js/src/modals/DeployContract/deployContract.spec.js @@ -41,7 +41,8 @@ function renderShallow () { + onClose={ sinon.stub() } + /> ); } diff --git a/js/src/modals/EditMeta/editMeta.js b/js/src/modals/EditMeta/editMeta.js index a232492ea..a09b5f07c 100644 --- a/js/src/modals/EditMeta/editMeta.js +++ b/js/src/modals/EditMeta/editMeta.js @@ -49,47 +49,57 @@ class EditMeta extends Component { title={ + defaultMessage='edit metadata' + /> } - visible> + visible + >
+ defaultMessage='name' + /> } onSubmit={ this.store.setName } - value={ name } /> + value={ name } + /> + defaultMessage='description for this address' + /> } label={ + defaultMessage='address description' + /> } value={ description } - onSubmit={ this.store.setDescription } /> + onSubmit={ this.store.setDescription } + /> { this.renderAccountFields() } + defaultMessage='press to add a tag' + /> } label={ + defaultMessage='(optional) tags' + /> } onTokensChange={ this.store.setTags } - tokens={ tags.slice() } /> + tokens={ tags.slice() } + /> ); @@ -102,12 +112,14 @@ class EditMeta extends Component {
@@ -140,7 +148,8 @@ export default class DetailsStep extends Component { + label={ func.name || '()' } + > { name } ); @@ -152,15 +161,18 @@ export default class DetailsStep extends Component { hint={ + defaultMessage='the function to call on the contract' + /> } label={ + defaultMessage='function to execute' + /> } onChange={ this.onFuncChange } - value={ func.signature }> + value={ func.signature } + > { functions } ); diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js index 060b25c17..14b90ef05 100644 --- a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js +++ b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js @@ -47,7 +47,8 @@ function render (props) { onFromAddressChange={ onFromAddressChange } onFuncChange={ onFuncChange } onGasEditClick={ onGasEditClick } - onValueChange={ onValueChange } /> + onValueChange={ onValueChange } + /> ); return component; diff --git a/js/src/modals/ExecuteContract/executeContract.js b/js/src/modals/ExecuteContract/executeContract.js index 689678a7c..a4ac132ee 100644 --- a/js/src/modals/ExecuteContract/executeContract.js +++ b/js/src/modals/ExecuteContract/executeContract.js @@ -41,27 +41,32 @@ const TITLES = { transfer: ( + defaultMessage='function details' + /> ), sending: ( + defaultMessage='sending' + /> ), complete: ( + defaultMessage='complete' + /> ), advanced: ( + defaultMessage='advanced options' + /> ), rejected: ( + defaultMessage='rejected' + /> ) }; const STAGES_BASIC = [TITLES.transfer, TITLES.sending, TITLES.complete]; @@ -139,7 +144,8 @@ class ExecuteContract extends Component { advancedOptions ? [STEP_BUSY] : [STEP_BUSY_OR_ADVANCED] - }> + } + > { this.renderExceptionWarning() } { this.renderStep() } @@ -170,10 +176,12 @@ class ExecuteContract extends Component { label={ + defaultMessage='cancel' + /> } icon={ } - onClick={ onClose } /> + onClick={ onClose } + /> ); const postBtn = (
- - - { this.renderDetails(account) } @@ -194,7 +191,8 @@ class Contract extends Component { ); @@ -333,5 +332,4 @@ export default class RpcCalls extends Component { resetRpcPrevCalls: PropTypes.func.isRequired }).isRequired } - } diff --git a/js/src/views/Status/components/RpcDocs/RpcDocs.js b/js/src/views/Status/components/RpcDocs/RpcDocs.js index 4eec91290..6252dc0f6 100644 --- a/js/src/views/Status/components/RpcDocs/RpcDocs.js +++ b/js/src/views/Status/components/RpcDocs/RpcDocs.js @@ -31,7 +31,6 @@ import RpcNav from '../RpcNav'; const rpcMethods = sortBy(rpcData.methods, 'name'); class RpcDocs extends Component { - render () { return (
@@ -98,7 +97,6 @@ class RpcDocs extends Component { handleMethodChange = name => { ReactDOM.findDOMNode(this[`_method-${name}`]).scrollIntoViewIfNeeded(); } - } export default RpcDocs; diff --git a/js/src/views/Status/components/RpcNav/RpcNav.js b/js/src/views/Status/components/RpcNav/RpcNav.js index 33ef0ebc4..df0ca1c7a 100644 --- a/js/src/views/Status/components/RpcNav/RpcNav.js +++ b/js/src/views/Status/components/RpcNav/RpcNav.js @@ -19,7 +19,6 @@ import { Link } from 'react-router'; import styles from './RpcNav.css'; export default class RpcNav extends Component { - render () { return (
diff --git a/js/src/views/Status/components/ScrollTopButton/ScrollTopButton.js b/js/src/views/Status/components/ScrollTopButton/ScrollTopButton.js index 3857a65b1..d660e3c27 100644 --- a/js/src/views/Status/components/ScrollTopButton/ScrollTopButton.js +++ b/js/src/views/Status/components/ScrollTopButton/ScrollTopButton.js @@ -24,7 +24,6 @@ import styles from './ScrollTopButton.css'; const scrollTopThreshold = 600; export default class ScrollTopButton extends Component { - state = {} componentDidMount () { @@ -45,7 +44,8 @@ export default class ScrollTopButton extends Component { return ( + onTouchTap={ this._scrollToTop } + > ); @@ -67,5 +67,4 @@ export default class ScrollTopButton extends Component { }); } } - } diff --git a/js/src/views/Status/components/Status/status.js b/js/src/views/Status/components/Status/status.js index c1dd91256..de98ad747 100644 --- a/js/src/views/Status/components/Status/status.js +++ b/js/src/views/Status/components/Status/status.js @@ -72,7 +72,8 @@ export default class Status extends Component { + actions={ this.props.actions } + />
{ this.renderSettings() } @@ -112,7 +113,8 @@ export default class Status extends Component { readOnly label='chain' value={ nodeStatus.netChain } - { ...this._test('chain') } /> + { ...this._test('chain') } + />
+ { ...this._test('peers') } + />
+ { ...this._test('network-port') } + />
@@ -136,8 +140,13 @@ export default class Status extends Component { allowCopy readOnly label='rpc enabled' - value={ rpcSettings.enabled ? 'yes' : 'no' } - { ...this._test('rpc-enabled') } /> + value={ + rpcSettings.enabled + ? 'yes' + : 'no' + } + { ...this._test('rpc-enabled') } + />
+ { ...this._test('rpc-interface') } + />
+ { ...this._test('rpc-port') } + />
@@ -164,7 +175,8 @@ export default class Status extends Component { readOnly label='enode' value={ nodeStatus.enode } - { ...this._test('node-enode') } /> + { ...this._test('node-enode') } + />
diff --git a/js/src/views/Status/middleware/localstorage.js b/js/src/views/Status/middleware/localstorage.js index e0b103a33..a5d64cab1 100644 --- a/js/src/views/Status/middleware/localstorage.js +++ b/js/src/views/Status/middleware/localstorage.js @@ -19,7 +19,6 @@ import { syncRpcStateFromLocalStorage } from '../actions/localstorage'; import rpcMetods from '../data/rpc.json'; export default class localStorageMiddleware { - toMiddleware () { return store => next => action => { let delegate; @@ -70,5 +69,4 @@ export default class localStorageMiddleware { const newArr = [value].concat(localStore.get(key) || []); localStore.set(key, newArr); } - } diff --git a/js/src/views/Wallet/wallet.js b/js/src/views/Wallet/wallet.js index 7a895d6dc..1d8daa034 100644 --- a/js/src/views/Wallet/wallet.js +++ b/js/src/views/Wallet/wallet.js @@ -220,7 +220,8 @@ class Wallet extends Component { icon={ } label='transfer' disabled={ !showTransferButton } - onClick={ this.onTransferClick } /> + onClick={ this.onTransferClick } + /> ); } @@ -229,7 +230,8 @@ class Wallet extends Component { key='delete' icon={ } label='delete' - onClick={ this.showDeleteDialog } /> + onClick={ this.showDeleteDialog } + /> ); buttons.push( @@ -237,7 +239,8 @@ class Wallet extends Component { key='editmeta' icon={ } label='edit' - onClick={ this.onEditClick } /> + onClick={ this.onEditClick } + /> ); if (owned) { @@ -246,14 +249,16 @@ class Wallet extends Component { key='settings' icon={ } label='settings' - onClick={ this.onSettingsClick } /> + onClick={ this.onSettingsClick } + /> ); } return ( + buttons={ buttons } + /> ); } @@ -265,7 +270,8 @@ class Wallet extends Component { account={ account } visible={ showDeleteDialog } route='/accounts' - onClose={ this.closeDeleteDialog } /> + onClose={ this.closeDeleteDialog } + /> ); } @@ -280,7 +286,8 @@ class Wallet extends Component { + onClose={ this.onEditClick } + /> ); } diff --git a/js/src/views/Web/AddressBar/addressBar.js b/js/src/views/Web/AddressBar/addressBar.js index 16e2132f3..1f7498be4 100644 --- a/js/src/views/Web/AddressBar/addressBar.js +++ b/js/src/views/Web/AddressBar/addressBar.js @@ -60,20 +60,24 @@ export default class AddressBar extends Component {
); } diff --git a/js/src/views/Web/web.js b/js/src/views/Web/web.js index a7b63ce30..d5f0cd27d 100644 --- a/js/src/views/Web/web.js +++ b/js/src/views/Web/web.js @@ -109,7 +109,8 @@ export default class Web extends Component { onLoad={ this.iframeOnLoad } sandbox='allow-forms allow-same-origin allow-scripts' scrolling='auto' - src={ address } /> + src={ address } + /> ); } @@ -150,4 +151,3 @@ export default class Web extends Component { }); }; } - diff --git a/js/src/views/WriteContract/writeContract.js b/js/src/views/WriteContract/writeContract.js index 8a3ddf3d1..aed1d6b3e 100644 --- a/js/src/views/WriteContract/writeContract.js +++ b/js/src/views/WriteContract/writeContract.js @@ -36,7 +36,6 @@ import styles from './writeContract.css'; @observer class WriteContract extends Component { - static propTypes = { accounts: PropTypes.object.isRequired, worker: PropTypes.object, @@ -241,7 +240,10 @@ class WriteContract extends Component { if (selectedBuild < 0) { return (
- +

Loading...

); @@ -253,7 +255,10 @@ class WriteContract extends Component { return (
- +

Loading Solidity { longVersion }

@@ -272,13 +277,15 @@ class WriteContract extends Component { /> { contract - ?