grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into jg-subscription-check

Browse Source
This commit is contained in:
Jaco Greeff 2016-12-09 18:17:36 +01:00
commit 290a4a40ff
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1271,7 +1271,7 @@ dependencies = [
[[package]] [[package]]
name = "parity-ui-precompiled" name = "parity-ui-precompiled"
version = "1.4.0" version = "1.4.0"
source = "git+https://github.com/ethcore/js-precompiled.git#8e8e515f958d2d4a5abec07253a51a052f2b744d" source = "git+https://github.com/ethcore/js-precompiled.git#b8e8e9a8482a51b9a86bb841674f71aca1e57934"
dependencies = [ dependencies = [
"parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

2
js/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "parity.js", "name": "parity.js",
"version": "0.2.103", "version": "0.2.104",
"main": "release/index.js", "main": "release/index.js",
"jsnext:main": "src/index.js", "jsnext:main": "src/index.js",
"author": "Parity Team <admin@parity.io>", "author": "Parity Team <admin@parity.io>",

6
js/src/views/Accounts/Summary/summary.js
View File

@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import BigNumber from 'bignumber.js';
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Link } from 'react-router'; import { Link } from 'react-router';
import { isEqual } from 'lodash'; import { isEqual } from 'lodash';
@ -113,15 +114,16 @@ export default class Summary extends Component {
renderOwners () { renderOwners () {
const { owners } = this.props; const { owners } = this.props;
const ownersValid = (owners || []).filter((owner) => owner.address && new BigNumber(owner.address).gt(0));
if (!owners || owners.length === 0) { if (!ownersValid || ownersValid.length === 0) {
return null; return null;
} }
return ( return (
<div className={ styles.owners }> <div className={ styles.owners }>
{ {
owners.map((owner) => ( ownersValid.map((owner) => (
<div key={ owner.address }> <div key={ owner.address }>
<div <div
data-tip data-tip

10
js/src/views/Accounts/accounts.js
View File

@ -293,13 +293,17 @@ function mapStateToProps (state) {
const walletsOwners = Object const walletsOwners = Object
.keys(walletsInfo) .keys(walletsInfo)
.map((wallet) => ({ .map((wallet) => {
owners: walletsInfo[wallet].owners.map((owner) => ({ const owners = walletsInfo[wallet].owners || [];
return {
owners: owners.map((owner) => ({
address: owner, address: owner,
name: accountsInfo[owner] && accountsInfo[owner].name || owner name: accountsInfo[owner] && accountsInfo[owner].name || owner
})), })),
address: wallet address: wallet
})) };
})
.reduce((walletsOwners, wallet) => { .reduce((walletsOwners, wallet) => {
walletsOwners[wallet.address] = wallet.owners; walletsOwners[wallet.address] = wallet.owners;
return walletsOwners; return walletsOwners;