From 2b8bed434c498ff7d200376290a3f85bebe60f94 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Sun, 20 Nov 2016 16:17:57 +0100
Subject: [PATCH 01/34] RPC for deleting accounts.

---
 ethcore/src/account_provider.rs      | 10 ++++++++--
 rpc/src/v1/impls/parity_accounts.rs  | 11 ++++++++++-
 rpc/src/v1/traits/parity_accounts.rs |  5 +++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ethcore/src/account_provider.rs b/ethcore/src/account_provider.rs
index e906aefe9..917ae8b8b 100644
--- a/ethcore/src/account_provider.rs
+++ b/ethcore/src/account_provider.rs
@@ -276,14 +276,20 @@ impl AccountProvider {
 	}
 
 	/// Returns `true` if the password for `account` is `password`. `false` if not.
-	pub fn test_password(&self, account: &Address, password: String) -> Result<bool, Error> {
-		match self.sstore.sign(account, &password, &Default::default()) {
+	pub fn test_password(&self, account: &Address, password: &str) -> Result<bool, Error> {
+		match self.sstore.sign(account, password, &Default::default()) {
 			Ok(_) => Ok(true),
 			Err(SSError::InvalidPassword) => Ok(false),
 			Err(e) => Err(Error::SStore(e)),
 		}
 	}
 
+	/// Permanently removes an account.
+	pub fn kill_account(&self, account: &Address, password: &str) -> Result<(), Error> {
+		try!(self.sstore.remove_account(account, &password));
+		Ok(())
+	}
+
 	/// Changes the password of `account` from `password` to `new_password`. Fails if incorrect `password` given.
 	pub fn change_password(&self, account: &Address, password: String, new_password: String) -> Result<(), Error> {
 		self.sstore.change_password(account, &password, &new_password).map_err(Error::SStore)
diff --git a/rpc/src/v1/impls/parity_accounts.rs b/rpc/src/v1/impls/parity_accounts.rs
index 2644c59e3..8229715ea 100644
--- a/rpc/src/v1/impls/parity_accounts.rs
+++ b/rpc/src/v1/impls/parity_accounts.rs
@@ -104,7 +104,7 @@ impl<C: 'static> ParityAccounts for ParityAccountsClient<C> where C: MiningBlock
 		let account: Address = account.into();
 
 		take_weak!(self.accounts)
-			.test_password(&account, password)
+			.test_password(&account, &password)
 			.map_err(|e| errors::account("Could not fetch account info.", e))
 	}
 
@@ -117,6 +117,15 @@ impl<C: 'static> ParityAccounts for ParityAccountsClient<C> where C: MiningBlock
 			.map_err(|e| errors::account("Could not fetch account info.", e))
 	}
 
+	fn kill_account(&self, account: RpcH160, password: String) -> Result<bool, Error> {
+		try!(self.active());
+		let account: Address = account.into();
+		take_weak!(self.accounts)
+			.kill_account(&account, &password)
+			.map(|_| true)
+			.map_err(|e| errors::account("Could not fetch account info.", e))
+	}
+
 	fn set_account_name(&self, addr: RpcH160, name: String) -> Result<bool, Error> {
 		try!(self.active());
 		let store = take_weak!(self.accounts);
diff --git a/rpc/src/v1/traits/parity_accounts.rs b/rpc/src/v1/traits/parity_accounts.rs
index 0f62f59d1..29706d0b2 100644
--- a/rpc/src/v1/traits/parity_accounts.rs
+++ b/rpc/src/v1/traits/parity_accounts.rs
@@ -53,6 +53,11 @@ build_rpc_trait! {
 		#[rpc(name = "parity_changePassword")]
 		fn change_password(&self, H160, String, String) -> Result<bool, Error>;
 
+		/// Permanently deletes an account.
+		/// Arguments: `account`, `password`.
+		#[rpc(name = "parity_killAccount")]
+		fn kill_account(&self, H160, String) -> Result<bool, Error>;
+
 		/// Set an account's name.
 		#[rpc(name = "parity_setAccountName")]
 		fn set_account_name(&self, H160, String) -> Result<bool, Error>;

From 2d9369e5ba150899ae3b94d8878daae8a2fc09f9 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Mon, 21 Nov 2016 11:03:18 +0100
Subject: [PATCH 02/34] Introduce test.

---
 rpc/src/v1/tests/mocked/parity_accounts.rs | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/rpc/src/v1/tests/mocked/parity_accounts.rs b/rpc/src/v1/tests/mocked/parity_accounts.rs
index c5ed4172e..c0982e60c 100644
--- a/rpc/src/v1/tests/mocked/parity_accounts.rs
+++ b/rpc/src/v1/tests/mocked/parity_accounts.rs
@@ -116,3 +116,27 @@ fn should_be_able_to_set_meta() {
 	assert_eq!(res, Some(response));
 }
 
+#[test]
+fn should_be_able_to_kill_account() {
+	let tester = setup();
+	tester.accounts.new_account("password").unwrap();
+	let accounts = tester.accounts.accounts().unwrap();
+	assert_eq!(accounts.len(), 1);
+	let address = accounts[0];
+
+	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_killAccount", "params": ["0xf00baba2f00baba2f00baba2f00baba2f00baba2"], "id": 1}}"#);
+	let response = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid params","data":null},"id":1}"#;
+	let res = tester.io.handle_request_sync(&request);
+	assert_eq!(res, Some(response.into()));
+
+	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_killAccount", "params": ["0x{}", "password"], "id": 1}}"#, address.hex());
+	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
+	let res = tester.io.handle_request_sync(&request);
+	assert_eq!(res, Some(response.into()));
+
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_accountsInfo", "params": [], "id": 1}"#;
+	let res = tester.io.handle_request_sync(request);
+	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{}},\"id\":1}}");
+	assert_eq!(res, Some(response));
+}
+

From 3db5e3e6279ba3f83539773fb591e020180a140c Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Tue, 22 Nov 2016 15:52:23 +0100
Subject: [PATCH 03/34] jsapi interface for parity_killAccount

---
 js/src/api/rpc/parity/parity.js     |  5 +++++
 js/src/jsonrpc/interfaces/parity.js | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/js/src/api/rpc/parity/parity.js b/js/src/api/rpc/parity/parity.js
index d14cc6554..ac16eb9b0 100644
--- a/js/src/api/rpc/parity/parity.js
+++ b/js/src/api/rpc/parity/parity.js
@@ -123,6 +123,11 @@ export default class Parity {
       .then((accounts) => (accounts || []).map(outAddress));
   }
 
+  killAccount (account, password) {
+    return this._transport
+      .execute('parity_killAccount', inAddress(account), password);
+  }
+
   listGethAccounts () {
     return this._transport
       .execute('parity_listGethAccounts')
diff --git a/js/src/jsonrpc/interfaces/parity.js b/js/src/jsonrpc/interfaces/parity.js
index a5717f502..d8d8a26c0 100644
--- a/js/src/jsonrpc/interfaces/parity.js
+++ b/js/src/jsonrpc/interfaces/parity.js
@@ -238,6 +238,24 @@ export default {
     }
   },
 
+  killAccount: {
+    desc: 'Permanently an account',
+    params: [
+      {
+        type: Address,
+        desc: 'The account to remove'
+      },
+      {
+        type: String,
+        desc: 'Account password'
+      }
+    ],
+    returns: {
+      type: Boolean,
+      desc: 'true on success'
+    }
+  },
+
   listGethAccounts: {
     desc: 'Returns a list of the accounts available from Geth',
     params: [],

From cce5b217ed14e6feeb78712d30e78f5430314113 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Tue, 22 Nov 2016 16:19:36 +0100
Subject: [PATCH 04/34] Delete account dialog

---
 js/src/modals/DeleteAccount/deleteAccount.css |  54 ++++++++
 js/src/modals/DeleteAccount/deleteAccount.js  | 127 ++++++++++++++++++
 js/src/modals/DeleteAccount/index.js          |  17 +++
 js/src/modals/index.js                        |   2 +
 js/src/views/Account/account.js               |  38 +++++-
 5 files changed, 234 insertions(+), 4 deletions(-)
 create mode 100644 js/src/modals/DeleteAccount/deleteAccount.css
 create mode 100644 js/src/modals/DeleteAccount/deleteAccount.js
 create mode 100644 js/src/modals/DeleteAccount/index.js

diff --git a/js/src/modals/DeleteAccount/deleteAccount.css b/js/src/modals/DeleteAccount/deleteAccount.css
new file mode 100644
index 000000000..9cd72c6ab
--- /dev/null
+++ b/js/src/modals/DeleteAccount/deleteAccount.css
@@ -0,0 +1,54 @@
+/* Copyright 2015, 2016 Ethcore (UK) Ltd.
+/* This file is part of Parity.
+/*
+/* Parity is free software: you can redistribute it and/or modify
+/* it under the terms of the GNU General Public License as published by
+/* the Free Software Foundation, either version 3 of the License, or
+/* (at your option) any later version.
+/*
+/* Parity is distributed in the hope that it will be useful,
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/* GNU General Public License for more details.
+/*
+/* You should have received a copy of the GNU General Public License
+/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+.body {
+  .hero {
+    padding-bottom: 1em;
+  }
+
+  .info {
+    display: inline-block;
+  }
+
+  .icon {
+    display: inline-block;
+  }
+
+  .nameinfo {
+    display: inline-block;
+    text-align: left;
+  }
+
+  .header {
+    text-transform: uppercase;
+    font-size: 1.25em;
+    padding-bottom: 0.25em;
+  }
+
+  .address {
+  }
+
+  .description {
+    padding-top: 1em;
+    font-size: 0.75em;
+    color: #aaa;
+  }
+
+  .password {
+    padding: 1em 5em;
+  }
+}
diff --git a/js/src/modals/DeleteAccount/deleteAccount.js b/js/src/modals/DeleteAccount/deleteAccount.js
new file mode 100644
index 000000000..1c6f48df5
--- /dev/null
+++ b/js/src/modals/DeleteAccount/deleteAccount.js
@@ -0,0 +1,127 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+
+import { ConfirmDialog, IdentityIcon, IdentityName, Input } from '../../ui';
+import { newError } from '../../redux/actions';
+
+import styles from './deleteAccount.css';
+
+class DeleteAccount extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired,
+    router: PropTypes.object
+  }
+
+  static propTypes = {
+    account: PropTypes.object.isRequired,
+    onClose: PropTypes.func,
+    newError: PropTypes.func
+  }
+
+  state = {
+    password: ''
+  }
+
+  render () {
+    const { account } = this.props;
+    const { password } = this.state;
+
+    return (
+      <ConfirmDialog
+        className={ styles.body }
+        title='confirm removal'
+        visible
+        onDeny={ this.closeDeleteDialog }
+        onConfirm={ this.onDeleteConfirmed }>
+        <div className={ styles.hero }>
+          Are you sure you want to remove permanently delete the following account?
+        </div>
+        <div className={ styles.info }>
+          <IdentityIcon
+            className={ styles.icon }
+            address={ account.address } />
+          <div className={ styles.nameinfo }>
+            <div className={ styles.header }>
+              <IdentityName address={ account.address } unknown />
+            </div>
+            <div className={ styles.address }>
+              { account.address }
+            </div>
+          </div>
+        </div>
+        <div className={ styles.description }>
+          { account.meta.description }
+        </div>
+        <div className={ styles.password }>
+          <Input
+            label='account password'
+            hint='provide the account password to confirm the account deletion'
+            type='password'
+            value={ password }
+            onChange={ this.onChangePassword } />
+        </div>
+      </ConfirmDialog>
+    );
+  }
+
+  onChangePassword = (event, password) => {
+    this.setState({ password });
+  }
+
+  onDeleteConfirmed = () => {
+    const { api, router } = this.context;
+    const { account, newError } = this.props;
+    const { password } = this.state;
+
+    api.parity
+      .killAccount(account.address, password)
+      .then((result) => {
+        if (result === true) {
+          router.push('/accounts');
+        } else {
+          newError(new Error('Deletion failed.'));
+        }
+
+        this.closeDeleteDialog();
+      })
+      .catch((error) => {
+        console.error('onDeleteConfirmed', error);
+        newError(new Error(`Deletion failed: ${error.message}`));
+        this.closeDeleteDialog();
+      });
+  }
+
+  closeDeleteDialog = () => {
+    this.props.onClose();
+  }
+}
+
+function mapStateToProps (state) {
+  return {};
+}
+
+function mapDispatchToProps (dispatch) {
+  return bindActionCreators({ newError }, dispatch);
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(DeleteAccount);
diff --git a/js/src/modals/DeleteAccount/index.js b/js/src/modals/DeleteAccount/index.js
new file mode 100644
index 000000000..5738c2704
--- /dev/null
+++ b/js/src/modals/DeleteAccount/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './deleteAccount';
diff --git a/js/src/modals/index.js b/js/src/modals/index.js
index d0f8f7afe..06114159b 100644
--- a/js/src/modals/index.js
+++ b/js/src/modals/index.js
@@ -17,6 +17,7 @@
 import AddAddress from './AddAddress';
 import AddContract from './AddContract';
 import CreateAccount from './CreateAccount';
+import DeleteAccount from './DeleteAccount';
 import DeployContract from './DeployContract';
 import EditMeta from './EditMeta';
 import ExecuteContract from './ExecuteContract';
@@ -32,6 +33,7 @@ export {
   AddAddress,
   AddContract,
   CreateAccount,
+  DeleteAccount,
   DeployContract,
   EditMeta,
   ExecuteContract,
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 86a76073e..b36f58618 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -17,12 +17,13 @@
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
+import ActionDelete from 'material-ui/svg-icons/action/delete';
 import ContentCreate from 'material-ui/svg-icons/content/create';
 import ContentSend from 'material-ui/svg-icons/content/send';
 import LockIcon from 'material-ui/svg-icons/action/lock';
 import VerifyIcon from 'material-ui/svg-icons/action/verified-user';
 
-import { EditMeta, Shapeshift, SMSVerification, Transfer, PasswordManager } from '../../modals';
+import { EditMeta, DeleteAccount, Shapeshift, SMSVerification, Transfer, PasswordManager } from '../../modals';
 import { Actionbar, Button, Page } from '../../ui';
 
 import shapeshiftBtn from '../../../assets/images/shapeshift-btn.png';
@@ -50,6 +51,7 @@ class Account extends Component {
   propName = null
 
   state = {
+    showDeleteDialog: false,
     showEditDialog: false,
     showFundDialog: false,
     showVerificationDialog: false,
@@ -62,8 +64,8 @@ class Account extends Component {
     const { api } = this.context;
     const { address } = this.props.params;
 
-    const store = new VerificationStore(api, address);
-    this.setState({ verificationStore: store });
+    const verificationStore = new VerificationStore(api, address);
+    this.setState({ verificationStore });
   }
 
   render () {
@@ -79,6 +81,7 @@ class Account extends Component {
 
     return (
       <div className={ styles.account }>
+        { this.renderDeleteDialog(account) }
         { this.renderEditDialog(account) }
         { this.renderFundDialog() }
         { this.renderVerificationDialog() }
@@ -131,7 +134,12 @@ class Account extends Component {
         key='passwordManager'
         icon={ <LockIcon /> }
         label='password'
-        onClick={ this.onPasswordClick } />
+        onClick={ this.onPasswordClick } />,
+      <Button
+        key='delete'
+        icon={ <ActionDelete /> }
+        label='delete account'
+        onClick={ this.onDeleteClick } />
     ];
 
     return (
@@ -141,6 +149,20 @@ class Account extends Component {
     );
   }
 
+  renderDeleteDialog (account) {
+    const { showDeleteDialog } = this.state;
+
+    if (!showDeleteDialog) {
+      return null;
+    }
+
+    return (
+      <DeleteAccount
+        account={ account }
+        onClose={ this.onDeleteClose } />
+    );
+  }
+
   renderEditDialog (account) {
     const { showEditDialog } = this.state;
 
@@ -228,6 +250,14 @@ class Account extends Component {
     );
   }
 
+  onDeleteClick = () => {
+    this.setState({ showDeleteDialog: true });
+  }
+
+  onDeleteClose = () => {
+    this.setState({ showDeleteDialog: false });
+  }
+
   onEditClick = () => {
     this.setState({
       showEditDialog: !this.state.showEditDialog

From 7f7ffd72844da4eecdbb427dd4e7ac566ab59e62 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Tue, 22 Nov 2016 16:46:40 +0100
Subject: [PATCH 05/34] Monitor killAccount for refresh

---
 js/src/api/subscriptions/personal.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/api/subscriptions/personal.js b/js/src/api/subscriptions/personal.js
index 58428895b..2cb0c3ea0 100644
--- a/js/src/api/subscriptions/personal.js
+++ b/js/src/api/subscriptions/personal.js
@@ -59,6 +59,7 @@ export default class Personal {
       }
 
       switch (data.method) {
+        case 'parity_killAccount':
         case 'parity_importGethAccounts':
         case 'personal_newAccount':
         case 'parity_newAccountFromPhrase':

From 78ffd1023687ceb7ff09906aeabf38a04ce903e6 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Wed, 23 Nov 2016 10:33:04 +0100
Subject: [PATCH 06/34] Typo in description

---
 js/src/jsonrpc/interfaces/parity.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/jsonrpc/interfaces/parity.js b/js/src/jsonrpc/interfaces/parity.js
index d8d8a26c0..02155890e 100644
--- a/js/src/jsonrpc/interfaces/parity.js
+++ b/js/src/jsonrpc/interfaces/parity.js
@@ -239,7 +239,7 @@ export default {
   },
 
   killAccount: {
-    desc: 'Permanently an account',
+    desc: 'Deletes an account',
     params: [
       {
         type: Address,

From 9f3a042f55aeeb3b9d4d68eef35e358667484b4d Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Wed, 23 Nov 2016 20:16:33 +0100
Subject: [PATCH 07/34] Update message

---
 rpc/src/v1/impls/parity_accounts.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpc/src/v1/impls/parity_accounts.rs b/rpc/src/v1/impls/parity_accounts.rs
index 8229715ea..3d91bf08a 100644
--- a/rpc/src/v1/impls/parity_accounts.rs
+++ b/rpc/src/v1/impls/parity_accounts.rs
@@ -123,7 +123,7 @@ impl<C: 'static> ParityAccounts for ParityAccountsClient<C> where C: MiningBlock
 		take_weak!(self.accounts)
 			.kill_account(&account, &password)
 			.map(|_| true)
-			.map_err(|e| errors::account("Could not fetch account info.", e))
+			.map_err(|e| errors::account("Could not delete account.", e))
 	}
 
 	fn set_account_name(&self, addr: RpcH160, name: String) -> Result<bool, Error> {

From 6c686023e070f7c7bb9361b2cb4a1e81a82c53d5 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Wed, 23 Nov 2016 20:37:35 +0100
Subject: [PATCH 08/34] Use `tester.accounts`

---
 rpc/src/v1/tests/mocked/parity_accounts.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/rpc/src/v1/tests/mocked/parity_accounts.rs b/rpc/src/v1/tests/mocked/parity_accounts.rs
index c0982e60c..d2dfe3544 100644
--- a/rpc/src/v1/tests/mocked/parity_accounts.rs
+++ b/rpc/src/v1/tests/mocked/parity_accounts.rs
@@ -134,9 +134,7 @@ fn should_be_able_to_kill_account() {
 	let res = tester.io.handle_request_sync(&request);
 	assert_eq!(res, Some(response.into()));
 
-	let request = r#"{"jsonrpc": "2.0", "method": "parity_accountsInfo", "params": [], "id": 1}"#;
-	let res = tester.io.handle_request_sync(request);
-	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{}},\"id\":1}}");
-	assert_eq!(res, Some(response));
+	let accounts = tester.accounts.accounts().unwrap();
+	assert_eq!(accounts.len(), 0);
 }
 

From 97ec5053f00508cd37b9d8a1172ee2c64942b289 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Wed, 23 Nov 2016 22:17:36 +0100
Subject: [PATCH 09/34] PR grumbles, wording, isRequired, no close on error

---
 js/src/modals/DeleteAccount/deleteAccount.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/js/src/modals/DeleteAccount/deleteAccount.js b/js/src/modals/DeleteAccount/deleteAccount.js
index 1c6f48df5..f3bd880c1 100644
--- a/js/src/modals/DeleteAccount/deleteAccount.js
+++ b/js/src/modals/DeleteAccount/deleteAccount.js
@@ -31,8 +31,8 @@ class DeleteAccount extends Component {
 
   static propTypes = {
     account: PropTypes.object.isRequired,
-    onClose: PropTypes.func,
-    newError: PropTypes.func
+    onClose: PropTypes.func.isRequired,
+    newError: PropTypes.func.isRequired
   }
 
   state = {
@@ -51,7 +51,7 @@ class DeleteAccount extends Component {
         onDeny={ this.closeDeleteDialog }
         onConfirm={ this.onDeleteConfirmed }>
         <div className={ styles.hero }>
-          Are you sure you want to remove permanently delete the following account?
+          Are you sure you want to permanently delete the following account?
         </div>
         <div className={ styles.info }>
           <IdentityIcon
@@ -95,16 +95,14 @@ class DeleteAccount extends Component {
       .then((result) => {
         if (result === true) {
           router.push('/accounts');
+          this.closeDeleteDialog();
         } else {
           newError(new Error('Deletion failed.'));
         }
-
-        this.closeDeleteDialog();
       })
       .catch((error) => {
         console.error('onDeleteConfirmed', error);
         newError(new Error(`Deletion failed: ${error.message}`));
-        this.closeDeleteDialog();
       });
   }
 

From 4d1c3b2a3d6e82a42fc60040afd40bf5276fe2ae Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 24 Nov 2016 06:24:17 +0700
Subject: [PATCH 10/34] Update gitlab-ci

[ci skip]
small fix for S3 windows
temp off alpine
---
 .gitlab-ci.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d3aa2b90..509a89b7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -305,20 +305,20 @@ linux-aarch64:
     - target/aarch64-unknown-linux-gnu/release/parity
     name: "aarch64-unknown-linux-gnu_parity"
   allow_failure: true
-linux-alpine:
-  stage: build
-  image: ethcore/rust-alpine:latest
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - cargo build --release $CARGOFLAGS
-    - strip target/release/parity
-    - md5sum target/release/parity > parity.md5
+#linux-alpine:
+#  stage: build
+#  image: ethcore/rust-alpine:latest
+#  only:
+#    - beta
+#    - tags
+#    - stable
+#    - triggers
+#  script:
+#    - export HOST_CC=gcc
+#    - export HOST_CXX=g++
+#    - cargo build --release $CARGOFLAGS
+#    - strip target/release/parity
+#    - md5sum target/release/parity > parity.md5
 #    - sh scripts/deb-build.sh arm64
 #    - cp target/aarch64-unknown-linux-gnu/release/parity deb/usr/bin/parity
 #    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
@@ -332,14 +332,14 @@ linux-alpine:
 #    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity.md5 --body parity.md5
 #    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
 #    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/"parity_"$VER"_arm64.deb.md5" --body "parity_"$VER"_arm64.deb.md5"
-  tags:
-    - rust
-    - rust-alpine
+#  tags:
+#    - rust
+#    - rust-alpine
 #  artifacts:
 #    paths:
 #    - target/aarch64-unknown-linux-gnu/release/parity
 #    name: "aarch64-unknown-linux-gnu_parity"
-  allow_failure: true
+#  allow_failure: true
 darwin:
   stage: build
   only:
@@ -405,7 +405,7 @@ windows:
     - if %CI_BUILD_REF_NAME% == "beta" set S3_BUCKET=builds-parity-published else (set S3_BUCKET=parity-builds)
     - if %CI_BUILD_REF_NAME% == "stable" set S3_BUCKET=builds-parity-published else (set S3_BUCKET=parity-builds)
     - echo %S3_BUCKET%
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-pc-windows-msvc
+    - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
     - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe
     - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe.md5 --body target\release\parity.exe.md5
     - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip --body target\release\parity.zip

From 0bb9a4aba7236452ef55bf42c0feb36d3d4c71a3 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 24 Nov 2016 06:33:22 +0700
Subject: [PATCH 11/34] Update gitlab-ci

[ci skip]
small fix
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 509a89b7b..d9f7295f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -451,7 +451,7 @@ test-rust-stable:
   image: ethcore/rust:stable
   before_script:
     - git submodule update --init --recursive
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF $CI_BUILD_REF@{1} | grep \.js | wc -l)
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep \.js | wc -l)
     - echo $JS_FILES_MODIFIED
     - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
   script:
@@ -468,7 +468,7 @@ test-rust-beta:
   image: ethcore/rust:beta
   before_script:
     - git submodule update --init --recursive
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF $CI_BUILD_REF@{1} | grep \.js | wc -l)
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep \.js | wc -l)
     - echo $JS_FILES_MODIFIED
     - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
   script:
@@ -486,7 +486,7 @@ test-rust-nightly:
   image: ethcore/rust:nightly
   before_script:
     - git submodule update --init --recursive
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF $CI_BUILD_REF@{1} | grep \.js | wc -l)
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep \.js | wc -l)
     - echo $JS_FILES_MODIFIED
     - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
   script:

From 6d6a2a8f1b544bdca0eda9d3949e35113af21e1c Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 24 Nov 2016 14:59:45 +0700
Subject: [PATCH 12/34] Update gitlab-ci

[ci skip]
small fix in S# windows
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9f7295f0..bbd529cf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -401,9 +401,9 @@ windows:
     - aws configure set aws_access_key_id %s3_key%
     - aws configure set aws_secret_access_key %s3_secret%
     - echo %CI_BUILD_REF_NAME%
-    - if %CI_BUILD_REF_NAME% == "master" set S3_BUCKET=builds-parity-published else (set S3_BUCKET=parity-builds)
-    - if %CI_BUILD_REF_NAME% == "beta" set S3_BUCKET=builds-parity-published else (set S3_BUCKET=parity-builds)
-    - if %CI_BUILD_REF_NAME% == "stable" set S3_BUCKET=builds-parity-published else (set S3_BUCKET=parity-builds)
+    - cmd if %CI_BUILD_REF_NAME% == "master" set S3_BUCKET=builds-parity-published else (set S3_BUCKET=parity-builds)
+    - cmd if %CI_BUILD_REF_NAME% == "beta" set S3_BUCKET=builds-parity-published else (set S3_BUCKET=parity-builds)
+    - cmd if %CI_BUILD_REF_NAME% == "stable" set S3_BUCKET=builds-parity-published else (set S3_BUCKET=parity-builds)
     - echo %S3_BUCKET%
     - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
     - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe

From 4dc24c9e876a1bfcc1469f66a7e4d2bfc23898ec Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 24 Nov 2016 17:37:42 +0700
Subject: [PATCH 13/34] Update gitlab-ci

[ci skip]
fix S3_BUCKET in Windows build
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbd529cf0..26d1da1d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -401,9 +401,9 @@ windows:
     - aws configure set aws_access_key_id %s3_key%
     - aws configure set aws_secret_access_key %s3_secret%
     - echo %CI_BUILD_REF_NAME%
-    - cmd if %CI_BUILD_REF_NAME% == "master" set S3_BUCKET=builds-parity-published else (set S3_BUCKET=parity-builds)
-    - cmd if %CI_BUILD_REF_NAME% == "beta" set S3_BUCKET=builds-parity-published else (set S3_BUCKET=parity-builds)
-    - cmd if %CI_BUILD_REF_NAME% == "stable" set S3_BUCKET=builds-parity-published else (set S3_BUCKET=parity-builds)
+    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=parity-builds
+    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=parity-builds
+    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=parity-builds
     - echo %S3_BUCKET%
     - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
     - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe

From 30526da0945619395f6b405221788d04a4de7141 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Thu, 24 Nov 2016 11:46:27 +0100
Subject: [PATCH 14/34] Allow forms, allow target=_blank

---
 js/src/views/Dapp/dapp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/views/Dapp/dapp.js b/js/src/views/Dapp/dapp.js
index 399d7b125..a4be4644e 100644
--- a/js/src/views/Dapp/dapp.js
+++ b/js/src/views/Dapp/dapp.js
@@ -63,7 +63,7 @@ export default class Dapp extends Component {
         className={ styles.frame }
         frameBorder={ 0 }
         name={ name }
-        sandbox='allow-same-origin allow-scripts'
+        sandbox='allow-forms allow-popups allow-same-origin allow-scripts'
         scrolling='auto'
         src={ src }>
       </iframe>

From 54ad70313c7dd606b3562050cb4a76569c454b26 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Thu, 24 Nov 2016 18:36:02 +0700
Subject: [PATCH 15/34] Update gitlab-ci

close https://github.com/ethcore/parity/issues/3515
---
 .gitlab-ci.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26d1da1d0..8df41550c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ linux-stable:
     - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=parity-builds; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
@@ -98,7 +98,7 @@ linux-centos:
     - md5sum target/release/parity > parity.md5
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=parity-builds; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity.md5 --body parity.md5
@@ -130,7 +130,7 @@ linux-i686:
     - md5sum "parity_"$VER"_i386.deb" > "parity_"$VER"_i386.deb.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=parity-builds; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/i686-unknown-linux-gnu
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/parity --body target/i686-unknown-linux-gnu/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/parity.md5 --body parity.md5
@@ -172,7 +172,7 @@ linux-armv7:
     - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=parity-builds; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity --body target/armv7-unknown-linux-gnueabihf/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity.md5 --body parity.md5
@@ -214,7 +214,7 @@ linux-arm:
     - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=parity-builds; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity --body target/arm-unknown-linux-gnueabihf/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity.md5 --body parity.md5
@@ -251,7 +251,7 @@ linux-armv6:
     - md5sum target/arm-unknown-linux-gnueabi/release/parity > parity.md5
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=parity-builds; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity --body target/arm-unknown-linux-gnueabi/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity.md5 --body parity.md5
@@ -291,7 +291,7 @@ linux-aarch64:
     - md5sum "parity_"$VER"_arm64.deb" > "parity_"$VER"_arm64.deb.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=parity-builds; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity --body target/aarch64-unknown-linux-gnu/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity.md5 --body parity.md5
@@ -326,7 +326,7 @@ linux-aarch64:
 #    - md5sum "parity_"$VER"_arm64.deb" > "parity_"$VER"_arm64.deb.md5"
 #    - aws configure set aws_access_key_id $s3_key
 #    - aws configure set aws_secret_access_key $s3_secret
-#    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=parity-builds; fi
+#    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
 #    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu
 #    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity --body target/aarch64-unknown-linux-gnu/release/parity
 #    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity.md5 --body parity.md5
@@ -353,7 +353,7 @@ darwin:
     - md5sum target/release/parity > parity.md5
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=parity-builds; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-apple-darwin
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity --body target/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity.md5 --body parity.md5
@@ -401,9 +401,9 @@ windows:
     - aws configure set aws_access_key_id %s3_key%
     - aws configure set aws_secret_access_key %s3_secret%
     - echo %CI_BUILD_REF_NAME%
-    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=parity-builds
-    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=parity-builds
-    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=parity-builds
+    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
     - echo %S3_BUCKET%
     - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
     - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe

From 67771f39de9c5b860851c4020f0dc1be7d372e59 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Thu, 24 Nov 2016 14:56:39 +0100
Subject: [PATCH 16/34] Trim whitespace from recovery phrase

---
 .../RecoveryPhrase/recoveryPhrase.js          | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
index 9feaa4d2c..ffa90ef27 100644
--- a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
+++ b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
@@ -54,8 +54,6 @@ export default class RecoveryPhrase extends Component {
         <Input
           hint='the account recovery phrase'
           label='account recovery phrase'
-          multiLine
-          rows={ 1 }
           value={ recoveryPhrase }
           onChange={ this.onEditPhrase } />
         <Input
@@ -112,17 +110,23 @@ export default class RecoveryPhrase extends Component {
   }
 
   onEditPhrase = (event) => {
-    const value = event.target.value;
-    let error = null;
+    const recoveryPhrase = event.target.value
+      .toLowerCase() // wordlists are lowercase
+      .trim() // remove whitespace at both ends
+      .replace(/\s/g, ' ') // replace any whitespace with single space
+      .replace(/ +/g, ' '); // replace multiple spaces with a single space
 
-    if (!value || value.trim().length < 25) {
-      error = ERRORS.noPhrase;
+    const parts = recoveryPhrase.split(' ');
+    let recoveryPhraseError = null;
+
+    if (!recoveryPhrase || recoveryPhrase.length < 25 || parts.length < 8) {
+      recoveryPhraseError = ERRORS.noPhrase;
     }
 
     this.setState({
-      recoveryPhrase: value,
-      recoveryPhraseError: error,
-      isValidPhrase: !error
+      recoveryPhrase,
+      recoveryPhraseError,
+      isValidPhrase: !recoveryPhraseError
     }, this.updateParent);
   }
 

From aa52c72bda9e75030901f22c2f868f09a599eba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Thu, 24 Nov 2016 15:05:52 +0100
Subject: [PATCH 17/34] Traces for genesis are always present.

---
 ethcore/src/trace/db.rs               | 117 +++++++++++++++++---------
 ethcore/src/types/trace_types/flat.rs |   2 +-
 2 files changed, 76 insertions(+), 43 deletions(-)

diff --git a/ethcore/src/trace/db.rs b/ethcore/src/trace/db.rs
index 6a1b55a1b..14129d4d9 100644
--- a/ethcore/src/trace/db.rs
+++ b/ethcore/src/trace/db.rs
@@ -128,6 +128,9 @@ impl<T> TraceDB<T> where T: DatabaseExtras {
 	/// Creates new instance of `TraceDB`.
 	pub fn new(config: Config, tracesdb: Arc<Database>, extras: Arc<T>) -> Self {
 		let mut batch = DBTransaction::new(&tracesdb);
+		let genesis = extras.block_hash(0)
+			.expect("Genesis block is always inserted upon extras db creation qed");
+		batch.write(db::COL_TRACE, &genesis, &FlatBlockTraces::default());
 		batch.put(db::COL_TRACE, b"version", TRACE_DB_VER);
 		tracesdb.write(batch).expect("failed to update version");
 
@@ -413,8 +416,12 @@ mod tests {
 	struct NoopExtras;
 
 	impl DatabaseExtras for NoopExtras {
-		fn block_hash(&self, _block_number: BlockNumber) -> Option<H256> {
-			unimplemented!();
+		fn block_hash(&self, block_number: BlockNumber) -> Option<H256> {
+			if block_number == 0 {
+				Some(H256::default())
+			} else {
+				unimplemented!()
+			}
 		}
 
 		fn transaction_hash(&self, _block_number: BlockNumber, _tx_position: usize) -> Option<H256> {
@@ -581,35 +588,21 @@ mod tests {
 		let db = Arc::new(Database::open(&DatabaseConfig::with_columns(::db::NUM_COLUMNS), temp.as_str()).unwrap());
 		let mut config = Config::default();
 		config.enabled = true;
-		let block_0 = H256::from(0xa1);
-		let block_1 = H256::from(0xa2);
-		let tx_0 = H256::from(0xff);
-		let tx_1 = H256::from(0xaf);
+		let block_1 = H256::from(0xa1);
+		let block_2 = H256::from(0xa2);
+		let tx_1 = H256::from(0xff);
+		let tx_2 = H256::from(0xaf);
 
 		let mut extras = Extras::default();
-		extras.block_hashes.insert(0, block_0.clone());
+		extras.block_hashes.insert(0, H256::default());
+
 		extras.block_hashes.insert(1, block_1.clone());
-		extras.transaction_hashes.insert(0, vec![tx_0.clone()]);
+		extras.block_hashes.insert(2, block_2.clone());
 		extras.transaction_hashes.insert(1, vec![tx_1.clone()]);
+		extras.transaction_hashes.insert(2, vec![tx_2.clone()]);
 
 		let tracedb = TraceDB::new(config, db.clone(), Arc::new(extras));
 
-		// import block 0
-		let request = create_simple_import_request(0, block_0.clone());
-		let mut batch = DBTransaction::new(&db);
-		tracedb.import(&mut batch, request);
-		db.write(batch).unwrap();
-
-		let filter = Filter {
-			range: (0..0),
-			from_address: AddressesFilter::from(vec![Address::from(1)]),
-			to_address: AddressesFilter::from(vec![]),
-		};
-
-		let traces = tracedb.filter(&filter);
-		assert_eq!(traces.len(), 1);
-		assert_eq!(traces[0], create_simple_localized_trace(0, block_0.clone(), tx_0.clone()));
-
 		// import block 1
 		let request = create_simple_import_request(1, block_1.clone());
 		let mut batch = DBTransaction::new(&db);
@@ -617,38 +610,56 @@ mod tests {
 		db.write(batch).unwrap();
 
 		let filter = Filter {
-			range: (0..1),
+			range: (1..1),
+			from_address: AddressesFilter::from(vec![Address::from(1)]),
+			to_address: AddressesFilter::from(vec![]),
+		};
+
+		let traces = tracedb.filter(&filter);
+		assert_eq!(traces.len(), 1);
+		assert_eq!(traces[0], create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));
+
+		// import block 2
+		let request = create_simple_import_request(2, block_2.clone());
+		let mut batch = DBTransaction::new(&db);
+		tracedb.import(&mut batch, request);
+		db.write(batch).unwrap();
+
+		let filter = Filter {
+			range: (1..2),
 			from_address: AddressesFilter::from(vec![Address::from(1)]),
 			to_address: AddressesFilter::from(vec![]),
 		};
 
 		let traces = tracedb.filter(&filter);
 		assert_eq!(traces.len(), 2);
-		assert_eq!(traces[0], create_simple_localized_trace(0, block_0.clone(), tx_0.clone()));
-		assert_eq!(traces[1], create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));
+		assert_eq!(traces[0], create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));
+		assert_eq!(traces[1], create_simple_localized_trace(2, block_2.clone(), tx_2.clone()));
 
-		let traces = tracedb.block_traces(0).unwrap();
-		assert_eq!(traces.len(), 1);
-		assert_eq!(traces[0], create_simple_localized_trace(0, block_0.clone(), tx_0.clone()));
+		assert!(tracedb.block_traces(0).is_some(), "Genesis trace should be always present.");
 
 		let traces = tracedb.block_traces(1).unwrap();
 		assert_eq!(traces.len(), 1);
 		assert_eq!(traces[0], create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));
 
-		assert_eq!(None, tracedb.block_traces(2));
-
-		let traces = tracedb.transaction_traces(0, 0).unwrap();
+		let traces = tracedb.block_traces(2).unwrap();
 		assert_eq!(traces.len(), 1);
-		assert_eq!(traces[0], create_simple_localized_trace(0, block_0.clone(), tx_0.clone()));
+		assert_eq!(traces[0], create_simple_localized_trace(2, block_2.clone(), tx_2.clone()));
+
+		assert_eq!(None, tracedb.block_traces(3));
 
 		let traces = tracedb.transaction_traces(1, 0).unwrap();
 		assert_eq!(traces.len(), 1);
 		assert_eq!(traces[0], create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));
 
-		assert_eq!(None, tracedb.transaction_traces(1, 1));
+		let traces = tracedb.transaction_traces(2, 0).unwrap();
+		assert_eq!(traces.len(), 1);
+		assert_eq!(traces[0], create_simple_localized_trace(2, block_2.clone(), tx_2.clone()));
+
+		assert_eq!(None, tracedb.transaction_traces(2, 1));
 
-		assert_eq!(tracedb.trace(0, 0, vec![]).unwrap(), create_simple_localized_trace(0, block_0.clone(), tx_0.clone()));
 		assert_eq!(tracedb.trace(1, 0, vec![]).unwrap(), create_simple_localized_trace(1, block_1.clone(), tx_1.clone()));
+		assert_eq!(tracedb.trace(2, 0, vec![]).unwrap(), create_simple_localized_trace(2, block_2.clone(), tx_2.clone()));
 	}
 
 	#[test]
@@ -660,8 +671,10 @@ mod tests {
 		let block_0 = H256::from(0xa1);
 		let tx_0 = H256::from(0xff);
 
-		extras.block_hashes.insert(0, block_0.clone());
-		extras.transaction_hashes.insert(0, vec![tx_0.clone()]);
+		extras.block_hashes.insert(0, H256::default());
+		extras.transaction_hashes.insert(0, vec![]);
+		extras.block_hashes.insert(1, block_0.clone());
+		extras.transaction_hashes.insert(1, vec![tx_0.clone()]);
 
 		// set tracing on
 		config.enabled = true;
@@ -669,8 +682,8 @@ mod tests {
 		{
 			let tracedb = TraceDB::new(config.clone(), db.clone(), Arc::new(extras.clone()));
 
-			// import block 0
-			let request = create_simple_import_request(0, block_0.clone());
+			// import block 1
+			let request = create_simple_import_request(1, block_0.clone());
 			let mut batch = DBTransaction::new(&db);
 			tracedb.import(&mut batch, request);
 			db.write(batch).unwrap();
@@ -678,8 +691,28 @@ mod tests {
 
 		{
 			let tracedb = TraceDB::new(config.clone(), db.clone(), Arc::new(extras));
-			let traces = tracedb.transaction_traces(0, 0);
-			assert_eq!(traces.unwrap(), vec![create_simple_localized_trace(0, block_0, tx_0)]);
+			let traces = tracedb.transaction_traces(1, 0);
+			assert_eq!(traces.unwrap(), vec![create_simple_localized_trace(1, block_0, tx_0)]);
 		}
 	}
+
+	#[test]
+	fn query_genesis() {
+		let temp = RandomTempPath::new();
+		let db = new_db(temp.as_str());
+		let mut config = Config::default();
+		let mut extras = Extras::default();
+		let block_0 = H256::from(0xa1);
+
+		extras.block_hashes.insert(0, block_0.clone());
+		extras.transaction_hashes.insert(0, vec![]);
+
+		// set tracing on
+		config.enabled = true;
+
+		let tracedb = TraceDB::new(config.clone(), db.clone(), Arc::new(extras.clone()));
+		let traces = tracedb.block_traces(0).unwrap();
+
+		assert_eq!(traces.len(), 0);
+	}
 }
diff --git a/ethcore/src/types/trace_types/flat.rs b/ethcore/src/types/trace_types/flat.rs
index 58983558d..d0c7cbe9b 100644
--- a/ethcore/src/types/trace_types/flat.rs
+++ b/ethcore/src/types/trace_types/flat.rs
@@ -119,7 +119,7 @@ impl Into<Vec<FlatTrace>> for FlatTransactionTraces {
 }
 
 /// Represents all traces produced by transactions in a single block.
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Default)]
 pub struct FlatBlockTraces(Vec<FlatTransactionTraces>);
 
 impl HeapSizeOf for FlatBlockTraces {

From 6b9b31ad37468a1edeb8ee229094e3c2861e0e30 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Thu, 24 Nov 2016 15:46:25 +0100
Subject: [PATCH 18/34] check for network ID for live/test matching

---
 js/src/redux/providers/status.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js
index 2153d1ddf..cedf62d89 100644
--- a/js/src/redux/providers/status.js
+++ b/js/src/redux/providers/status.js
@@ -242,6 +242,7 @@ export default class Status {
     Promise
       .all([
         this._api.web3.clientVersion(),
+        this._api.net.version(),
         this._api.parity.defaultExtraData(),
         this._api.parity.netChain(),
         this._api.parity.netPort(),
@@ -249,9 +250,11 @@ export default class Status {
         newConnection ? Promise.resolve(null) : this._api.parity.enode()
       ])
       .then(([
-        clientVersion, defaultExtraData, netChain, netPort, rpcSettings, enode
+        clientVersion, netVersion, defaultExtraData, netChain, netPort, rpcSettings, enode
       ]) => {
-        const isTest = netChain === 'morden' || netChain === 'ropsten' || netChain === 'testnet';
+        const isTest =
+          netVersion === '2' || // morden
+          netVersion === '3'; // ropsten
 
         const longStatus = {
           clientVersion,

From 905d0c0b433158657a34a6f0474ed6a4babcf09e Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Thu, 24 Nov 2016 15:50:50 +0000
Subject: [PATCH 19/34] [ci skip] js-precompiled 20161124-154751

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aa636c8ec..c29056f49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1263,7 +1263,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#55687884fd6bee1a9c34c518f8c8db8ecdda85d3"
+source = "git+https://github.com/ethcore/js-precompiled.git#bed8cd5ea70b002300ed934f77f6fa3812fb380a"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 490ec7bb1..f71ddfc1c 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.69",
+  "version": "0.2.70",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From fa1343e8af3562022fbf1ea2eead11c5a7bf2009 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 24 Nov 2016 17:17:08 +0100
Subject: [PATCH 20/34] align copy button to input field

---
 js/src/ui/Form/Input/input.css |  2 +-
 js/src/ui/Form/Input/input.js  | 22 ++--------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/js/src/ui/Form/Input/input.css b/js/src/ui/Form/Input/input.css
index bc7cfb840..b4d535eb9 100644
--- a/js/src/ui/Form/Input/input.css
+++ b/js/src/ui/Form/Input/input.css
@@ -18,7 +18,7 @@
 .container {
   display: flex;
   flex-direction: row;
-  align-items: flex-end;
+  align-items: baseline;
   position: relative;
 }
 
diff --git a/js/src/ui/Form/Input/input.js b/js/src/ui/Form/Input/input.js
index 4dee227c6..e48ab63ff 100644
--- a/js/src/ui/Form/Input/input.js
+++ b/js/src/ui/Form/Input/input.js
@@ -144,35 +144,17 @@ export default class Input extends Component {
   }
 
   renderCopyButton () {
-    const { allowCopy, label, hint, floatCopy } = this.props;
+    const { allowCopy, hideUnderline } = this.props;
     const { value } = this.state;
 
     if (!allowCopy) {
       return null;
     }
-
-    const style = {
-      marginBottom: 13
-    };
-
     const text = typeof allowCopy === 'string'
       ? allowCopy
       : value;
 
-    if (!label) {
-      style.marginBottom = 2;
-    } else if (label && !hint) {
-      style.marginBottom = 4;
-    } else if (label && hint) {
-      style.marginBottom = 10;
-    }
-
-    if (floatCopy) {
-      style.position = 'absolute';
-      style.left = -24;
-      style.bottom = style.marginBottom;
-      style.marginBottom = 0;
-    }
+    const style = hideUnderline ? {} : { position: 'relative', top: '2px' };
 
     return (
       <div className={ styles.copy } style={ style }>

From 51afc3afbe2624196636fc13da33ce6a26d2be37 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Thu, 24 Nov 2016 16:40:11 +0000
Subject: [PATCH 21/34] [ci skip] js-precompiled 20161124-163141

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c29056f49..6253e35b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1263,7 +1263,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#bed8cd5ea70b002300ed934f77f6fa3812fb380a"
+source = "git+https://github.com/ethcore/js-precompiled.git#b415b2fb0d87c355fca8aa0f88898c5db7089c8e"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index f71ddfc1c..0790d80d7 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.70",
+  "version": "0.2.71",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 815cdc6ba1f94139563afa9e3d5816e4e152f56f Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Thu, 24 Nov 2016 16:50:27 +0000
Subject: [PATCH 22/34] [ci skip] js-precompiled 20161124-164849

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6253e35b7..d39822691 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1263,7 +1263,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#b415b2fb0d87c355fca8aa0f88898c5db7089c8e"
+source = "git+https://github.com/ethcore/js-precompiled.git#613917280fb18d283f519988f00f7f89c96c576f"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 0790d80d7..032be8f4b 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.71",
+  "version": "0.2.72",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 2d79eee454cc541cb5540f459a3aa61db037ecc4 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Fri, 25 Nov 2016 04:10:37 +0700
Subject: [PATCH 23/34] Update gitlab-ci

[ci skip]
add darwin installer in master
---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8df41550c..8a20c44ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -348,15 +348,22 @@ darwin:
     - stable
     - triggers
   script:
+    - cargo build --release -p ethstore $CARGOFLAGS
     - cargo build --release $CARGOFLAGS
     - rm -rf parity.md5
     - md5sum target/release/parity > parity.md5
+    - packagesbuild -v mac/Parity.pkgproj
+    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
+    - mv target/release/Parity\ Ethereum.pkg "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg"
+    - md5sum "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg" >> "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5"
     - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
     - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
     - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-apple-darwin
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity --body target/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/"parity-"$VER"-osx-installer-EXPERIMENTAL.pkg" --body "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/"parity-$VER"-osx-installer-EXPERIMENTAL.pkg.md5" --body "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5"
   tags:
     - osx
   artifacts:

From 30c3b1351857b4d4c10e81dc3add1246d7eee133 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Fri, 25 Nov 2016 06:10:36 +0700
Subject: [PATCH 24/34] Update gitlab-ci

https://github.com/ethcore/parity/issues/3185
---
 .gitlab-ci.yml | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a20c44ad..7db272840 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -363,7 +363,7 @@ darwin:
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity --body target/release/parity
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity.md5 --body parity.md5
     - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/"parity-"$VER"-osx-installer-EXPERIMENTAL.pkg" --body "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/"parity-$VER"-osx-installer-EXPERIMENTAL.pkg.md5" --body "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/"parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5" --body "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5"
   tags:
     - osx
   artifacts:
@@ -460,11 +460,11 @@ test-rust-stable:
     - git submodule update --init --recursive
     - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep \.js | wc -l)
     - echo $JS_FILES_MODIFIED
-    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
+    - if [ "$JS_FILES_MODIFIED" = 0  ]; then echo "skip js test"; else ./js/scripts/install-deps.sh;fi
   script:
     - export RUST_BACKTRACE=1
     - echo $JS_FILES_MODIFIED
-    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; else ./test.sh $CARGOFLAGS --no-release; fi
+    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; else echo "skip js test"./test.sh $CARGOFLAGS --no-release; fi
   tags:
     - rust
     - rust-stable
@@ -477,11 +477,11 @@ test-rust-beta:
     - git submodule update --init --recursive
     - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep \.js | wc -l)
     - echo $JS_FILES_MODIFIED
-    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
+    - if [ "$JS_FILES_MODIFIED" = 0  ]; then echo "skip js test"; else ./js/scripts/install-deps.sh;fi
   script:
     - export RUST_BACKTRACE=1
     - echo $JS_FILES_MODIFIED
-    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; else ./test.sh $CARGOFLAGS --no-release; fi
+    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; else echo "skip js test"./test.sh $CARGOFLAGS --no-release; fi
   tags:
     - rust
     - rust-beta
@@ -495,26 +495,15 @@ test-rust-nightly:
     - git submodule update --init --recursive
     - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep \.js | wc -l)
     - echo $JS_FILES_MODIFIED
-    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
+    - if [ "$JS_FILES_MODIFIED" = 0  ]; then echo "skip js test"; else ./js/scripts/install-deps.sh;fi
   script:
     - export RUST_BACKTRACE=1
     - echo $JS_FILES_MODIFIED
-    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; else ./test.sh $CARGOFLAGS --no-release; fi
+    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; else echo "skip js test"./test.sh $CARGOFLAGS --no-release; fi
   tags:
     - rust
     - rust-nightly
   allow_failure: true
-js-tests:
-  stage: test
-  image: ethcore/rust:stable
-  before_script:
-    - ./js/scripts/install-deps.sh
-  script:
-    - ./js/scripts/lint.sh
-    - ./js/scripts/test.sh
-    - ./js/scripts/build.sh
-  tags:
-    - javascript-test
 js-release:
   stage: js-build
   only:

From 4d9492a01d022c692cab2d7502d4271d1fc87eb7 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Thu, 24 Nov 2016 23:16:52 +0000
Subject: [PATCH 25/34] [ci skip] js-precompiled 20161124-231507

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d39822691..809e5a07a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1263,7 +1263,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#613917280fb18d283f519988f00f7f89c96c576f"
+source = "git+https://github.com/ethcore/js-precompiled.git#f1de5e5612d8237143b37aebf237a49475c2c4e6"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 032be8f4b..6d8c37165 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.72",
+  "version": "0.2.73",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 202739689d1fea840fc93dbdcf2534212b6465db Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Fri, 25 Nov 2016 06:27:07 +0700
Subject: [PATCH 26/34] Update gitlab-ci

small fix for test's and js-build
---
 .gitlab-ci.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7db272840..4ef73461d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -464,7 +464,7 @@ test-rust-stable:
   script:
     - export RUST_BACKTRACE=1
     - echo $JS_FILES_MODIFIED
-    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; else echo "skip js test"./test.sh $CARGOFLAGS --no-release; fi
+    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js test"&./test.sh $CARGOFLAGS --no-release; echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; fi
   tags:
     - rust
     - rust-stable
@@ -481,7 +481,7 @@ test-rust-beta:
   script:
     - export RUST_BACKTRACE=1
     - echo $JS_FILES_MODIFIED
-    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; else echo "skip js test"./test.sh $CARGOFLAGS --no-release; fi
+    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js test"&./test.sh $CARGOFLAGS --no-release; echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; fi
   tags:
     - rust
     - rust-beta
@@ -499,7 +499,7 @@ test-rust-nightly:
   script:
     - export RUST_BACKTRACE=1
     - echo $JS_FILES_MODIFIED
-    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; else echo "skip js test"./test.sh $CARGOFLAGS --no-release; fi
+    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js test"&./test.sh $CARGOFLAGS --no-release; echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; fi
   tags:
     - rust
     - rust-nightly
@@ -512,9 +512,11 @@ js-release:
     - stable
   image: ethcore/rust:stable
   before_script:
-    - if [[ $NIGHTLY != "master" ]]; then ./js/scripts/install-deps.sh; fi
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep \.js | wc -l)
+    - echo $JS_FILES_MODIFIED
+    - if [ "$JS_FILES_MODIFIED" = 0  ]; then echo "skip js build"; else ./js/scripts/install-deps.sh;fi
   script:
-    - if [[ $NIGHTLY != "master" ]]; then ./js/scripts/build.sh; fi
-    - if [[ $NIGHTLY != "master" ]]; then ./js/scripts/release.sh; fi
+    - echo $JS_FILES_MODIFIED
+    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js build"; else ./js/scripts/build.sh&./js/scripts/release.sh; fi
   tags:
     - javascript

From 86522c8f71e15797e06758c6989fe4f5bd668a35 Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Fri, 25 Nov 2016 07:02:54 +0700
Subject: [PATCH 27/34] Update gitlab-ci

if fix
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ef73461d..366b89d20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -464,7 +464,7 @@ test-rust-stable:
   script:
     - export RUST_BACKTRACE=1
     - echo $JS_FILES_MODIFIED
-    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js test"&./test.sh $CARGOFLAGS --no-release; echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; fi
+    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js test"&./test.sh $CARGOFLAGS --no-release; else echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; fi
   tags:
     - rust
     - rust-stable
@@ -481,7 +481,7 @@ test-rust-beta:
   script:
     - export RUST_BACKTRACE=1
     - echo $JS_FILES_MODIFIED
-    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js test"&./test.sh $CARGOFLAGS --no-release; echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; fi
+    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js test"&./test.sh $CARGOFLAGS --no-release; else echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; fi
   tags:
     - rust
     - rust-beta
@@ -499,7 +499,7 @@ test-rust-nightly:
   script:
     - export RUST_BACKTRACE=1
     - echo $JS_FILES_MODIFIED
-    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js test"&./test.sh $CARGOFLAGS --no-release; echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; fi
+    - if [ "$JS_FILES_MODIFIED" = 0 ]; then echo "skip js test"&./test.sh $CARGOFLAGS --no-release; else echo "skip rust test"&./js/scripts/lint.sh&./js/scripts/test.sh&./js/scripts/build.sh; fi
   tags:
     - rust
     - rust-nightly

From 686978fa974dfd73cf050705cf7a05b247c7e928 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Fri, 25 Nov 2016 11:36:32 +0000
Subject: [PATCH 28/34] [ci skip] js-precompiled 20161125-113155

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 809e5a07a..62ef5ea11 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1263,7 +1263,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#f1de5e5612d8237143b37aebf237a49475c2c4e6"
+source = "git+https://github.com/ethcore/js-precompiled.git#7cb42b0c636f76eb478c9270a1e507ac3c3ba434"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 6d8c37165..12b0cd9c6 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.73",
+  "version": "0.2.74",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 0e2cd1d0803d023173b42e4203cbad5fde7c6ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Fri, 25 Nov 2016 12:59:15 +0100
Subject: [PATCH 29/34] Fixing phrases generated on windows (#3614)

---
 ethstore/src/random.rs | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/ethstore/src/random.rs b/ethstore/src/random.rs
index 1d050e422..954ec500f 100644
--- a/ethstore/src/random.rs
+++ b/ethstore/src/random.rs
@@ -47,7 +47,7 @@ impl Random for [u8; 32] {
 pub fn random_phrase(words: usize) -> String {
 	lazy_static! {
 		static ref WORDS: Vec<String> = String::from_utf8_lossy(include_bytes!("../res/wordlist.txt"))
-			.split("\n")
+			.lines()
 			.map(|s| s.to_owned())
 			.collect();
 	}
@@ -55,8 +55,19 @@ pub fn random_phrase(words: usize) -> String {
 	(0..words).map(|_| rng.choose(&WORDS).unwrap()).join(" ")
 }
 
-#[test]
-fn should_produce_right_number_of_words() {
-	let p = random_phrase(10);
-	assert_eq!(p.split(" ").count(), 10);
-}
\ No newline at end of file
+#[cfg(test)]
+mod tests {
+	use super::random_phrase;
+
+	#[test]
+	fn should_produce_right_number_of_words() {
+		let p = random_phrase(10);
+		assert_eq!(p.split(" ").count(), 10);
+	}
+
+	#[test]
+	fn should_not_include_carriage_return() {
+		let p = random_phrase(10);
+		assert!(!p.contains('\r'), "Carriage return should be trimmed.");
+	}
+}

From d0312b89ad9109f21167936ce5644696032f6724 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Fri, 25 Nov 2016 13:03:15 +0100
Subject: [PATCH 30/34] Update test, fix number. (#3612)

---
 ethcore/res/ethereum/tests            | 2 +-
 ethcore/src/json_tests/transaction.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests
index 9028c4801..e8f4624b7 160000
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@@ -1 +1 @@
-Subproject commit 9028c4801fd39fbb71a9796979182549a24e81c8
+Subproject commit e8f4624b7f1a15c63674eecf577c7ab76c3b16be
diff --git a/ethcore/src/json_tests/transaction.rs b/ethcore/src/json_tests/transaction.rs
index 438852124..12e82bca2 100644
--- a/ethcore/src/json_tests/transaction.rs
+++ b/ethcore/src/json_tests/transaction.rs
@@ -34,7 +34,7 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
 			Some(x) if x < 1_150_000 => &old_schedule,
 			Some(_) => &new_schedule
 		};
-		let allow_network_id_of_one = number.map_or(false, |n| n >= 3_500_000); 
+		let allow_network_id_of_one = number.map_or(false, |n| n >= 2_675_000); 
 
 		let rlp: Vec<u8> = test.rlp.into();
 		let res = UntrustedRlp::new(&rlp)

From 9b9bdaa1b1abaa924eeb7735a17e5392b8bc8a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Fri, 25 Nov 2016 13:04:02 +0100
Subject: [PATCH 31/34] Appending logs by default (#3609)

---
 logger/src/lib.rs    | 9 ++++++---
 parity/cli/usage.txt | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/logger/src/lib.rs b/logger/src/lib.rs
index 7e13f406c..1e1555c7c 100644
--- a/logger/src/lib.rs
+++ b/logger/src/lib.rs
@@ -26,9 +26,8 @@ extern crate time;
 #[macro_use]
 extern crate lazy_static;
 
-use std::{env, thread};
+use std::{env, thread, fs};
 use std::sync::Arc;
-use std::fs::File;
 use std::io::Write;
 use isatty::{stderr_isatty, stdout_isatty};
 use env_logger::LogBuilder;
@@ -80,9 +79,13 @@ pub fn setup_log(config: &Config) -> Result<Arc<RotatingLogger>, String> {
 	let enable_color = config.color && isatty;
 	let logs = Arc::new(RotatingLogger::new(levels));
 	let logger = logs.clone();
+	let mut open_options = fs::OpenOptions::new();
 
 	let maybe_file = match config.file.as_ref() {
-		Some(f) => Some(try!(File::create(f).map_err(|_| format!("Cannot write to log file given: {}", f)))),
+		Some(f) => Some(try!(open_options
+			.append(true).create(true).open(f)
+			.map_err(|_| format!("Cannot write to log file given: {}", f))
+		)),
 		None => None,
 	};
 
diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt
index 97cda74ba..fe0824dfe 100644
--- a/parity/cli/usage.txt
+++ b/parity/cli/usage.txt
@@ -323,7 +323,7 @@ Miscellaneous Options:
   -l --logging LOGGING     Specify the logging level. Must conform to the same
                            format as RUST_LOG. (default: {flag_logging:?})
   --log-file FILENAME      Specify a filename into which logging should be
-                           directed. (default: {flag_log_file:?})
+                           appended. (default: {flag_log_file:?})
   --no-config              Don't load a configuration file.
   --no-color               Don't use terminal color codes in output. (default: {flag_no_color})
   -v --version             Show information about version.

From 08c507daaac26b2643545f9203144b930e630c9d Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Fri, 25 Nov 2016 16:46:35 +0100
Subject: [PATCH 32/34] Smarter balance fetching (#3605)

* Smarter dApps Manifest fetching...

* Fetching only visible accounts (and don't delete other balances) #3590

* Moved balances action into BalancesActions #3590

* Fetch balances for accounts and contracts #3590

* Add balances to contract/address/account views #3590

* Fix transaction not fetching on first load

* Remove console.warn

* Fix pending tokens not showing #3154

* Fix tokens image update

* Remove unused name in Header

* Separate Tokens and ETH fetching #3590

* Remove unused isTest

* Fetch Tokens Balance via Filter #3590

* Fix linting

* Fix updating tokens image (#3590)

* Fix contract balances

* Improved Status

* Fixing secureApi issues...

* Fetch all tokens every 2 minutes (for safety) #3590

* PR changes fix

* Fix Account error
---
 js/src/api/format/input.js                    |  21 +-
 js/src/api/transport/error.js                 |   3 +-
 js/src/api/transport/ws/ws.js                 |  12 +-
 js/src/api/util/format.js                     |  13 +
 js/src/dapps/tokenreg/Status/actions.js       |   2 +-
 js/src/redux/providers/balances.js            | 291 ++++-----------
 js/src/redux/providers/balancesActions.js     | 346 +++++++++++++++++-
 js/src/redux/providers/balancesReducer.js     |  80 +++-
 js/src/redux/providers/imagesActions.js       |   5 +-
 js/src/redux/providers/imagesReducer.js       |   6 +-
 js/src/redux/providers/personalActions.js     |  24 ++
 js/src/redux/providers/personalReducer.js     |  16 +-
 js/src/redux/providers/status.js              |  37 +-
 js/src/redux/providers/statusReducer.js       |   2 +-
 js/src/secureApi.js                           |   8 +-
 js/src/ui/BlockStatus/blockStatus.js          |   2 +-
 js/src/views/Account/Header/header.js         |  43 +--
 .../Account/Transactions/transactions.js      |   6 +
 js/src/views/Account/account.js               |  37 +-
 js/src/views/Accounts/List/list.js            |  14 +-
 js/src/views/Accounts/Summary/summary.js      |   8 +-
 js/src/views/Accounts/accounts.js             |  30 +-
 js/src/views/Address/address.js               |  36 +-
 js/src/views/Addresses/addresses.js           |  32 +-
 js/src/views/Contract/contract.js             |  30 +-
 js/src/views/Contracts/contracts.js           |  32 +-
 js/src/views/Dapps/dappsStore.js              |  17 +
 27 files changed, 798 insertions(+), 355 deletions(-)

diff --git a/js/src/api/format/input.js b/js/src/api/format/input.js
index 55c85e4f3..80f3bc0eb 100644
--- a/js/src/api/format/input.js
+++ b/js/src/api/format/input.js
@@ -15,9 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import BigNumber from 'bignumber.js';
-import { range } from 'lodash';
 
 import { isArray, isHex, isInstanceOf, isString } from '../util/types';
+import { padLeft } from '../util/format';
 
 export function inAddress (address) {
   // TODO: address validation if we have upper-lower addresses
@@ -51,19 +51,20 @@ export function inHash (hash) {
   return inHex(hash);
 }
 
-export function pad (input, length) {
-  const value = inHex(input).substr(2, length * 2);
-  return '0x' + value + range(length * 2 - value.length).map(() => '0').join('');
-}
-
 export function inTopics (_topics) {
   let topics = (_topics || [])
     .filter((topic) => topic === null || topic)
-    .map((topic) => topic === null ? null : pad(topic, 32));
+    .map((topic) => {
+      if (topic === null) {
+        return null;
+      }
 
-  // while (topics.length < 4) {
-  //   topics.push(null);
-  // }
+      if (Array.isArray(topic)) {
+        return inTopics(topic);
+      }
+
+      return padLeft(topic, 32);
+    });
 
   return topics;
 }
diff --git a/js/src/api/transport/error.js b/js/src/api/transport/error.js
index 341839f69..6cb0dac17 100644
--- a/js/src/api/transport/error.js
+++ b/js/src/api/transport/error.js
@@ -36,7 +36,8 @@ export const ERROR_CODES = {
   REQUEST_NOT_FOUND: -32042,
   COMPILATION_ERROR: -32050,
   ENCRYPTION_ERROR: -32055,
-  FETCH_ERROR: -32060
+  FETCH_ERROR: -32060,
+  INVALID_PARAMS: -32602
 };
 
 export default class TransportError extends ExtendableError {
diff --git a/js/src/api/transport/ws/ws.js b/js/src/api/transport/ws/ws.js
index c30c910e6..53600b6d3 100644
--- a/js/src/api/transport/ws/ws.js
+++ b/js/src/api/transport/ws/ws.js
@@ -79,7 +79,7 @@ export default class Ws extends JsonRpcBase {
     this._ws.onclose = this._onClose;
     this._ws.onmessage = this._onMessage;
 
-    // Get counts in dev mode
+    // Get counts in dev mode only
     if (process.env.NODE_ENV === 'development') {
       this._count = 0;
       this._lastCount = {
@@ -93,8 +93,13 @@ export default class Ws extends JsonRpcBase {
         const s = Math.round(1000 * n / t) / 1000;
 
         if (this._debug) {
-          console.log('::parityWS', `speed: ${s} req/s`, `count: ${this._count}`);
+          console.log('::parityWS', `speed: ${s} req/s`, `count: ${this._count}`, `(+${n})`);
         }
+
+        this._lastCount = {
+          timestamp: Date.now(),
+          count: this._count
+        };
       }, 5000);
 
       window._parityWS = this;
@@ -117,6 +122,7 @@ export default class Ws extends JsonRpcBase {
     this._connected = false;
     this._connecting = false;
 
+    event.timestamp = Date.now();
     this._lastError = event;
 
     if (this._autoConnect) {
@@ -144,6 +150,8 @@ export default class Ws extends JsonRpcBase {
     window.setTimeout(() => {
       if (this._connected) {
         console.error('ws:onError', event);
+
+        event.timestamp = Date.now();
         this._lastError = event;
       }
     }, 50);
diff --git a/js/src/api/util/format.js b/js/src/api/util/format.js
index 93f31a161..f1909748d 100644
--- a/js/src/api/util/format.js
+++ b/js/src/api/util/format.js
@@ -14,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import { range } from 'lodash';
+import { inHex } from '../format/input';
+
 export function bytesToHex (bytes) {
   return '0x' + bytes.map((b) => ('0' + b.toString(16)).slice(-2)).join('');
 }
@@ -33,3 +36,13 @@ export function hex2Ascii (_hex) {
 export function asciiToHex (string) {
   return '0x' + string.split('').map((s) => s.charCodeAt(0).toString(16)).join('');
 }
+
+export function padRight (input, length) {
+  const value = inHex(input).substr(2, length * 2);
+  return '0x' + value + range(length * 2 - value.length).map(() => '0').join('');
+}
+
+export function padLeft (input, length) {
+  const value = inHex(input).substr(2, length * 2);
+  return '0x' + range(length * 2 - value.length).map(() => '0').join('') + value;
+}
diff --git a/js/src/dapps/tokenreg/Status/actions.js b/js/src/dapps/tokenreg/Status/actions.js
index b07949a28..027de57af 100644
--- a/js/src/dapps/tokenreg/Status/actions.js
+++ b/js/src/dapps/tokenreg/Status/actions.js
@@ -127,7 +127,7 @@ export const subscribeEvents = () => (dispatch, getState) => {
         const params = log.params;
 
         if (event === 'Registered' && type === 'pending') {
-          return dispatch(setTokenData(params.id.toNumber(), {
+          return dispatch(setTokenData(params.id.value.toNumber(), {
             tla: '...',
             base: -1,
             address: params.addr.value,
diff --git a/js/src/redux/providers/balances.js b/js/src/redux/providers/balances.js
index 9e9c0a481..6b1084934 100644
--- a/js/src/redux/providers/balances.js
+++ b/js/src/redux/providers/balances.js
@@ -16,68 +16,63 @@
 
 import { throttle } from 'lodash';
 
-import { getBalances, getTokens } from './balancesActions';
-import { setAddressImage } from './imagesActions';
+import { loadTokens, setTokenReg, fetchBalances, fetchTokens, fetchTokensBalances } from './balancesActions';
+import { padRight } from '../../api/util/format';
 
 import Contracts from '../../contracts';
-import * as abis from '../../contracts/abi';
-
-import imagesEthereum from '../../../assets/images/contracts/ethereum-black-64x64.png';
-
-const ETH = {
-  name: 'Ethereum',
-  tag: 'ETH',
-  image: imagesEthereum
-};
 
 export default class Balances {
   constructor (store, api) {
     this._api = api;
     this._store = store;
 
-    this._tokens = {};
-    this._images = {};
-
-    this._accountsInfo = null;
-    this._tokenreg = null;
-    this._fetchingBalances = false;
-    this._fetchingTokens = false;
-    this._fetchedTokens = false;
-
     this._tokenregSubId = null;
     this._tokenregMetaSubId = null;
 
     // Throttled `retrieveTokens` function
-    // that gets called max once every 20s
-    this._throttledRetrieveTokens = throttle(
-      this._retrieveTokens,
-      20 * 1000,
+    // that gets called max once every 40s
+    this.longThrottledFetch = throttle(
+      this.fetchBalances,
+      40 * 1000,
+      { trailing: true }
+    );
+
+    this.shortThrottledFetch = throttle(
+      this.fetchBalances,
+      2 * 1000,
+      { trailing: true }
+    );
+
+    // Fetch all tokens every 2 minutes
+    this.throttledTokensFetch = throttle(
+      this.fetchTokens,
+      60 * 1000,
       { trailing: true }
     );
   }
 
   start () {
-    this._subscribeBlockNumber();
-    this._subscribeAccountsInfo();
-    this._retrieveTokens();
+    this.subscribeBlockNumber();
+    this.subscribeAccountsInfo();
+
+    this.loadTokens();
   }
 
-  _subscribeAccountsInfo () {
+  subscribeAccountsInfo () {
     this._api
       .subscribe('parity_accountsInfo', (error, accountsInfo) => {
         if (error) {
           return;
         }
 
-        this._accountsInfo = accountsInfo;
-        this._retrieveTokens();
+        this.fetchBalances();
       })
       .catch((error) => {
         console.warn('_subscribeAccountsInfo', error);
       });
   }
 
-  _subscribeBlockNumber () {
+  subscribeBlockNumber () {
     this._api
       .subscribe('eth_blockNumber', (error) => {
         if (error) {
@@ -86,123 +81,63 @@ export default class Balances {
 
         const { syncing } = this._store.getState().nodeStatus;
 
+        this.throttledTokensFetch();
+
         // If syncing, only retrieve balances once every
         // few seconds
         if (syncing) {
-          return this._throttledRetrieveTokens();
+          this.shortThrottledFetch();
+          return this.longThrottledFetch();
         }
 
-        this._throttledRetrieveTokens.cancel();
-        this._retrieveTokens();
+        this.longThrottledFetch.cancel();
+        return this.shortThrottledFetch();
       })
       .catch((error) => {
         console.warn('_subscribeBlockNumber', error);
       });
   }
 
-  getTokenRegistry () {
-    if (this._tokenreg) {
-      return Promise.resolve(this._tokenreg);
-    }
-
-    return Contracts.get().tokenReg
-      .getContract()
-      .then((tokenreg) => {
-        this._tokenreg = tokenreg;
-        this.attachToTokens();
-
-        return tokenreg;
-      });
+  fetchBalances () {
+    this._store.dispatch(fetchBalances());
   }
 
-  _retrieveTokens () {
-    if (this._fetchingTokens) {
-      return;
-    }
+  fetchTokens () {
+    this._store.dispatch(fetchTokensBalances());
+  }
 
-    if (this._fetchedTokens) {
-      return this._retrieveBalances();
-    }
-
-    this._fetchingTokens = true;
-    this._fetchedTokens = false;
+  getTokenRegistry () {
+    return Contracts.get().tokenReg.getContract();
+  }
 
+  loadTokens () {
     this
       .getTokenRegistry()
       .then((tokenreg) => {
-        return tokenreg.instance.tokenCount
-          .call()
-          .then((numTokens) => {
-            const promises = [];
+        this._store.dispatch(setTokenReg(tokenreg));
+        this._store.dispatch(loadTokens());
 
-            for (let i = 0; i < numTokens.toNumber(); i++) {
-              promises.push(this.fetchTokenInfo(tokenreg, i));
-            }
-
-            return Promise.all(promises);
-          });
-      })
-      .then(() => {
-        this._fetchingTokens = false;
-        this._fetchedTokens = true;
-
-        this._store.dispatch(getTokens(this._tokens));
-        this._retrieveBalances();
+        return this.attachToTokens(tokenreg);
       })
       .catch((error) => {
-        console.warn('balances::_retrieveTokens', error);
+        console.warn('balances::loadTokens', error);
       });
   }
 
-  _retrieveBalances () {
-    if (this._fetchingBalances) {
-      return;
-    }
-
-    if (!this._accountsInfo) {
-      return;
-    }
-
-    this._fetchingBalances = true;
-
-    const addresses = Object
-      .keys(this._accountsInfo)
-      .filter((address) => {
-        const account = this._accountsInfo[address];
-        return !account.meta || !account.meta.deleted;
-      });
-
-    this._balances = {};
-
-    Promise
-      .all(addresses.map((a) => this.fetchAccountBalance(a)))
-      .then((balances) => {
-        addresses.forEach((a, idx) => {
-          this._balances[a] = balances[idx];
-        });
-
-        this._store.dispatch(getBalances(this._balances));
-        this._fetchingBalances = false;
-      })
-      .catch((error) => {
-        console.warn('_retrieveBalances', error);
-        this._fetchingBalances = false;
-      });
+  attachToTokens (tokenreg) {
+    return Promise
+      .all([
+        this.attachToTokenMetaChange(tokenreg),
+        this.attachToNewToken(tokenreg)
+      ]);
   }
 
-  attachToTokens () {
-    this.attachToTokenMetaChange();
-    this.attachToNewToken();
-  }
-
-  attachToNewToken () {
+  attachToNewToken (tokenreg) {
     if (this._tokenregSubId) {
-      return;
+      return Promise.resolve();
     }
 
-    this._tokenreg
-      .instance
-      .Registered
+    return tokenreg.instance.Registered
       .subscribe({
         fromBlock: 0,
         toBlock: 'latest',
@@ -212,138 +147,38 @@ export default class Balances {
           return console.error('balances::attachToNewToken', 'failed to attach to tokenreg Registered', error.toString(), error.stack);
         }
 
-        const promises = logs.map((log) => {
-          const id = log.params.id.value.toNumber();
-          return this.fetchTokenInfo(this._tokenreg, id);
-        });
-
-        return Promise.all(promises);
+        this.handleTokensLogs(logs);
       })
       .then((tokenregSubId) => {
         this._tokenregSubId = tokenregSubId;
-      })
-      .catch((e) => {
-        console.warn('balances::attachToNewToken', e);
       });
   }
 
-  attachToTokenMetaChange () {
+  attachToTokenMetaChange (tokenreg) {
     if (this._tokenregMetaSubId) {
-      return;
+      return Promise.resolve();
     }
 
-    this._tokenreg
-      .instance
-      .MetaChanged
+    return tokenreg.instance.MetaChanged
       .subscribe({
         fromBlock: 0,
         toBlock: 'latest',
-        topics: [ null, this._api.util.asciiToHex('IMG') ],
+        topics: [ null, padRight(this._api.util.asciiToHex('IMG'), 32) ],
         skipInitFetch: true
       }, (error, logs) => {
         if (error) {
           return console.error('balances::attachToTokenMetaChange', 'failed to attach to tokenreg MetaChanged', error.toString(), error.stack);
         }
 
-        // In case multiple logs for same token
-        // in one block. Take the last value.
-        const tokens = logs
-          .filter((log) => log.type === 'mined')
-          .reduce((_tokens, log) => {
-            const id = log.params.id.value.toNumber();
-            const image = log.params.value.value;
-
-            const token = Object.values(this._tokens).find((c) => c.id === id);
-            const { address } = token;
-
-            _tokens[address] = { address, id, image };
-            return _tokens;
-          }, {});
-
-        Object
-          .values(tokens)
-          .forEach((token) => {
-            const { address, image } = token;
-
-            if (this._images[address] !== image.toString()) {
-              this._store.dispatch(setAddressImage(address, image));
-              this._images[address] = image.toString();
-            }
-          });
+        this.handleTokensLogs(logs);
       })
       .then((tokenregMetaSubId) => {
         this._tokenregMetaSubId = tokenregMetaSubId;
-      })
-      .catch((e) => {
-        console.warn('balances::attachToTokenMetaChange', e);
       });
   }
 
-  fetchTokenInfo (tokenreg, tokenId) {
-    return Promise
-      .all([
-        tokenreg.instance.token.call({}, [tokenId]),
-        tokenreg.instance.meta.call({}, [tokenId, 'IMG'])
-      ])
-      .then(([ tokenData, image ]) => {
-        const [ address, tag, format, name ] = tokenData;
-        const contract = this._api.newContract(abis.eip20, address);
-
-        if (this._images[address] !== image.toString()) {
-          this._store.dispatch(setAddressImage(address, image));
-          this._images[address] = image.toString();
-        }
-
-        const token = {
-          format: format.toString(),
-          id: tokenId,
-
-          address,
-          tag,
-          name,
-          contract
-        };
-
-        this._tokens[address] = token;
-
-        return token;
-      })
-      .catch((e) => {
-        console.warn('balances::fetchTokenInfo', `couldn't fetch token #${tokenId}`, e);
-      });
-  }
-
-  /**
-   * TODO?: txCount is only shown on an address page, so we
-   * might not need to fetch it for each address for each block,
-   * but only for one address when the user is on the account
-   * view.
-   */
-  fetchAccountBalance (address) {
-    const _tokens = Object.values(this._tokens);
-    const tokensPromises = _tokens
-      .map((token) => {
-        return token.contract.instance.balanceOf.call({}, [ address ]);
-      });
-
-    return Promise
-      .all([
-        this._api.eth.getTransactionCount(address),
-        this._api.eth.getBalance(address)
-      ].concat(tokensPromises))
-      .then(([ txCount, ethBalance, ...tokensBalance ]) => {
-        const tokens = []
-          .concat(
-            { token: ETH, value: ethBalance },
-            _tokens
-              .map((token, index) => ({
-                token,
-                value: tokensBalance[index]
-              }))
-          );
-
-        const balance = { txCount, tokens };
-        return balance;
-      });
+  handleTokensLogs (logs) {
+    const tokenIds = logs.map((log) => log.params.id.value.toNumber());
+    this._store.dispatch(fetchTokens(tokenIds));
   }
 }
diff --git a/js/src/redux/providers/balancesActions.js b/js/src/redux/providers/balancesActions.js
index 2771c455e..f5d602b73 100644
--- a/js/src/redux/providers/balancesActions.js
+++ b/js/src/redux/providers/balancesActions.js
@@ -14,16 +14,354 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export function getBalances (balances) {
+import { range, uniq, isEqual } from 'lodash';
+
+import { hashToImageUrl } from './imagesReducer';
+import { setAddressImage } from './imagesActions';
+
+import * as ABIS from '../../contracts/abi';
+import imagesEthereum from '../../../assets/images/contracts/ethereum-black-64x64.png';
+
+const ETH = {
+  name: 'Ethereum',
+  tag: 'ETH',
+  image: imagesEthereum
+};
+
+export function setBalances (balances) {
   return {
-    type: 'getBalances',
+    type: 'setBalances',
     balances
   };
 }
 
-export function getTokens (tokens) {
+export function setTokens (tokens) {
   return {
-    type: 'getTokens',
+    type: 'setTokens',
     tokens
   };
 }
+
+export function setTokenReg (tokenreg) {
+  return {
+    type: 'setTokenReg',
+    tokenreg
+  };
+}
+
+export function setTokensFilter (tokensFilter) {
+  return {
+    type: 'setTokensFilter',
+    tokensFilter
+  };
+}
+
+export function setTokenImage (tokenAddress, image) {
+  return {
+    type: 'setTokenImage',
+    tokenAddress, image
+  };
+}
+
+export function loadTokens () {
+  return (dispatch, getState) => {
+    const { tokenreg } = getState().balances;
+
+    return tokenreg.instance.tokenCount
+      .call()
+      .then((numTokens) => {
+        const tokenIds = range(numTokens.toNumber());
+        dispatch(fetchTokens(tokenIds));
+      })
+      .catch((error) => {
+        console.warn('balances::loadTokens', error);
+      });
+  };
+}
+
+export function fetchTokens (_tokenIds) {
+  const tokenIds = uniq(_tokenIds || []);
+  return (dispatch, getState) => {
+    const { api, images, balances } = getState();
+    const { tokenreg } = balances;
+
+    return Promise
+      .all(tokenIds.map((id) => fetchTokenInfo(tokenreg, id, api)))
+      .then((tokens) => {
+        // dispatch only the changed images
+        tokens
+          .forEach((token) => {
+            const { image, address } = token;
+
+            if (images[address] === image) {
+              return;
+            }
+
+            dispatch(setTokenImage(address, image));
+            dispatch(setAddressImage(address, image, true));
+          });
+
+        dispatch(setTokens(tokens));
+        dispatch(fetchBalances());
+      })
+      .catch((error) => {
+        console.warn('balances::fetchTokens', error);
+      });
+  };
+}
+
+export function fetchBalances (_addresses) {
+  return (dispatch, getState) => {
+    const { api, personal } = getState();
+    const { visibleAccounts } = personal;
+
+    const addresses = uniq(_addresses || visibleAccounts || []);
+
+    if (addresses.length === 0) {
+      return Promise.resolve();
+    }
+
+    const fullFetch = addresses.length === 1;
+
+    return Promise
+      .all(addresses.map((addr) => fetchAccount(addr, api, fullFetch)))
+      .then((accountsBalances) => {
+        const balances = {};
+
+        addresses.forEach((addr, idx) => {
+          balances[addr] = accountsBalances[idx];
+        });
+
+        dispatch(setBalances(balances));
+        updateTokensFilter(addresses)(dispatch, getState);
+      })
+      .catch((error) => {
+        console.warn('balances::fetchBalances', error);
+      });
+  };
+}
+
+export function updateTokensFilter (_addresses, _tokens) {
+  return (dispatch, getState) => {
+    const { api, balances, personal } = getState();
+    const { visibleAccounts } = personal;
+    const { tokensFilter } = balances;
+
+    const addresses = uniq(_addresses || visibleAccounts || []).sort();
+    const tokens = _tokens || Object.values(balances.tokens) || [];
+    const tokenAddresses = tokens.map((t) => t.address).sort();
+
+    if (tokensFilter.filterFromId || tokensFilter.filterToId) {
+      const sameTokens = isEqual(tokenAddresses, tokensFilter.tokenAddresses);
+      const sameAddresses = isEqual(addresses, tokensFilter.addresses);
+
+      if (sameTokens && sameAddresses) {
+        return queryTokensFilter(tokensFilter)(dispatch, getState);
+      }
+    }
+
+    let promise = Promise.resolve();
+
+    if (tokensFilter.filterFromId) {
+      promise = promise.then(() => api.eth.uninstallFilter(tokensFilter.filterFromId));
+    }
+
+    if (tokensFilter.filterToId) {
+      promise = promise.then(() => api.eth.uninstallFilter(tokensFilter.filterToId));
+    }
+
+    if (tokenAddresses.length === 0 || addresses.length === 0) {
+      return promise;
+    }
+
+    const TRANSFER_SIGNATURE = api.util.sha3('Transfer(address,address,uint256)');
+    const topicsFrom = [ TRANSFER_SIGNATURE, addresses, null ];
+    const topicsTo = [ TRANSFER_SIGNATURE, null, addresses ];
+
+    const options = {
+      fromBlock: 0,
+      toBlock: 'pending',
+      address: tokenAddresses
+    };
+
+    const optionsFrom = {
+      ...options,
+      topics: topicsFrom
+    };
+
+    const optionsTo = {
+      ...options,
+      topics: topicsTo
+    };
+
+    const newFilters = Promise.all([
+      api.eth.newFilter(optionsFrom),
+      api.eth.newFilter(optionsTo)
+    ]);
+
+    promise
+      .then(() => newFilters)
+      .then(([ filterFromId, filterToId ]) => {
+        const nextTokensFilter = {
+          filterFromId, filterToId,
+          addresses, tokenAddresses
+        };
+
+        dispatch(setTokensFilter(nextTokensFilter));
+        fetchTokensBalances(addresses, tokens)(dispatch, getState);
+      })
+      .catch((error) => {
+        console.warn('balances::updateTokensFilter', error);
+      });
+  };
+}
+
+export function queryTokensFilter (tokensFilter) {
+  return (dispatch, getState) => {
+    const { api, personal, balances } = getState();
+    const { visibleAccounts } = personal;
+    const visibleAddresses = visibleAccounts.map((a) => a.toLowerCase());
+
+    Promise
+      .all([
+        api.eth.getFilterChanges(tokensFilter.filterFromId),
+        api.eth.getFilterChanges(tokensFilter.filterToId)
+      ])
+      .then(([ logsFrom, logsTo ]) => {
+        const addresses = [];
+        const tokenAddresses = [];
+
+        logsFrom
+          .concat(logsTo)
+          .forEach((log) => {
+            const tokenAddress = log.address;
+            const fromAddress = '0x' + log.topics[1].slice(-40);
+            const toAddress = '0x' + log.topics[2].slice(-40);
+
+            const fromIdx = visibleAddresses.indexOf(fromAddress);
+            const toIdx = visibleAddresses.indexOf(toAddress);
+
+            if (fromIdx > -1) {
+              addresses.push(visibleAccounts[fromIdx]);
+            }
+
+            if (toIdx > -1) {
+              addresses.push(visibleAccounts[toIdx]);
+            }
+
+            tokenAddresses.push(tokenAddress);
+          });
+
+        if (addresses.length === 0) {
+          return;
+        }
+
+        const tokens = balances.tokens.filter((t) => tokenAddresses.includes(t.address));
+
+        fetchTokensBalances(uniq(addresses), tokens)(dispatch, getState);
+      });
+  };
+}
+
+export function fetchTokensBalances (_addresses = null, _tokens = null) {
+  return (dispatch, getState) => {
+    const { api, personal, balances } = getState();
+    const { visibleAccounts } = personal;
+
+    const addresses = _addresses || visibleAccounts;
+    const tokens = _tokens || Object.values(balances.tokens);
+
+    if (addresses.length === 0) {
+      return Promise.resolve();
+    }
+
+    return Promise
+      .all(addresses.map((addr) => fetchTokensBalance(addr, tokens, api)))
+      .then((tokensBalances) => {
+        const balances = {};
+
+        addresses.forEach((addr, idx) => {
+          balances[addr] = tokensBalances[idx];
+        });
+
+        dispatch(setBalances(balances));
+      })
+      .catch((error) => {
+        console.warn('balances::fetchTokensBalances', error);
+      });
+  };
+}
+
+function fetchAccount (address, api, full = false) {
+  const promises = [ api.eth.getBalance(address) ];
+
+  if (full) {
+    promises.push(api.eth.getTransactionCount(address));
+  }
+
+  return Promise
+    .all(promises)
+    .then(([ ethBalance, txCount ]) => {
+      const tokens = [ { token: ETH, value: ethBalance } ];
+      const balance = { tokens };
+
+      if (full) {
+        balance.txCount = txCount;
+      }
+
+      return balance;
+    })
+    .catch((error) => {
+      console.warn('balances::fetchAccountBalance', `couldn't fetch balance for account #${address}`, error);
+    });
+}
+
+function fetchTokensBalance (address, _tokens, api) {
+  const tokensPromises = _tokens
+    .map((token) => {
+      return token.contract.instance.balanceOf.call({}, [ address ]);
+    });
+
+  return Promise
+    .all(tokensPromises)
+    .then((tokensBalance) => {
+      const tokens = _tokens
+        .map((token, index) => ({
+          token,
+          value: tokensBalance[index]
+        }));
+
+      const balance = { tokens };
+      return balance;
+    })
+    .catch((error) => {
+      console.warn('balances::fetchTokensBalance', `couldn't fetch tokens balance for account #${address}`, error);
+    });
+}
+
+function fetchTokenInfo (tokenreg, tokenId, api, dispatch) {
+  return Promise
+    .all([
+      tokenreg.instance.token.call({}, [tokenId]),
+      tokenreg.instance.meta.call({}, [tokenId, 'IMG'])
+    ])
+    .then(([ tokenData, image ]) => {
+      const [ address, tag, format, name ] = tokenData;
+      const contract = api.newContract(ABIS.eip20, address);
+
+      const token = {
+        format: format.toString(),
+        id: tokenId,
+        image: hashToImageUrl(image),
+        address,
+        tag,
+        name,
+        contract
+      };
+
+      return token;
+    })
+    .catch((error) => {
+      console.warn('balances::fetchTokenInfo', `couldn't fetch token #${tokenId}`, error);
+    });
+}
diff --git a/js/src/redux/providers/balancesReducer.js b/js/src/redux/providers/balancesReducer.js
index ea28a5217..f26f08f7d 100644
--- a/js/src/redux/providers/balancesReducer.js
+++ b/js/src/redux/providers/balancesReducer.js
@@ -15,22 +15,92 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import { handleActions } from 'redux-actions';
+import BigNumber from 'bignumber.js';
 
 const initialState = {
   balances: {},
-  tokens: {}
+  tokens: {},
+  tokenreg: null,
+  tokensFilter: {}
 };
 
 export default handleActions({
-  getBalances (state, action) {
-    const { balances } = action;
+  setBalances (state, action) {
+    const nextBalances = action.balances;
+    const prevBalances = state.balances;
+    const balances = { ...prevBalances };
+
+    Object.keys(nextBalances).forEach((address) => {
+      if (!balances[address]) {
+        balances[address] = Object.assign({}, nextBalances[address]);
+        return;
+      }
+
+      const balance = Object.assign({}, balances[address]);
+      const { tokens, txCount = balance.txCount } = nextBalances[address];
+      const nextTokens = [].concat(balance.tokens);
+
+      tokens.forEach((t) => {
+        const { token, value } = t;
+        const { tag } = token;
+
+        const tokenIndex = nextTokens.findIndex((tok) => tok.token.tag === tag);
+
+        if (tokenIndex === -1) {
+          nextTokens.push({
+            token,
+            value
+          });
+        } else {
+          nextTokens[tokenIndex] = { token, value };
+        }
+      });
+
+      balances[address] = Object.assign({}, { txCount: txCount || new BigNumber(0), tokens: nextTokens });
+    });
 
     return Object.assign({}, state, { balances });
   },
 
-  getTokens (state, action) {
+  setTokens (state, action) {
     const { tokens } = action;
-
     return Object.assign({}, state, { tokens });
+  },
+
+  setTokenImage (state, action) {
+    const { tokenAddress, image } = action;
+    const { balances } = state;
+    const nextBalances = {};
+
+    Object.keys(balances).forEach((address) => {
+      const tokenIndex = balances[address].tokens.findIndex((t) => t.token.address === tokenAddress);
+
+      if (tokenIndex === -1 || balances[address].tokens[tokenIndex].value.equals(0)) {
+        return;
+      }
+
+      const tokens = [].concat(balances[address].tokens);
+      tokens[tokenIndex].token = {
+        ...tokens[tokenIndex].token,
+        image
+      };
+
+      nextBalances[address] = {
+        ...balances[address],
+        tokens
+      };
+    });
+
+    return Object.assign({}, state, { balance: { ...balances, nextBalances } });
+  },
+
+  setTokenReg (state, action) {
+    const { tokenreg } = action;
+    return Object.assign({}, state, { tokenreg });
+  },
+
+  setTokensFilter (state, action) {
+    const { tokensFilter } = action;
+    return Object.assign({}, state, { tokensFilter });
   }
 }, initialState);
diff --git a/js/src/redux/providers/imagesActions.js b/js/src/redux/providers/imagesActions.js
index ce9221a3b..8ef3c3b39 100644
--- a/js/src/redux/providers/imagesActions.js
+++ b/js/src/redux/providers/imagesActions.js
@@ -14,10 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export function setAddressImage (address, hashArray) {
+export function setAddressImage (address, hashArray, converted = false) {
   return {
     type: 'setAddressImage',
     address,
-    hashArray
+    hashArray,
+    converted
   };
 }
diff --git a/js/src/redux/providers/imagesReducer.js b/js/src/redux/providers/imagesReducer.js
index 396576cc8..3f91f262f 100644
--- a/js/src/redux/providers/imagesReducer.js
+++ b/js/src/redux/providers/imagesReducer.js
@@ -31,10 +31,12 @@ export function hashToImageUrl (hashArray) {
 
 export default handleActions({
   setAddressImage (state, action) {
-    const { address, hashArray } = action;
+    const { address, hashArray, converted } = action;
+
+    const image = converted ? hashArray : hashToImageUrl(hashArray);
 
     return Object.assign({}, state, {
-      [address]: hashToImageUrl(hashArray)
+      [address]: image
     });
   }
 }, initialState);
diff --git a/js/src/redux/providers/personalActions.js b/js/src/redux/providers/personalActions.js
index 2e422cb1a..d8f925b2d 100644
--- a/js/src/redux/providers/personalActions.js
+++ b/js/src/redux/providers/personalActions.js
@@ -14,9 +14,33 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import { isEqual } from 'lodash';
+
+import { fetchBalances } from './balancesActions';
+
 export function personalAccountsInfo (accountsInfo) {
   return {
     type: 'personalAccountsInfo',
     accountsInfo
   };
 }
+
+export function _setVisibleAccounts (addresses) {
+  return {
+    type: 'setVisibleAccounts',
+    addresses
+  };
+}
+
+export function setVisibleAccounts (addresses) {
+  return (dispatch, getState) => {
+    const { visibleAccounts } = getState().personal;
+
+    if (isEqual(addresses.sort(), visibleAccounts.sort())) {
+      return;
+    }
+
+    dispatch(fetchBalances(addresses));
+    dispatch(_setVisibleAccounts(addresses));
+  };
+}
diff --git a/js/src/redux/providers/personalReducer.js b/js/src/redux/providers/personalReducer.js
index 6d35610e9..622c81ee5 100644
--- a/js/src/redux/providers/personalReducer.js
+++ b/js/src/redux/providers/personalReducer.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import { handleActions } from 'redux-actions';
+import { isEqual } from 'lodash';
 
 const initialState = {
   accountsInfo: {},
@@ -23,7 +24,8 @@ const initialState = {
   contacts: {},
   hasContacts: false,
   contracts: {},
-  hasContracts: false
+  hasContracts: false,
+  visibleAccounts: []
 };
 
 export default handleActions({
@@ -55,5 +57,17 @@ export default handleActions({
       contracts,
       hasContracts: Object.keys(contracts).length !== 0
     });
+  },
+
+  setVisibleAccounts (state, action) {
+    const addresses = (action.addresses || []).sort();
+
+    if (isEqual(addresses, state.addresses)) {
+      return state;
+    }
+
+    return Object.assign({}, state, {
+      visibleAccounts: addresses
+    });
   }
 }, initialState);
diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js
index cedf62d89..936fe3f25 100644
--- a/js/src/redux/providers/status.js
+++ b/js/src/redux/providers/status.js
@@ -30,6 +30,8 @@ export default class Status {
 
     this._pollPingTimeoutId = null;
     this._longStatusTimeoutId = null;
+
+    this._timestamp = Date.now();
   }
 
   start () {
@@ -131,10 +133,10 @@ export default class Status {
       secureToken
     };
 
-    const gotReconnected = !this._apiStatus.isConnected && apiStatus.isConnected;
+    const gotConnected = !this._apiStatus.isConnected && apiStatus.isConnected;
 
-    if (gotReconnected) {
-      this._pollLongStatus(true);
+    if (gotConnected) {
+      this._pollLongStatus();
       this._store.dispatch(statusCollection({ isPingable: true }));
     }
 
@@ -156,20 +158,22 @@ export default class Status {
 
     const { refreshStatus } = this._store.getState().nodeStatus;
 
-    const statusPromises = [ this._api.eth.syncing(), this._api.parity.netPeers() ];
+    const statusPromises = [ this._api.eth.syncing() ];
 
     if (refreshStatus) {
+      statusPromises.push(this._api.parity.netPeers());
       statusPromises.push(this._api.eth.hashrate());
     }
 
     Promise
       .all(statusPromises)
-      .then(([ syncing, netPeers, ...statusResults ]) => {
+      .then(([ syncing, ...statusResults ]) => {
         const status = statusResults.length === 0
-          ? { syncing, netPeers }
+          ? { syncing }
           : {
-            syncing, netPeers,
-            hashrate: statusResults[0]
+            syncing,
+            netPeers: statusResults[0],
+            hashrate: statusResults[1]
           };
 
         if (!isEqual(status, this._status)) {
@@ -223,7 +227,7 @@ export default class Status {
    * fetched every 30s just in case, and whenever
    * the client got reconnected.
    */
-  _pollLongStatus = (newConnection = false) => {
+  _pollLongStatus = () => {
     if (!this._api.isConnected) {
       return;
     }
@@ -241,34 +245,33 @@ export default class Status {
 
     Promise
       .all([
+        this._api.parity.netPeers(),
         this._api.web3.clientVersion(),
         this._api.net.version(),
         this._api.parity.defaultExtraData(),
         this._api.parity.netChain(),
         this._api.parity.netPort(),
         this._api.parity.rpcSettings(),
-        newConnection ? Promise.resolve(null) : this._api.parity.enode()
+        this._api.parity.enode()
       ])
       .then(([
-        clientVersion, netVersion, defaultExtraData, netChain, netPort, rpcSettings, enode
+        netPeers, clientVersion, netVersion, defaultExtraData, netChain, netPort, rpcSettings, enode
       ]) => {
         const isTest =
           netVersion === '2' || // morden
           netVersion === '3'; // ropsten
 
         const longStatus = {
+          netPeers,
           clientVersion,
           defaultExtraData,
           netChain,
           netPort,
           rpcSettings,
-          isTest
+          isTest,
+          enode
         };
 
-        if (enode) {
-          longStatus.enode = enode;
-        }
-
         if (!isEqual(longStatus, this._longStatus)) {
           this._store.dispatch(statusCollection(longStatus));
           this._longStatus = longStatus;
@@ -278,7 +281,7 @@ export default class Status {
         console.error('_pollLongStatus', error);
       });
 
-    nextTimeout(newConnection ? 5000 : 30000);
+    nextTimeout(60000);
   }
 
   _pollLogs = () => {
diff --git a/js/src/redux/providers/statusReducer.js b/js/src/redux/providers/statusReducer.js
index f0ef0cb1b..07ba4af5b 100644
--- a/js/src/redux/providers/statusReducer.js
+++ b/js/src/redux/providers/statusReducer.js
@@ -43,7 +43,7 @@ const initialState = {
   isConnected: false,
   isConnecting: false,
   isPingable: false,
-  isTest: false,
+  isTest: undefined,
   refreshStatus: false,
   traceMode: undefined
 };
diff --git a/js/src/secureApi.js b/js/src/secureApi.js
index af62da2cf..8243420b5 100644
--- a/js/src/secureApi.js
+++ b/js/src/secureApi.js
@@ -77,6 +77,12 @@ export default class SecureApi extends Api {
           return this
             ._checkNodeUp()
             .then((isNodeUp) => {
+              const { timestamp } = lastError;
+
+              if ((Date.now() - timestamp) > 250) {
+                return nextTick();
+              }
+
               const nextToken = this._tokensToTry[0] || 'initial';
               const nextState = nextToken !== 'initial' ? 0 : 1;
 
@@ -89,7 +95,7 @@ export default class SecureApi extends Api {
                 this.updateToken(nextToken, nextState);
               }
 
-              nextTick();
+              return nextTick();
             });
         }
         break;
diff --git a/js/src/ui/BlockStatus/blockStatus.js b/js/src/ui/BlockStatus/blockStatus.js
index 98e10f504..8abd5d656 100644
--- a/js/src/ui/BlockStatus/blockStatus.js
+++ b/js/src/ui/BlockStatus/blockStatus.js
@@ -44,7 +44,7 @@ class BlockStatus extends Component {
       );
     }
 
-    if (!syncing.warpChunksAmount.eq(syncing.warpChunksProcessed)) {
+    if (syncing.warpChunksAmount && syncing.warpChunksProcessed && !syncing.warpChunksAmount.eq(syncing.warpChunksProcessed)) {
       return (
         <div className={ styles.syncStatus }>
           { 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 (
       <div className={ styles.infoline }>
@@ -101,28 +88,4 @@ export default class Header extends Component {
       </div>
     );
   }
-
-  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() }
         <Page>
           <Header
-            isTest={ isTest }
             account={ account }
             balance={ balance } />
           <Transactions
@@ -307,10 +328,8 @@ function mapStateToProps (state) {
   const { accounts } = state.personal;
   const { balances } = state.balances;
   const { images } = state;
-  const { isTest } = state.nodeStatus;
 
   return {
-    isTest,
     accounts,
     balances,
     images
@@ -318,7 +337,9 @@ function mapStateToProps (state) {
 }
 
 function mapDispatchToProps (dispatch) {
-  return bindActionCreators({}, dispatch);
+  return bindActionCreators({
+    setVisibleAccounts
+  }, dispatch);
 }
 
 export default connect(
diff --git a/js/src/views/Accounts/List/list.js b/js/src/views/Accounts/List/list.js
index 09158d1de..ebb834584 100644
--- a/js/src/views/Accounts/List/list.js
+++ b/js/src/views/Accounts/List/list.js
@@ -117,14 +117,14 @@ export default class List extends Component {
       if (balanceA && !balanceB) return -1;
       if (!balanceA && balanceB) return 1;
 
-      const ethA = balanceA.tokens
-        .find(token => 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 } />
         <Page>
           <Header
-            isTest={ isTest }
             account={ contact }
             balance={ balance } />
           <Transactions
@@ -134,17 +158,17 @@ class Address extends Component {
 function mapStateToProps (state) {
   const { contacts } = state.personal;
   const { balances } = state.balances;
-  const { isTest } = state.nodeStatus;
 
   return {
-    isTest,
     contacts,
     balances
   };
 }
 
 function mapDispatchToProps (dispatch) {
-  return bindActionCreators({}, dispatch);
+  return bindActionCreators({
+    setVisibleAccounts
+  }, dispatch);
 }
 
 export default connect(
diff --git a/js/src/views/Addresses/addresses.js b/js/src/views/Addresses/addresses.js
index d36a143b8..685d21857 100644
--- a/js/src/views/Addresses/addresses.js
+++ b/js/src/views/Addresses/addresses.js
@@ -18,12 +18,13 @@ 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 '../Accounts/List';
 import Summary from '../Accounts/Summary';
 import { AddAddress } from '../../modals';
 import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '../../ui';
+import { setVisibleAccounts } from '../../redux/providers/personalActions';
 
 import styles from './addresses.css';
 
@@ -33,6 +34,8 @@ class Addresses extends Component {
   }
 
   static propTypes = {
+    setVisibleAccounts: PropTypes.func.isRequired,
+
     balances: PropTypes.object,
     contacts: PropTypes.object,
     hasContacts: PropTypes.bool
@@ -45,6 +48,29 @@ class Addresses extends Component {
     searchTokens: []
   }
 
+  componentWillMount () {
+    this.setVisibleAccounts();
+  }
+
+  componentWillReceiveProps (nextProps) {
+    const prevAddresses = Object.keys(this.props.contacts);
+    const nextAddresses = Object.keys(nextProps.contacts);
+
+    if (prevAddresses.length !== nextAddresses.length || !isEqual(prevAddresses.sort(), nextAddresses.sort())) {
+      this.setVisibleAccounts(nextProps);
+    }
+  }
+
+  componentWillUnmount () {
+    this.props.setVisibleAccounts([]);
+  }
+
+  setVisibleAccounts (props = this.props) {
+    const { contacts, setVisibleAccounts } = props;
+    const addresses = Object.keys(contacts);
+    setVisibleAccounts(addresses);
+  }
+
   render () {
     const { balances, contacts, hasContacts } = this.props;
     const { searchValues, sortOrder } = this.state;
@@ -231,7 +257,9 @@ function mapStateToProps (state) {
 }
 
 function mapDispatchToProps (dispatch) {
-  return bindActionCreators({}, dispatch);
+  return bindActionCreators({
+    setVisibleAccounts
+  }, dispatch);
 }
 
 export default connect(
diff --git a/js/src/views/Contract/contract.js b/js/src/views/Contract/contract.js
index a3264acb6..fb288f85e 100644
--- a/js/src/views/Contract/contract.js
+++ b/js/src/views/Contract/contract.js
@@ -24,6 +24,8 @@ import EyeIcon from 'material-ui/svg-icons/image/remove-red-eye';
 import ContentClear from 'material-ui/svg-icons/content/clear';
 
 import { newError } from '../../redux/actions';
+import { setVisibleAccounts } from '../../redux/providers/personalActions';
+
 import { EditMeta, ExecuteContract } from '../../modals';
 import { Actionbar, Button, Page, Modal, Editor } from '../../ui';
 
@@ -41,6 +43,8 @@ class Contract extends Component {
   }
 
   static propTypes = {
+    setVisibleAccounts: PropTypes.func.isRequired,
+
     accounts: PropTypes.object,
     balances: PropTypes.object,
     contracts: PropTypes.object,
@@ -68,21 +72,29 @@ class Contract extends Component {
 
     this.attachContract(this.props);
     this.setBaseAccount(this.props);
+    this.setVisibleAccounts();
 
     api
       .subscribe('eth_blockNumber', this.queryContract)
       .then(blockSubscriptionId => 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() }
         <Page>
           <Header
-            isTest={ isTest }
             account={ account }
             balance={ balance } />
           <Queries
@@ -430,7 +448,7 @@ function mapStateToProps (state) {
 }
 
 function mapDispatchToProps (dispatch) {
-  return bindActionCreators({ newError }, dispatch);
+  return bindActionCreators({ newError, setVisibleAccounts }, dispatch);
 }
 
 export default connect(
diff --git a/js/src/views/Contracts/contracts.js b/js/src/views/Contracts/contracts.js
index 098e5f5c2..2f7ac2478 100644
--- a/js/src/views/Contracts/contracts.js
+++ b/js/src/views/Contracts/contracts.js
@@ -20,10 +20,11 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import ContentAdd from 'material-ui/svg-icons/content/add';
 import FileIcon from 'material-ui/svg-icons/action/description';
-import { uniq } from 'lodash';
+import { uniq, isEqual } from 'lodash';
 
 import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '../../ui';
 import { AddContract, DeployContract } from '../../modals';
+import { setVisibleAccounts } from '../../redux/providers/personalActions';
 
 import List from '../Accounts/List';
 
@@ -35,6 +36,8 @@ class Contracts extends Component {
   }
 
   static propTypes = {
+    setVisibleAccounts: PropTypes.func.isRequired,
+
     balances: PropTypes.object,
     accounts: PropTypes.object,
     contracts: PropTypes.object,
@@ -49,6 +52,29 @@ class Contracts extends Component {
     searchTokens: []
   }
 
+  componentWillMount () {
+    this.setVisibleAccounts();
+  }
+
+  componentWillReceiveProps (nextProps) {
+    const prevAddresses = Object.keys(this.props.contracts);
+    const nextAddresses = Object.keys(nextProps.contracts);
+
+    if (prevAddresses.length !== nextAddresses.length || !isEqual(prevAddresses.sort(), nextAddresses.sort())) {
+      this.setVisibleAccounts(nextProps);
+    }
+  }
+
+  componentWillUnmount () {
+    this.props.setVisibleAccounts([]);
+  }
+
+  setVisibleAccounts (props = this.props) {
+    const { contracts, setVisibleAccounts } = props;
+    const addresses = Object.keys(contracts);
+    setVisibleAccounts(addresses);
+  }
+
   render () {
     const { contracts, hasContracts, balances } = this.props;
     const { searchValues, sortOrder } = this.state;
@@ -205,7 +231,9 @@ function mapStateToProps (state) {
 }
 
 function mapDispatchToProps (dispatch) {
-  return bindActionCreators({}, dispatch);
+  return bindActionCreators({
+    setVisibleAccounts
+  }, dispatch);
 }
 
 export default connect(
diff --git a/js/src/views/Dapps/dappsStore.js b/js/src/views/Dapps/dappsStore.js
index f9fc4863c..f5f7d9d47 100644
--- a/js/src/views/Dapps/dappsStore.js
+++ b/js/src/views/Dapps/dappsStore.js
@@ -32,6 +32,8 @@ export default class DappsStore {
   @observable modalOpen = false;
   @observable externalOverlayVisible = true;
 
+  _manifests = {};
+
   constructor (api) {
     this._api = api;
 
@@ -249,12 +251,27 @@ export default class DappsStore {
   }
 
   _fetchManifest (manifestHash) {
+    if (/^(0x)?0+/.test(manifestHash)) {
+      return Promise.resolve(null);
+    }
+
+    if (this._manifests[manifestHash]) {
+      return Promise.resolve(this._manifests[manifestHash]);
+    }
+
     return fetch(`${this._getHost()}/api/content/${manifestHash}/`, { redirect: 'follow', mode: 'cors' })
       .then((response) => {
         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;

From 6d6e942d9d291161bfb69f512f2309447585f718 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Fri, 25 Nov 2016 16:46:57 +0100
Subject: [PATCH 33/34] Add dappreg link to apps list (#3568)

* Fix rendering when contract is empty

* Add registration dapp to app list
---
 js/src/dapps/dappreg/ButtonBar/buttonBar.js   |  4 ++--
 js/src/dapps/dappreg/Dapp/dapp.js             |  4 ++++
 js/src/dapps/dappreg/SelectDapp/selectDapp.js |  4 ++++
 js/src/dapps/dappreg/dappsStore.js            |  7 +++++--
 js/src/views/Dapps/builtin.json               | 10 ++++++++++
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/js/src/dapps/dappreg/ButtonBar/buttonBar.js b/js/src/dapps/dappreg/ButtonBar/buttonBar.js
index 289def0ea..074c527d0 100644
--- a/js/src/dapps/dappreg/ButtonBar/buttonBar.js
+++ b/js/src/dapps/dappreg/ButtonBar/buttonBar.js
@@ -50,12 +50,12 @@ export default class ButtonBar extends Component {
           key='delete'
           label='Delete'
           warning
-          disabled={ !this.dappsStore.currentApp.isOwner && !this.dappsStore.isContractOwner }
+          disabled={ !this.dappsStore.currentApp || (!this.dappsStore.currentApp.isOwner && !this.dappsStore.isContractOwner) }
           onClick={ this.onDeleteClick } />,
         <Button
           key='edit'
           label='Edit'
-          disabled={ !this.dappsStore.currentApp.isOwner }
+          disabled={ !this.dappsStore.currentApp || !this.dappsStore.currentApp.isOwner }
           onClick={ this.onEditClick } />,
         <Button
           key='new'
diff --git a/js/src/dapps/dappreg/Dapp/dapp.js b/js/src/dapps/dappreg/Dapp/dapp.js
index 31d889868..2e07f6ba0 100644
--- a/js/src/dapps/dappreg/Dapp/dapp.js
+++ b/js/src/dapps/dappreg/Dapp/dapp.js
@@ -33,6 +33,10 @@ export default class Dapp extends Component {
       ? this.dappsStore.wipApp
       : this.dappsStore.currentApp;
 
+    if (!app) {
+      return null;
+    }
+
     return (
       <div className={ styles.app }>
         { this.dappsStore.isNew ? this.renderOwnerSelect(app) : this.renderOwnerStatic(app) }
diff --git a/js/src/dapps/dappreg/SelectDapp/selectDapp.js b/js/src/dapps/dappreg/SelectDapp/selectDapp.js
index 458f5fbe2..8c0e846f3 100644
--- a/js/src/dapps/dappreg/SelectDapp/selectDapp.js
+++ b/js/src/dapps/dappreg/SelectDapp/selectDapp.js
@@ -36,6 +36,10 @@ export default class SelectDapp extends Component {
       );
     }
 
+    if (!this.dappsStore.currentApp) {
+      return null;
+    }
+
     let overlayImg = null;
     if (this.dappsStore.currentApp.imageHash) {
       overlayImg = (
diff --git a/js/src/dapps/dappreg/dappsStore.js b/js/src/dapps/dappreg/dappsStore.js
index 7072cb663..4baf7337c 100644
--- a/js/src/dapps/dappreg/dappsStore.js
+++ b/js/src/dapps/dappreg/dappsStore.js
@@ -136,7 +136,10 @@ export default class DappsStore {
         .sort((a, b) => a.name.localeCompare(b.name));
 
       this.apps = ownApps.concat(otherApps);
-      this.currentApp = this.apps[0];
+
+      if (this.apps.length) {
+        this.currentApp = this.apps[0];
+      }
     });
   }
 
@@ -328,7 +331,7 @@ export default class DappsStore {
       })
       .then(() => {
         this.sortApps();
-        this.setLoading(this.count === 0);
+        this.setLoading(false);
       })
       .catch((error) => {
         console.error('Store:loadDapps', error);
diff --git a/js/src/views/Dapps/builtin.json b/js/src/views/Dapps/builtin.json
index 414464315..1124c52fd 100644
--- a/js/src/views/Dapps/builtin.json
+++ b/js/src/views/Dapps/builtin.json
@@ -54,5 +54,15 @@
     "version": "1.0.0",
     "visible": true,
     "secure": true
+  },
+  {
+    "id": "0x7bbc4f1a27628781b96213e781a1b8eec6982c1db8fac739af6e4c5a55862c03",
+    "url": "dappreg",
+    "name": "Dapp Registration",
+    "description": "Enables the registration and content management of dapps on the network",
+    "author": "Parity Team <admin@ethcore.io>",
+    "version": "1.0.0",
+    "visible": false,
+    "secure": true
   }
 ]

From 7610336596d2e937c342b913d1b9839ee35e532c Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Fri, 25 Nov 2016 17:10:02 +0100
Subject: [PATCH 34/34] Fixing tokens sent as Array (#3621)

---
 js/src/redux/providers/balancesReducer.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/js/src/redux/providers/balancesReducer.js b/js/src/redux/providers/balancesReducer.js
index f26f08f7d..01923a4f4 100644
--- a/js/src/redux/providers/balancesReducer.js
+++ b/js/src/redux/providers/balancesReducer.js
@@ -64,6 +64,16 @@ export default handleActions({
 
   setTokens (state, action) {
     const { tokens } = action;
+
+    if (Array.isArray(tokens)) {
+      const objTokens = tokens.reduce((_tokens, token) => {
+        _tokens[token.address] = token;
+        return _tokens;
+      }, {});
+
+      return Object.assign({}, state, { tokens: objTokens });
+    }
+
     return Object.assign({}, state, { tokens });
   },