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 {
+ onChange={ this.onChange }
+ >
{ addresses.map(this.renderOption) }
);
@@ -80,7 +81,8 @@ export default class AddressSelect extends Component {
return (
+ value={ account.address }
+ >
{ account.name }
);
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 {
deployment account
+ 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 {
transfer from
+ 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) => (
+ value={ token.address }
+ >
{ token.coin.tla } / { token.coin.name }
));
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.onSaveClick }
+ />
];
} else {
buttons = [
@@ -51,16 +53,19 @@ export default class ButtonBar extends Component {
label='Delete'
warning
disabled={ !this.dappsStore.currentApp || (!this.dappsStore.currentApp.isOwner && !this.dappsStore.isContractOwner) }
- onClick={ this.onDeleteClick } />,
+ onClick={ this.onDeleteClick }
+ />,
,
+ onClick={ this.onEditClick }
+ />,
+ onClick={ this.onNewClick }
+ />
];
}
diff --git a/js/src/dapps/dappreg/Dapp/dapp.js b/js/src/dapps/dappreg/Dapp/dapp.js
index 0b2d4551d..2a89d6cbd 100644
--- a/js/src/dapps/dappreg/Dapp/dapp.js
+++ b/js/src/dapps/dappreg/Dapp/dapp.js
@@ -61,14 +61,16 @@ export default class Dapp extends Component {
const overlayImage = (
+ src={ api.util.createIdentityImg(this.dappsStore.currentAccount.address, 4) }
+ />
);
return (
+ overlay={ overlayImage }
+ >
);
@@ -78,14 +80,16 @@ export default class Dapp extends Component {
const overlayImage = (
+ src={ api.util.createIdentityImg(app.owner, 4) }
+ />
);
return (
+ overlay={ overlayImage }
+ >
);
@@ -100,7 +104,8 @@ export default class Dapp extends Component {
overlayImage = (
+ src={ `/api/content/${hash.substr(2)}` }
+ />
);
}
@@ -109,13 +114,15 @@ export default class Dapp extends Component {
hint={ app[`${type}Error`] || app[`${type}Url`] || '...' }
label={ label }
key={ `${type}Edit` }
- overlay={ overlayImage }>
+ overlay={ overlayImage }
+ >
+ onChange={ onChange }
+ />
);
}
diff --git a/js/src/dapps/dappreg/ModalDelete/modalDelete.js b/js/src/dapps/dappreg/ModalDelete/modalDelete.js
index 5513b7fe3..9f860ad6d 100644
--- a/js/src/dapps/dappreg/ModalDelete/modalDelete.js
+++ b/js/src/dapps/dappreg/ModalDelete/modalDelete.js
@@ -53,7 +53,8 @@ export default class ModalDelete extends Component {
+ header={ HEADERS[this.modalStore.stepDelete] }
+ >
{ this.renderStep() }
);
@@ -67,19 +68,22 @@ export default class ModalDelete extends Component {
+ onClick={ this.onClickClose }
+ />
];
case STEP_CONFIRM:
return [
,
+ onClick={ this.onClickClose }
+ />,
+ onClick={ this.onClickYes }
+ />
];
default:
return null;
diff --git a/js/src/dapps/dappreg/ModalRegister/modalRegister.js b/js/src/dapps/dappreg/ModalRegister/modalRegister.js
index a16514ed8..5294c377c 100644
--- a/js/src/dapps/dappreg/ModalRegister/modalRegister.js
+++ b/js/src/dapps/dappreg/ModalRegister/modalRegister.js
@@ -53,7 +53,8 @@ export default class ModalRegister extends Component {
+ header={ HEADERS[this.modalStore.stepRegister] }
+ >
{ this.renderStep() }
);
@@ -67,19 +68,22 @@ export default class ModalRegister extends Component {
+ onClick={ this.onClickClose }
+ />
];
case STEP_CONFIRM:
return [
,
+ onClick={ this.onClickClose }
+ />,
+ onClick={ this.onClickConfirmYes }
+ />
];
default:
return null;
diff --git a/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js b/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js
index ba5773802..5f4f7ecf1 100644
--- a/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js
+++ b/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js
@@ -52,7 +52,8 @@ export default class ModalUpdate extends Component {
+ header={ HEADERS[this.modalStore.stepUpdate] }
+ >
{ this.renderStep() }
);
@@ -66,19 +67,22 @@ export default class ModalUpdate extends Component {
+ onClick={ this.onClickClose }
+ />
];
case STEP_CONFIRM:
return [
,
+ onClick={ this.onClickClose }
+ />,
+ onClick={ this.onClickYes }
+ />
];
default:
return null;
diff --git a/js/src/dapps/dappreg/SelectAccount/selectAccount.js b/js/src/dapps/dappreg/SelectAccount/selectAccount.js
index f06064ffe..315d2f21c 100644
--- a/js/src/dapps/dappreg/SelectAccount/selectAccount.js
+++ b/js/src/dapps/dappreg/SelectAccount/selectAccount.js
@@ -27,7 +27,8 @@ export default class SelectAccount extends Component {
return (
+ onChange={ this.onSelect }
+ >
{ this.renderOptions() }
);
diff --git a/js/src/dapps/dappreg/SelectDapp/selectDapp.js b/js/src/dapps/dappreg/SelectDapp/selectDapp.js
index 61e1d16be..8b726eaf3 100644
--- a/js/src/dapps/dappreg/SelectDapp/selectDapp.js
+++ b/js/src/dapps/dappreg/SelectDapp/selectDapp.js
@@ -30,7 +30,8 @@ export default class SelectDapp extends Component {
return (
+ label='Application Id, the unique assigned identifier'
+ >
);
@@ -51,11 +52,13 @@ export default class SelectDapp extends Component {
+ overlay={ overlayImg }
+ >
+ onChange={ this.onSelect }
+ >
{ this.renderOptions() }
@@ -67,7 +70,8 @@ export default class SelectDapp extends Component {
return (
+ key={ app.id }
+ >
{ app.name }
);
diff --git a/js/src/dapps/githubhint/Application/application.js b/js/src/dapps/githubhint/Application/application.js
index 630a36a68..f0599a8d8 100644
--- a/js/src/dapps/githubhint/Application/application.js
+++ b/js/src/dapps/githubhint/Application/application.js
@@ -94,7 +94,8 @@ export default class Application extends Component {
disabled={ registerBusy }
value={ repo }
className={ repoError ? styles.error : null }
- onChange={ this.onChangeRepo } />
+ onChange={ this.onChangeRepo }
+ />
,
+ onChange={ this.onChangeCommit }
+ />
];
} else {
@@ -115,7 +117,8 @@ export default class Application extends Component {
disabled={ registerBusy }
value={ url }
className={ urlError ? styles.error : null }
- onChange={ this.onChangeUrl } />
+ onChange={ this.onChangeUrl }
+ />
);
}
@@ -128,11 +131,17 @@ export default class Application extends Component {
File Link
+ onClick={ this.onClickTypeNormal }
+ >
+ File Link
+
Content Bundle
+ 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 {
register url
+ 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'
+ />,
}
label={
+ defaultMessage='Save Address'
+ />
}
onClick={ this.onAdd }
- ref='addButton' />
+ ref='addButton'
+ />
]);
}
@@ -97,45 +103,54 @@ export default class AddAddress extends Component {
hint={
+ defaultMessage='the network address for the entry'
+ />
}
label={
+ defaultMessage='network address'
+ />
}
onChange={ this.onEditAddress }
ref='inputAddress'
- value={ address } />
+ value={ address }
+ />
+ defaultMessage='a descriptive name for the entry'
+ />
}
label={
+ defaultMessage='address name'
+ />
}
onChange={ this.onEditName }
ref='inputName'
- value={ name } />
+ value={ name }
+ />
+ defaultMessage='an expanded description for the entry'
+ />
}
label={
+ defaultMessage='(optional) address description'
+ />
}
onChange={ this.onEditDescription }
ref='inputDescription'
- value={ description } />
+ value={ description }
+ />
);
}
diff --git a/js/src/modals/AddContract/addContract.js b/js/src/modals/AddContract/addContract.js
index 49d3a4143..f3d2b1984 100644
--- a/js/src/modals/AddContract/addContract.js
+++ b/js/src/modals/AddContract/addContract.js
@@ -51,13 +51,16 @@ class AddContract extends Component {
,
+ key='type'
+ />,
+ key='details'
+ />
] }
- visible>
+ visible
+ >
{ this.renderStep() }
);
@@ -98,9 +101,11 @@ class AddContract extends Component {
label={
+ defaultMessage='Cancel'
+ />
}
- onClick={ this.onClose } />
+ onClick={ this.onClose }
+ />
);
if (step === 0) {
@@ -112,9 +117,11 @@ class AddContract extends Component {
label={
+ defaultMessage='Next'
+ />
}
- onClick={ this.onNext } />
+ onClick={ this.onNext }
+ />
];
}
@@ -126,19 +133,23 @@ class AddContract extends Component {
label={
+ defaultMessage='Back'
+ />
}
- onClick={ this.onPrev } />,
+ onClick={ this.onPrev }
+ />,
}
key='add'
label={
+ defaultMessage='Add Contract'
+ />
}
disabled={ this.store.hasError }
- onClick={ this.onAdd } />
+ onClick={ this.onAdd }
+ />
];
}
@@ -152,58 +163,70 @@ class AddContract extends Component {
hint={
+ defaultMessage='the network address for the contract'
+ />
}
label={
+ defaultMessage='network address'
+ />
}
onChange={ this.onChangeAddress }
onSubmit={ this.onEditAddress }
- value={ address } />
+ value={ address }
+ />
+ defaultMessage='a descriptive name for the contract'
+ />
}
label={
+ defaultMessage='contract name'
+ />
}
onSubmit={ this.onEditName }
- value={ name } />
+ value={ name }
+ />
+ defaultMessage='an expanded description for the entry'
+ />
}
label={
+ defaultMessage='(optional) contract description'
+ />
}
onSubmit={ this.onEditDescription }
- value={ description } />
+ value={ description }
+ />
+ defaultMessage='the abi for the contract'
+ />
}
label={
+ defaultMessage='contract abi'
+ />
}
onSubmit={ this.onEditAbi }
readOnly={ abiType.readOnly }
- value={ abi } />
+ value={ abi }
+ />
);
}
diff --git a/js/src/modals/AddContract/addContract.spec.js b/js/src/modals/AddContract/addContract.spec.js
index 3e0bdf527..2fcee7f17 100644
--- a/js/src/modals/AddContract/addContract.spec.js
+++ b/js/src/modals/AddContract/addContract.spec.js
@@ -37,7 +37,8 @@ function render (props = {}) {
,
+ onClose={ onClose }
+ />,
{ context: { store: reduxStore } }
).find('AddContract').shallow({ context: { api } });
instance = component.instance();
diff --git a/js/src/modals/AddContract/types.js b/js/src/modals/AddContract/types.js
index 3b16b9651..4a9068784 100644
--- a/js/src/modals/AddContract/types.js
+++ b/js/src/modals/AddContract/types.js
@@ -30,15 +30,18 @@ const ABI_TYPES = [
+ defaultMessage='ERC 20'
+ />
)
- } } />
+ } }
+ />
),
label: (
+ defaultMessage='Token'
+ />
),
readOnly: true,
type: 'token',
@@ -54,15 +57,18 @@ const ABI_TYPES = [
+ defaultMessage='see contract code'
+ />
)
- } } />
+ } }
+ />
),
label: (
+ defaultMessage='Multisig Wallet'
+ />
),
readOnly: true,
type: 'multisig',
@@ -72,12 +78,14 @@ const ABI_TYPES = [
description: (
+ defaultMessage='Contract created from custom ABI'
+ />
),
label: (
+ defaultMessage='Custom Contract'
+ />
),
type: 'custom',
value: ''
diff --git a/js/src/modals/AddDapps/addDapps.js b/js/src/modals/AddDapps/addDapps.js
index f079c900f..ad1f71214 100644
--- a/js/src/modals/AddDapps/addDapps.js
+++ b/js/src/modals/AddDapps/addDapps.js
@@ -47,46 +47,56 @@ export default class AddDapps extends Component {
label={
+ defaultMessage='Done'
+ />
}
- onClick={ store.closeModal } />
+ onClick={ store.closeModal }
+ />
] }
compact
title={
+ defaultMessage='visible applications'
+ />
}
- visible>
+ visible
+ >
{
this.renderList(store.sortedLocal,
,
+ defaultMessage='Applications locally available'
+ />,
+ defaultMessage='All applications installed locally on the machine by the user for access by the Parity client.'
+ />
)
}
{
this.renderList(store.sortedBuiltin,
,
+ defaultMessage='Applications bundled with Parity'
+ />,
+ defaultMessage='Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.'
+ />
)
}
{
this.renderList(store.sortedNetwork,
,
+ defaultMessage='Applications on the global network'
+ />,
+ defaultMessage='These applications are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each application before interacting.'
+ />
)
}
diff --git a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js b/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
index 2ff143b64..8987133b0 100644
--- a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
+++ b/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
@@ -35,12 +35,14 @@ export default class AccountDetails extends Component {
allowCopy
hint='a descriptive name for the account'
label='account name'
- value={ name } />
+ value={ name }
+ />
+ value={ address }
+ />
{ this.renderPhrase() }
);
@@ -59,7 +61,8 @@ export default class AccountDetails extends Component {
allowCopy
hint='the account recovery phrase'
label='owner recovery phrase (keep private and secure, it allows full and unlimited access to the account)'
- value={ phrase } />
+ value={ phrase }
+ />
);
}
}
diff --git a/js/src/modals/CreateAccount/CreationType/creationType.js b/js/src/modals/CreateAccount/CreationType/creationType.js
index 3c91c9701..fd602e1d5 100644
--- a/js/src/modals/CreateAccount/CreationType/creationType.js
+++ b/js/src/modals/CreateAccount/CreationType/creationType.js
@@ -34,25 +34,32 @@ export default class CreationType extends Component {
+ onChange={ this.onChange }
+ >
+ value='fromNew'
+ />
+ value='fromPhrase'
+ />
+ value='fromGeth'
+ />
+ value='fromJSON'
+ />
+ value='fromPresale'
+ />
+ value='fromRaw'
+ />
);
diff --git a/js/src/modals/CreateAccount/NewAccount/newAccount.js b/js/src/modals/CreateAccount/NewAccount/newAccount.js
index cbf7d1587..6cab1de02 100644
--- a/js/src/modals/CreateAccount/NewAccount/newAccount.js
+++ b/js/src/modals/CreateAccount/NewAccount/newAccount.js
@@ -64,12 +64,14 @@ export default class CreateAccount extends Component {
hint='a descriptive name for the account'
error={ accountNameError }
value={ accountName }
- onChange={ this.onEditAccountName } />
+ onChange={ this.onEditAccountName }
+ />
+ onChange={ this.onEditPasswordHint }
+ />
{ this.renderIdentitySelector() }
@@ -108,7 +112,8 @@ export default class CreateAccount extends Component {
+ value={ address }
+ />
);
});
@@ -117,7 +122,8 @@ export default class CreateAccount extends Component {
valueSelected={ selectedAddress }
className={ styles.selector }
name='identitySelector'
- onChange={ this.onChangeIdentity }>
+ onChange={ this.onChangeIdentity }
+ >
{ buttons }
);
@@ -135,10 +141,12 @@ export default class CreateAccount extends Component {
+ onTouchTap={ this.onChangeIdentity }
+ >
+ center
+ />
);
});
@@ -148,9 +156,11 @@ export default class CreateAccount extends Component {
{ identities }
+ onTouchTap={ this.createIdentities }
+ >
+ color='rgb(0, 151, 167)'
+ />
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 }
+ />
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 }
+ />
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 }
+ />
+ steps={ steps }
+ >
{ this.renderWarning() }
{ this.renderPage() }
@@ -162,11 +163,13 @@ export default class CreateAccount extends Component {
}
label='Cancel'
- onClick={ this.onClose } />,
+ onClick={ this.onClose }
+ />,
}
label='Next'
- onClick={ this.onNext } />
+ onClick={ this.onNext }
+ />
];
case 1:
const createLabel = createType === 'fromNew'
@@ -177,16 +180,19 @@ export default class CreateAccount extends Component {
}
label='Cancel'
- onClick={ this.onClose } />,
+ onClick={ this.onClose }
+ />,
}
label='Back'
- onClick={ this.onPrev } />,
+ onClick={ this.onPrev }
+ />,
}
label={ createLabel }
disabled={ !this.state.canCreate }
- onClick={ this.onCreate } />
+ onClick={ this.onCreate }
+ />
];
case 2:
@@ -195,12 +201,14 @@ export default class CreateAccount extends Component {
}
label='Print Phrase'
- onClick={ this.printPhrase } />
+ onClick={ this.printPhrase }
+ />
) : null,
}
label='Close'
- onClick={ this.onClose } />
+ onClick={ this.onClose }
+ />
];
}
}
diff --git a/js/src/modals/CreateAccount/errors.js b/js/src/modals/CreateAccount/errors.js
index 25293926f..3ffed1b65 100644
--- a/js/src/modals/CreateAccount/errors.js
+++ b/js/src/modals/CreateAccount/errors.js
@@ -21,30 +21,35 @@ export default {
noFile: (
+ defaultMessage='select a valid wallet file to import'
+ />
),
noKey: (
+ defaultMessage='you need to provide the raw private key'
+ />
),
noMatchPassword: (
+ defaultMessage='the supplied passwords does not match'
+ />
),
noName: (
+ defaultMessage='you need to specify a valid name for the account'
+ />
),
invalidKey: (
+ defaultMessage='the raw key needs to be hex, 64 characters in length and contain the prefix "0x"'
+ />
)
};
diff --git a/js/src/modals/CreateWallet/createWallet.js b/js/src/modals/CreateWallet/createWallet.js
index c19d3303c..c4a338544 100644
--- a/js/src/modals/CreateWallet/createWallet.js
+++ b/js/src/modals/CreateWallet/createWallet.js
@@ -204,7 +204,6 @@ export default class CreateWallet extends Component {
default:
case 'TYPE':
return [ cancelBtn, nextBtn ];
-
}
}
diff --git a/js/src/modals/DappPermissions/dappPermissions.js b/js/src/modals/DappPermissions/dappPermissions.js
index c6498b282..5f6adaeed 100644
--- a/js/src/modals/DappPermissions/dappPermissions.js
+++ b/js/src/modals/DappPermissions/dappPermissions.js
@@ -47,17 +47,21 @@ export default class DappPermissions extends Component {
label={
+ defaultMessage='Done'
+ />
}
- onClick={ store.closeModal } />
+ onClick={ store.closeModal }
+ />
] }
compact
title={
+ defaultMessage='visible dapp accounts'
+ />
}
- visible>
+ visible
+ >
{ this.renderListItems() }
@@ -105,7 +109,8 @@ export default class DappPermissions 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
+ >
);
@@ -102,12 +112,14 @@ class EditMeta extends Component {
}
- onClick={ this.props.onClose } />,
+ onClick={ this.props.onClose }
+ />,
}
- onClick={ this.onSave } />
+ onClick={ this.onSave }
+ />
];
}
@@ -123,15 +135,18 @@ class EditMeta extends Component {
hint={
+ defaultMessage='a hint to allow password recovery'
+ />
}
label={
+ defaultMessage='(optional) password hint'
+ />
}
value={ passwordHint }
- onSubmit={ this.store.setPasswordHint } />
+ onSubmit={ this.store.setPasswordHint }
+ />
);
}
diff --git a/js/src/modals/EditMeta/editMeta.spec.js b/js/src/modals/EditMeta/editMeta.spec.js
index e6dac1f23..ad63e908a 100644
--- a/js/src/modals/EditMeta/editMeta.spec.js
+++ b/js/src/modals/EditMeta/editMeta.spec.js
@@ -37,7 +37,8 @@ function render (props) {
,
+ onClose={ onClose }
+ />,
{ context: { store: reduxStore } }
).find('EditMeta').shallow({ context: { api } });
instance = component.instance();
diff --git a/js/src/modals/ExecuteContract/AdvancedStep/advancedStep.js b/js/src/modals/ExecuteContract/AdvancedStep/advancedStep.js
index 4142aa961..78f03efaa 100644
--- a/js/src/modals/ExecuteContract/AdvancedStep/advancedStep.js
+++ b/js/src/modals/ExecuteContract/AdvancedStep/advancedStep.js
@@ -39,15 +39,18 @@ export default class AdvancedStep extends Component {
hint={
+ defaultMessage='Only post the transaction after this block'
+ />
}
label={
+ defaultMessage='BlockNumber to send from'
+ />
}
value={ minBlock }
- onSubmit={ onMinBlockChange } />
+ onSubmit={ onMinBlockChange }
+ />
diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
index 1ea1ff302..37aa7b092 100644
--- a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
+++ b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
@@ -62,15 +62,18 @@ export default class DetailsStep extends Component {
hint={
+ defaultMessage='the account to transact with'
+ />
}
label={
+ defaultMessage='from account'
+ />
}
onChange={ onFromAddressChange }
- value={ fromAddress } />
+ value={ fromAddress }
+ />
{ this.renderFunctionSelect() }
{ this.renderParameters() }
@@ -80,15 +83,18 @@ export default class DetailsStep extends Component {
hint={
+ defaultMessage='the amount to send to with the transaction'
+ />
}
label={
+ defaultMessage='transaction value (in ETH)'
+ />
}
onSubmit={ onAmountChange }
- value={ amount } />
+ value={ amount }
+ />
+ defaultMessage='advanced sending options'
+ />
}
onCheck={ onAdvancedClick }
- style={ CHECK_STYLE } />
+ style={ CHECK_STYLE }
+ />
@@ -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 = (
+ defaultMessage='post transaction'
+ />
}
disabled={ !!(sending || hasError) }
icon={ }
- onClick={ this.postTransaction } />
+ onClick={ this.postTransaction }
+ />
);
const nextBtn = (
+ defaultMessage='next'
+ />
}
icon={ }
- onClick={ this.onNextClick } />
+ onClick={ this.onNextClick }
+ />
);
const prevBtn = (
+ defaultMessage='prev'
+ />
}
icon={ }
- onClick={ this.onPrevClick } />
+ onClick={ this.onPrevClick }
+ />
);
if (step === STEP_DETAILS) {
@@ -233,10 +247,12 @@ class ExecuteContract extends Component {
label={
+ defaultMessage='done'
+ />
}
icon={ }
- onClick={ onClose } />
+ onClick={ onClose }
+ />
];
}
@@ -250,13 +266,16 @@ class ExecuteContract extends Component {
title={
+ defaultMessage='The execution has been rejected'
+ />
}
state={
- } />
+ defaultMessage='You can safely close this window, the function execution will not occur.'
+ />
+ }
+ />
);
}
@@ -269,7 +288,8 @@ class ExecuteContract extends Component {
onFromAddressChange={ onFromAddressChange }
onFuncChange={ this.onFuncChange }
onAdvancedClick={ this.onAdvancedClick }
- onValueChange={ this.onValueChange } />
+ onValueChange={ this.onValueChange }
+ />
);
} else if (step === (advancedOptions ? STEP_BUSY : STEP_BUSY_OR_ADVANCED)) {
return (
@@ -277,9 +297,11 @@ class ExecuteContract extends Component {
title={
+ defaultMessage='The function execution is in progress'
+ />
}
- state={ busyState } />
+ state={ busyState }
+ />
);
} else if (advancedOptions && (step === STEP_BUSY_OR_ADVANCED)) {
return (
@@ -287,7 +309,8 @@ class ExecuteContract extends Component {
gasStore={ this.gasStore }
minBlock={ minBlock }
minBlockError={ minBlockError }
- onMinBlockChange={ this.onMinBlockChange } />
+ onMinBlockChange={ this.onMinBlockChange }
+ />
);
}
@@ -406,7 +429,8 @@ class ExecuteContract extends Component {
busyState: (
+ defaultMessage='Waiting for authorization in the Parity Signer'
+ />
)
});
@@ -429,7 +453,8 @@ class ExecuteContract extends Component {
busyState: (
+ defaultMessage='Your transaction has been posted to the network'
+ />
)
});
})
diff --git a/js/src/modals/ExecuteContract/executeContract.spec.js b/js/src/modals/ExecuteContract/executeContract.spec.js
index aad966502..4cb27ea03 100644
--- a/js/src/modals/ExecuteContract/executeContract.spec.js
+++ b/js/src/modals/ExecuteContract/executeContract.spec.js
@@ -35,7 +35,8 @@ function render (props) {
{ ...props }
contract={ CONTRACT }
onClose={ onClose }
- onFromAddressChange={ onFromAddressChange } />,
+ onFromAddressChange={ onFromAddressChange }
+ />,
{ context: { api: createApi(), store: STORE } }
).find('ExecuteContract').shallow();
diff --git a/js/src/modals/FirstRun/TnC/tnc.js b/js/src/modals/FirstRun/TnC/tnc.js
index 96892828b..66861dada 100644
--- a/js/src/modals/FirstRun/TnC/tnc.js
+++ b/js/src/modals/FirstRun/TnC/tnc.js
@@ -167,7 +167,8 @@ export default class TnC extends Component {
className={ styles.accept }
label='I accept these terms and conditions'
checked={ hasAccepted }
- onCheck={ onAccept } />
+ onCheck={ onAccept }
+ />
);
}
diff --git a/js/src/modals/FirstRun/Welcome/welcome.js b/js/src/modals/FirstRun/Welcome/welcome.js
index 853ad99fe..5e155b518 100644
--- a/js/src/modals/FirstRun/Welcome/welcome.js
+++ b/js/src/modals/FirstRun/Welcome/welcome.js
@@ -32,7 +32,8 @@ export default class FirstRun extends Component {
+ style={ LOGO_STYLE }
+ />
Welcome to Parity , the fastest and simplest way to run your node.
The next few steps will guide you through the process of setting up you Parity instance and the associated account.
Click Next to continue your journey.
diff --git a/js/src/modals/FirstRun/firstRun.js b/js/src/modals/FirstRun/firstRun.js
index 03bc8d770..12902af4e 100644
--- a/js/src/modals/FirstRun/firstRun.js
+++ b/js/src/modals/FirstRun/firstRun.js
@@ -71,7 +71,8 @@ class FirstRun extends Component {
actions={ this.renderDialogActions() }
current={ stage }
steps={ STAGE_NAMES }
- visible>
+ visible
+ >
{ this.renderStage() }
);
@@ -89,19 +90,22 @@ class FirstRun extends Component {
return (
+ onAccept={ this.onAcceptTnC }
+ />
);
case 2:
return (
+ onChange={ this.onChangeDetails }
+ />
);
case 3:
return (
+ phrase={ phrase }
+ />
);
case 4:
return (
@@ -120,7 +124,8 @@ class FirstRun extends Component {
}
label='Next'
- onClick={ this.onNext } />
+ onClick={ this.onNext }
+ />
);
case 1:
@@ -129,7 +134,8 @@ class FirstRun extends Component {
disabled={ !hasAcceptedTnc }
icon={ }
label='Next'
- onClick={ this.onNext } />
+ onClick={ this.onNext }
+ />
);
case 2:
@@ -173,7 +179,8 @@ class FirstRun extends Component {
}
label='Close'
- onClick={ this.onClose } />
+ onClick={ this.onClose }
+ />
);
}
}
diff --git a/js/src/modals/LoadContract/loadContract.js b/js/src/modals/LoadContract/loadContract.js
index 4b70e595d..944ac1716 100644
--- a/js/src/modals/LoadContract/loadContract.js
+++ b/js/src/modals/LoadContract/loadContract.js
@@ -35,7 +35,6 @@ const SELECTED_STYLE = {
};
export default class LoadContract extends Component {
-
static propTypes = {
onClose: PropTypes.func.isRequired,
onLoad: PropTypes.func.isRequired,
@@ -279,5 +278,4 @@ export default class LoadContract extends Component {
deleteId: -1
});
}
-
}
diff --git a/js/src/modals/PasswordManager/passwordManager.js b/js/src/modals/PasswordManager/passwordManager.js
index 1bd3ea91c..05767d009 100644
--- a/js/src/modals/PasswordManager/passwordManager.js
+++ b/js/src/modals/PasswordManager/passwordManager.js
@@ -65,9 +65,11 @@ class PasswordManager extends Component {
title={
+ defaultMessage='Password Manager'
+ />
}
- visible>
+ visible
+ >
{ this.renderAccount() }
{ this.renderPage() }
{ this.renderMessage() }
@@ -90,7 +92,8 @@ class PasswordManager extends Component {
? MSG_SUCCESS_STYLE
: MSG_FAILURE_STYLE
}
- zDepth={ 1 }>
+ zDepth={ 1 }
+ >
{ infoMessage.value }
);
@@ -106,7 +109,8 @@ class PasswordManager extends Component {
+ unknown
+ />
{ address }
@@ -125,14 +129,17 @@ class PasswordManager extends Component {
return (
+ tabItemContainerStyle={ TABS_ITEM_STYLE }
+ >
+ defaultMessage='Test Password'
+ />
}
- onActive={ this.onActivateTestTab }>
+ onActive={ this.onActivateTestTab }
+ >
@@ -158,9 +168,11 @@ class PasswordManager extends Component {
label={
+ defaultMessage='Change Password'
+ />
}
- onActive={ this.onActivateChangeTab }>
+ onActive={ this.onActivateChangeTab }
+ >
@@ -235,7 +240,8 @@ export default class Details extends Component {
hint='the recipient address'
error={ recipientError }
value={ recipient }
- onChange={ this.onEditRecipient } />
+ onChange={ this.onEditRecipient }
+ />
);
}
diff --git a/js/src/modals/Transfer/Extras/extras.js b/js/src/modals/Transfer/Extras/extras.js
index 630739ac1..506040dce 100644
--- a/js/src/modals/Transfer/Extras/extras.js
+++ b/js/src/modals/Transfer/Extras/extras.js
@@ -45,19 +45,23 @@ export default class Extras extends Component {
hint={
+ defaultMessage='Only post the transaction after this block'
+ />
}
label={
+ defaultMessage='BlockNumber to send from'
+ />
}
value={ minBlock }
- onChange={ this.onEditMinBlock } />
+ onChange={ this.onEditMinBlock }
+ />
+ onChange={ onChange }
+ />
);
@@ -76,15 +80,18 @@ export default class Extras extends Component {
hint={
+ defaultMessage='the data to pass through with the transaction'
+ />
}
label={
+ defaultMessage='transaction data'
+ />
}
onChange={ this.onEditData }
- value={ data } />
+ value={ data }
+ />
);
}
diff --git a/js/src/modals/Transfer/transfer.js b/js/src/modals/Transfer/transfer.js
index 4139b2b81..a5b447428 100644
--- a/js/src/modals/Transfer/transfer.js
+++ b/js/src/modals/Transfer/transfer.js
@@ -86,8 +86,7 @@ class Transfer extends Component {
}
return (
-
+
);
}
@@ -100,7 +99,8 @@ class Transfer extends Component {
+ inline
+ />
@@ -142,7 +142,8 @@ class Transfer extends Component {
return (
+ state={ busyState }
+ />
);
}
@@ -218,7 +219,8 @@ class Transfer extends Component {
minBlockError={ minBlockError }
onChange={ this.store.onUpdateDetails }
total={ total }
- totalError={ totalError } />
+ totalError={ totalError }
+ />
);
}
@@ -230,33 +232,38 @@ class Transfer extends Component {
}
label='Cancel'
- onClick={ this.handleClose } />
+ onClick={ this.handleClose }
+ />
);
const nextBtn = (
}
label='Next'
- onClick={ this.store.onNext } />
+ onClick={ this.store.onNext }
+ />
);
const prevBtn = (
}
label='Back'
- onClick={ this.store.onPrev } />
+ onClick={ this.store.onPrev }
+ />
);
const sendBtn = (
}
label='Send'
- onClick={ this.store.onSend } />
+ onClick={ this.store.onSend }
+ />
);
const doneBtn = (
}
label='Close'
- onClick={ this.handleClose } />
+ onClick={ this.handleClose }
+ />
);
switch (stage) {
diff --git a/js/src/modals/UpgradeParity/upgradeParity.js b/js/src/modals/UpgradeParity/upgradeParity.js
index a11e1a1fe..85e978d15 100644
--- a/js/src/modals/UpgradeParity/upgradeParity.js
+++ b/js/src/modals/UpgradeParity/upgradeParity.js
@@ -50,22 +50,27 @@ export default class UpgradeParity extends Component {
,
+ defaultMessage='upgrade available'
+ />,
,
+ defaultMessage='upgrading parity'
+ />,
store.step === STEP_ERROR
?
+ defaultMessage='error'
+ />
:
+ defaultMessage='upgrade completed'
+ />
] }
- visible>
+ visible
+ >
{ this.renderStep() }
);
@@ -81,9 +86,11 @@ export default class UpgradeParity extends Component {
label={
+ defaultMessage='close'
+ />
}
- onClick={ store.closeModal } />;
+ onClick={ store.closeModal }
+ />;
const doneButton =
}
@@ -91,9 +98,11 @@ export default class UpgradeParity extends Component {
label={
+ defaultMessage='done'
+ />
}
- onClick={ store.closeModal } />;
+ onClick={ store.closeModal }
+ />;
switch (store.step) {
case STEP_INFO:
@@ -104,9 +113,11 @@ export default class UpgradeParity extends Component {
label={
+ defaultMessage='upgrade now'
+ />
}
- onClick={ store.upgradeNow } />,
+ onClick={ store.upgradeNow }
+ />,
closeButton
];
@@ -142,7 +153,8 @@ export default class UpgradeParity extends Component {
values={ {
currentversion:
{ currentversion }
,
newversion:
{ newversion }
- } } />
+ } }
+ />
{ this.renderConsensusInfo() }
@@ -157,8 +169,10 @@ export default class UpgradeParity extends Component {
defaultMessage='Your upgrade to Parity {newversion} is currently in progress'
values={ {
newversion: { newversion }
- } } />
- } />
+ } }
+ />
+ }
+ />
);
case STEP_COMPLETED:
@@ -172,7 +186,8 @@ export default class UpgradeParity extends Component {
defaultMessage='Your upgrade to Parity {newversion} has failed with an error.'
values={ {
newversion: { newversion }
- } } />
+ } }
+ />
{ store.error.message }
@@ -188,7 +203,8 @@ export default class UpgradeParity extends Component {
defaultMessage='Your upgrade to Parity {newversion} has been successfully completed.'
values={ {
newversion:
{ newversion }
- } } />
+ } }
+ />
);
}
@@ -204,7 +220,8 @@ export default class UpgradeParity extends Component {
+ defaultMessage='Your current Parity version is capable of handling the network requirements.'
+ />
);
} else if (consensusCapability.capableUntil) {
@@ -215,7 +232,8 @@ export default class UpgradeParity extends Component {
defaultMessage='Your current Parity version is capable of handling the network requirements until block {blockNumber}'
values={ {
blockNumber: consensusCapability.capableUntil
- } } />
+ } }
+ />
);
} else if (consensusCapability.incapableSince) {
@@ -226,7 +244,8 @@ export default class UpgradeParity extends Component {
defaultMessage='Your current Parity version is incapable of handling the network requirements since block {blockNumber}'
values={ {
blockNumber: consensusCapability.incapableSince
- } } />
+ } }
+ />
);
}
@@ -236,7 +255,8 @@ export default class UpgradeParity extends Component {
+ defaultMessage='Your current Parity version is capable of handling the network requirements.'
+ />
);
}
@@ -246,7 +266,8 @@ export default class UpgradeParity extends Component {
return (
+ defaultMessage='unknown'
+ />
);
}
diff --git a/js/src/modals/WalletSettings/walletSettings.js b/js/src/modals/WalletSettings/walletSettings.js
index 36b8eb1b6..3c46c5b76 100644
--- a/js/src/modals/WalletSettings/walletSettings.js
+++ b/js/src/modals/WalletSettings/walletSettings.js
@@ -317,7 +317,6 @@ class WalletSettings extends Component {
default:
case 'TYPE':
return [ cancelBtn, nextBtn ];
-
}
}
}
@@ -333,4 +332,7 @@ function mapStateToProps (initState, initProps) {
};
}
-export default connect(mapStateToProps)(WalletSettings);
+export default connect(
+ mapStateToProps,
+ null
+)(WalletSettings);
diff --git a/js/src/ui/AccountCard/accountCard.js b/js/src/ui/AccountCard/accountCard.js
index 518dfaaa6..08c2f009b 100644
--- a/js/src/ui/AccountCard/accountCard.js
+++ b/js/src/ui/AccountCard/accountCard.js
@@ -26,7 +26,6 @@ import { fromWei } from '~/api/util/wei';
import styles from './accountCard.css';
export default class AccountCard extends Component {
-
static propTypes = {
account: PropTypes.object.isRequired,
onClick: PropTypes.func.isRequired,
diff --git a/js/src/ui/Actionbar/Import/import.js b/js/src/ui/Actionbar/Import/import.js
index fcf51a53e..fc2829c63 100644
--- a/js/src/ui/Actionbar/Import/import.js
+++ b/js/src/ui/Actionbar/Import/import.js
@@ -36,7 +36,6 @@ const initialState = {
};
export default class ActionbarImport extends Component {
-
static propTypes = {
onConfirm: PropTypes.func.isRequired,
renderValidation: PropTypes.func,
@@ -219,5 +218,4 @@ export default class ActionbarImport extends Component {
onCloseModal = () => {
this.setState(initialState);
}
-
}
diff --git a/js/src/ui/Actionbar/Search/search.js b/js/src/ui/Actionbar/Search/search.js
index 31541f082..ef7aa019e 100644
--- a/js/src/ui/Actionbar/Search/search.js
+++ b/js/src/ui/Actionbar/Search/search.js
@@ -68,7 +68,8 @@ export default class ActionbarSearch extends Component {
return (
+ key='searchAccount'
+ >
}
label=''
- onClick={ this.handleSearchClick } />
+ onClick={ this.handleSearchClick }
+ />
);
}
diff --git a/js/src/ui/Actionbar/Sort/sort.js b/js/src/ui/Actionbar/Sort/sort.js
index eb0c672fb..99db96251 100644
--- a/js/src/ui/Actionbar/Sort/sort.js
+++ b/js/src/ui/Actionbar/Sort/sort.js
@@ -60,7 +60,7 @@ export default class ActionbarSort extends Component {
label=''
icon={
}
onClick={ this.store.handleMenuOpen }
- />
+ />
}
open={ this.store.menuOpen }
onRequestChange={ this.store.handleMenuChange }
@@ -116,5 +116,4 @@ export default class ActionbarSort extends Component {
/>
);
}
-
}
diff --git a/js/src/ui/Balance/balance.js b/js/src/ui/Balance/balance.js
index 2010bdc78..00c03b46c 100644
--- a/js/src/ui/Balance/balance.js
+++ b/js/src/ui/Balance/balance.js
@@ -76,10 +76,12 @@ class Balance extends Component {
return (
+ key={ token.tag }
+ >
+ alt={ token.name }
+ />
{ value }
diff --git a/js/src/ui/BlockStatus/blockStatus.js b/js/src/ui/BlockStatus/blockStatus.js
index 22c0fab2e..19536465c 100644
--- a/js/src/ui/BlockStatus/blockStatus.js
+++ b/js/src/ui/BlockStatus/blockStatus.js
@@ -44,7 +44,8 @@ class BlockStatus extends Component {
defaultMessage='{blockNumber} best block'
values={ {
blockNumber: blockNumber.toFormat()
- } } />
+ } }
+ />
);
}
@@ -57,7 +58,8 @@ class BlockStatus extends Component {
defaultMessage='{percentage}% warp restore'
values={ {
percentage: syncing.warpChunksProcessed.mul(100).div(syncing.warpChunksAmount).toFormat(2)
- } } />
+ } }
+ />
);
}
@@ -74,7 +76,8 @@ class BlockStatus extends Component {
values={ {
currentBlock: syncing.currentBlock.toFormat(),
highestBlock: syncing.highestBlock.toFormat()
- } } />
+ } }
+ />
);
}
@@ -89,7 +92,8 @@ class BlockStatus extends Component {
defaultMessage=', {percentage}% historic'
values={ {
percentage: first.mul(100).div(last).toFormat(2)
- } } />
+ } }
+ />
);
}
diff --git a/js/src/ui/Button/button.js b/js/src/ui/Button/button.js
index d0a358bad..47d2db8b2 100644
--- a/js/src/ui/Button/button.js
+++ b/js/src/ui/Button/button.js
@@ -45,7 +45,8 @@ export default class Button extends Component {
icon={ icon }
label={ label }
primary={ primary }
- onTouchTap={ onClick } />
+ onTouchTap={ onClick }
+ />
);
}
}
diff --git a/js/src/ui/ConfirmDialog/confirmDialog.js b/js/src/ui/ConfirmDialog/confirmDialog.js
index 5035ced03..7cfb914f9 100644
--- a/js/src/ui/ConfirmDialog/confirmDialog.js
+++ b/js/src/ui/ConfirmDialog/confirmDialog.js
@@ -28,12 +28,14 @@ import styles from './confirmDialog.css';
const DEFAULT_NO = (
+ defaultMessage='no'
+ />
);
const DEFAULT_YES = (
+ defaultMessage='yes'
+ />
);
export default class ConfirmDialog extends Component {
@@ -58,7 +60,8 @@ export default class ConfirmDialog extends Component {
className={ className }
actions={ this.renderActions() }
title={ title }
- visible={ visible }>
+ visible={ visible }
+ >
{ children }
@@ -73,11 +76,13 @@ export default class ConfirmDialog extends Component {
}
label={ labelDeny || DEFAULT_NO }
- onClick={ onDeny } />,
+ onClick={ onDeny }
+ />,
}
label={ labelConfirm || DEFAULT_YES }
- onClick={ onConfirm } />
+ onClick={ onConfirm }
+ />
];
}
}
diff --git a/js/src/ui/ConfirmDialog/confirmDialog.spec.js b/js/src/ui/ConfirmDialog/confirmDialog.spec.js
index 6affa4cbf..cb5ab4026 100644
--- a/js/src/ui/ConfirmDialog/confirmDialog.spec.js
+++ b/js/src/ui/ConfirmDialog/confirmDialog.spec.js
@@ -54,7 +54,8 @@ function render (props = {}) {
{ ...props }
title='test title'
onConfirm={ onConfirm }
- onDeny={ onDeny }>
+ onDeny={ onDeny }
+ >
some test content
diff --git a/js/src/ui/Editor/editor.js b/js/src/ui/Editor/editor.js
index 55747a3db..4da7acd8a 100644
--- a/js/src/ui/Editor/editor.js
+++ b/js/src/ui/Editor/editor.js
@@ -25,7 +25,6 @@ import 'brace/mode/json';
import './mode-solidity';
export default class Editor extends Component {
-
static propTypes = {
className: PropTypes.string,
value: PropTypes.string,
@@ -99,5 +98,4 @@ export default class Editor extends Component {
handleOnChange = (value) => {
this.props.onChange(value);
}
-
}
diff --git a/js/src/ui/Form/AddressSelect/addressSelectStore.js b/js/src/ui/Form/AddressSelect/addressSelectStore.js
index 5025564a0..0b8b2adfc 100644
--- a/js/src/ui/Form/AddressSelect/addressSelectStore.js
+++ b/js/src/ui/Form/AddressSelect/addressSelectStore.js
@@ -25,7 +25,6 @@ import { sha3 } from '~/api/util/sha3';
const ZERO = /^(0x)?0*$/;
export default class AddressSelectStore {
-
@observable loading = false;
@observable values = [];
@observable registryValues = [];
@@ -305,5 +304,4 @@ export default class AddressSelectStore {
return nameA.localeCompare(nameB);
});
}
-
}
diff --git a/js/src/ui/Form/Input/input.js b/js/src/ui/Form/Input/input.js
index a24dd13cb..8ad93ca84 100644
--- a/js/src/ui/Form/Input/input.js
+++ b/js/src/ui/Form/Input/input.js
@@ -168,7 +168,8 @@ export default class Input extends Component {
underlineStyle={ underlineStyle }
underlineFocusStyle={ underlineFocusStyle }
underlineShow={ !hideUnderline }
- value={ value }>
+ value={ value }
+ >
{ children }
diff --git a/js/src/ui/Form/InputAddress/inputAddress.js b/js/src/ui/Form/InputAddress/inputAddress.js
index 4673634c8..abdf04dbe 100644
--- a/js/src/ui/Form/InputAddress/inputAddress.js
+++ b/js/src/ui/Form/InputAddress/inputAddress.js
@@ -134,7 +134,8 @@ class InputAddress extends Component {
+ inline
+ />
);
}
diff --git a/js/src/ui/Form/InputChip/inputChip.js b/js/src/ui/Form/InputChip/inputChip.js
index 479ca4b09..5165e5727 100644
--- a/js/src/ui/Form/InputChip/inputChip.js
+++ b/js/src/ui/Form/InputChip/inputChip.js
@@ -203,5 +203,4 @@ export default class InputChip extends Component {
onTokensChange(tokens.filter(token => token && token.length > 0));
}
-
}
diff --git a/js/src/ui/Form/InputInline/inputInline.js b/js/src/ui/Form/InputInline/inputInline.js
index 02b93a90f..8070b8ee7 100644
--- a/js/src/ui/Form/InputInline/inputInline.js
+++ b/js/src/ui/Form/InputInline/inputInline.js
@@ -50,7 +50,8 @@ export default class InputInline extends Component {
return (
+ onClick={ this.onToggle }
+ >
{ this.props.static || value }
);
@@ -66,7 +67,8 @@ export default class InputInline extends Component {
onBlur={ this.onBlur }
onChange={ this.props.onChange }
onKeyDown={ this.onKeyDown }
- onSubmit={ this.props.onSubmit } />
+ onSubmit={ this.props.onSubmit }
+ />
);
}
diff --git a/js/src/ui/Form/RadioButtons/radioButtons.js b/js/src/ui/Form/RadioButtons/radioButtons.js
index e18a884be..dc99f46d2 100644
--- a/js/src/ui/Form/RadioButtons/radioButtons.js
+++ b/js/src/ui/Form/RadioButtons/radioButtons.js
@@ -48,7 +48,8 @@ export default class RadioButtons extends Component {
+ valueSelected={ key }
+ >
{ this.renderContent() }
);
@@ -78,7 +79,8 @@ export default class RadioButtons extends Component {
}
}
- value={ key } />
+ value={ key }
+ />
);
});
}
diff --git a/js/src/ui/Form/TypedInput/typedInput.js b/js/src/ui/Form/TypedInput/typedInput.js
index dcdd599bb..9c7d84921 100644
--- a/js/src/ui/Form/TypedInput/typedInput.js
+++ b/js/src/ui/Form/TypedInput/typedInput.js
@@ -32,7 +32,6 @@ import { ABI_TYPES, parseAbiType } from '~/util/abi';
import styles from './typedInput.css';
export default class TypedInput extends Component {
-
static propTypes = {
param: PropTypes.oneOfType([
PropTypes.object,
@@ -359,7 +358,8 @@ export default class TypedInput extends Component {
+ value={ bool }
+ >
{ bool }
);
@@ -377,7 +377,8 @@ export default class TypedInput extends Component {
value
? 'true'
: 'false'
- }>
+ }
+ >
{ boolitems }
);
@@ -445,5 +446,4 @@ export default class TypedInput extends Component {
return param;
}
-
}
diff --git a/js/src/ui/Form/TypedInput/typedInput.spec.js b/js/src/ui/Form/TypedInput/typedInput.spec.js
index 7cd123d97..5791969a4 100644
--- a/js/src/ui/Form/TypedInput/typedInput.spec.js
+++ b/js/src/ui/Form/TypedInput/typedInput.spec.js
@@ -31,7 +31,8 @@ function render (props) {
component = shallow(
+ onChange={ onChange }
+ />
);
select = component.find('Select');
diff --git a/js/src/ui/Form/form.js b/js/src/ui/Form/form.js
index 3d3c7438a..c4b27a5d7 100644
--- a/js/src/ui/Form/form.js
+++ b/js/src/ui/Form/form.js
@@ -36,7 +36,8 @@ export default class Form extends Component {
return (
);
@@ -83,8 +85,12 @@ export default class TxRow extends Component {
-
+ className={ styles.link }
+ >
+
);
}
@@ -95,7 +101,8 @@ export default class TxRow extends Component {
+ address={ address }
+ />
{ esLink || 'DEPLOY' }
diff --git a/js/src/ui/TxList/TxRow/txRow.spec.js b/js/src/ui/TxList/TxRow/txRow.spec.js
index 030ff4432..f74f3cdcf 100644
--- a/js/src/ui/TxList/TxRow/txRow.spec.js
+++ b/js/src/ui/TxList/TxRow/txRow.spec.js
@@ -28,7 +28,8 @@ const api = new Api({ execute: sinon.stub() });
function render (props) {
return shallow(
,
+ { ...props }
+ />,
{ context: { api } }
);
}
diff --git a/js/src/ui/TxList/txList.spec.js b/js/src/ui/TxList/txList.spec.js
index 11367fbce..fb5202613 100644
--- a/js/src/ui/TxList/txList.spec.js
+++ b/js/src/ui/TxList/txList.spec.js
@@ -40,7 +40,8 @@ function render (props) {
return shallow(
,
+ { ...props }
+ />,
{ context: { api } }
);
}
diff --git a/js/src/util/signer.js b/js/src/util/signer.js
index 5d4442094..3adee7672 100644
--- a/js/src/util/signer.js
+++ b/js/src/util/signer.js
@@ -25,7 +25,6 @@ import { sha3 } from '~/api/util/sha3';
// Adapted from https://github.com/kvhnuke/etherwallet/blob/mercury/app/scripts/myetherwallet.js
export class Signer {
-
static fromJson (json, password) {
return Signer
.getSeed(json, password)
@@ -98,5 +97,4 @@ export class Signer {
tx.sign(this.seed);
return inHex(tx.serialize().toString('hex'));
}
-
}
diff --git a/js/src/util/solidity.js b/js/src/util/solidity.js
index d4c9686d5..89463215d 100644
--- a/js/src/util/solidity.js
+++ b/js/src/util/solidity.js
@@ -17,7 +17,6 @@
import solc from 'solc/browser-wrapper';
export default class SolidityUtils {
-
static compile (data, compiler) {
const { sourcecode, build, optimize, files } = data;
diff --git a/js/src/util/wallets.js b/js/src/util/wallets.js
index 739a1e3c2..95f763b43 100644
--- a/js/src/util/wallets.js
+++ b/js/src/util/wallets.js
@@ -25,7 +25,6 @@ import WalletAbi from '~/contracts/abi/wallet.json';
const _cachedWalletLookup = {};
export default class WalletsUtils {
-
static getCallArgs (api, options, values = []) {
const walletContract = new Contract(api, WalletAbi);
@@ -255,5 +254,4 @@ export default class WalletsUtils {
return transactions;
});
}
-
}
diff --git a/js/src/views/Account/Header/header.js b/js/src/views/Account/Header/header.js
index f5694177a..31124de1b 100644
--- a/js/src/views/Account/Header/header.js
+++ b/js/src/views/Account/Header/header.js
@@ -72,7 +72,8 @@ export default class Header extends Component {
+ balance={ balance }
+ />
{ children }
@@ -95,8 +96,10 @@ export default class Header extends Component {
title={
- } />
+ unknown
+ />
+ }
+ />
);
}
@@ -120,7 +123,8 @@ export default class Header extends Component {
defaultMessage='{count} outgoing transactions'
values={ {
count: txCount.toFormat()
- } } />
+ } }
+ />
);
}
@@ -139,7 +143,8 @@ export default class Header extends Component {
defaultMessage='uuid: {uuid}'
values={ {
uuid
- } } />
+ } }
+ />
);
}
diff --git a/js/src/views/Account/Transactions/transactions.js b/js/src/views/Account/Transactions/transactions.js
index 547c918d8..12929c875 100644
--- a/js/src/views/Account/Transactions/transactions.js
+++ b/js/src/views/Account/Transactions/transactions.js
@@ -63,8 +63,10 @@ class Transactions extends Component {
title={
- }>
+ defaultMessage='transactions'
+ />
+ }
+ >
{ this.renderTransactionList() }
{ this.renderEtherscanFooter() }
@@ -102,7 +104,8 @@ class Transactions extends Component {
defaultMessage='Transaction list powered by {etherscan}'
values={ {
etherscan: etherscan.io
- } } />
+ } }
+ />
);
}
diff --git a/js/src/views/Account/Transactions/transactions.spec.js b/js/src/views/Account/Transactions/transactions.spec.js
index 53f55b524..a46edc3f8 100644
--- a/js/src/views/Account/Transactions/transactions.spec.js
+++ b/js/src/views/Account/Transactions/transactions.spec.js
@@ -28,7 +28,8 @@ function render (props) {
component = shallow(
,
+ { ...props }
+ />,
{ context: { store: createRedux() } }
).find('Transactions').shallow({ context: { api: createApi() } });
instance = component.instance();
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index e3c4d9776..a69683ca2 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -96,10 +96,12 @@ class Account extends Component {
+ balance={ balance }
+ />
+ address={ address }
+ />
);
@@ -116,58 +118,71 @@ class Account extends Component {
label={
+ defaultMessage='transfer'
+ />
}
- onClick={ this.store.toggleTransferDialog } />,
+ onClick={ this.store.toggleTransferDialog }
+ />,
+ src={ shapeshiftBtn }
+ />
}
key='shapeshift'
label={
+ defaultMessage='shapeshift'
+ />
}
- onClick={ this.store.toggleFundDialog } />,
+ onClick={ this.store.toggleFundDialog }
+ />,
}
key='sms-verification'
label={
+ defaultMessage='verify'
+ />
}
- onClick={ this.store.toggleVerificationDialog } />,
+ onClick={ this.store.toggleVerificationDialog }
+ />,
}
key='editmeta'
label={
+ defaultMessage='edit'
+ />
}
- onClick={ this.store.toggleEditDialog } />,
+ onClick={ this.store.toggleEditDialog }
+ />,
}
key='passwordManager'
label={
+ defaultMessage='password'
+ />
}
- onClick={ this.store.togglePasswordDialog } />,
+ onClick={ this.store.togglePasswordDialog }
+ />,
}
key='delete'
label={
+ defaultMessage='delete account'
+ />
}
- onClick={ this.store.toggleDeleteDialog } />
+ onClick={ this.store.toggleDeleteDialog }
+ />
];
return (
@@ -176,8 +191,10 @@ class Account extends Component {
title={
- } />
+ defaultMessage='Account Management'
+ />
+ }
+ />
);
}
@@ -189,7 +206,8 @@ class Account extends Component {
return (
+ onClose={ this.store.toggleDeleteDialog }
+ />
);
}
@@ -201,7 +219,8 @@ class Account extends Component {
return (
+ onClose={ this.store.toggleEditDialog }
+ />
);
}
@@ -215,7 +234,8 @@ class Account extends Component {
return (
+ onClose={ this.store.toggleFundDialog }
+ />
);
}
@@ -227,7 +247,8 @@ class Account extends Component {
return (
+ onClose={ this.store.togglePasswordDialog }
+ />
);
}
@@ -244,7 +265,8 @@ class Account extends Component {
balance={ balance }
balances={ balances }
images={ images }
- onClose={ this.store.toggleTransferDialog } />
+ onClose={ this.store.toggleTransferDialog }
+ />
);
}
@@ -258,7 +280,8 @@ class Account extends Component {
return (
+ onClose={ this.store.toggleVerificationDialog }
+ />
);
}
}
diff --git a/js/src/views/Account/account.spec.js b/js/src/views/Account/account.spec.js
index 33ca89588..6b0e0d393 100644
--- a/js/src/views/Account/account.spec.js
+++ b/js/src/views/Account/account.spec.js
@@ -29,7 +29,8 @@ function render (props) {
component = shallow(
,
+ { ...props }
+ />,
{ context: { store: createRedux() } }
).find('Account').shallow();
instance = component.instance();
diff --git a/js/src/views/Accounts/accounts.js b/js/src/views/Accounts/accounts.js
index 06322e436..df9fc5947 100644
--- a/js/src/views/Accounts/accounts.js
+++ b/js/src/views/Accounts/accounts.js
@@ -130,7 +130,8 @@ class Accounts extends Component {
balances={ balances }
empty={ !_hasAccounts }
order={ sortOrder }
- handleAddSearchToken={ this.onAddSearchToken } />
+ handleAddSearchToken={ this.onAddSearchToken }
+ />
);
}
@@ -172,7 +173,8 @@ class Accounts extends Component {
+ onChange={ onChange }
+ />
);
}
@@ -186,7 +188,8 @@ class Accounts extends Component {
key='sortAccounts'
id='sortAccounts'
order={ this.state.sortOrder }
- onChange={ onChange } />
+ onChange={ onChange }
+ />
);
}
@@ -198,19 +201,19 @@ class Accounts extends Component {
key='newAccount'
icon={ }
label='new account'
- onClick={ this.onNewAccountClick } />,
-
+ onClick={ this.onNewAccountClick }
+ />,
}
label='new wallet'
- onClick={ this.onNewWalletClick } />,
-
+ onClick={ this.onNewWalletClick }
+ />,
,
-
+ filename='accounts'
+ />,
this.renderSearchButton(),
this.renderSortButton()
];
@@ -219,11 +222,13 @@ class Accounts extends Component {
+ buttons={ buttons }
+ >
+ text='actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item'
+ />
);
}
@@ -240,7 +245,8 @@ class Accounts extends Component {
+ onUpdate={ this.onNewAccountUpdate }
+ />
);
}
diff --git a/js/src/views/Address/Delete/delete.js b/js/src/views/Address/Delete/delete.js
index beaf42867..1e663daaa 100644
--- a/js/src/views/Address/Delete/delete.js
+++ b/js/src/views/Address/Delete/delete.js
@@ -52,14 +52,16 @@ class Delete extends Component {
title='confirm removal'
visible
onDeny={ this.closeDeleteDialog }
- onConfirm={ this.onDeleteConfirmed }>
+ onConfirm={ this.onDeleteConfirmed }
+ >
Are you sure you want to remove the following address from your addressbook?
+ address={ account.address }
+ />
diff --git a/js/src/views/Address/address.js b/js/src/views/Address/address.js
index c0927bedf..79c591b14 100644
--- a/js/src/views/Address/address.js
+++ b/js/src/views/Address/address.js
@@ -147,12 +147,14 @@ class Address extends Component {
key='editmeta'
icon={
}
label='edit'
- onClick={ this.onEditClick } />,
+ onClick={ this.onEditClick }
+ />,
}
label='delete address'
- onClick={ this.showDeleteDialog } />
+ onClick={ this.showDeleteDialog }
+ />
];
const addToBook = (
@@ -182,7 +184,8 @@ class Address extends Component {
return (
+ onClose={ this.onEditClick }
+ />
);
}
diff --git a/js/src/views/Addresses/addresses.js b/js/src/views/Addresses/addresses.js
index faa6a1a32..8f22e97ce 100644
--- a/js/src/views/Addresses/addresses.js
+++ b/js/src/views/Addresses/addresses.js
@@ -116,7 +116,8 @@ class Addresses extends Component {
key='sortAccounts'
id='sortAddresses'
order={ this.state.sortOrder }
- onChange={ onChange } />
+ onChange={ onChange }
+ />
);
}
@@ -129,7 +130,8 @@ class Addresses extends Component {
+ onChange={ onChange }
+ />
);
}
@@ -141,19 +143,18 @@ class Addresses extends Component {
key='newAddress'
icon={
}
label='new address'
- onClick={ this.onOpenAdd } />,
-
+ onClick={ this.onOpenAdd }
+ />,
,
-
+ filename='addressbook'
+ />,
,
-
this.renderSearchButton(),
this.renderSortButton()
];
@@ -162,7 +163,8 @@ class Addresses extends Component {
+ buttons={ buttons }
+ />
);
}
@@ -177,7 +179,8 @@ class Addresses extends Component {
return (
+ onClose={ this.onCloseAdd }
+ />
);
}
diff --git a/js/src/views/Application/Container/container.js b/js/src/views/Application/Container/container.js
index 80e3571c1..f70e017b4 100644
--- a/js/src/views/Application/Container/container.js
+++ b/js/src/views/Application/Container/container.js
@@ -22,7 +22,6 @@ import { Errors, ParityBackground, Tooltips } from '~/ui';
import styles from '../application.css';
export default class Container extends Component {
-
static propTypes = {
children: PropTypes.node.isRequired,
onCloseFirstRun: PropTypes.func,
@@ -37,7 +36,8 @@ export default class Container extends Component {
+ visible={ showFirstRun }
+ />
diff --git a/js/src/views/Application/Status/status.js b/js/src/views/Application/Status/status.js
index 54dad960e..f955f45e3 100644
--- a/js/src/views/Application/Status/status.js
+++ b/js/src/views/Application/Status/status.js
@@ -68,7 +68,8 @@ class Status extends Component {
+ defaultMessage='Capable'
+ />
);
}
@@ -81,7 +82,8 @@ class Status extends Component {
defaultMessage='Capable until #{blockNumber}'
values={ {
blockNumber: upgradeStore.consensusCapability.capableUntil
- } } />
+ } }
+ />
);
}
@@ -94,7 +96,8 @@ class Status extends Component {
defaultMessage='Incapable since #{blockNumber}'
values={ {
blockNumber: upgradeStore.consensusCapability.incapableSince
- } } />
+ } }
+ />
);
}
@@ -103,7 +106,8 @@ class Status extends Component {
+ defaultMessage='Unknown capability'
+ />
);
}
@@ -119,10 +123,12 @@ class Status extends Component {
);
diff --git a/js/src/views/Application/TabBar/tabBar.js b/js/src/views/Application/TabBar/tabBar.js
index 81be1d294..2b7b82ad8 100644
--- a/js/src/views/Application/TabBar/tabBar.js
+++ b/js/src/views/Application/TabBar/tabBar.js
@@ -45,7 +45,8 @@ class Tab extends Component {
view.id === 'signer'
? this.renderSignerLabel(view.id)
: this.renderLabel(view.id)
- }>
+ }
+ >
{ children }
);
@@ -55,7 +56,8 @@ class Tab extends Component {
return (
+ id={ `settings.views.${id}.label` }
+ />
{ bubble }
);
@@ -70,7 +72,8 @@ class Tab extends Component {
+ value={ pendings }
+ />
);
}
@@ -133,7 +136,8 @@ class TabBar extends Component {
? (
+ text='navigate between the different parts and views of the application, switching between an account view, token view and distributed application view'
+ />
)
: null;
@@ -141,10 +145,12 @@ class TabBar extends Component {
+ to={ view.route }
+ >
+ view={ view }
+ >
{ body }
diff --git a/js/src/views/Application/application.js b/js/src/views/Application/application.js
index 2b32cf64e..38b7d4f78 100644
--- a/js/src/views/Application/application.js
+++ b/js/src/views/Application/application.js
@@ -83,11 +83,13 @@ class Application extends Component {
+ showFirstRun={ this.store.firstrunVisible }
+ >
+ pending={ pending }
+ />
{ children }
diff --git a/js/src/views/Connection/connection.js b/js/src/views/Connection/connection.js
index 81b6d536c..3463b4bf9 100644
--- a/js/src/views/Connection/connection.js
+++ b/js/src/views/Connection/connection.js
@@ -91,7 +91,8 @@ class Connection extends Component {
defaultMessage='Unable to make a connection to the Parity Secure API. To update your secure token or to generate a new one, run {newToken} and supply the token below'
values={ {
newToken: parity signer new-token
- } } />
+ } }
+ />
+ defaultMessage='invalid signer token'
+ />
)
}
hint={
+ defaultMessage='a generated token from Parity'
+ />
}
label={
+ defaultMessage='secure token'
+ />
}
onChange={ this.onChangeToken }
- value={ token } />
+ value={ token }
+ />
);
@@ -126,7 +131,8 @@ class Connection extends Component {
+ defaultMessage='Connecting to the Parity Secure API.'
+ />
);
}
@@ -136,7 +142,8 @@ class Connection extends Component {
+ defaultMessage='Connecting to the Parity Node. If this informational message persists, please ensure that your Parity node is running and reachable on the network.'
+ />
);
}
diff --git a/js/src/views/Contract/Events/Event/event.js b/js/src/views/Contract/Events/Event/event.js
index f5ca34910..83a3998b7 100644
--- a/js/src/views/Contract/Events/Event/event.js
+++ b/js/src/views/Contract/Events/Event/event.js
@@ -62,7 +62,11 @@ export default class Event extends Component {
return (
- { event.state === 'pending' ? 'pending' : this.formatBlockTimestamp(block) }
+ {
+ event.state === 'pending'
+ ? 'pending'
+ : this.formatBlockTimestamp(block)
+ }
{ this.formatNumber(transaction.blockNumber) }
@@ -86,7 +90,12 @@ export default class Event extends Component {
renderAddressName (address, withName = true) {
return (
-
+
{ withName ? : address }
);
@@ -103,7 +112,8 @@ export default class Event extends Component {
text
className={ styles.input }
value={ param.value }
- label={ name } />
+ label={ name }
+ />
);
default:
diff --git a/js/src/views/Contract/Events/events.js b/js/src/views/Contract/Events/events.js
index 1367624e8..0a7a3365d 100644
--- a/js/src/views/Contract/Events/events.js
+++ b/js/src/views/Contract/Events/events.js
@@ -67,7 +67,8 @@ export default class Events extends Component {
+ isTest={ isTest }
+ />
);
});
diff --git a/js/src/views/Contract/Queries/inputQuery.js b/js/src/views/Contract/Queries/inputQuery.js
index ce2a858ad..56a126e9e 100644
--- a/js/src/views/Contract/Queries/inputQuery.js
+++ b/js/src/views/Contract/Queries/inputQuery.js
@@ -49,9 +49,7 @@ export default class InputQuery extends Component {
const { name, className } = this.props;
return (
-
+
-
+
{ this.renderResults() }
@@ -83,7 +79,8 @@ export default class InputQuery extends Component {
+ onClick={ this.onClick }
+ />
);
diff --git a/js/src/views/Contract/contract.js b/js/src/views/Contract/contract.js
index fc299f7cb..aeb791587 100644
--- a/js/src/views/Contract/contract.js
+++ b/js/src/views/Contract/contract.js
@@ -142,19 +142,16 @@ class Contract extends Component {
>
{ this.renderBlockNumber(account.meta) }
-
-
-
{ this.renderDetails(account) }
@@ -194,7 +191,8 @@ class Contract extends Component {
}
label='Close'
- onClick={ this.closeDetailsDialog } />
+ onClick={ this.closeDetailsDialog }
+ />
);
return (
@@ -244,28 +242,33 @@ class Contract extends Component {
key='execute'
icon={ }
label='execute'
- onClick={ this.showExecuteDialog } />,
+ onClick={ this.showExecuteDialog }
+ />,
}
label='edit'
- onClick={ this.showEditDialog } />,
+ onClick={ this.showEditDialog }
+ />,
}
label='delete contract'
- onClick={ this.showDeleteDialog } />,
+ onClick={ this.showDeleteDialog }
+ />,
}
label='view details'
- onClick={ this.showDetailsDialog } />
+ onClick={ this.showDetailsDialog }
+ />
];
return (
+ buttons={ !account ? [] : buttons }
+ />
);
}
@@ -277,7 +280,8 @@ class Contract extends Component {
account={ account }
visible={ showDeleteDialog }
route='/contracts'
- onClose={ this.closeDeleteDialog } />
+ onClose={ this.closeDeleteDialog }
+ />
);
}
@@ -291,7 +295,8 @@ class Contract extends Component {
return (
+ onClose={ this.closeEditDialog }
+ />
);
}
@@ -309,7 +314,8 @@ class Contract extends Component {
contract={ contract }
fromAddress={ fromAddress }
onClose={ this.closeExecuteDialog }
- onFromAddressChange={ this.onFromAddressChange } />
+ onFromAddressChange={ this.onFromAddressChange }
+ />
);
}
diff --git a/js/src/views/Contracts/contracts.js b/js/src/views/Contracts/contracts.js
index 532c2ffb4..7f1fabd7d 100644
--- a/js/src/views/Contracts/contracts.js
+++ b/js/src/views/Contracts/contracts.js
@@ -114,7 +114,8 @@ class Contracts extends Component {
{ key: 'blockNumber:-1', label: 'mined block' }
] }
showDefault={ false }
- onChange={ onChange } />
+ onChange={ onChange }
+ />
);
}
@@ -127,7 +128,8 @@ class Contracts extends Component {
+ onChange={ onChange }
+ />
);
}
@@ -137,12 +139,14 @@ class Contracts extends Component {
key='addContract'
icon={ }
label='watch contract'
- onClick={ this.onAddContract } />,
+ onClick={ this.onAddContract }
+ />,
}
label='deploy contract'
- onClick={ this.onDeployContract } />,
+ onClick={ this.onDeployContract }
+ />,
+ buttons={ buttons }
+ />
);
}
@@ -175,7 +180,8 @@ class Contracts extends Component {
return (
+ onClose={ this.onAddContractClose }
+ />
);
}
@@ -190,7 +196,8 @@ class Contracts extends Component {
return (
+ onClose={ this.onDeployContractClose }
+ />
);
}
diff --git a/js/src/views/Dapp/dapp.js b/js/src/views/Dapp/dapp.js
index 7f1416392..e317d2ddc 100644
--- a/js/src/views/Dapp/dapp.js
+++ b/js/src/views/Dapp/dapp.js
@@ -123,7 +123,8 @@ export default class Dapp extends Component {
name={ name }
sandbox='allow-forms allow-popups allow-same-origin allow-scripts'
scrolling='auto'
- src={ src } />
+ src={ src }
+ />
);
}
}
diff --git a/js/src/views/Dapps/UrlButton/urlButton.js b/js/src/views/Dapps/UrlButton/urlButton.js
index 0a01be03b..bf3a7863f 100644
--- a/js/src/views/Dapps/UrlButton/urlButton.js
+++ b/js/src/views/Dapps/UrlButton/urlButton.js
@@ -47,7 +47,8 @@ class UrlButton extends Component {
label={
+ defaultMessage='URL'
+ />
}
onClick={ this.toggleInput }
/>
@@ -61,7 +62,8 @@ class UrlButton extends Component {
hint={
+ defaultMessage='https://mkr.market'
+ />
}
onBlur={ this.hideInput }
onFocus={ this.showInput }
diff --git a/js/src/views/Dapps/dapps.js b/js/src/views/Dapps/dapps.js
index 27e5c8b52..98351755c 100644
--- a/js/src/views/Dapps/dapps.js
+++ b/js/src/views/Dapps/dapps.js
@@ -58,7 +58,8 @@ class Dapps extends Component {
+ defaultMessage='Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.'
+ />
+ defaultMessage='I understand that these applications are not affiliated with Parity'
+ />
}
checked={ false }
- onCheck={ this.onClickAcceptExternal } />
+ onCheck={ this.onClickAcceptExternal }
+ />
@@ -85,7 +88,8 @@ class Dapps extends Component {
title={
+ defaultMessage='Decentralized Applications'
+ />
}
buttons={ [
,
@@ -95,7 +99,8 @@ class Dapps extends Component {
label={
+ defaultMessage='edit'
+ />
}
onClick={ this.store.openModal }
/>,
@@ -105,9 +110,11 @@ class Dapps extends Component {
label={
+ defaultMessage='permissions'
+ />
}
- onClick={ this.openPermissionsModal } />
+ onClick={ this.openPermissionsModal }
+ />
] }
/>
@@ -136,7 +143,8 @@ class Dapps extends Component {
return (
+ key={ app.id }
+ >
);
diff --git a/js/src/views/ParityBar/parityBar.js b/js/src/views/ParityBar/parityBar.js
index 8893ac566..af97e5655 100644
--- a/js/src/views/ParityBar/parityBar.js
+++ b/js/src/views/ParityBar/parityBar.js
@@ -27,7 +27,6 @@ import imagesEthcoreBlock from '../../../assets/images/parity-logo-white-no-text
import styles from './parityBar.css';
class ParityBar extends Component {
-
static propTypes = {
pending: PropTypes.array,
dapp: PropTypes.bool
@@ -70,7 +69,8 @@ class ParityBar extends Component {
const parityIcon = (
+ className={ styles.parityIcon }
+ />
);
return (
@@ -81,13 +81,15 @@ class ParityBar extends Component {
+ label={ this.renderLabel('Parity') }
+ />
}
label={ this.renderSignerLabel() }
- onClick={ this.toggleDisplay } />
+ onClick={ this.toggleDisplay }
+ />
@@ -106,7 +108,8 @@ class ParityBar extends Component {
}
label='Close'
- onClick={ this.toggleDisplay } />
+ onClick={ this.toggleDisplay }
+ />
@@ -137,7 +140,8 @@ class ParityBar extends Component {
+ value={ pending.length }
+ />
);
}
diff --git a/js/src/views/Settings/Background/background.js b/js/src/views/Settings/Background/background.js
index ebf3c7a96..a81f837c4 100644
--- a/js/src/views/Settings/Background/background.js
+++ b/js/src/views/Settings/Background/background.js
@@ -56,20 +56,24 @@ class Background extends Component {
render () {
return (
-
- }>
+
+ }
+ >
+ defaultMessage='The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new Signer token. This is so that decentralized applications cannot pretend to be trustworthy.'
+ />
+ defaultMessage='Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or use a new Signer token.'
+ />
+ defaultMessage='generate more'
+ />
}
- onClick={ this.generateSeeds } />
+ onClick={ this.generateSeeds }
+ />
diff --git a/js/src/views/Settings/Parity/parity.js b/js/src/views/Settings/Parity/parity.js
index d207c04dd..532343f92 100644
--- a/js/src/views/Settings/Parity/parity.js
+++ b/js/src/views/Settings/Parity/parity.js
@@ -79,9 +79,11 @@ export default class Parity extends Component {
render () {
return (
-
- }>
+
+ }
+ >
@@ -162,7 +164,8 @@ export default class Parity extends Component {
+ label={ label }
+ >
{ label }
);
@@ -173,34 +176,49 @@ export default class Parity extends Component {
label={
+ defaultMessage='mode of operation'
+ />
}
hint={
+ defaultMessage='the syning mode for the Parity node'
+ />
}
value={ mode }
- onChange={ this.onChangeMode }>
+ onChange={ this.onChangeMode }
+ >
{
- renderItem('active',
)
+ renderItem('active',
+
+ )
}
{
- renderItem('passive',
)
+ renderItem('passive',
+
+ )
}
{
- renderItem('dark',
)
+ renderItem('dark',
+
+ )
}
{
- renderItem('offline',
)
+ renderItem('offline',
+
+ )
}
);
diff --git a/js/src/views/Settings/Proxy/proxy.js b/js/src/views/Settings/Proxy/proxy.js
index dba95d458..f8edf07b8 100644
--- a/js/src/views/Settings/Proxy/proxy.js
+++ b/js/src/views/Settings/Proxy/proxy.js
@@ -32,15 +32,18 @@ export default class Proxy extends Component {
const proxyurl = `${dappsUrl}/proxy/proxy.pac`;
return (
-
- }>
+
+ }
+ >
+ defaultMessage='The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.'
+ />
@@ -51,7 +54,8 @@ export default class Proxy extends Component {
defaultMessage='Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,'
values={ {
homeProxy: http://home.parity/
- } } />
+ } }
+ />
{ proxyurl }
@@ -64,7 +68,8 @@ export default class Proxy extends Component {
windowsLink:
,
macOSLink:
,
ubuntuLink:
- } } />
+ } }
+ />
diff --git a/js/src/views/Settings/Views/views.js b/js/src/views/Settings/Views/views.js
index 85b811876..6f950c442 100644
--- a/js/src/views/Settings/Views/views.js
+++ b/js/src/views/Settings/Views/views.js
@@ -35,94 +35,114 @@ class Views extends Component {
render () {
return (
-
- }>
+
+ }
+ >
+ defaultMessage='Manage the available application views, using only the parts of the application that is applicable to you.'
+ />
+ defaultMessage='Are you an end-user? The defaults are setups for both beginner and advanced users alike.'
+ />
+ defaultMessage='Are you a developer? Add some features to manage contracts are interact with application deployments.'
+ />
+ defaultMessage='Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.'
+ />
{
this.renderView('accounts',
,
+ id='settings.views.accounts.label'
+ />,
+ defaultMessage='A list of all the accounts associated to and imported into this Parity instance. Send transactions, receive incoming values, manage your balances and fund your accounts.'
+ />
)
}
{
this.renderView('addresses',
,
+ id='settings.views.addresses.label'
+ />,
+ defaultMessage='A list of all contacts and address book entries that is managed by this Parity instance. Watch accounts and have the details available at the click of a button when transacting.'
+ />
)
}
{
this.renderView('apps',
,
+ id='settings.views.apps.label'
+ />,
+ defaultMessage='Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and interact with application from around the network.'
+ />
)
}
{
this.renderView('contracts',
,
+ id='settings.views.contracts.label'
+ />,
+ defaultMessage='Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, specifically for advanced users that understand the inner working of certain contracts.'
+ />
)
}
{
this.renderView('status',
,
+ id='settings.views.status.label'
+ />,
+ defaultMessage='See how the Parity node is performing in terms of connections to the network, logs from the actual running instance and details of mining (if enabled and configured).'
+ />
)
}
{
this.renderView('signer',
,
+ id='settings.views.signer.label'
+ />,
+ defaultMessage='The secure transaction management area of the application where you can approve any outgoing transactions made from the application as well as those placed into the queue by distributed applications.'
+ />
)
}
{
this.renderView('settings',
,
+ id='settings.views.settings.label'
+ />,
+ defaultMessage='This view. Allows you to customize the application in term of options, operation and look and feel.'
+ />
)
}
@@ -164,7 +184,8 @@ class Views extends Component {
}
onCheck={ toggle }
checked={ view.active }
- value={ view.active } />
+ value={ view.active }
+ />
{ description }
diff --git a/js/src/views/Settings/settings.js b/js/src/views/Settings/settings.js
index dbf0043e4..ee8e8d679 100644
--- a/js/src/views/Settings/settings.js
+++ b/js/src/views/Settings/settings.js
@@ -51,7 +51,8 @@ export default class Settings extends Component {
className={ styles.bar }
title={
- }>
+ }
+ >
{ this.renderTab(hash, 'views', ) }
{ this.renderTab(hash, 'background', ) }
@@ -82,7 +83,8 @@ export default class Settings extends Component {
}
onActive={ this.onActivate(section) }
- value={ section } />
+ value={ section }
+ />
);
}
diff --git a/js/src/views/Signer/components/Account/AccountLink/accountLink.js b/js/src/views/Signer/components/Account/AccountLink/accountLink.js
index c4bc362c1..f3ccf8e12 100644
--- a/js/src/views/Signer/components/Account/AccountLink/accountLink.js
+++ b/js/src/views/Signer/components/Account/AccountLink/accountLink.js
@@ -50,7 +50,7 @@ export default class AccountLink extends Component {
href={ this.state.link }
target='_blank'
className={ `${styles.container} ${className}` }
- >
+ >
{ children || address }
);
diff --git a/js/src/views/Signer/components/Account/account.js b/js/src/views/Signer/components/Account/account.js
index dbe950b75..caa9bc1e3 100644
--- a/js/src/views/Signer/components/Account/account.js
+++ b/js/src/views/Signer/components/Account/account.js
@@ -57,10 +57,12 @@ export default class Account extends Component {
+ isTest={ isTest }
+ >
+ address={ address }
+ />
{ this.renderName() }
{ this.renderBalance() }
@@ -83,7 +85,8 @@ export default class Account extends Component {
return (
+ isTest={ isTest }
+ >
[{ this.shortAddress(address) }]
);
@@ -92,7 +95,8 @@ export default class Account extends Component {
return (
+ isTest={ isTest }
+ >
{ name }
[{ this.tinyAddress(address) }]
diff --git a/js/src/views/Signer/components/RequestPending/requestPending.js b/js/src/views/Signer/components/RequestPending/requestPending.js
index 3e8586063..461d205ba 100644
--- a/js/src/views/Signer/components/RequestPending/requestPending.js
+++ b/js/src/views/Signer/components/RequestPending/requestPending.js
@@ -68,7 +68,8 @@ export default class RequestPending extends Component {
isTest={ isTest }
onConfirm={ this.onConfirm }
onReject={ onReject }
- store={ store } />
+ store={ store }
+ />
);
}
@@ -86,7 +87,8 @@ export default class RequestPending extends Component {
onConfirm={ this.onConfirm }
onReject={ onReject }
store={ store }
- transaction={ transaction } />
+ transaction={ transaction }
+ />
);
}
diff --git a/js/src/views/Signer/components/SignRequest/signRequest.js b/js/src/views/Signer/components/SignRequest/signRequest.js
index 6eea11057..4d301e2a9 100644
--- a/js/src/views/Signer/components/SignRequest/signRequest.js
+++ b/js/src/views/Signer/components/SignRequest/signRequest.js
@@ -76,7 +76,8 @@ export default class SignRequest extends Component {
+ isTest={ isTest }
+ />
Dapp is requesting to sign arbitrary transaction using this account.
@@ -101,7 +102,8 @@ export default class SignRequest extends Component {
+ className={ styles.txHash }
+ />
);
@@ -122,7 +124,7 @@ export default class SignRequest extends Component {
onConfirm={ this.onConfirm }
onReject={ this.onReject }
className={ styles.actions }
- />
+ />
);
}
diff --git a/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js b/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js
index 319c5ae98..ff2b0996c 100644
--- a/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js
+++ b/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js
@@ -59,7 +59,8 @@ export default class TransactionMainDetails extends Component {
+ isTest={ isTest }
+ />
@@ -70,7 +71,8 @@ export default class TransactionMainDetails extends Component {
gasStore
? gasStore.overrideTransaction(transaction)
: transaction
- } />
+ }
+ />
{ this.renderEditGas() }
{ children }
@@ -90,7 +92,8 @@ export default class TransactionMainDetails extends Component {
}
label='Edit gas/gasPrice'
- onClick={ this.toggleGasEditor } />
+ onClick={ this.toggleGasEditor }
+ />
);
}
@@ -107,7 +110,8 @@ export default class TransactionMainDetails extends Component {
data-effect='solid'
data-for={ labelId }
data-place='bottom'
- data-tip>
+ data-tip
+ >
{ totalValueDisplay }
ETH
@@ -128,7 +132,8 @@ export default class TransactionMainDetails extends Component {
+ data-tip
+ >
{ valueDisplay }
ETH
diff --git a/js/src/views/Signer/components/TransactionPending/transactionPending.js b/js/src/views/Signer/components/TransactionPending/transactionPending.js
index fc575c8cd..90752e525 100644
--- a/js/src/views/Signer/components/TransactionPending/transactionPending.js
+++ b/js/src/views/Signer/components/TransactionPending/transactionPending.js
@@ -102,13 +102,15 @@ export default class TransactionPending extends Component {
isTest={ isTest }
totalValue={ totalValue }
transaction={ transaction }
- value={ value } />
+ value={ value }
+ />
+ onReject={ this.onReject }
+ />
);
}
@@ -118,11 +120,11 @@ export default class TransactionPending extends Component {
return (
-
+
+ onClick={ this.toggleGasEditor }
+ />
);
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
index f9d93cbe1..b7e1657ac 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
@@ -133,7 +133,8 @@ class TransactionPendingFormConfirm extends Component {
data-effect='solid'
data-for={ `transactionConfirmForm${this.id}` }
data-place='bottom'
- data-tip>
+ data-tip
+ >
+ className={ styles.signerIcon }
+ />
}
label={
isSending
@@ -150,7 +152,8 @@ class TransactionPendingFormConfirm extends Component {
: 'Confirm Transaction'
}
onTouchTap={ this.onConfirm }
- primary />
+ primary
+ />
{ this.renderTooltip() }
@@ -167,7 +170,8 @@ class TransactionPendingFormConfirm extends Component {
error={ walletError }
label='Select Local Key'
onChange={ this.onKeySelect }
- type='file' />
+ type='file'
+ />
);
}
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js
index def8aae08..9650a21e5 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js
@@ -21,7 +21,6 @@ import RaisedButton from 'material-ui/RaisedButton';
import styles from './transactionPendingFormReject.css';
export default class TransactionPendingFormReject extends Component {
-
static propTypes = {
onReject: PropTypes.func.isRequired,
className: PropTypes.string
diff --git a/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js b/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
index f0b167f27..ec2badf7a 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
@@ -56,8 +56,7 @@ export default class TransactionPendingForm extends Component {
if (this.state.isRejectOpen) {
return (
-
+
);
}
@@ -84,7 +83,8 @@ export default class TransactionPendingForm extends Component {
return (
+ onClick={ this.onToggleReject }
+ >
{ html }
);
diff --git a/js/src/views/Signer/components/TxHashLink/txHashLink.js b/js/src/views/Signer/components/TxHashLink/txHashLink.js
index be92828c1..088828d0b 100644
--- a/js/src/views/Signer/components/TxHashLink/txHashLink.js
+++ b/js/src/views/Signer/components/TxHashLink/txHashLink.js
@@ -33,10 +33,10 @@ export default class TxHashLink extends Component {
+ target='_blank'
+ >
{ children || txHash }
);
}
-
}
diff --git a/js/src/views/Signer/containers/RequestsPage/requestsPage.js b/js/src/views/Signer/containers/RequestsPage/requestsPage.js
index ebc955157..5c6d5326b 100644
--- a/js/src/views/Signer/containers/RequestsPage/requestsPage.js
+++ b/js/src/views/Signer/containers/RequestsPage/requestsPage.js
@@ -77,7 +77,8 @@ class RequestsPage extends Component {
+ hashes={ localHashes }
+ />
);
}
diff --git a/js/src/views/Status/components/AutoComplete/AutoComplete.js b/js/src/views/Status/components/AutoComplete/AutoComplete.js
index 6cf9f6d02..4d0491dd1 100644
--- a/js/src/views/Status/components/AutoComplete/AutoComplete.js
+++ b/js/src/views/Status/components/AutoComplete/AutoComplete.js
@@ -18,7 +18,6 @@ import React, { Component, PropTypes } from 'react';
import AutoComplete from 'material-ui/AutoComplete';
export default class WrappedAutoComplete extends Component {
-
render () {
return (
@@ -40,5 +39,4 @@ export default class WrappedAutoComplete extends Component {
static contextTypes = {
muiTheme: PropTypes.object.isRequired
}
-
}
diff --git a/js/src/views/Status/components/Box/Box.js b/js/src/views/Status/components/Box/Box.js
index e6e5bf1cb..6d04179fc 100644
--- a/js/src/views/Status/components/Box/Box.js
+++ b/js/src/views/Status/components/Box/Box.js
@@ -17,7 +17,6 @@
import React, { Component, PropTypes } from 'react';
export default class Box extends Component {
-
renderValue () {
if (!this.props.value) {
return;
@@ -43,5 +42,4 @@ export default class Box extends Component {
value: PropTypes.string,
children: PropTypes.element
}
-
}
diff --git a/js/src/views/Status/components/Call/Call.js b/js/src/views/Status/components/Call/Call.js
index 13f9cee55..0554e9762 100644
--- a/js/src/views/Status/components/Call/Call.js
+++ b/js/src/views/Status/components/Call/Call.js
@@ -20,7 +20,6 @@ import Response from '../Response';
import styles from './Call.css';
export default class Call extends Component {
-
render () {
let { callNo, name, params, response } = this.props.call;
params = this.formatParams(params);
@@ -30,7 +29,7 @@ export default class Call extends Component {
ref={ this.setElement }
className={ styles.call }
{ ...this._test(`call-${callNo}`) }
- >
+ >
#{ callNo }
{ name }({ params })
@@ -65,5 +64,4 @@ export default class Call extends Component {
call: PropTypes.object.isRequired,
setActiveCall: PropTypes.func.isRequired
}
-
}
diff --git a/js/src/views/Status/components/Calls/Calls.js b/js/src/views/Status/components/Calls/Calls.js
index f1956dcf1..19e419a03 100644
--- a/js/src/views/Status/components/Calls/Calls.js
+++ b/js/src/views/Status/components/Calls/Calls.js
@@ -20,7 +20,6 @@ import CallsToolbar from '../CallsToolbar';
import styles from './Calls.css';
export default class Calls extends Component {
-
state = {
activeCall: null,
activeChild: null
@@ -60,7 +59,7 @@ export default class Calls extends Component {
title='Clear RPC calls history'
onClick={ this.clearHistory }
className={ styles.removeIcon }
- >
+ >
);
@@ -121,5 +120,4 @@ export default class Calls extends Component {
}).isRequired,
reset: PropTypes.func
}
-
}
diff --git a/js/src/views/Status/components/CallsToolbar/CallsToolbar.js b/js/src/views/Status/components/CallsToolbar/CallsToolbar.js
index 77e7ab4ba..716bc5be8 100644
--- a/js/src/views/Status/components/CallsToolbar/CallsToolbar.js
+++ b/js/src/views/Status/components/CallsToolbar/CallsToolbar.js
@@ -30,7 +30,6 @@ import rpcData from '../../data/rpc.json';
const rpcMethods = sortBy(rpcData.methods, 'name');
export default class CallsToolbar extends Component {
-
render () {
const { call, callEl, containerEl } = this.props;
@@ -47,11 +46,11 @@ export default class CallsToolbar extends Component {
+ >
+ >
@@ -61,7 +60,7 @@ export default class CallsToolbar extends Component {
tooltip='Set'
tooltipPosition='top-left'
{ ...this._test('button-setCall') }
- >
+ >
+ >
+ >
+ >
diff --git a/js/src/views/Status/components/EditableValue/EditableValue.js b/js/src/views/Status/components/EditableValue/EditableValue.js
index 85591c509..11eec08df 100644
--- a/js/src/views/Status/components/EditableValue/EditableValue.js
+++ b/js/src/views/Status/components/EditableValue/EditableValue.js
@@ -21,7 +21,6 @@ import styles from './EditableValue.css';
import valueStyles from '../Value/Value.css';
export default class EditableValue extends Component {
-
state = {
value: this.props.value,
inEditMode: false
@@ -77,7 +76,7 @@ export default class EditableValue extends Component {
className={ `${valueStyles.valueContainer} ${styles.container}` }
onSubmit={ this.onSubmit }
{ ...this._testInherit() }
- >
+ >
{ this.renderResetButton() }
{ this.props.children }
@@ -104,7 +103,7 @@ export default class EditableValue extends Component {
ref={ setInput }
onChange={ onChange }
readOnly={ !inEditMode }
- />
+ />
);
}
@@ -139,7 +138,7 @@ export default class EditableValue extends Component {
onClick={ this.onResetToDefault }
title={ `Reset to ${this.props.defaultValue}` }
{ ...this._testInherit('reset') }
- >
+ >
);
@@ -153,7 +152,7 @@ export default class EditableValue extends Component {
className={ styles.iconSuccess }
onClick={ this.onSubmit }
{ ...this._testInherit('submit') }
- >
+ >
,
+ >
];
@@ -174,7 +173,7 @@ export default class EditableValue extends Component {
onClick={ this.onOpenEdit }
title='Edit'
{ ...this._testInherit('edit') }
- >
+ >
);
@@ -188,5 +187,4 @@ export default class EditableValue extends Component {
autocomplete: PropTypes.bool,
dataSource: PropTypes.arrayOf(PropTypes.string)
}
-
}
diff --git a/js/src/views/Status/components/JsonEditor/JsonEditor.js b/js/src/views/Status/components/JsonEditor/JsonEditor.js
index 50e62c698..75643966e 100644
--- a/js/src/views/Status/components/JsonEditor/JsonEditor.js
+++ b/js/src/views/Status/components/JsonEditor/JsonEditor.js
@@ -21,7 +21,6 @@ import formatJson from 'format-json';
import styles from './JsonEditor.css';
export default class JsonEditor extends Component {
-
constructor (...args) {
super(...args);
let { value } = this.props;
@@ -52,7 +51,7 @@ export default class JsonEditor extends Component {
onChange={ this.onChange }
className={ `${styles.editor} ${errorClass}` }
value={ this.state.value }
- />
+ />
{ this.renderError() }
);
@@ -94,5 +93,4 @@ export default class JsonEditor extends Component {
onChange: PropTypes.func.isRequired,
value: PropTypes.object
}
-
}
diff --git a/js/src/views/Status/components/Markdown/Markdown.js b/js/src/views/Status/components/Markdown/Markdown.js
index 3f4aae23c..7c97f31f6 100644
--- a/js/src/views/Status/components/Markdown/Markdown.js
+++ b/js/src/views/Status/components/Markdown/Markdown.js
@@ -19,7 +19,6 @@ import React, { Component, PropTypes } from 'react';
import styles from './Markdown.css';
export default class Marked extends Component {
-
state = {}
render () {
@@ -54,5 +53,4 @@ export default class Marked extends Component {
val: PropTypes.any,
style: PropTypes.object
}
-
}
diff --git a/js/src/views/Status/components/Response/Response.js b/js/src/views/Status/components/Response/Response.js
index 0d5784407..889f13964 100644
--- a/js/src/views/Status/components/Response/Response.js
+++ b/js/src/views/Status/components/Response/Response.js
@@ -20,7 +20,6 @@ import { isArray, isPlainObject } from 'lodash';
import styles from './Response.css';
export default class Response extends Component {
-
render () {
let { response } = this.props;
let formatted;
@@ -61,5 +60,4 @@ export default class Response extends Component {
static propTypes = {
response: PropTypes.any.isRequired
}
-
}
diff --git a/js/src/views/Status/components/RpcCalls/RpcCalls.js b/js/src/views/Status/components/RpcCalls/RpcCalls.js
index ab57370eb..0416a98db 100644
--- a/js/src/views/Status/components/RpcCalls/RpcCalls.js
+++ b/js/src/views/Status/components/RpcCalls/RpcCalls.js
@@ -32,7 +32,6 @@ import RpcNav from '../RpcNav';
const rpcMethods = _.sortBy(rpcData.methods, 'name');
export default class RpcCalls extends Component {
-
state = {};
componentWillReceiveProps (nextProps) {
@@ -277,7 +276,7 @@ export default class RpcCalls extends Component {
className={ 'dapp-block-button' }
disabled={ this.state.jsonEditorError }
onClick={ this.onRpcFire }
- >
+ >
Fire!
);
@@ -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') }
+ />
@@ -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') }
+ />
@@ -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 {
+ :
+ }
onClick={ this.onGo }
- icon={ isLoading ? : }
- />
+ />
+ />
}
- />
+ onClick={ this.onGo }
+ />
);
}
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 (
);
@@ -253,7 +255,10 @@ class WriteContract extends Component {
return (
-
+
Loading Solidity { longVersion }
@@ -272,13 +277,15 @@ class WriteContract extends Component {
/>
{
contract
- ? }
- label='Deploy'
- onClick={ this.store.handleOpenDeployModal }
- primary={ false }
- />
- : null
+ ? (
+ }
+ label='Deploy'
+ onClick={ this.store.handleOpenDeployModal }
+ primary={ false }
+ />
+ )
+ : null
}
@@ -316,8 +323,8 @@ class WriteContract extends Component {
>
{
build.release
- ? (
{ build.version } )
- : build.longVersion
+ ? (
{ build.version } )
+ : build.longVersion
}
));
@@ -394,7 +401,10 @@ class WriteContract extends Component {
if (compiling) {
return (
);
@@ -565,15 +575,20 @@ class WriteContract extends Component {
applyResize = () => {
this.setState({ size: this.size });
}
-
}
function mapStateToProps (state) {
const { accounts } = state.personal;
const { worker, error } = state.worker;
- return { accounts, worker, workerError: error };
+
+ return {
+ accounts,
+ worker,
+ workerError: error
+ };
}
export default connect(
- mapStateToProps
+ mapStateToProps,
+ null
)(WriteContract);
diff --git a/js/src/views/WriteContract/writeContractStore.js b/js/src/views/WriteContract/writeContractStore.js
index a1f710f8e..6cc304eac 100644
--- a/js/src/views/WriteContract/writeContractStore.js
+++ b/js/src/views/WriteContract/writeContractStore.js
@@ -49,7 +49,6 @@ const SNIPPETS = {
let instance = null;
export default class WriteContractStore {
-
@observable sourcecode = '';
@observable compiled = false;
@@ -514,5 +513,4 @@ export default class WriteContractStore {
return files;
}
-
}