{ syncing.warpChunksProcessed.mul(100).div(syncing.warpChunksAmount).toFormat(2) }% warp restore
diff --git a/js/src/views/Account/Header/header.js b/js/src/views/Account/Header/header.js
index 66f0a36b9..b28abeb69 100644
--- a/js/src/views/Account/Header/header.js
+++ b/js/src/views/Account/Header/header.js
@@ -28,20 +28,7 @@ export default class Header extends Component {
static propTypes = {
account: PropTypes.object,
- balance: PropTypes.object,
- isTest: PropTypes.bool
- }
-
- state = {
- name: null
- }
-
- componentWillMount () {
- this.setName();
- }
-
- componentWillReceiveProps () {
- this.setName();
+ balance: PropTypes.object
}
render () {
@@ -87,13 +74,13 @@ export default class Header extends Component {
}
renderTxCount () {
- const { isTest, balance } = this.props;
+ const { balance } = this.props;
if (!balance) {
return null;
}
- const txCount = balance.txCount.sub(isTest ? 0x100000 : 0);
+ const { txCount } = balance;
return (
@@ -101,28 +88,4 @@ export default class Header extends Component {
);
}
-
- onSubmitName = (name) => {
- const { api } = this.context;
- const { account } = this.props;
-
- this.setState({ name }, () => {
- api.parity
- .setAccountName(account.address, name)
- .catch((error) => {
- console.error(error);
- });
- });
- }
-
- setName () {
- const { account } = this.props;
-
- if (account && account.name !== this.propName) {
- this.propName = account.name;
- this.setState({
- name: account.name
- });
- }
- }
}
diff --git a/js/src/views/Account/Transactions/transactions.js b/js/src/views/Account/Transactions/transactions.js
index 3e14dd923..2261284a1 100644
--- a/js/src/views/Account/Transactions/transactions.js
+++ b/js/src/views/Account/Transactions/transactions.js
@@ -143,6 +143,12 @@ class Transactions extends Component {
getTransactions = (props) => {
const { isTest, address, traceMode } = props;
+ // Don't fetch the transactions if we don't know in which
+ // network we are yet...
+ if (isTest === undefined) {
+ return;
+ }
+
return this
.fetchTransactions(isTest, address, traceMode)
.then(transactions => {
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index b36f58618..1181b7f73 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -30,6 +30,7 @@ import shapeshiftBtn from '../../../assets/images/shapeshift-btn.png';
import Header from './Header';
import Transactions from './Transactions';
+import { setVisibleAccounts } from '../../redux/providers/personalActions';
import VerificationStore from '../../modals/SMSVerification/store';
@@ -41,11 +42,12 @@ class Account extends Component {
}
static propTypes = {
+ setVisibleAccounts: PropTypes.func.isRequired,
+ images: PropTypes.object.isRequired,
+
params: PropTypes.object,
accounts: PropTypes.object,
- balances: PropTypes.object,
- images: PropTypes.object.isRequired,
- isTest: PropTypes.bool
+ balances: PropTypes.object
}
propName = null
@@ -66,10 +68,30 @@ class Account extends Component {
const verificationStore = new VerificationStore(api, address);
this.setState({ verificationStore });
+ this.setVisibleAccounts();
+ }
+
+ componentWillReceiveProps (nextProps) {
+ const prevAddress = this.props.params.address;
+ const nextAddress = nextProps.params.address;
+
+ if (prevAddress !== nextAddress) {
+ this.setVisibleAccounts(nextProps);
+ }
+ }
+
+ componentWillUnmount () {
+ this.props.setVisibleAccounts([]);
+ }
+
+ setVisibleAccounts (props = this.props) {
+ const { params, setVisibleAccounts } = props;
+ const addresses = [ params.address ];
+ setVisibleAccounts(addresses);
}
render () {
- const { accounts, balances, isTest } = this.props;
+ const { accounts, balances } = this.props;
const { address } = this.props.params;
const account = (accounts || {})[address];
@@ -90,7 +112,6 @@ class Account extends Component {
{ this.renderActionbar() }
token.token.tag.toLowerCase() === 'eth')
- .value;
- const ethB = balanceB.tokens
- .find(token => token.token.tag.toLowerCase() === 'eth')
- .value;
+ const ethA = balanceA.tokens.find(token => token.token.tag.toLowerCase() === 'eth');
+ const ethB = balanceB.tokens.find(token => token.token.tag.toLowerCase() === 'eth');
- return -1 * ethA.comparedTo(ethB);
+ if (!ethA && !ethB) return 0;
+ if (ethA && !ethB) return -1;
+ if (!ethA && ethB) return 1;
+
+ return -1 * ethA.value.comparedTo(ethB.value);
}
if (key === 'tags') {
diff --git a/js/src/views/Accounts/Summary/summary.js b/js/src/views/Accounts/Summary/summary.js
index 88249bb1c..4baf838ce 100644
--- a/js/src/views/Accounts/Summary/summary.js
+++ b/js/src/views/Accounts/Summary/summary.js
@@ -38,10 +38,6 @@ export default class Summary extends Component {
noLink: false
};
- state = {
- name: 'Unnamed'
- };
-
shouldComponentUpdate (nextProps) {
const prev = {
link: this.props.link, name: this.props.name,
@@ -66,8 +62,8 @@ export default class Summary extends Component {
return true;
}
- const prevValues = prevTokens.map((t) => t.value.toNumber());
- const nextValues = nextTokens.map((t) => t.value.toNumber());
+ const prevValues = prevTokens.map((t) => ({ value: t.value.toNumber(), image: t.token.image }));
+ const nextValues = nextTokens.map((t) => ({ value: t.value.toNumber(), image: t.token.image }));
if (!isEqual(prevValues, nextValues)) {
return true;
diff --git a/js/src/views/Accounts/accounts.js b/js/src/views/Accounts/accounts.js
index 0075a15a2..df55a47e7 100644
--- a/js/src/views/Accounts/accounts.js
+++ b/js/src/views/Accounts/accounts.js
@@ -18,11 +18,12 @@ import React, { Component, PropTypes } from 'react';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import ContentAdd from 'material-ui/svg-icons/content/add';
-import { uniq } from 'lodash';
+import { uniq, isEqual } from 'lodash';
import List from './List';
import { CreateAccount } from '../../modals';
import { Actionbar, ActionbarExport, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '../../ui';
+import { setVisibleAccounts } from '../../redux/providers/personalActions';
import styles from './accounts.css';
@@ -32,6 +33,8 @@ class Accounts extends Component {
}
static propTypes = {
+ setVisibleAccounts: PropTypes.func.isRequired,
+
accounts: PropTypes.object,
hasAccounts: PropTypes.bool,
balances: PropTypes.object
@@ -50,6 +53,27 @@ class Accounts extends Component {
window.setTimeout(() => {
this.setState({ show: true });
}, 100);
+
+ this.setVisibleAccounts();
+ }
+
+ componentWillReceiveProps (nextProps) {
+ const prevAddresses = Object.keys(this.props.accounts);
+ const nextAddresses = Object.keys(nextProps.accounts);
+
+ if (prevAddresses.length !== nextAddresses.length || !isEqual(prevAddresses.sort(), nextAddresses.sort())) {
+ this.setVisibleAccounts(nextProps);
+ }
+ }
+
+ componentWillUnmount () {
+ this.props.setVisibleAccounts([]);
+ }
+
+ setVisibleAccounts (props = this.props) {
+ const { accounts, setVisibleAccounts } = props;
+ const addresses = Object.keys(accounts);
+ setVisibleAccounts(addresses);
}
render () {
@@ -206,7 +230,9 @@ function mapStateToProps (state) {
}
function mapDispatchToProps (dispatch) {
- return bindActionCreators({}, dispatch);
+ return bindActionCreators({
+ setVisibleAccounts
+ }, dispatch);
}
export default connect(
diff --git a/js/src/views/Address/address.js b/js/src/views/Address/address.js
index 210f63b99..f0a452185 100644
--- a/js/src/views/Address/address.js
+++ b/js/src/views/Address/address.js
@@ -26,6 +26,7 @@ import { Actionbar, Button, Page } from '../../ui';
import Header from '../Account/Header';
import Transactions from '../Account/Transactions';
import Delete from './Delete';
+import { setVisibleAccounts } from '../../redux/providers/personalActions';
import styles from './address.css';
@@ -36,9 +37,10 @@ class Address extends Component {
}
static propTypes = {
+ setVisibleAccounts: PropTypes.func.isRequired,
+
contacts: PropTypes.object,
balances: PropTypes.object,
- isTest: PropTypes.bool,
params: PropTypes.object
}
@@ -47,8 +49,31 @@ class Address extends Component {
showEditDialog: false
}
+ componentDidMount () {
+ this.setVisibleAccounts();
+ }
+
+ componentWillReceiveProps (nextProps) {
+ const prevAddress = this.props.params.address;
+ const nextAddress = nextProps.params.address;
+
+ if (prevAddress !== nextAddress) {
+ this.setVisibleAccounts(nextProps);
+ }
+ }
+
+ componentWillUnmount () {
+ this.props.setVisibleAccounts([]);
+ }
+
+ setVisibleAccounts (props = this.props) {
+ const { params, setVisibleAccounts } = props;
+ const addresses = [ params.address ];
+ setVisibleAccounts(addresses);
+ }
+
render () {
- const { contacts, balances, isTest } = this.props;
+ const { contacts, balances } = this.props;
const { address } = this.props.params;
const { showDeleteDialog } = this.state;
@@ -70,7 +95,6 @@ class Address extends Component {
onClose={ this.closeDeleteDialog } />
this.setState({ blockSubscriptionId }));
}
- componentWillReceiveProps (newProps) {
- const { accounts, contracts } = newProps;
+ componentWillReceiveProps (nextProps) {
+ const { accounts, contracts } = nextProps;
if (Object.keys(contracts).length !== Object.keys(this.props.contracts).length) {
- this.attachContract(newProps);
+ this.attachContract(nextProps);
}
if (Object.keys(accounts).length !== Object.keys(this.props.accounts).length) {
- this.setBaseAccount(newProps);
+ this.setBaseAccount(nextProps);
+ }
+
+ const prevAddress = this.props.params.address;
+ const nextAddress = nextProps.params.address;
+
+ if (prevAddress !== nextAddress) {
+ this.setVisibleAccounts(nextProps);
}
}
@@ -92,6 +104,13 @@ class Contract extends Component {
api.unsubscribe(blockSubscriptionId);
contract.unsubscribe(subscriptionId);
+ this.props.setVisibleAccounts([]);
+ }
+
+ setVisibleAccounts (props = this.props) {
+ const { params, setVisibleAccounts } = props;
+ const addresses = [ params.address ];
+ setVisibleAccounts(addresses);
}
render () {
@@ -112,7 +131,6 @@ class Contract extends Component {
{ this.renderExecuteDialog() }
{
return response.ok
? response.json()
: null;
})
+ .then((manifest) => {
+ if (manifest) {
+ this._manifests[manifestHash] = manifest;
+ }
+
+ return manifest;
+ })
.catch((error) => {
console.warn('DappsStore:fetchManifest', error);
return null;