Add latest @parity/ui

This commit is contained in:
Jaco Greeff 2017-09-20 09:45:28 +02:00
parent ac3d548079
commit 206abaebb9
3 changed files with 31 additions and 42 deletions

54
js/package-lock.json generated
View File

@ -48,7 +48,7 @@
"@parity/parity.js": "1.8.7",
"@parity/shapeshift": "github:paritytech/js-shapeshift#1e015cb4355b8db81aeac6a71abf971677de8f5b",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a",
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf",
"happypack": "3.1.0",
"lodash": "4.17.2",
"oo7": "0.5.3",
@ -72,7 +72,7 @@
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/dapp-vaults": "github:paritytech/dapp-vaults#f1ce18e69df07648bb13ac5cfe88b52cd83dc731",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a",
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf",
"file-saver": "1.3.3",
"react": "15.6.1",
"react-dom": "15.6.1",
@ -88,7 +88,7 @@
"@parity/dapp-account": "github:paritytech/dapp-account#eb7f989f2d801b1940b4251463b8f6a09433973c",
"@parity/dapp-addresses": "github:paritytech/dapp-addresses#4eb1345610273de6d32ad6cb3d0b6fe3f0fb1af3",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-addresses": {
@ -97,7 +97,7 @@
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/dapp-accounts": "github:paritytech/dapp-accounts#cd59bc6f3bbe6a8656e624789a678fcbf5220d22",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-chaindeploy": {
@ -115,7 +115,7 @@
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/dapp-account": "github:paritytech/dapp-account#eb7f989f2d801b1940b4251463b8f6a09433973c",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-contracts": {
@ -125,7 +125,7 @@
"@parity/dapp-account": "github:paritytech/dapp-account#eb7f989f2d801b1940b4251463b8f6a09433973c",
"@parity/dapp-accounts": "github:paritytech/dapp-accounts#cd59bc6f3bbe6a8656e624789a678fcbf5220d22",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-dapp-accounts": {
@ -133,7 +133,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-dapp-methods": {
@ -141,7 +141,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-dapp-visible": {
@ -149,7 +149,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-dappreg": {
@ -157,7 +157,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-develop": {
@ -167,7 +167,7 @@
"@parity/dapp-contracts": "github:paritytech/dapp-contracts#e7656290c46d598eab76ad5b7402386c32b87c44",
"@parity/parity.js": "1.8.7",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a",
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf",
"oo7": "0.5.3",
"oo7-parity": "0.6.8",
"oo7-react": "0.4.5",
@ -195,7 +195,7 @@
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/dapp-web": "github:paritytech/dapp-web#b5e209ab2a9e6ac37b780b292a648e8764cb5f96",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a",
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf",
"react-markdown": "2.4.4"
},
"dependencies": {
@ -216,7 +216,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-playground": {
@ -224,7 +224,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-registry": {
@ -232,7 +232,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a",
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf",
"material-ui": "0.16.5"
}
},
@ -241,7 +241,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-signaturereg": {
@ -260,7 +260,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-status": {
@ -268,7 +268,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a",
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf",
"bytes": "2.4.0",
"format-number": "2.0.1"
}
@ -278,7 +278,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-tokenreg": {
@ -297,7 +297,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-wallet": {
@ -306,7 +306,7 @@
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/dapp-account": "github:paritytech/dapp-account#eb7f989f2d801b1940b4251463b8f6a09433973c",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a"
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf"
}
},
"@parity/dapp-web": {
@ -314,7 +314,7 @@
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/shared": "github:paritytech/js-shared#753cc3229c9cd8392a3dda859997e5bb85605954",
"@parity/ui": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a",
"@parity/ui": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf",
"base32.js": "0.1.0"
}
},
@ -389,7 +389,7 @@
}
},
"@parity/ui": {
"version": "github:paritytech/js-ui#f22c13839faeb9c57b950a798b7347378a1a668a",
"version": "github:paritytech/js-ui#fcd56a8e81340f671a3de66cb9388aca781f14bf",
"requires": {
"@parity/api": "github:paritytech/js-api#ca3e026f40d434218eec9ab27a3958ec6761e8ea",
"@parity/etherscan": "github:paritytech/js-etherscan#a3b432ebfca2f57462da93c68b6d6f8aebb1244f",
@ -608,9 +608,9 @@
}
},
"aproba": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
"integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw=="
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
},
"archive-type": {
"version": "3.2.0",
@ -6506,7 +6506,7 @@
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"requires": {
"aproba": "1.1.2",
"aproba": "1.2.0",
"console-control-strings": "1.1.0",
"has-unicode": "2.0.1",
"object-assign": "4.1.1",

View File

@ -25,12 +25,12 @@ import { connect } from 'react-redux';
import store from 'store';
import AccountCard from '@parity/ui/AccountCard';
import Badge from '@parity/ui/Badge';
import Button from '@parity/ui/Button';
import ContainerTitle from '@parity/ui/Container/Title';
import IdentityIcon from '@parity/ui/IdentityIcon';
import GradientBg from '@parity/ui/GradientBg';
import SelectionList from '@parity/ui/SectionList';
import SignerPending from '@parity/ui/SignerPending';
import { CancelIcon, FingerprintIcon } from '@parity/ui/Icons';
import imagesEthcoreBlock from '@parity/shared/assets/images/parity-logo-white-no-text.svg';
@ -399,25 +399,12 @@ class ParityBar extends Component {
}
renderSignerLabel () {
const { pending } = this.props;
let bubble = null;
if (pending && pending.length) {
bubble = (
<Badge
color='red'
className={ styles.labelBubble }
value={ pending.length }
/>
);
}
return this.renderLabel(
<FormattedMessage
id='parityBar.label.signer'
defaultMessage='Signer'
/>,
bubble
<SignerPending className={ styles.labelBubble } />
);
}

View File

@ -24,6 +24,7 @@ import ClientVersion from '@parity/ui/ClientVersion';
import GradientBg from '@parity/ui/GradientBg';
import NetChain from '@parity/ui/NetChain';
import NetPeers from '@parity/ui/NetPeers';
import SignerPending from '@parity/ui/SignerPending';
import StatusIndicator from '@parity/ui/StatusIndicator';
import Consensus from './Consensus';
@ -48,6 +49,7 @@ function Status ({ className = '', upgradeStore }, { api }) {
<Component key={ index } />
))
}
<SignerPending />
<StatusIndicator id='application.status.health' />
<BlockNumber
className={ styles.blockNumber }