From 6a053c23190d9b2d5f2caaa37d8426709b2e9084 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 11 Nov 2019 17:57:14 +0100 Subject: [PATCH 001/154] Change selection for council votes (#1865) --- packages/app-accounts/src/Vanity/index.tsx | 4 +- packages/app-council/src/Overview/Vote.tsx | 88 ++++++++++++---------- packages/react-api/src/with/call.tsx | 4 +- 3 files changed, 52 insertions(+), 44 deletions(-) diff --git a/packages/app-accounts/src/Vanity/index.tsx b/packages/app-accounts/src/Vanity/index.tsx index 742d2a5d0b06..4c55988f428f 100644 --- a/packages/app-accounts/src/Vanity/index.tsx +++ b/packages/app-accounts/src/Vanity/index.tsx @@ -237,7 +237,7 @@ class VanityApp extends TxComponent { return; } - setTimeout((): void => { + setImmediate((): void => { if (this._isActive) { if (this.results.length === 25) { this.checkMatches(); @@ -257,7 +257,7 @@ class VanityApp extends TxComponent { this.executeGeneration(); } - }, 0); + }); } private onCreateToggle = (createSeed: string): void => { diff --git a/packages/app-council/src/Overview/Vote.tsx b/packages/app-council/src/Overview/Vote.tsx index f6916a41092d..6be0be43f6af 100644 --- a/packages/app-council/src/Overview/Vote.tsx +++ b/packages/app-council/src/Overview/Vote.tsx @@ -13,12 +13,14 @@ import React from 'react'; import styled from 'styled-components'; import { createType } from '@polkadot/types'; import { withCalls, withMulti } from '@polkadot/react-api'; -import { AddressRow, Button, Toggle } from '@polkadot/react-components'; +import { AddressMini, Button, Toggle } from '@polkadot/react-components'; import TxModal, { TxModalState, TxModalProps } from '@polkadot/react-components/TxModal'; import translate from '../translate'; import VoteValue from './VoteValue'; +type VoteType = 'member' | 'runnerup' | 'candidate'; + interface Props extends ApiProps, ComponentProps, TxModalProps { voterPositions?: DerivedVoterPositions; } @@ -46,37 +48,47 @@ interface State extends TxModalState { const Candidates = styled.div` display: flex; flex-wrap: wrap; -`; + justify-content: center; + + .candidate { + border: 1px solid #eee; + border-radius: 0.25rem; + margin: 0.25rem; + padding-bottom: 0.25rem; + padding-right: 0.5rem; + position: relative; + + &::after { + content: ''; + position: absolute; + top: 0; + right: 0; + border-color: transparent; + border-style: solid; + border-radius: 0.25em; + border-width: 0.25em; + } -const Candidate = styled.div` - cursor: pointer; - width: 25rem; - min-width: calc(50% - 1rem); - border-radius: 0.5rem; - border: 1px solid #eee; - padding: 0.75rem 0.5rem 0.25rem; - margin: 0.25rem; - transition: all 0.2s; - - b { - min-width: 5rem; - } + &.isAye { + background: #fff; + border-color: #ccc; + } - &.aye { - background-color: rgba(0, 255, 0, 0.05); + &.member::after { + border-color: green; + } - b { - color: green; + &.runnerup::after { + border-color: steelblue; } - } - &.nay { - background-color: rgba(0, 0, 0, 0.05); - } + .ui--AddressMini-icon { + z-index: 1; + } - .ui--Row-children { - text-align: right; - width: 100%; + .candidate-right { + text-align: right; + } } `; @@ -164,11 +176,11 @@ class Vote extends TxModal { protected renderContent = (): React.ReactNode => { const { api, electionsInfo: { candidates, members, runnersUp }, t } = this.props; const { accountId, votes } = this.state; - const _candidates = candidates.map((accountId): [AccountId, boolean] => [accountId, false]); + const _candidates = candidates.map((accountId): [AccountId, VoteType] => [accountId, 'candidate']); const available = api.tx.electionsPhragmen ? members - .map(([accountId]): [AccountId, boolean] => [accountId, true]) - .concat(runnersUp.map(([accountId]): [AccountId, boolean] => [accountId, false])) + .map(([accountId]): [AccountId, VoteType] => [accountId, 'member']) + .concat(runnersUp.map(([accountId]): [AccountId, VoteType] => [accountId, 'runnerup'])) .concat(_candidates) : _candidates; @@ -200,21 +212,17 @@ class Vote extends TxModal { )} */} - {available.map(([accountId, isMember]): React.ReactNode => { + {available.map(([accountId, type]): React.ReactNode => { const key = accountId.toString(); const isAye = votes[key] || false; return ( - - +
{ onChange={this.onChangeVote(key)} value={isAye} /> - - +
+ ); })}
diff --git a/packages/react-api/src/with/call.tsx b/packages/react-api/src/with/call.tsx index bd7ac1a4ba1c..cc7ecba90e24 100644 --- a/packages/react-api/src/with/call.tsx +++ b/packages/react-api/src/with/call.tsx @@ -98,12 +98,12 @@ export default function withCall

(endpoint: string, { // The attachment takes time when a lot is available, set a timeout // to first handle the current queue before subscribing - setTimeout((): void => { + setImmediate((): void => { this .subscribe(this.getParams(this.props)) .then(NOOP) .catch(NOOP); - }, 0); + }); } public componentWillUnmount (): void { From 6ddfaf0ef3bb405b59fe6593f87bdc55f8bae1d9 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Mon, 11 Nov 2019 17:01:59 +0000 Subject: [PATCH 002/154] [CI Skip] 0.37.0-beta.66 --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 29 files changed, 67 insertions(+), 67 deletions(-) diff --git a/lerna.json b/lerna.json index 7b2fb99ca1ed..fd95240edd3b 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.65" + "version": "0.37.0-beta.66" } diff --git a/package.json b/package.json index 3c68c4e5c763..d56ec7312216 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index e5287e8eb2e2..9d1d7dbf821b 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 6c436f56c601..b86dd498f9af 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", + "@polkadot/react-components": "^0.37.0-beta.66", "@polkadot/react-qr": "^0.47.0-beta.5", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 7eed4cef7cb0..82ffefa31e17 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 47bda462ca3f..a7adade12422 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index f23ba539c573..e7cbb542baa4 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/api-contract": "^0.97.0-beta.2", - "@polkadot/react-components": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index ea864bf4fc5c..b1b8103d1593 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", - "@polkadot/react-query": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-query": "^0.37.0-beta.66" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 57e86a04f143..caa25979f1b7 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/apps-routing": "^0.37.0-beta.65", - "@polkadot/react-components": "^0.37.0-beta.65" + "@polkadot/apps-routing": "^0.37.0-beta.66", + "@polkadot/react-components": "^0.37.0-beta.66" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 8c5e72bec559..5df6b65f4eb2 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", - "@polkadot/react-query": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-query": "^0.37.0-beta.66" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index e168c86556f2..63dda82a1fe1 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 73f13f9cc3e6..a2412b1e39e6 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", - "@polkadot/react-params": "^0.37.0-beta.65", - "@polkadot/react-signer": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-params": "^0.37.0-beta.66", + "@polkadot/react-signer": "^0.37.0-beta.66" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index a029ccfb05f0..17f91cbbdc6d 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 2d0844c368c2..0f124329c76c 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", + "@polkadot/react-components": "^0.37.0-beta.66", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 7b8bf11d099a..21a3b7bc444e 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", - "@polkadot/react-query": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-query": "^0.37.0-beta.66" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index d46d92f1125a..9e7ab46f1a32 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", - "@polkadot/react-query": "^0.37.0-beta.65", + "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-query": "^0.37.0-beta.66", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index e6882df5aaba..d019cee3fb0c 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/app-explorer": "^0.37.0-beta.65", - "@polkadot/react-components": "^0.37.0-beta.65", - "@polkadot/react-query": "^0.37.0-beta.65" + "@polkadot/app-explorer": "^0.37.0-beta.66", + "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-query": "^0.37.0-beta.66" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 463667621aea..bece302591e8 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", - "@polkadot/react-params": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-params": "^0.37.0-beta.66" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 97542b6fbfa2..d8b5bd5dd234 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 8fa896e325ac..b309dc41a4d1 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index e78f52362767..7944b8452444 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", - "@polkadot/react-query": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-query": "^0.37.0-beta.66" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 6ca0aa6514c1..687ab54df4d1 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", - "@polkadot/react-query": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-query": "^0.37.0-beta.66" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 78f4cdea30ad..b31ef64253e8 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index c44e1cff1f12..c9f9f0d065dd 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", - "@polkadot/react-signer": "^0.37.0-beta.65", + "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-signer": "^0.37.0-beta.66", "@polkadot/ui-assets": "^0.47.0-beta.5", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index bac3f2b510b6..d2e264d6ce80 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 1a0596e2d4a3..9f43b878b342 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/react-api": "^0.37.0-beta.65", + "@polkadot/react-api": "^0.37.0-beta.66", "@polkadot/react-identicon": "^0.47.0-beta.5", - "@polkadot/react-query": "^0.37.0-beta.65", + "@polkadot/react-query": "^0.37.0-beta.66", "@polkadot/ui-keyring": "^0.47.0-beta.5", "@polkadot/ui-settings": "^0.47.0-beta.5", "@types/chart.js": "^2.8.10", diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 44fe47688e97..31c5614c4352 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65" + "@polkadot/react-components": "^0.37.0-beta.66" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 0d3dcf8284b7..da1462297f73 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index f0da2c9bb894..b5cc1b10eeff 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.65", + "version": "0.37.0-beta.66", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.65", + "@polkadot/react-components": "^0.37.0-beta.66", "@polkadot/react-qr": "^0.47.0-beta.5" } } From 2a52609f23022ac9dfa99220ee70427319699f55 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 11 Nov 2019 19:58:13 +0100 Subject: [PATCH 003/154] Add staking favorites (top of list) (#1866) --- packages/app-staking/src/Overview/Address.tsx | 35 ++++++++-- .../app-staking/src/Overview/CurrentList.tsx | 64 ++++++++++++++----- 2 files changed, 79 insertions(+), 20 deletions(-) diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx index bff78b9460cf..cc7d134bc7fd 100644 --- a/packages/app-staking/src/Overview/Address.tsx +++ b/packages/app-staking/src/Overview/Address.tsx @@ -24,8 +24,10 @@ interface Props extends I18nProps { defaultName: string; filter: ValidatorFilter; isElected: boolean; + isFavorite: boolean; lastAuthors?: string[]; myAccounts: string[]; + onFavorite: (accountId: string) => void; points?: Points; recentlyOnline?: DerivedHeartbeats; stakingInfo?: DerivedStaking; @@ -44,7 +46,7 @@ interface StakingState { const WITH_VALIDATOR_PREFS = { validatorPayment: true }; -function Address ({ address, authorsMap, className, defaultName, filter, isElected, lastAuthors, myAccounts, points, recentlyOnline, stakingInfo, t, withNominations = true }: Props): React.ReactElement | null { +function Address ({ address, authorsMap, className, defaultName, filter, isElected, isFavorite, lastAuthors, myAccounts, onFavorite, points, recentlyOnline, stakingInfo, t, withNominations = true }: Props): React.ReactElement | null { const { isSubstrateV2 } = useContext(ApiContext); const [extraInfo, setExtraInfo] = useState<[React.ReactNode, React.ReactNode][] | undefined>(); const [hasActivity, setHasActivity] = useState(true); @@ -120,13 +122,23 @@ function Address ({ address, authorsMap, className, defaultName, filter, isElect const lastBlockNumber = authorsMap[stashId]; const isAuthor = lastAuthors && lastAuthors.includes(stashId); + const _onFavorite = (): void => onFavorite(stashId); return ( - {lastBlockNumber && ( -

#{lastBlockNumber}
+ {isSubstrateV2 && ( +
+ {lastBlockNumber && ( +
#{lastBlockNumber}
+ )} + +
)} {controllerId && (
@@ -200,6 +212,22 @@ function Address ({ address, authorsMap, className, defaultName, filter, isElect export default withMulti( styled(Address)` + .extras { + display: inline-block; + margin-bottom: 0.75rem; + + .favorite { + cursor: pointer; + display: inline-block; + margin-left: 0.5rem; + margin-right: -0.25rem; + + &.isSelected { + color: goldenrod; + } + } + } + .blockNumberV1, .blockNumberV2 { border-radius: 0.25rem; @@ -220,7 +248,6 @@ export default withMulti( .blockNumberV2 { display: inline-block; - margin-bottom: 0.75rem; padding: 0.25rem 0; &.isCurrent { diff --git a/packages/app-staking/src/Overview/CurrentList.tsx b/packages/app-staking/src/Overview/CurrentList.tsx index 1836ae9fbd16..10bfab9609f4 100644 --- a/packages/app-staking/src/Overview/CurrentList.tsx +++ b/packages/app-staking/src/Overview/CurrentList.tsx @@ -2,14 +2,15 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { AccountId } from '@polkadot/types/interfaces'; import { DerivedHeartbeats, DerivedStakingOverview } from '@polkadot/api-derive/types'; import { I18nProps } from '@polkadot/react-components/types'; +import { AccountId } from '@polkadot/types/interfaces'; import { ValidatorFilter } from '../types'; import React, { useContext, useEffect, useState } from 'react'; import { ApiContext } from '@polkadot/react-api'; import { Columar, Column, Dropdown, FilterOverlay } from '@polkadot/react-components'; +import store from 'store'; import keyring from '@polkadot/ui-keyring'; import translate from '../translate'; @@ -23,17 +24,21 @@ interface Props extends I18nProps { stakingOverview?: DerivedStakingOverview; } -function renderColumn (myAccounts: string[], addresses: AccountId[] | string[], defaultName: string, withOnline: boolean, filter: string, { authorsMap, lastAuthors, recentlyOnline, stakingOverview }: Props, pointIndexes?: number[]): React.ReactNode { - return (addresses as AccountId[]).map((address, index): React.ReactNode => ( +const STORE_FAVS = 'staking:favorites'; + +function renderColumn (myAccounts: string[], favorites: string[], addresses: string[], defaultName: string, withOnline: boolean, filter: string, onFavorite: (accountId: string) => void, { authorsMap, lastAuthors, recentlyOnline, stakingOverview }: Props, pointIndexes?: number[]): React.ReactNode { + return addresses.map((address, index): React.ReactNode => (
accountId.eq(address))} + isFavorite={favorites.includes(address)} lastAuthors={lastAuthors} - key={address.toString()} + key={address} myAccounts={myAccounts} + onFavorite={onFavorite} points={ stakingOverview && pointIndexes && pointIndexes[index] !== -1 ? stakingOverview.eraPoints.individual[pointIndexes[index]] @@ -48,28 +53,55 @@ function renderColumn (myAccounts: string[], addresses: AccountId[] | string[], )); } -function filterAccounts (list: string[] = [], without: AccountId[] | string[]): string[] { - return list.filter((accountId): boolean => !without.includes(accountId as any)); +function filterAccounts (list: string[] = [], without: string[], favorites: string[]): string[] { + return list + .filter((accountId): boolean => !without.includes(accountId as any)) + .sort((a, b): number => { + const aIdx = favorites.includes(a); + const bIdx = favorites.includes(b); + + return aIdx === bIdx + ? 0 + : aIdx + ? -1 + : 1; + }); +} + +function accountsToString (accounts: AccountId[]): string[] { + return accounts.map((accountId): string => accountId.toString()); } function CurrentList (props: Props): React.ReactElement { const { isSubstrateV2 } = useContext(ApiContext); + const [favorites, setFavorites] = useState(store.get(STORE_FAVS, [])); const [filter, setFilter] = useState('all'); const [myAccounts] = useState(keyring.getAccounts().map(({ address }): string => address)); - const [{ electedFiltered, nextFiltered, pointIndexes }, setFiltered] = useState<{ electedFiltered: string[]; nextFiltered: string[]; pointIndexes: number[] }>({ electedFiltered: [], nextFiltered: [], pointIndexes: [] }); + const [{ elected, pointIndexes, validators, waiting }, setFiltered] = useState<{ elected: string[]; pointIndexes: number[]; validators: string[]; waiting: string[] }>({ elected: [], pointIndexes: [], validators: [], waiting: [] }); const { next, stakingOverview, t } = props; useEffect((): void => { if (stakingOverview) { - const elected = stakingOverview.currentElected.map((accountId): string => accountId.toString()); + const validators = filterAccounts(accountsToString(stakingOverview.validators), [], favorites); + const elected = isSubstrateV2 ? filterAccounts(accountsToString(stakingOverview.currentElected), validators, favorites) : []; setFiltered({ - electedFiltered: isSubstrateV2 ? filterAccounts(elected, stakingOverview.validators) : [], - nextFiltered: filterAccounts(next, elected), - pointIndexes: stakingOverview.validators.map((validator): number => elected.indexOf(validator.toString())) + elected, + pointIndexes: validators.map((validator): number => stakingOverview.currentElected.indexOf(validator as any)), + validators, + waiting: filterAccounts(next, elected, favorites) }); } - }, [next, stakingOverview]); + }, [favorites, next, stakingOverview]); + + const _onFavorite = (accountId: string): void => { + const newFavs = favorites.includes(accountId) + ? favorites.filter((thisOne): boolean => thisOne !== accountId) + : [...favorites, accountId]; + + store.set(STORE_FAVS, newFavs); + setFavorites(newFavs); + }; return (
@@ -94,16 +126,16 @@ function CurrentList (props: Props): React.ReactElement { emptyText={t('No addresses found')} headerText={t('validators')} > - {stakingOverview && renderColumn(myAccounts, stakingOverview.validators, t('validator'), true, filter, props, pointIndexes)} + {stakingOverview && renderColumn(myAccounts, favorites, validators, t('validator'), true, filter, _onFavorite, props, pointIndexes)} - {(electedFiltered.length !== 0 || nextFiltered.length !== 0) && ( + {(elected.length !== 0 || waiting.length !== 0) && ( <> - {renderColumn(myAccounts, electedFiltered, t('intention'), false, filter, props)} - {renderColumn(myAccounts, nextFiltered, t('intention'), false, filter, props)} + {renderColumn(myAccounts, favorites, elected, t('intention'), false, filter, _onFavorite, props)} + {renderColumn(myAccounts, favorites, waiting, t('intention'), false, filter, _onFavorite, props)} )} From 25c50576dca40fdfcf0e2b6eae9c9efe67fb8b5f Mon Sep 17 00:00:00 2001 From: Github Actions Date: Mon, 11 Nov 2019 19:03:11 +0000 Subject: [PATCH 004/154] [CI Skip] 0.37.0-beta.67 --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 29 files changed, 67 insertions(+), 67 deletions(-) diff --git a/lerna.json b/lerna.json index fd95240edd3b..7fe76a9d6f2d 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.66" + "version": "0.37.0-beta.67" } diff --git a/package.json b/package.json index d56ec7312216..5b3c59b24392 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 9d1d7dbf821b..cf2f20070793 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index b86dd498f9af..63342ed46f3b 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-components": "^0.37.0-beta.67", "@polkadot/react-qr": "^0.47.0-beta.5", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 82ffefa31e17..017357d52b7c 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index a7adade12422..4fda31e80200 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index e7cbb542baa4..99cce5041c7f 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/api-contract": "^0.97.0-beta.2", - "@polkadot/react-components": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index b1b8103d1593..1d9f8ca548cf 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", - "@polkadot/react-query": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-query": "^0.37.0-beta.67" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index caa25979f1b7..f73b0544333d 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/apps-routing": "^0.37.0-beta.66", - "@polkadot/react-components": "^0.37.0-beta.66" + "@polkadot/apps-routing": "^0.37.0-beta.67", + "@polkadot/react-components": "^0.37.0-beta.67" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 5df6b65f4eb2..5936a3dad259 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", - "@polkadot/react-query": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-query": "^0.37.0-beta.67" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 63dda82a1fe1..8f8330c600cf 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index a2412b1e39e6..cf5789ebaed6 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", - "@polkadot/react-params": "^0.37.0-beta.66", - "@polkadot/react-signer": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-params": "^0.37.0-beta.67", + "@polkadot/react-signer": "^0.37.0-beta.67" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 17f91cbbdc6d..d16fcabbaf74 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 0f124329c76c..e26f408f3785 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-components": "^0.37.0-beta.67", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 21a3b7bc444e..cc62c562efc3 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", - "@polkadot/react-query": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-query": "^0.37.0-beta.67" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 9e7ab46f1a32..e74accaca659 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", - "@polkadot/react-query": "^0.37.0-beta.66", + "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-query": "^0.37.0-beta.67", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index d019cee3fb0c..bbdbd680bda0 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/app-explorer": "^0.37.0-beta.66", - "@polkadot/react-components": "^0.37.0-beta.66", - "@polkadot/react-query": "^0.37.0-beta.66" + "@polkadot/app-explorer": "^0.37.0-beta.67", + "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-query": "^0.37.0-beta.67" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index bece302591e8..bb53d7ebdab0 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", - "@polkadot/react-params": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-params": "^0.37.0-beta.67" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index d8b5bd5dd234..44934bce0a29 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index b309dc41a4d1..d252fe37ae00 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 7944b8452444..fa3b5115fe3c 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", - "@polkadot/react-query": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-query": "^0.37.0-beta.67" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 687ab54df4d1..fe1c30a1639d 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", - "@polkadot/react-query": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-query": "^0.37.0-beta.67" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index b31ef64253e8..91782a366ad3 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index c9f9f0d065dd..b7aa1d4f6d51 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", - "@polkadot/react-signer": "^0.37.0-beta.66", + "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-signer": "^0.37.0-beta.67", "@polkadot/ui-assets": "^0.47.0-beta.5", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index d2e264d6ce80..64b17fd80150 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 9f43b878b342..94f363be849c 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/react-api": "^0.37.0-beta.66", + "@polkadot/react-api": "^0.37.0-beta.67", "@polkadot/react-identicon": "^0.47.0-beta.5", - "@polkadot/react-query": "^0.37.0-beta.66", + "@polkadot/react-query": "^0.37.0-beta.67", "@polkadot/ui-keyring": "^0.47.0-beta.5", "@polkadot/ui-settings": "^0.47.0-beta.5", "@types/chart.js": "^2.8.10", diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 31c5614c4352..4ddea730d183 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66" + "@polkadot/react-components": "^0.37.0-beta.67" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index da1462297f73..c4af27e86b0c 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index b5cc1b10eeff..16e8005f7ba9 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.66", + "version": "0.37.0-beta.67", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.66", + "@polkadot/react-components": "^0.37.0-beta.67", "@polkadot/react-qr": "^0.47.0-beta.5" } } From a3b3eb99307c71b9b61177b9e8412e19880864c3 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 11 Nov 2019 20:51:04 +0100 Subject: [PATCH 005/154] Small fav display tweaks (#1868) * Add staking favorites (top of list) * Small display tweaks * Checks --- packages/app-staking/src/Overview/Address.tsx | 4 +- .../app-staking/src/Overview/CurrentList.tsx | 106 ++++++++++-------- 2 files changed, 60 insertions(+), 50 deletions(-) diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx index cc7d134bc7fd..1f4013be196b 100644 --- a/packages/app-staking/src/Overview/Address.tsx +++ b/packages/app-staking/src/Overview/Address.tsx @@ -223,7 +223,7 @@ export default withMulti( margin-right: -0.25rem; &.isSelected { - color: goldenrod; + color: darkorange; } } } @@ -273,7 +273,7 @@ export default withMulti( } .staking--label.controllerSpacer { - margin-top: 2.75rem; + margin-top: 0.5rem; } `, translate, diff --git a/packages/app-staking/src/Overview/CurrentList.tsx b/packages/app-staking/src/Overview/CurrentList.tsx index 10bfab9609f4..bb7e2fa3d22f 100644 --- a/packages/app-staking/src/Overview/CurrentList.tsx +++ b/packages/app-staking/src/Overview/CurrentList.tsx @@ -24,37 +24,12 @@ interface Props extends I18nProps { stakingOverview?: DerivedStakingOverview; } -const STORE_FAVS = 'staking:favorites'; +type AccountExtend = [string, boolean, boolean, number]; -function renderColumn (myAccounts: string[], favorites: string[], addresses: string[], defaultName: string, withOnline: boolean, filter: string, onFavorite: (accountId: string) => void, { authorsMap, lastAuthors, recentlyOnline, stakingOverview }: Props, pointIndexes?: number[]): React.ReactNode { - return addresses.map((address, index): React.ReactNode => ( -
accountId.eq(address))} - isFavorite={favorites.includes(address)} - lastAuthors={lastAuthors} - key={address} - myAccounts={myAccounts} - onFavorite={onFavorite} - points={ - stakingOverview && pointIndexes && pointIndexes[index] !== -1 - ? stakingOverview.eraPoints.individual[pointIndexes[index]] - : undefined - } - recentlyOnline={ - withOnline - ? recentlyOnline - : undefined - } - /> - )); -} +const STORE_FAVS = 'staking:favorites'; -function filterAccounts (list: string[] = [], without: string[], favorites: string[]): string[] { - return list +function filterAccounts (accounts: string[] = [], elected: string[], favorites: string[], without: string[], noPoints = false): AccountExtend[] { + return accounts .filter((accountId): boolean => !without.includes(accountId as any)) .sort((a, b): number => { const aIdx = favorites.includes(a); @@ -65,43 +40,78 @@ function filterAccounts (list: string[] = [], without: string[], favorites: stri : aIdx ? -1 : 1; - }); + }) + .map((accountId): AccountExtend => [ + accountId, + elected.includes(accountId), + favorites.includes(accountId), + noPoints + ? -1 + : elected.indexOf(accountId) + ]); } function accountsToString (accounts: AccountId[]): string[] { return accounts.map((accountId): string => accountId.toString()); } -function CurrentList (props: Props): React.ReactElement { +function CurrentList ({ authorsMap, lastAuthors, next, recentlyOnline, stakingOverview, t }: Props): React.ReactElement { const { isSubstrateV2 } = useContext(ApiContext); const [favorites, setFavorites] = useState(store.get(STORE_FAVS, [])); const [filter, setFilter] = useState('all'); const [myAccounts] = useState(keyring.getAccounts().map(({ address }): string => address)); - const [{ elected, pointIndexes, validators, waiting }, setFiltered] = useState<{ elected: string[]; pointIndexes: number[]; validators: string[]; waiting: string[] }>({ elected: [], pointIndexes: [], validators: [], waiting: [] }); - const { next, stakingOverview, t } = props; + const [{ elected, validators, waiting }, setFiltered] = useState<{ elected: AccountExtend[]; validators: AccountExtend[]; waiting: AccountExtend[] }>({ elected: [], validators: [], waiting: [] }); useEffect((): void => { if (stakingOverview) { - const validators = filterAccounts(accountsToString(stakingOverview.validators), [], favorites); - const elected = isSubstrateV2 ? filterAccounts(accountsToString(stakingOverview.currentElected), validators, favorites) : []; + const _elected = accountsToString(stakingOverview.currentElected); + const _validators = accountsToString(stakingOverview.validators); + const validators = filterAccounts(_validators, _elected, favorites, []); + const elected = isSubstrateV2 ? filterAccounts(_elected, _elected, favorites, _validators, true) : []; setFiltered({ elected, - pointIndexes: validators.map((validator): number => stakingOverview.currentElected.indexOf(validator as any)), validators, - waiting: filterAccounts(next, elected, favorites) + waiting: filterAccounts(next, [], favorites, _elected, true) }); } }, [favorites, next, stakingOverview]); - const _onFavorite = (accountId: string): void => { - const newFavs = favorites.includes(accountId) - ? favorites.filter((thisOne): boolean => thisOne !== accountId) - : [...favorites, accountId]; - - store.set(STORE_FAVS, newFavs); - setFavorites(newFavs); - }; + const _onFavorite = (accountId: string): void => + setFavorites( + store.set( + STORE_FAVS, + favorites.includes(accountId) + ? favorites.filter((thisOne): boolean => thisOne !== accountId) + : [...favorites, accountId] + ) + ); + + const _renderColumn = (addresses: AccountExtend[], defaultName: string, withOnline: boolean): React.ReactNode => + addresses.map(([address, isElected, isFavorite, pointIndex]): React.ReactNode => ( +
+ )); return (
@@ -126,7 +136,7 @@ function CurrentList (props: Props): React.ReactElement { emptyText={t('No addresses found')} headerText={t('validators')} > - {stakingOverview && renderColumn(myAccounts, favorites, validators, t('validator'), true, filter, _onFavorite, props, pointIndexes)} + {validators.length !== 0 && _renderColumn(validators, t('validator'), true)} { > {(elected.length !== 0 || waiting.length !== 0) && ( <> - {renderColumn(myAccounts, favorites, elected, t('intention'), false, filter, _onFavorite, props)} - {renderColumn(myAccounts, favorites, waiting, t('intention'), false, filter, _onFavorite, props)} + {_renderColumn(elected, t('intention'), false)} + {_renderColumn(waiting, t('intention'), false)} )} From c27bed085787e36fff60f1d4efc4652bb1c77d5f Mon Sep 17 00:00:00 2001 From: Github Actions Date: Mon, 11 Nov 2019 19:55:54 +0000 Subject: [PATCH 006/154] [CI Skip] 0.37.0-beta.68 --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 29 files changed, 67 insertions(+), 67 deletions(-) diff --git a/lerna.json b/lerna.json index 7fe76a9d6f2d..30c44a96fde0 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.67" + "version": "0.37.0-beta.68" } diff --git a/package.json b/package.json index 5b3c59b24392..5bc7170ed7b5 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index cf2f20070793..76566c055d0c 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 63342ed46f3b..e24b68ab2fd7 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-components": "^0.37.0-beta.68", "@polkadot/react-qr": "^0.47.0-beta.5", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 017357d52b7c..cd787d464cc9 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 4fda31e80200..b15f90799e9f 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 99cce5041c7f..9774117924e9 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/api-contract": "^0.97.0-beta.2", - "@polkadot/react-components": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 1d9f8ca548cf..9ef8f21a5259 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", - "@polkadot/react-query": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-query": "^0.37.0-beta.68" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index f73b0544333d..0ad3e7bd448a 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/apps-routing": "^0.37.0-beta.67", - "@polkadot/react-components": "^0.37.0-beta.67" + "@polkadot/apps-routing": "^0.37.0-beta.68", + "@polkadot/react-components": "^0.37.0-beta.68" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 5936a3dad259..b21f72052383 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", - "@polkadot/react-query": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-query": "^0.37.0-beta.68" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 8f8330c600cf..fd4bfc24d0d2 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index cf5789ebaed6..dc862c806129 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", - "@polkadot/react-params": "^0.37.0-beta.67", - "@polkadot/react-signer": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-params": "^0.37.0-beta.68", + "@polkadot/react-signer": "^0.37.0-beta.68" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index d16fcabbaf74..419bb3ad0838 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index e26f408f3785..ece86c1cd85e 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-components": "^0.37.0-beta.68", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index cc62c562efc3..a6ef7837ec4c 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", - "@polkadot/react-query": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-query": "^0.37.0-beta.68" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index e74accaca659..932de60a445c 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", - "@polkadot/react-query": "^0.37.0-beta.67", + "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-query": "^0.37.0-beta.68", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index bbdbd680bda0..50ca08ab2aad 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/app-explorer": "^0.37.0-beta.67", - "@polkadot/react-components": "^0.37.0-beta.67", - "@polkadot/react-query": "^0.37.0-beta.67" + "@polkadot/app-explorer": "^0.37.0-beta.68", + "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-query": "^0.37.0-beta.68" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index bb53d7ebdab0..d38a470321fd 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", - "@polkadot/react-params": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-params": "^0.37.0-beta.68" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 44934bce0a29..c648e745ac34 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index d252fe37ae00..d85373634d7a 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index fa3b5115fe3c..f7050e704b77 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", - "@polkadot/react-query": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-query": "^0.37.0-beta.68" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index fe1c30a1639d..45e86066410e 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", - "@polkadot/react-query": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-query": "^0.37.0-beta.68" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 91782a366ad3..8a1506a193be 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index b7aa1d4f6d51..801928ee3c4a 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", - "@polkadot/react-signer": "^0.37.0-beta.67", + "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-signer": "^0.37.0-beta.68", "@polkadot/ui-assets": "^0.47.0-beta.5", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 64b17fd80150..8a0cc2a6cf03 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 94f363be849c..cf9f5d28af72 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/react-api": "^0.37.0-beta.67", + "@polkadot/react-api": "^0.37.0-beta.68", "@polkadot/react-identicon": "^0.47.0-beta.5", - "@polkadot/react-query": "^0.37.0-beta.67", + "@polkadot/react-query": "^0.37.0-beta.68", "@polkadot/ui-keyring": "^0.47.0-beta.5", "@polkadot/ui-settings": "^0.47.0-beta.5", "@types/chart.js": "^2.8.10", diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 4ddea730d183..af9bb8f72738 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67" + "@polkadot/react-components": "^0.37.0-beta.68" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index c4af27e86b0c..957afde32b7b 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 16e8005f7ba9..07f964d51b72 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.67", + "version": "0.37.0-beta.68", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.67", + "@polkadot/react-components": "^0.37.0-beta.68", "@polkadot/react-qr": "^0.47.0-beta.5" } } From 5ec79faa4a1b5b8cba3d6649aa7220c4b2501cf6 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 11 Nov 2019 23:35:00 +0100 Subject: [PATCH 007/154] Add fav & current as nominations (#1869) * Add fav & current as nominations * Toggle nominee at end * Selection icons for council --- .../app-council/src/Overview/Candidate.tsx | 10 +- packages/app-council/src/Overview/Member.tsx | 10 +- packages/app-council/src/Overview/Summary.tsx | 5 +- packages/app-council/src/Overview/Vote.tsx | 2 + .../src/Actions/Account/Nominate.tsx | 136 +++++++++++++++--- .../app-staking/src/Actions/Account/index.tsx | 3 +- .../app-staking/src/Overview/CurrentList.tsx | 53 ++++--- packages/app-staking/src/constants.ts | 5 + packages/react-components/src/Badge.tsx | 9 +- 9 files changed, 182 insertions(+), 51 deletions(-) create mode 100644 packages/app-staking/src/constants.ts diff --git a/packages/app-council/src/Overview/Candidate.tsx b/packages/app-council/src/Overview/Candidate.tsx index 08ccebb29b98..37594e27ad4d 100644 --- a/packages/app-council/src/Overview/Candidate.tsx +++ b/packages/app-council/src/Overview/Candidate.tsx @@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/react-components/types'; import { AccountId } from '@polkadot/types/interfaces'; import React from 'react'; -import { AddressCard } from '@polkadot/react-components'; +import { AddressCard, Badge, Icon } from '@polkadot/react-components'; import translate from '../translate'; import Voters from './Voters'; @@ -21,6 +21,14 @@ function Candidate ({ address, isRunnerUp, t, voters }: Props): React.ReactEleme return ( } + isTooltip + type='runnerup' + /> + )} value={address} withIndexOrAddress > diff --git a/packages/app-council/src/Overview/Member.tsx b/packages/app-council/src/Overview/Member.tsx index a4e19eb5f9ca..e75d822fd77f 100644 --- a/packages/app-council/src/Overview/Member.tsx +++ b/packages/app-council/src/Overview/Member.tsx @@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/react-components/types'; import { AccountId } from '@polkadot/types/interfaces'; import React from 'react'; -import { AddressCard } from '@polkadot/react-components'; +import { AddressCard, Badge, Icon } from '@polkadot/react-components'; import translate from '../translate'; import Voters from './Voters'; @@ -20,6 +20,14 @@ function Member ({ address, t, voters }: Props): React.ReactElement { return ( } + isTooltip + type='selected' + /> + } value={address} withIndexOrAddress > diff --git a/packages/app-council/src/Overview/Summary.tsx b/packages/app-council/src/Overview/Summary.tsx index b47cc67797df..c9a63aec4989 100644 --- a/packages/app-council/src/Overview/Summary.tsx +++ b/packages/app-council/src/Overview/Summary.tsx @@ -24,8 +24,11 @@ function Summary ({ bestNumber, electionsInfo: { members, candidateCount, desire {formatNumber(members.length)}/{formatNumber(desiredSeats)} + + {formatNumber(runnersUp.length)} + - {formatNumber(candidateCount.addn(runnersUp.length))} + {formatNumber(candidateCount)} {voteCount && ( diff --git a/packages/app-council/src/Overview/Vote.tsx b/packages/app-council/src/Overview/Vote.tsx index 6be0be43f6af..4abe55b82ebe 100644 --- a/packages/app-council/src/Overview/Vote.tsx +++ b/packages/app-council/src/Overview/Vote.tsx @@ -31,6 +31,8 @@ interface State extends TxModalState { // voterPositions: DerivedVoterPositions; } +// const MAX_VOTES = 16; + // const AlreadyVoted = styled.article` // display: flex; // align-items: center; diff --git a/packages/app-staking/src/Actions/Account/Nominate.tsx b/packages/app-staking/src/Actions/Account/Nominate.tsx index fdbc81790ad1..f7669bf62a1f 100644 --- a/packages/app-staking/src/Actions/Account/Nominate.tsx +++ b/packages/app-staking/src/Actions/Account/Nominate.tsx @@ -5,14 +5,16 @@ import { I18nProps } from '@polkadot/react-components/types'; import { KeyringSectionOption } from '@polkadot/ui-keyring/options/types'; -import React, { useState } from 'react'; -import { Button, InputAddress, Modal, TxButton } from '@polkadot/react-components'; +import React, { useEffect, useState } from 'react'; +import store from 'store'; +import styled from 'styled-components'; +import { AddressMini, Button, InputAddress, Modal, Toggle, TxButton } from '@polkadot/react-components'; +import { STORE_FAVS } from '../../constants'; import translate from '../../translate'; interface Props extends I18nProps { controllerId: string; - isOpen: boolean; nominees?: string[]; onClose: () => void; stashId: string; @@ -22,27 +24,52 @@ interface Props extends I18nProps { // We only allow a maximum of 16 nominees, negative to slice const MAX_NOMINEES = -16; -function Nominate ({ controllerId, isOpen, onClose, stashId, stashOptions, t }: Props): React.ReactElement | null { - const [nominees, setNominees] = useState([]); +function Nominate ({ className, controllerId, nominees, onClose, stashId, stashOptions, t }: Props): React.ReactElement | null { + const [favorites] = useState(store.get(STORE_FAVS, [])); + const [next, setNext] = useState(); + const [{ options, shortlist }, setShortlist] = useState<{ options: KeyringSectionOption[]; shortlist: string[] }>({ options: [], shortlist: [] }); - if (!isOpen) { - return null; - } + useEffect((): void => { + if (!next && nominees) { + setNext(nominees); + } + }, [next, nominees]); + + useEffect((): void => { + if (nominees) { + const shortlist = [ + // ensure that the favorite is included in the list of stashes + ...favorites.filter((accountId): boolean => stashOptions.some(({ value }): boolean => value === accountId)), + // make sure the nominee is not in our favorites already + ...nominees.filter((accountId): boolean => !favorites.includes(accountId)) + ]; + + setShortlist({ + options: stashOptions.filter(({ value }): boolean => !shortlist.includes(value as string)), + shortlist + }); + } + }, [favorites, nominees, stashOptions]); const _onChangeNominees = (_nominees: string[]): void => { const newNominees = _nominees.slice(MAX_NOMINEES); if (JSON.stringify(newNominees) !== JSON.stringify(nominees)) { - setNominees(newNominees); + setNext(newNominees); } }; + const _onToggleNominee = (nominee: string): void => + setNext( + (next || []).includes(nominee) + ? (next || []).filter((accountId): boolean => accountId !== nominee) + : [...(next || []), nominee].slice(MAX_NOMINEES) + ); return ( {t('Nominate Validators')} @@ -67,11 +94,39 @@ function Nominate ({ controllerId, isOpen, onClose, stashId, stashOptions, t }: isMultiple label={t('nominate the following addresses')} onChangeMulti={_onChangeNominees} - options={stashOptions} + options={options} placeholder={t('select accounts(s) nominate')} type='account' - value={nominees} + value={next || []} /> + {shortlist.length !== 0 && ( +
+ {shortlist.map((address): React.ReactNode => { + const isAye = next?.includes(address); + const _onChange = (): void => _onToggleNominee(address); + + return ( + +
+ +
+
+ ); + })} +
+ )} @@ -84,10 +139,10 @@ function Nominate ({ controllerId, isOpen, onClose, stashId, stashOptions, t }: { const { stashOptions } = this.props; const { controllerId, isNominateOpen, nominees, stashId } = this.state; - if (!stashId || !controllerId) { + if (!isNominateOpen || !stashId || !controllerId) { return null; } return ( !without.includes(accountId as any)) .sort((a, b): number => { - const aIdx = favorites.includes(a); - const bIdx = favorites.includes(b); + const isFavA = favorites.includes(a); + const isFavB = favorites.includes(b); - return aIdx === bIdx + return isFavA === isFavB ? 0 - : aIdx - ? -1 - : 1; + : (isFavA ? -1 : 1); }) - .map((accountId): AccountExtend => [ - accountId, - elected.includes(accountId), - favorites.includes(accountId), - noPoints - ? -1 - : elected.indexOf(accountId) - ]); + .map((accountId): AccountExtend => { + const electedIdx = elected.indexOf(accountId); + + return [ + accountId, + elected.includes(accountId), + favorites.includes(accountId), + electedIdx !== -1 + ? eraPoints?.individual[electedIdx] + : undefined + ]; + }); } function accountsToString (accounts: AccountId[]): string[] { @@ -66,13 +67,13 @@ function CurrentList ({ authorsMap, lastAuthors, next, recentlyOnline, stakingOv if (stakingOverview) { const _elected = accountsToString(stakingOverview.currentElected); const _validators = accountsToString(stakingOverview.validators); - const validators = filterAccounts(_validators, _elected, favorites, []); - const elected = isSubstrateV2 ? filterAccounts(_elected, _elected, favorites, _validators, true) : []; + const validators = filterAccounts(_validators, _elected, favorites, [], stakingOverview.eraPoints); + const elected = isSubstrateV2 ? filterAccounts(_elected, _elected, favorites, _validators) : []; setFiltered({ elected, validators, - waiting: filterAccounts(next, [], favorites, _elected, true) + waiting: filterAccounts(next, [], favorites, _elected) }); } }, [favorites, next, stakingOverview]); @@ -88,7 +89,7 @@ function CurrentList ({ authorsMap, lastAuthors, next, recentlyOnline, stakingOv ); const _renderColumn = (addresses: AccountExtend[], defaultName: string, withOnline: boolean): React.ReactNode => - addresses.map(([address, isElected, isFavorite, pointIndex]): React.ReactNode => ( + addresses.map(([address, isElected, isFavorite, points]): React.ReactNode => (
Date: Mon, 11 Nov 2019 22:40:10 +0000 Subject: [PATCH 008/154] [CI Skip] 0.37.0-beta.69 --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-council.json | 5 ++++- packages/apps/public/locales/en/app-staking.json | 4 +++- packages/apps/public/locales/en/ui.json | 5 ++++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 32 files changed, 78 insertions(+), 70 deletions(-) diff --git a/lerna.json b/lerna.json index 30c44a96fde0..b418d853485b 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.68" + "version": "0.37.0-beta.69" } diff --git a/package.json b/package.json index 5bc7170ed7b5..947793a3d4d3 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 76566c055d0c..626b4cb6e576 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index e24b68ab2fd7..10556a1c9580 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-components": "^0.37.0-beta.69", "@polkadot/react-qr": "^0.47.0-beta.5", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index cd787d464cc9..57d4b059b10c 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index b15f90799e9f..3afda26f6854 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 9774117924e9..7d1c7ceda105 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/api-contract": "^0.97.0-beta.2", - "@polkadot/react-components": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 9ef8f21a5259..8b7bc0b1342e 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", - "@polkadot/react-query": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-query": "^0.37.0-beta.69" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 0ad3e7bd448a..ab3ffca86e79 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/apps-routing": "^0.37.0-beta.68", - "@polkadot/react-components": "^0.37.0-beta.68" + "@polkadot/apps-routing": "^0.37.0-beta.69", + "@polkadot/react-components": "^0.37.0-beta.69" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index b21f72052383..320b3c1580d2 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", - "@polkadot/react-query": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-query": "^0.37.0-beta.69" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index fd4bfc24d0d2..0af678f4c570 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index dc862c806129..285a0c7e69b3 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", - "@polkadot/react-params": "^0.37.0-beta.68", - "@polkadot/react-signer": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-params": "^0.37.0-beta.69", + "@polkadot/react-signer": "^0.37.0-beta.69" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 419bb3ad0838..bd64c754a322 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index ece86c1cd85e..8fc3659cec7f 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-components": "^0.37.0-beta.69", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index a6ef7837ec4c..c320ae23614b 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", - "@polkadot/react-query": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-query": "^0.37.0-beta.69" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 932de60a445c..08400e59a454 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", - "@polkadot/react-query": "^0.37.0-beta.68", + "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-query": "^0.37.0-beta.69", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 50ca08ab2aad..e34db751977f 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/app-explorer": "^0.37.0-beta.68", - "@polkadot/react-components": "^0.37.0-beta.68", - "@polkadot/react-query": "^0.37.0-beta.68" + "@polkadot/app-explorer": "^0.37.0-beta.69", + "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-query": "^0.37.0-beta.69" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index d38a470321fd..1a5f1b142b48 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", - "@polkadot/react-params": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-params": "^0.37.0-beta.69" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index c648e745ac34..c23682489f08 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index d85373634d7a..7d9df28fd6d0 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index f7050e704b77..dcbaf100e689 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", - "@polkadot/react-query": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-query": "^0.37.0-beta.69" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 45e86066410e..fe0f9b41682f 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", - "@polkadot/react-query": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-query": "^0.37.0-beta.69" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 8a1506a193be..5565afb63383 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 801928ee3c4a..39c42a2b9700 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", - "@polkadot/react-signer": "^0.37.0-beta.68", + "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-signer": "^0.37.0-beta.69", "@polkadot/ui-assets": "^0.47.0-beta.5", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-council.json b/packages/apps/public/locales/en/app-council.json index 1692537d0694..4e489ba6b271 100644 --- a/packages/apps/public/locales/en/app-council.json +++ b/packages/apps/public/locales/en/app-council.json @@ -39,5 +39,8 @@ "The amount that is associated with this vote. This value is is locked for the duration of the vote.": "The amount that is associated with this vote. This value is is locked for the duration of the vote.", "vote value": "vote value", "voting balance ": "voting balance ", - "runner up": "runner up" + "runner up": "runner up", + "Runner up": "Runner up", + "Current member": "Current member", + "runners up": "runners up" } diff --git a/packages/apps/public/locales/en/app-staking.json b/packages/apps/public/locales/en/app-staking.json index 96811497fe14..da27f6944542 100644 --- a/packages/apps/public/locales/en/app-staking.json +++ b/packages/apps/public/locales/en/app-staking.json @@ -94,5 +94,7 @@ "Active with {{blocks}} blocks authored{{hasMessage}} heartbeat message": "Active with {{blocks}} blocks authored{{hasMessage}} heartbeat message", "transferrable ": "transferrable ", "The specified value is greater than your free balance. The node will bond the maximum amount available.": "The specified value is greater than your free balance. The node will bond the maximum amount available.", - "Change session keys": "Change session keys" + "Change session keys": "Change session keys", + "Aye": "Aye", + "Nay": "Nay" } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index 2b2812be299e..938ac3a296c1 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -609,5 +609,8 @@ "The password to unlock the selected account.": "", "derivation path": "", "//hard/soft": "", - "runner up": "" + "runner up": "", + "Runner up": "", + "Current member": "", + "runners up": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 8a0cc2a6cf03..68dea8fe014c 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index cf9f5d28af72..4b846b4cba14 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/react-api": "^0.37.0-beta.68", + "@polkadot/react-api": "^0.37.0-beta.69", "@polkadot/react-identicon": "^0.47.0-beta.5", - "@polkadot/react-query": "^0.37.0-beta.68", + "@polkadot/react-query": "^0.37.0-beta.69", "@polkadot/ui-keyring": "^0.47.0-beta.5", "@polkadot/ui-settings": "^0.47.0-beta.5", "@types/chart.js": "^2.8.10", diff --git a/packages/react-params/package.json b/packages/react-params/package.json index af9bb8f72738..7a520c8023ff 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68" + "@polkadot/react-components": "^0.37.0-beta.69" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 957afde32b7b..dbb28e49c844 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 07f964d51b72..0c17a29eb387 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.68", + "version": "0.37.0-beta.69", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.68", + "@polkadot/react-components": "^0.37.0-beta.69", "@polkadot/react-qr": "^0.47.0-beta.5" } } From 94a5c70f236e74fce33daad8ff87407b4e108359 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 12 Nov 2019 08:17:33 +0100 Subject: [PATCH 009/154] Add treasury balance (#1870) --- .../app-treasury/src/Overview/Summary.tsx | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/packages/app-treasury/src/Overview/Summary.tsx b/packages/app-treasury/src/Overview/Summary.tsx index c218993d4412..392dfa30f8f2 100644 --- a/packages/app-treasury/src/Overview/Summary.tsx +++ b/packages/app-treasury/src/Overview/Summary.tsx @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/camelcase */ // Copyright 2017-2019 @polkadot/app-democracy authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. @@ -9,34 +8,39 @@ import BN from 'bn.js'; import React from 'react'; import { SummaryBox, CardSummary } from '@polkadot/react-components'; import { withCalls } from '@polkadot/react-api'; -import { formatBalance, formatNumber } from '@polkadot/util'; +import { formatBalance, formatNumber, stringToU8a } from '@polkadot/util'; import translate from '../translate'; +const TREASURY_ACCOUNT = stringToU8a('modlpy/trsry'.padEnd(32, '\0')); + interface Props extends I18nProps { - treasury_proposalCount?: BN; - treasury_approvals?: BN[]; - treasury_pot?: BN; + treasuryBalance?: BN; + approvals?: BN[]; + proposalCount?: BN; + pot?: BN; } -function Summary ({ treasury_proposalCount, treasury_approvals, treasury_pot, t }: Props): React.ReactElement { - const value = treasury_pot && treasury_pot.gtn(0) - ? treasury_pot.toString() - : null; +function Summary ({ treasuryBalance, approvals, proposalCount, pot, t }: Props): React.ReactElement { + const value = treasuryBalance?.gtn(0) + ? treasuryBalance.toString() + : pot?.gtn(0) + ? pot.toString() + : null; return (
- {formatNumber(treasury_proposalCount)} + {formatNumber(proposalCount)} - {treasury_approvals ? treasury_approvals.length : '0'} + {formatNumber(approvals?.length)}
{value && ( - + {formatBalance(value, false)}{formatBalance.calcSi(value).value} )} @@ -47,8 +51,12 @@ function Summary ({ treasury_proposalCount, treasury_approvals, treasury_pot, t export default translate( withCalls( - 'query.treasury.proposalCount', - 'query.treasury.approvals', - 'query.treasury.pot' + ['query.balances.freeBalance', { + params: [TREASURY_ACCOUNT], + propName: 'treasuryBalance' + }], + ['query.treasury.approvals', { propName: 'approvals' }], + ['query.treasury.proposalCount', { propName: 'proposalCount' }], + ['query.treasury.pot', { propName: 'pot' }] )(Summary) ); From e15b69e62ce09ecbc7604108a323f7d5af2fe00f Mon Sep 17 00:00:00 2001 From: Github Actions Date: Tue, 12 Nov 2019 07:22:47 +0000 Subject: [PATCH 010/154] [CI Skip] 0.37.0-beta.70 --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-treasury.json | 3 ++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 69 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index b418d853485b..e9a103ec1f4a 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.69" + "version": "0.37.0-beta.70" } diff --git a/package.json b/package.json index 947793a3d4d3..ca3a2b1ae8de 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 626b4cb6e576..9b392b66a98e 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 10556a1c9580..9c9e372ed83c 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-components": "^0.37.0-beta.70", "@polkadot/react-qr": "^0.47.0-beta.5", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 57d4b059b10c..8f81d7f9dd70 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 3afda26f6854..a1afad3e868f 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 7d1c7ceda105..596aab21ecb7 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/api-contract": "^0.97.0-beta.2", - "@polkadot/react-components": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 8b7bc0b1342e..d91ef4e4e280 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", - "@polkadot/react-query": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-query": "^0.37.0-beta.70" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index ab3ffca86e79..51cc0c1c9d44 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/apps-routing": "^0.37.0-beta.69", - "@polkadot/react-components": "^0.37.0-beta.69" + "@polkadot/apps-routing": "^0.37.0-beta.70", + "@polkadot/react-components": "^0.37.0-beta.70" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 320b3c1580d2..08b7b8341aac 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", - "@polkadot/react-query": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-query": "^0.37.0-beta.70" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 0af678f4c570..a3c0258741f9 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 285a0c7e69b3..b4ceaeb67f2a 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", - "@polkadot/react-params": "^0.37.0-beta.69", - "@polkadot/react-signer": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-params": "^0.37.0-beta.70", + "@polkadot/react-signer": "^0.37.0-beta.70" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index bd64c754a322..e6a9bf18200d 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 8fc3659cec7f..4a485d964a7f 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-components": "^0.37.0-beta.70", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index c320ae23614b..c07c815782c7 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", - "@polkadot/react-query": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-query": "^0.37.0-beta.70" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 08400e59a454..714a7431696e 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", - "@polkadot/react-query": "^0.37.0-beta.69", + "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-query": "^0.37.0-beta.70", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index e34db751977f..06aa86c93818 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/app-explorer": "^0.37.0-beta.69", - "@polkadot/react-components": "^0.37.0-beta.69", - "@polkadot/react-query": "^0.37.0-beta.69" + "@polkadot/app-explorer": "^0.37.0-beta.70", + "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-query": "^0.37.0-beta.70" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 1a5f1b142b48..00fff6fb6e3d 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", - "@polkadot/react-params": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-params": "^0.37.0-beta.70" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index c23682489f08..68cc18acc292 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 7d9df28fd6d0..8e815a788bbf 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index dcbaf100e689..b30a60f3a0f1 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", - "@polkadot/react-query": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-query": "^0.37.0-beta.70" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index fe0f9b41682f..a580ddf8d5e5 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", - "@polkadot/react-query": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-query": "^0.37.0-beta.70" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 5565afb63383..f3215acdb890 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 39c42a2b9700..e72356917850 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", - "@polkadot/react-signer": "^0.37.0-beta.69", + "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-signer": "^0.37.0-beta.70", "@polkadot/ui-assets": "^0.47.0-beta.5", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-treasury.json b/packages/apps/public/locales/en/app-treasury.json index f2ddb40dcaa1..1d6d48ab9e43 100644 --- a/packages/apps/public/locales/en/app-treasury.json +++ b/packages/apps/public/locales/en/app-treasury.json @@ -32,5 +32,6 @@ "burn percentage": "burn percentage", "Submit": "Submit", "Pot": "Pot", - "pot size": "pot size" + "pot size": "pot size", + "available": "available" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 68dea8fe014c..469bcaab1113 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 4b846b4cba14..e2b4b4d12187 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/react-api": "^0.37.0-beta.69", + "@polkadot/react-api": "^0.37.0-beta.70", "@polkadot/react-identicon": "^0.47.0-beta.5", - "@polkadot/react-query": "^0.37.0-beta.69", + "@polkadot/react-query": "^0.37.0-beta.70", "@polkadot/ui-keyring": "^0.47.0-beta.5", "@polkadot/ui-settings": "^0.47.0-beta.5", "@types/chart.js": "^2.8.10", diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 7a520c8023ff..9902dfffad25 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69" + "@polkadot/react-components": "^0.37.0-beta.70" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index dbb28e49c844..9076d43e3cf8 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 0c17a29eb387..bc68f8029005 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.69", + "version": "0.37.0-beta.70", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.69", + "@polkadot/react-components": "^0.37.0-beta.70", "@polkadot/react-qr": "^0.47.0-beta.5" } } From 2b9dd5baa9782c476420613afb905b33fd8dabb7 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 12 Nov 2019 09:58:16 +0100 Subject: [PATCH 011/154] Blocks per session graph (hidden) (#1871) --- packages/app-staking/src/Query/Validator.tsx | 79 ++++++++++++++ packages/app-staking/src/Query/index.tsx | 37 +++++++ packages/app-staking/src/index.tsx | 2 + packages/app-staking/src/types.ts | 8 -- packages/react-components/src/Chart/Line.tsx | 109 +++++++++++++++++++ packages/react-components/src/Chart/index.ts | 4 +- 6 files changed, 230 insertions(+), 9 deletions(-) create mode 100644 packages/app-staking/src/Query/Validator.tsx create mode 100644 packages/app-staking/src/Query/index.tsx create mode 100644 packages/react-components/src/Chart/Line.tsx diff --git a/packages/app-staking/src/Query/Validator.tsx b/packages/app-staking/src/Query/Validator.tsx new file mode 100644 index 000000000000..77a1cf6dd041 --- /dev/null +++ b/packages/app-staking/src/Query/Validator.tsx @@ -0,0 +1,79 @@ +// Copyright 2017-2019 @polkadot/app-staking authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { I18nProps } from '@polkadot/react-components/types'; +import { SessionIndex } from '@polkadot/types/interfaces'; + +import BN from 'bn.js'; +import React, { useEffect, useState } from 'react'; +import { Chart } from '@polkadot/react-components'; +import { withCalls } from '@polkadot/react-api'; +import { formatNumber } from '@polkadot/util'; + +import translate from '../translate'; + +interface Props extends I18nProps { + blockCounts?: BN[]; + className?: string; + currentIndex: SessionIndex; + validatorId: string; +} + +interface Value { + label: string; + value: BN; +} + +function getIndexRange (currentIndex: SessionIndex): BN[] { + const range: BN[] = []; + let thisIndex: BN = currentIndex; + + while (thisIndex.gtn(0) && range.length < 50) { + range.push(thisIndex); + + thisIndex = thisIndex.subn(1); + } + + return range.reverse(); +} + +function Validator ({ blockCounts, className, currentIndex, t }: Props): React.ReactElement { + const [labels, setLabels] = useState([]); + const [values, setValues] = useState([]); + + useEffect((): void => { + setLabels( + getIndexRange(currentIndex).map((index): string => formatNumber(index)) + ); + }, [currentIndex]); + + useEffect((): void => { + if (blockCounts) { + setValues( + blockCounts.map((value, index): Value => ({ + label: labels[index], + value + })) + ); + } + }, [blockCounts, labels]); + + return ( +
+

{t('blocks per session')}

+ +
+ ); +} + +export default translate( + withCalls( + ['query.imOnline.authoredBlocks', { + isMulti: true, + propName: 'blockCounts', + paramPick: ({ currentIndex, validatorId }: Props): [BN, string][] => + getIndexRange(currentIndex).map((index): [BN, string] => [index, validatorId]) + }] + )(Validator) +); diff --git a/packages/app-staking/src/Query/index.tsx b/packages/app-staking/src/Query/index.tsx new file mode 100644 index 000000000000..10436c07eba5 --- /dev/null +++ b/packages/app-staking/src/Query/index.tsx @@ -0,0 +1,37 @@ +// Copyright 2017-2019 @polkadot/app-staking authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { BareProps } from '@polkadot/react-components/types'; +import { ComponentProps } from '../types'; + +import React from 'react'; +import { withRouter, RouteComponentProps } from 'react-router-dom'; + +import Validator from './Validator'; + +interface Props extends BareProps, ComponentProps, RouteComponentProps<{}> { + match: { + isExact: boolean; + params: { + value: string; + }; + path: string; + url: string; + }; +} + +function Query ({ stakingOverview, match: { params: { value } } }: Props): React.ReactElement { + if (!stakingOverview) { + return
loading
; + } + + return ( + + ); +} + +export default withRouter(Query); diff --git a/packages/app-staking/src/index.tsx b/packages/app-staking/src/index.tsx index bc4c2f6f430f..3276835a165c 100644 --- a/packages/app-staking/src/index.tsx +++ b/packages/app-staking/src/index.tsx @@ -21,6 +21,7 @@ import accountObservable from '@polkadot/ui-keyring/observable/accounts'; import Accounts from './Actions/Accounts'; import basicMd from './md/basic.md'; import Overview from './Overview'; +import Query from './Query'; import translate from './translate'; interface Props extends AppProps, ApiProps, I18nProps { @@ -80,6 +81,7 @@ function App ({ allAccounts, allStashesAndControllers: [allStashes, allControlle + diff --git a/packages/app-staking/src/types.ts b/packages/app-staking/src/types.ts index a98590ab8238..2cf6cf7af7f4 100644 --- a/packages/app-staking/src/types.ts +++ b/packages/app-staking/src/types.ts @@ -4,17 +4,9 @@ import { DerivedFees, DerivedBalances, DerivedHeartbeats, DerivedStakingOverview } from '@polkadot/api-derive/types'; import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; -import { EraPoints } from '@polkadot/types/interfaces'; -import { u32 } from '@polkadot/types'; export type Nominators = Record; -export interface DerivedStakingOverviewExt { - currentElected: string[]; - eraPointsEarned: EraPoints; - validatorCount: u32; -} - export interface ComponentProps { allAccounts?: SubjectInfo; allControllers: string[]; diff --git a/packages/react-components/src/Chart/Line.tsx b/packages/react-components/src/Chart/Line.tsx new file mode 100644 index 000000000000..88872c5b2d34 --- /dev/null +++ b/packages/react-components/src/Chart/Line.tsx @@ -0,0 +1,109 @@ +// Copyright 2017-2019 @polkadot/react-components authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { BareProps } from '../types'; + +import BN from 'bn.js'; +import React, { useEffect, useState } from 'react'; +import ChartJs from 'chart.js'; +import { Line } from 'react-chartjs-2'; +import { bnToBn } from '@polkadot/util'; + +interface Value { + label: string; + value: number | BN; +} + +interface Props extends BareProps { + aspectRatio?: number; + values: Value[]; +} + +interface State { + chartData?: ChartJs.ChartData; + chartOptions?: ChartJs.ChartOptions; + jsonValues?: string; +} + +interface Config { + labels: string[]; + datasets: { + data: number[]; + fill: boolean; + backgroundColor: string; + borderColor: string; + hoverBackgroundColor: string; + }[]; +} + +const alphaColor = (hexColor: string): string => + ChartJs.helpers.color(hexColor).alpha(0.65).rgbString(); + +function calculateOptions (aspectRatio: number, values: Value[], jsonValues: string): State { + const chartData = values.reduce((data, { label, value }): Config => { + const dataset = data.datasets[0]; + + dataset.data.push(bnToBn(value).toNumber()); + data.labels.push(label); + + return data; + }, { + labels: [] as string[], + datasets: [{ + data: [] as number[], + fill: false, + backgroundColor: alphaColor('#ff8c00'), + borderColor: alphaColor('#ff8c00'), + hoverBackgroundColor: alphaColor('#ff8c00') + }] + }); + + return { + chartData, + chartOptions: { + // width/height by default this is "1", i.e. a square box + aspectRatio, + // no need for the legend, expect the labels contain everything + legend: { + display: false + }, + scales: { + xAxes: [{ + ticks: { + beginAtZero: true + } + }] + } + }, + jsonValues + }; +} + +export default function LineChart ({ aspectRatio = 4, className, style, values }: Props): React.ReactElement | null { + const [{ chartData, chartOptions, jsonValues }, setState] = useState({}); + + useEffect((): void => { + const newJsonValues = JSON.stringify(values); + + if (newJsonValues !== jsonValues) { + setState(calculateOptions(aspectRatio, values, newJsonValues)); + } + }, [values]); + + if (!chartData) { + return null; + } + + return ( +
+ +
+ ); +} diff --git a/packages/react-components/src/Chart/index.ts b/packages/react-components/src/Chart/index.ts index 704e0ff784fa..882db3970b26 100644 --- a/packages/react-components/src/Chart/index.ts +++ b/packages/react-components/src/Chart/index.ts @@ -4,8 +4,10 @@ import Doughnut from './Doughnut'; import HorizBar from './HorizBar'; +import Line from './Line'; export default { Doughnut, - HorizBar + HorizBar, + Line }; From 76e116a3ff9faee650b19baa273f5f6ad2dfcada Mon Sep 17 00:00:00 2001 From: Github Actions Date: Tue, 12 Nov 2019 09:03:13 +0000 Subject: [PATCH 012/154] [CI Skip] 0.37.0-beta.71 --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-staking.json | 3 ++- packages/apps/public/locales/en/ui.json | 3 ++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 31 files changed, 71 insertions(+), 69 deletions(-) diff --git a/lerna.json b/lerna.json index e9a103ec1f4a..1050192ae13a 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.70" + "version": "0.37.0-beta.71" } diff --git a/package.json b/package.json index ca3a2b1ae8de..53efd3367998 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 9b392b66a98e..c4a08f6c6630 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 9c9e372ed83c..455688269d46 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-components": "^0.37.0-beta.71", "@polkadot/react-qr": "^0.47.0-beta.5", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 8f81d7f9dd70..8ea2330a0c5f 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index a1afad3e868f..dfe1404f42da 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 596aab21ecb7..363dc9a21bb2 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/api-contract": "^0.97.0-beta.2", - "@polkadot/react-components": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index d91ef4e4e280..d602afbf14c0 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", - "@polkadot/react-query": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-query": "^0.37.0-beta.71" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 51cc0c1c9d44..c76559b8a5a8 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/apps-routing": "^0.37.0-beta.70", - "@polkadot/react-components": "^0.37.0-beta.70" + "@polkadot/apps-routing": "^0.37.0-beta.71", + "@polkadot/react-components": "^0.37.0-beta.71" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 08b7b8341aac..c212d1df0331 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", - "@polkadot/react-query": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-query": "^0.37.0-beta.71" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index a3c0258741f9..da7858becdc5 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index b4ceaeb67f2a..f1381aad12bc 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", - "@polkadot/react-params": "^0.37.0-beta.70", - "@polkadot/react-signer": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-params": "^0.37.0-beta.71", + "@polkadot/react-signer": "^0.37.0-beta.71" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index e6a9bf18200d..db21cf1c1769 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 4a485d964a7f..8e2abc1a7b0c 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-components": "^0.37.0-beta.71", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index c07c815782c7..39986499cd0b 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", - "@polkadot/react-query": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-query": "^0.37.0-beta.71" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 714a7431696e..87f9a77aecee 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", - "@polkadot/react-query": "^0.37.0-beta.70", + "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-query": "^0.37.0-beta.71", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 06aa86c93818..2192a28986d4 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/app-explorer": "^0.37.0-beta.70", - "@polkadot/react-components": "^0.37.0-beta.70", - "@polkadot/react-query": "^0.37.0-beta.70" + "@polkadot/app-explorer": "^0.37.0-beta.71", + "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-query": "^0.37.0-beta.71" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 00fff6fb6e3d..b511b19e7470 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", - "@polkadot/react-params": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-params": "^0.37.0-beta.71" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 68cc18acc292..eaa1f8be71fc 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 8e815a788bbf..7d2a01e42307 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index b30a60f3a0f1..2a21e59b9250 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", - "@polkadot/react-query": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-query": "^0.37.0-beta.71" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index a580ddf8d5e5..3b2c4b57caa9 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", - "@polkadot/react-query": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-query": "^0.37.0-beta.71" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index f3215acdb890..fd383637f0ab 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index e72356917850..61ba7fd72b2d 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", - "@polkadot/react-signer": "^0.37.0-beta.70", + "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-signer": "^0.37.0-beta.71", "@polkadot/ui-assets": "^0.47.0-beta.5", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-staking.json b/packages/apps/public/locales/en/app-staking.json index da27f6944542..b80b47533065 100644 --- a/packages/apps/public/locales/en/app-staking.json +++ b/packages/apps/public/locales/en/app-staking.json @@ -96,5 +96,6 @@ "The specified value is greater than your free balance. The node will bond the maximum amount available.": "The specified value is greater than your free balance. The node will bond the maximum amount available.", "Change session keys": "Change session keys", "Aye": "Aye", - "Nay": "Nay" + "Nay": "Nay", + "blocks per session": "blocks per session" } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index 938ac3a296c1..65e7c3f9107d 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -612,5 +612,6 @@ "runner up": "", "Runner up": "", "Current member": "", - "runners up": "" + "runners up": "", + "blocks per session": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 469bcaab1113..b536d77edffb 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index e2b4b4d12187..09c900babf07 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/react-api": "^0.37.0-beta.70", + "@polkadot/react-api": "^0.37.0-beta.71", "@polkadot/react-identicon": "^0.47.0-beta.5", - "@polkadot/react-query": "^0.37.0-beta.70", + "@polkadot/react-query": "^0.37.0-beta.71", "@polkadot/ui-keyring": "^0.47.0-beta.5", "@polkadot/ui-settings": "^0.47.0-beta.5", "@types/chart.js": "^2.8.10", diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 9902dfffad25..db5a867f1f59 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70" + "@polkadot/react-components": "^0.37.0-beta.71" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 9076d43e3cf8..78eb2fe09720 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index bc68f8029005..f6eb042fed24 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.70", + "version": "0.37.0-beta.71", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.70", + "@polkadot/react-components": "^0.37.0-beta.71", "@polkadot/react-qr": "^0.47.0-beta.5" } } From 7e65066d18d23785299a27f94b2b6cd1b7d5b296 Mon Sep 17 00:00:00 2001 From: Keith Ingram Date: Tue, 12 Nov 2019 12:00:44 +0100 Subject: [PATCH 013/154] Functional InputNumber with fixed bugs (#1820) * Functional InputNumber * linting * linting * remove max button * linting * linting * version * version * combine values * fix * Re-enable SI dropdown * KSM formats * Formatting tweaks * Mini fixes * Adjust postfix opacity * Linting * More linting * Remove unneeded list override * Misc small adjustments * Vertical alignment --- packages/app-accounts/src/modals/Transfer.tsx | 2 +- packages/app-claims/src/Claim.tsx | 4 +- packages/app-claims/src/index.tsx | 4 +- packages/app-contracts/src/Contracts/Call.tsx | 1 + packages/app-contracts/src/Deploy.tsx | 6 +- .../app-council/src/Overview/VoteValue.tsx | 2 +- .../app-democracy/src/Overview/Proposal.tsx | 4 +- .../app-democracy/src/Overview/Referendum.tsx | 4 +- packages/app-generic-asset/src/Transfer.tsx | 2 +- .../src/Actions/Account/BondExtra.tsx | 2 +- packages/react-api/src/Api.tsx | 4 +- packages/react-components/src/AddressInfo.tsx | 58 ++- packages/react-components/src/AddressMini.tsx | 1 + packages/react-components/src/Balance.tsx | 40 +- packages/react-components/src/Bonded.tsx | 26 +- packages/react-components/src/Call.tsx | 4 +- .../react-components/src/InputBalance.tsx | 12 +- .../src/InputBalanceBonded.tsx | 4 +- packages/react-components/src/InputNumber.tsx | 473 ++++++++---------- packages/react-components/src/Row.tsx | 1 + .../react-components/src/TreasuryProposal.tsx | 6 +- packages/react-query/src/Available.tsx | 19 +- packages/react-query/src/Balance.tsx | 19 +- packages/react-query/src/BalanceVoting.tsx | 19 +- packages/react-query/src/Bonded.tsx | 17 +- packages/react-query/src/FormatBalance.tsx | 51 ++ packages/react-query/src/LockedVote.tsx | 18 +- packages/react-query/src/index.ts | 1 + packages/react-signer/src/Checks/Proposal.tsx | 4 +- packages/react-signer/src/Modal.tsx | 1 + 30 files changed, 419 insertions(+), 390 deletions(-) create mode 100644 packages/react-query/src/FormatBalance.tsx diff --git a/packages/app-accounts/src/modals/Transfer.tsx b/packages/app-accounts/src/modals/Transfer.tsx index b0ffc9bb4758..3ce8f8bc6111 100644 --- a/packages/app-accounts/src/modals/Transfer.tsx +++ b/packages/app-accounts/src/modals/Transfer.tsx @@ -84,7 +84,7 @@ function Transfer ({ className, onClose, recipientId: propRecipientId, senderId: } }, [amount, recipientId, senderId]); - const transferrable = {t('transferrable ')}; + const transferrable = {t('transferrable')}; return ( {t('has a valid claim for')} -

{formatBalance(claimValue)}

+

{button} ) diff --git a/packages/app-claims/src/index.tsx b/packages/app-claims/src/index.tsx index ff0789278463..6d4fa9c6c070 100644 --- a/packages/app-claims/src/index.tsx +++ b/packages/app-claims/src/index.tsx @@ -14,7 +14,7 @@ import styled from 'styled-components'; import CopyToClipboard from 'react-copy-to-clipboard'; import { withApi, withMulti } from '@polkadot/react-api'; import { Button, Card, Columar, Column, InputAddress, Tooltip } from '@polkadot/react-components'; -import { InputNumber } from '@polkadot/react-components/InputNumber'; +import { TokenUnit } from '@polkadot/react-components/InputNumber'; import TxModal, { TxModalState, TxModalProps } from '@polkadot/react-components/TxModal'; import { u8aToHex, u8aToString } from '@polkadot/util'; import { decodeAddress } from '@polkadot/util-crypto'; @@ -112,7 +112,7 @@ class App extends TxModal {

- claim your {InputNumber.units} tokens + claim your {TokenUnit.abbr} tokens

diff --git a/packages/app-contracts/src/Contracts/Call.tsx b/packages/app-contracts/src/Contracts/Call.tsx index 09fe72e10e0d..794320e40835 100644 --- a/packages/app-contracts/src/Contracts/Call.tsx +++ b/packages/app-contracts/src/Contracts/Call.tsx @@ -167,6 +167,7 @@ function Call (props: Props): React.ReactElement | null { help={t('The allotted value for this contract, i.e. the amount transferred to the contract as part of this call.')} isDisabled={isBusy} isError={!isEndowmentValid} + isZeroable label={t('value')} onChange={_onChangeEndowment} value={endowment} diff --git a/packages/app-contracts/src/Deploy.tsx b/packages/app-contracts/src/Deploy.tsx index 7ec70be5f200..bbee4ff42c8f 100644 --- a/packages/app-contracts/src/Deploy.tsx +++ b/packages/app-contracts/src/Deploy.tsx @@ -21,7 +21,7 @@ import ContractModal, { ContractModalProps, ContractModalState } from './Modal'; import Params from './Params'; import store from './store'; import translate from './translate'; -import { GAS_LIMIT } from './constants'; +import { ENDOWMENT, GAS_LIMIT } from './constants'; type ConstructOptions = { key: string; text: React.ReactNode; value: string }[]; @@ -51,7 +51,7 @@ class Deploy extends ContractModal { ...this.defaultState, constructorIndex: -1, constructOptions: [], - endowment: new BN(0), + endowment: new BN(ENDOWMENT), gasLimit: new BN(GAS_LIMIT), isHashValid: false, params: [], @@ -182,7 +182,7 @@ class Deploy extends ContractModal { } + labelExtra={{t('voting balance')}} params={accountId} />} onChange={_setVoteValue} /> ); diff --git a/packages/app-democracy/src/Overview/Proposal.tsx b/packages/app-democracy/src/Overview/Proposal.tsx index 22196daf8ab4..b40d6a2f4d70 100644 --- a/packages/app-democracy/src/Overview/Proposal.tsx +++ b/packages/app-democracy/src/Overview/Proposal.tsx @@ -11,7 +11,7 @@ import React from 'react'; import { Option, Tuple, Vec } from '@polkadot/types'; import { ActionItem, InputAddress, Labelled, Static } from '@polkadot/react-components'; import { withCalls, withMulti } from '@polkadot/react-api'; -import { formatBalance } from '@polkadot/util'; +import { FormatBalance } from '@polkadot/react-query'; import translate from '../translate'; import Seconding from './Seconding'; @@ -42,7 +42,7 @@ function renderProposal ({ democracy_depositOf, t }: Props): React.ReactNode { ))} - {formatBalance(balance)} +
); diff --git a/packages/app-democracy/src/Overview/Referendum.tsx b/packages/app-democracy/src/Overview/Referendum.tsx index 4150c6ad6151..bb07af767474 100644 --- a/packages/app-democracy/src/Overview/Referendum.tsx +++ b/packages/app-democracy/src/Overview/Referendum.tsx @@ -104,12 +104,12 @@ function Referendum ({ chain_bestNumber, className, democracy_enactmentPeriod, d values={[ { colors: COLORS_AYE, - label: `Aye, ${formatBalance(votedAye)} (${formatNumber(voteCountAye)})`, + label: `Aye, ${formatBalance(votedAye, { forceUnit: '-' })} (${formatNumber(voteCountAye)})`, value: votedAye.muln(10000).div(votedTotal).toNumber() / 100 }, { colors: COLORS_NAY, - label: `Nay, ${formatBalance(votedNay)} (${formatNumber(voteCountNay)})`, + label: `Nay, ${formatBalance(votedNay, { forceUnit: '-' })} (${formatNumber(voteCountNay)})`, value: votedNay.muln(10000).div(votedTotal).toNumber() / 100 } ]} diff --git a/packages/app-generic-asset/src/Transfer.tsx b/packages/app-generic-asset/src/Transfer.tsx index b67653a018b5..5c171d90a215 100644 --- a/packages/app-generic-asset/src/Transfer.tsx +++ b/packages/app-generic-asset/src/Transfer.tsx @@ -63,7 +63,7 @@ function Transfer ({ assets, className, onClose, recipientId: propRecipientId, s } }; - const transferrable = {t('transferrable ')}; + const transferrable = {t('transferrable')}; return (
diff --git a/packages/app-staking/src/Actions/Account/BondExtra.tsx b/packages/app-staking/src/Actions/Account/BondExtra.tsx index 31e5e4622822..55b24ea57629 100644 --- a/packages/app-staking/src/Actions/Account/BondExtra.tsx +++ b/packages/app-staking/src/Actions/Account/BondExtra.tsx @@ -100,7 +100,7 @@ class BondExtra extends TxComponent { private renderContent (): React.ReactNode { const { stashId, systemChain, t } = this.props; const { amountError, maxAdditional, maxBalance } = this.state; - const transferrable = {t('transferrable ')}; + const transferrable = {t('transferrable')}; const isUnsafeChain = detectUnsafe(systemChain); return ( diff --git a/packages/react-api/src/Api.tsx b/packages/react-api/src/Api.tsx index 3a9045872a1a..82464f81ce6b 100644 --- a/packages/react-api/src/Api.tsx +++ b/packages/react-api/src/Api.tsx @@ -11,7 +11,7 @@ import ApiPromise from '@polkadot/api/promise'; import { isWeb3Injected, web3Accounts, web3Enable } from '@polkadot/extension-dapp'; import defaults from '@polkadot/rpc-provider/defaults'; import { WsProvider } from '@polkadot/rpc-provider'; -import { InputNumber } from '@polkadot/react-components/InputNumber'; +import { TokenUnit } from '@polkadot/react-components/InputNumber'; import keyring from '@polkadot/ui-keyring'; import uiSettings from '@polkadot/ui-settings'; import ApiSigner from '@polkadot/react-signer/ApiSigner'; @@ -152,7 +152,7 @@ export default class Api extends React.PureComponent { decimals: tokenDecimals, unit: tokenSymbol }); - InputNumber.setUnit(tokenSymbol); + TokenUnit.setAbbr(tokenSymbol); // finally load the keyring keyring.loadAll({ diff --git a/packages/react-components/src/AddressInfo.tsx b/packages/react-components/src/AddressInfo.tsx index 137e42d2668e..fa7e1def5f2a 100644 --- a/packages/react-components/src/AddressInfo.tsx +++ b/packages/react-components/src/AddressInfo.tsx @@ -12,6 +12,7 @@ import styled from 'styled-components'; import { formatBalance, formatNumber, isObject } from '@polkadot/util'; import { Icon, Tooltip, TxButton } from '@polkadot/react-components'; import { withCalls, withMulti } from '@polkadot/react-api'; +import { FormatBalance } from '@polkadot/react-query'; import CryptoType from './CryptoType'; import Label from './Label'; @@ -165,7 +166,7 @@ function renderUnlocking ({ stakingInfo, t }: Props): React.ReactNode { return (
- {formatBalance(total)} + @@ -211,9 +212,10 @@ function renderValidatorPrefs ({ stakingInfo, t, withValidatorPrefs = false }: P {validatorPrefsDisplay.validatorPayment && stakingInfo.validatorPrefs.validatorPayment && ( <>
@@ -73,7 +73,7 @@ export function Proposal ({ deposit, democracy_minimumDeposit = ZERO, onChange, {t('The deposit of {{deposit}} will be reserved until the proposal is completed', { replace: { - deposit: formatBalance(extraAmount) + deposit: formatBalance(extraAmount, { forceUnit: '-' }) } })}
diff --git a/packages/react-signer/src/Modal.tsx b/packages/react-signer/src/Modal.tsx index a2b1b2566775..7a70c257820b 100644 --- a/packages/react-signer/src/Modal.tsx +++ b/packages/react-signer/src/Modal.tsx @@ -294,6 +294,7 @@ class Signer extends React.PureComponent { From c9e9fc55bc4e27f228880e1f6db67543e77e685c Mon Sep 17 00:00:00 2001 From: Github Actions Date: Tue, 12 Nov 2019 11:05:35 +0000 Subject: [PATCH 014/154] [CI Skip] 0.37.0-beta.72 --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-accounts.json | 3 ++- packages/apps/public/locales/en/app-council.json | 3 ++- packages/apps/public/locales/en/app-generic-asset.json | 3 ++- packages/apps/public/locales/en/app-staking.json | 3 ++- packages/apps/public/locales/en/ui.json | 4 +++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 34 files changed, 78 insertions(+), 72 deletions(-) diff --git a/lerna.json b/lerna.json index 1050192ae13a..a88c5b7ef089 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.71" + "version": "0.37.0-beta.72" } diff --git a/package.json b/package.json index 53efd3367998..f3b92fce4a67 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index c4a08f6c6630..67d850e19d71 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 455688269d46..a382a9dc4b47 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-components": "^0.37.0-beta.72", "@polkadot/react-qr": "^0.47.0-beta.5", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 8ea2330a0c5f..66d1edc3b686 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index dfe1404f42da..187981455c40 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 363dc9a21bb2..8efabf400591 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/api-contract": "^0.97.0-beta.2", - "@polkadot/react-components": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index d602afbf14c0..cf6201749c8c 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", - "@polkadot/react-query": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-query": "^0.37.0-beta.72" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index c76559b8a5a8..7ef0aaf596b6 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/apps-routing": "^0.37.0-beta.71", - "@polkadot/react-components": "^0.37.0-beta.71" + "@polkadot/apps-routing": "^0.37.0-beta.72", + "@polkadot/react-components": "^0.37.0-beta.72" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index c212d1df0331..20d41b5c8a84 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", - "@polkadot/react-query": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-query": "^0.37.0-beta.72" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index da7858becdc5..50af4fd276c4 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index f1381aad12bc..d500db240606 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", - "@polkadot/react-params": "^0.37.0-beta.71", - "@polkadot/react-signer": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-params": "^0.37.0-beta.72", + "@polkadot/react-signer": "^0.37.0-beta.72" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index db21cf1c1769..24fb495d457d 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 8e2abc1a7b0c..d6224f6c224a 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-components": "^0.37.0-beta.72", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 39986499cd0b..7189aae83fec 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", - "@polkadot/react-query": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-query": "^0.37.0-beta.72" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 87f9a77aecee..cc4e5ac0c983 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", - "@polkadot/react-query": "^0.37.0-beta.71", + "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-query": "^0.37.0-beta.72", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 2192a28986d4..9bcc56daaec7 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/app-explorer": "^0.37.0-beta.71", - "@polkadot/react-components": "^0.37.0-beta.71", - "@polkadot/react-query": "^0.37.0-beta.71" + "@polkadot/app-explorer": "^0.37.0-beta.72", + "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-query": "^0.37.0-beta.72" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index b511b19e7470..904b96b72191 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", - "@polkadot/react-params": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-params": "^0.37.0-beta.72" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index eaa1f8be71fc..fe8c4823dd60 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 7d2a01e42307..068934c612b2 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 2a21e59b9250..630b6a964256 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", - "@polkadot/react-query": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-query": "^0.37.0-beta.72" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 3b2c4b57caa9..7f6241497558 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", - "@polkadot/react-query": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-query": "^0.37.0-beta.72" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index fd383637f0ab..1252b035ca89 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 61ba7fd72b2d..22c92c5f5773 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", - "@polkadot/react-signer": "^0.37.0-beta.71", + "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-signer": "^0.37.0-beta.72", "@polkadot/ui-assets": "^0.47.0-beta.5", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-accounts.json b/packages/apps/public/locales/en/app-accounts.json index 91b5e4b549a7..85f419e644c5 100644 --- a/packages/apps/public/locales/en/app-accounts.json +++ b/packages/apps/public/locales/en/app-accounts.json @@ -90,5 +90,6 @@ "The password to unlock the selected account.": "The password to unlock the selected account.", "derivation path": "derivation path", "//hard/soft": "//hard/soft", - "Unlock": "Unlock" + "Unlock": "Unlock", + "transferrable": "transferrable" } diff --git a/packages/apps/public/locales/en/app-council.json b/packages/apps/public/locales/en/app-council.json index 4e489ba6b271..fba8f27b313f 100644 --- a/packages/apps/public/locales/en/app-council.json +++ b/packages/apps/public/locales/en/app-council.json @@ -42,5 +42,6 @@ "runner up": "runner up", "Runner up": "Runner up", "Current member": "Current member", - "runners up": "runners up" + "runners up": "runners up", + "voting balance": "voting balance" } diff --git a/packages/apps/public/locales/en/app-generic-asset.json b/packages/apps/public/locales/en/app-generic-asset.json index 48d9c0ce7825..73d3caecfaff 100644 --- a/packages/apps/public/locales/en/app-generic-asset.json +++ b/packages/apps/public/locales/en/app-generic-asset.json @@ -21,5 +21,6 @@ "Type the amount you want to transfer. Note that you can select the unit on the right e.g sending 1 milli is equivalent to sending 0.001.": "Type the amount you want to transfer. Note that you can select the unit on the right e.g sending 1 milli is equivalent to sending 0.001.", "amount": "amount", "Make Transfer": "Make Transfer", - "transferrable ": "transferrable " + "transferrable ": "transferrable ", + "transferrable": "transferrable" } diff --git a/packages/apps/public/locales/en/app-staking.json b/packages/apps/public/locales/en/app-staking.json index b80b47533065..78ba90d9e965 100644 --- a/packages/apps/public/locales/en/app-staking.json +++ b/packages/apps/public/locales/en/app-staking.json @@ -97,5 +97,6 @@ "Change session keys": "Change session keys", "Aye": "Aye", "Nay": "Nay", - "blocks per session": "blocks per session" + "blocks per session": "blocks per session", + "transferrable": "transferrable" } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index 65e7c3f9107d..ab988bfa08ee 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -613,5 +613,7 @@ "Runner up": "", "Current member": "", "runners up": "", - "blocks per session": "" + "blocks per session": "", + "voting balance": "", + "Max": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index b536d77edffb..27bd44d90bc9 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 09c900babf07..49b8891b7e00 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/react-api": "^0.37.0-beta.71", + "@polkadot/react-api": "^0.37.0-beta.72", "@polkadot/react-identicon": "^0.47.0-beta.5", - "@polkadot/react-query": "^0.37.0-beta.71", + "@polkadot/react-query": "^0.37.0-beta.72", "@polkadot/ui-keyring": "^0.47.0-beta.5", "@polkadot/ui-settings": "^0.47.0-beta.5", "@types/chart.js": "^2.8.10", diff --git a/packages/react-params/package.json b/packages/react-params/package.json index db5a867f1f59..f189edd8daf2 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71" + "@polkadot/react-components": "^0.37.0-beta.72" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 78eb2fe09720..e6802d0cfde6 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index f6eb042fed24..b00570f30829 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.71", + "version": "0.37.0-beta.72", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.71", + "@polkadot/react-components": "^0.37.0-beta.72", "@polkadot/react-qr": "^0.47.0-beta.5" } } From e7e4efebeb4f4f79d834d04aa51b3dce9de00cc1 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 12 Nov 2019 14:39:38 +0100 Subject: [PATCH 015/154] Enable validator overview (#1872) * Enable validator overview * CallDiv indicator for consts --- package.json | 6 +- packages/app-contracts/package.json | 2 +- packages/app-staking/src/Overview/Address.tsx | 21 +++- packages/app-staking/src/Overview/index.tsx | 4 +- packages/app-staking/src/Query/Validator.tsx | 34 +++--- packages/app-staking/src/Query/index.tsx | 71 ++++++++++--- packages/app-staking/src/index.tsx | 32 ++++-- packages/app-staking/src/types.ts | 1 + packages/app-storage/src/Query.tsx | 2 +- packages/app-storage/src/Selection/Consts.tsx | 2 +- packages/react-api/package.json | 2 +- packages/react-components/src/AddressRow.tsx | 4 +- packages/react-components/src/Chart/Line.tsx | 64 +++++------ .../src/InputAddressSimple.tsx | 13 ++- .../src/InputConsts/index.tsx | 2 +- .../src/InputConsts/options/key.tsx | 2 +- yarn.lock | 100 +++++++++--------- 17 files changed, 234 insertions(+), 128 deletions(-) diff --git a/package.json b/package.json index f3b92fce4a67..2fed87d2bdfa 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.2", - "@polkadot/api-contract": "^0.97.0-beta.2", + "@polkadot/api": "^0.97.0-beta.3", + "@polkadot/api-contract": "^0.97.0-beta.3", "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/types": "^0.97.0-beta.2", + "@polkadot/types": "^0.97.0-beta.3", "@polkadot/util": "^1.7.0-beta.6", "@polkadot/util-crypto": "^1.7.0-beta.6", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 8efabf400591..141c314c966c 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/api-contract": "^0.97.0-beta.2", + "@polkadot/api-contract": "^0.97.0-beta.3", "@polkadot/react-components": "^0.37.0-beta.72" } } diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx index 1f4013be196b..d76a8486f52d 100644 --- a/packages/app-staking/src/Overview/Address.tsx +++ b/packages/app-staking/src/Overview/Address.tsx @@ -47,7 +47,7 @@ interface StakingState { const WITH_VALIDATOR_PREFS = { validatorPayment: true }; function Address ({ address, authorsMap, className, defaultName, filter, isElected, isFavorite, lastAuthors, myAccounts, onFavorite, points, recentlyOnline, stakingInfo, t, withNominations = true }: Props): React.ReactElement | null { - const { isSubstrateV2 } = useContext(ApiContext); + const { api, isSubstrateV2 } = useContext(ApiContext); const [extraInfo, setExtraInfo] = useState<[React.ReactNode, React.ReactNode][] | undefined>(); const [hasActivity, setHasActivity] = useState(true); const [{ balanceOpts, controllerId, hasNominators, isNominatorMe, nominators, sessionId, stashId }, setStakingState] = useState({ @@ -123,6 +123,9 @@ function Address ({ address, authorsMap, className, defaultName, filter, isElect const lastBlockNumber = authorsMap[stashId]; const isAuthor = lastAuthors && lastAuthors.includes(stashId); const _onFavorite = (): void => onFavorite(stashId); + const _onQueryStats = (): void => { + window.location.hash = `/staking/query/${stashId}`; + }; return ( } isDisabled={isSubstrateV2 && !hasActivity} + overlay={ + api.query.imOnline?.authoredBlocks && ( + + ) + } stakingInfo={stakingInfo} value={stashId} withBalance={balanceOpts} @@ -275,6 +287,13 @@ export default withMulti( .staking--label.controllerSpacer { margin-top: 0.5rem; } + + .staking--stats { + bottom: 0.75rem; + cursor: pointer; + position: absolute; + right: 0.5rem; + } `, translate, withCalls( diff --git a/packages/app-staking/src/Overview/index.tsx b/packages/app-staking/src/Overview/index.tsx index edba10ceef99..a488b429b9c7 100644 --- a/packages/app-staking/src/Overview/index.tsx +++ b/packages/app-staking/src/Overview/index.tsx @@ -14,7 +14,7 @@ import Summary from './Summary'; interface Props extends BareProps, ComponentProps {} -export default function Overview ({ allControllers, allStashes, recentlyOnline, stakingOverview }: Props): React.ReactElement { +export default function Overview ({ allControllers, allStashes, className, recentlyOnline, stakingOverview }: Props): React.ReactElement { const { isSubstrateV2 } = useContext(ApiContext); const { byAuthor, lastBlockAuthors, lastBlockNumber } = useContext(BlockAuthorsContext); const [next, setNext] = useState([]); @@ -31,7 +31,7 @@ export default function Overview ({ allControllers, allStashes, recentlyOnline, }, [allControllers, allStashes, validators]); return ( -
+
{ const [labels, setLabels] = useState([]); - const [values, setValues] = useState([]); + const [{ avgSet, idxSet }, setValues] = useState<{ avgSet: number[]; idxSet: BN[] }>({ avgSet: [], idxSet: [] }); useEffect((): void => { setLabels( @@ -50,19 +48,29 @@ function Validator ({ blockCounts, className, currentIndex, t }: Props): React.R useEffect((): void => { if (blockCounts) { - setValues( - blockCounts.map((value, index): Value => ({ - label: labels[index], - value - })) - ); + const avgSet: number[] = []; + const idxSet: BN[] = []; + + blockCounts.reduce((total: BN, value, index): BN => { + total = total.add(value); + + avgSet.push(total.toNumber() / (index + 1)); + idxSet.push(value); + + return total; + }, new BN(0)); + + setValues({ avgSet, idxSet }); } }, [blockCounts, labels]); return (

{t('blocks per session')}

- +
); } diff --git a/packages/app-staking/src/Query/index.tsx b/packages/app-staking/src/Query/index.tsx index 10436c07eba5..f5c5a33f1cc0 100644 --- a/packages/app-staking/src/Query/index.tsx +++ b/packages/app-staking/src/Query/index.tsx @@ -2,15 +2,17 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { BareProps } from '@polkadot/react-components/types'; +import { I18nProps } from '@polkadot/react-components/types'; import { ComponentProps } from '../types'; -import React from 'react'; +import React, { useState } from 'react'; import { withRouter, RouteComponentProps } from 'react-router-dom'; +import { Button, InputAddressSimple } from '@polkadot/react-components'; +import translate from '../translate'; import Validator from './Validator'; -interface Props extends BareProps, ComponentProps, RouteComponentProps<{}> { +interface Props extends I18nProps, ComponentProps, RouteComponentProps<{}> { match: { isExact: boolean; params: { @@ -21,17 +23,62 @@ interface Props extends BareProps, ComponentProps, RouteComponentProps<{}> { }; } -function Query ({ stakingOverview, match: { params: { value } } }: Props): React.ReactElement { - if (!stakingOverview) { - return
loading
; - } +// const _onQuery = (): void => { +// if (isValid && value.length !== 0) { +// window.location.hash = `/explorer/query/${value}`; +// } +// }; + +// return ( +// +// +//
); } -export default withRouter(Query); +export default translate(withRouter(Query)); diff --git a/packages/app-staking/src/index.tsx b/packages/app-staking/src/index.tsx index 3276835a165c..7c1b321aa4d0 100644 --- a/packages/app-staking/src/index.tsx +++ b/packages/app-staking/src/index.tsx @@ -9,13 +9,14 @@ import { AccountId, BlockNumber } from '@polkadot/types/interfaces'; import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import { ComponentProps } from './types'; -import React from 'react'; +import React, { useContext } from 'react'; import { Route, Switch } from 'react-router'; +import { useRouteMatch } from 'react-router-dom'; import styled from 'styled-components'; import { Option } from '@polkadot/types'; import { HelpOverlay } from '@polkadot/react-components'; import Tabs from '@polkadot/react-components/Tabs'; -import { withCalls, withMulti, withObservable } from '@polkadot/react-api'; +import { ApiContext, withCalls, withMulti, withObservable } from '@polkadot/react-api'; import accountObservable from '@polkadot/ui-keyring/observable/accounts'; import Accounts from './Actions/Accounts'; @@ -36,7 +37,9 @@ const EMPY_ACCOUNTS: string[] = []; const EMPTY_ALL: [string[], string[]] = [EMPY_ACCOUNTS, EMPY_ACCOUNTS]; function App ({ allAccounts, allStashesAndControllers: [allStashes, allControllers] = EMPTY_ALL, basePath, className, recentlyOnline, stakingOverview, t }: Props): React.ReactElement { - const _renderComponent = (Component: React.ComponentType): () => React.ReactNode => { + const { api } = useContext(ApiContext); + const routeMatch = useRouteMatch({ path: basePath, strict: true }); + const _renderComponent = (Component: React.ComponentType, className?: string): () => React.ReactNode => { // eslint-disable-next-line react/display-name return (): React.ReactNode => { if (!allAccounts) { @@ -48,6 +51,7 @@ function App ({ allAccounts, allStashesAndControllers: [allStashes, allControlle allAccounts={allAccounts} allControllers={allControllers} allStashes={allStashes} + className={className} recentlyOnline={recentlyOnline} stakingOverview={stakingOverview} /> @@ -63,8 +67,10 @@ function App ({ allAccounts, allStashesAndControllers: [allStashes, allControlle basePath={basePath} hidden={ !allAccounts || Object.keys(allAccounts).length === 0 - ? ['actions'] - : [] + ? ['actions', 'query'] + : api.query.imOnline?.authoredBlocks + ? [] + : ['query'] } items={[ { @@ -75,6 +81,11 @@ function App ({ allAccounts, allStashesAndControllers: [allStashes, allControlle { name: 'actions', text: t('Account actions') + }, + { + hasParams: true, + name: 'query', + text: t('Validator stats') } ]} /> @@ -82,8 +93,9 @@ function App ({ allAccounts, allStashesAndControllers: [allStashes, allControlle - + + {_renderComponent(Overview, routeMatch?.isExact ? '' : 'staking--hidden')()} ); } @@ -93,6 +105,14 @@ export default withMulti( .rx--updated { background: transparent !important; } + + .staking--hidden { + display: none; + } + + .staking--queryInput { + margin-bottom: 1.5rem; + } `, translate, withCalls( diff --git a/packages/app-staking/src/types.ts b/packages/app-staking/src/types.ts index 2cf6cf7af7f4..f7cee5ae3859 100644 --- a/packages/app-staking/src/types.ts +++ b/packages/app-staking/src/types.ts @@ -11,6 +11,7 @@ export interface ComponentProps { allAccounts?: SubjectInfo; allControllers: string[]; allStashes: string[]; + className?: string; recentlyOnline?: DerivedHeartbeats; stakingOverview?: DerivedStakingOverview; } diff --git a/packages/app-storage/src/Query.tsx b/packages/app-storage/src/Query.tsx index b36ab03f55e9..3a3ab53078ed 100644 --- a/packages/app-storage/src/Query.tsx +++ b/packages/app-storage/src/Query.tsx @@ -86,7 +86,7 @@ function getCachedComponent (query: QueryTypes): CacheInstance { if (isConst) { const { meta, method, section } = key as unknown as ConstValue; - renderHelper = withCallDiv(`consts.${section}.${method}`); + renderHelper = withCallDiv(`consts.${section}.${method}`, { withIndicator: true }); type = meta.type.toString(); } else { const values: any[] = params.map(({ value }): any => value); diff --git a/packages/app-storage/src/Selection/Consts.tsx b/packages/app-storage/src/Selection/Consts.tsx index 61480be0b2e6..3195e5421e1f 100644 --- a/packages/app-storage/src/Selection/Consts.tsx +++ b/packages/app-storage/src/Selection/Consts.tsx @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { ConstantCodec } from '@polkadot/api-metadata/consts/types'; +import { ConstantCodec } from '@polkadot/metadata/Decorated/types'; import { I18nProps } from '@polkadot/react-components/types'; import { ConstValue } from '@polkadot/react-components/InputConsts/types'; import { ComponentProps } from '../types'; diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 27bd44d90bc9..6564c92cf58b 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/api": "^0.97.0-beta.2", + "@polkadot/api": "^0.97.0-beta.3", "@polkadot/extension-dapp": "^0.14.0-beta.4", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/packages/react-components/src/AddressRow.tsx b/packages/react-components/src/AddressRow.tsx index 6a1ac0bf8d52..de671005d315 100644 --- a/packages/react-components/src/AddressRow.tsx +++ b/packages/react-components/src/AddressRow.tsx @@ -31,6 +31,7 @@ export interface Props extends I18nProps, RowProps { label?: string; accounts_info?: DeriveAccountInfo; noDefaultNameOpacity?: boolean; + overlay?: React.ReactNode; stakingInfo?: DerivedStaking; value: AccountId | AccountIndex | Address | string | null; withAddressOrName?: boolean; @@ -83,7 +84,7 @@ class AddressRow extends Row { } public render (): React.ReactNode { - const { accounts_info = {}, className, isContract, isDisabled, isInline, label, style } = this.props; + const { accounts_info = {}, className, isContract, isDisabled, isInline, label, overlay, style } = this.props; const { accountId, accountIndex } = accounts_info; const isValid = this.props.isValid || accountId || accountIndex; @@ -104,6 +105,7 @@ class AddressRow extends Row { {this.renderButtons()}
{this.renderChildren()} + {overlay}
); } diff --git a/packages/react-components/src/Chart/Line.tsx b/packages/react-components/src/Chart/Line.tsx index 88872c5b2d34..09b5e338729c 100644 --- a/packages/react-components/src/Chart/Line.tsx +++ b/packages/react-components/src/Chart/Line.tsx @@ -8,16 +8,12 @@ import BN from 'bn.js'; import React, { useEffect, useState } from 'react'; import ChartJs from 'chart.js'; import { Line } from 'react-chartjs-2'; -import { bnToBn } from '@polkadot/util'; - -interface Value { - label: string; - value: number | BN; -} interface Props extends BareProps { aspectRatio?: number; - values: Value[]; + labels: string[]; + legends: string[]; + values: (number | BN)[][]; } interface State { @@ -26,37 +22,43 @@ interface State { jsonValues?: string; } +interface Dataset { + data: number[]; + fill: boolean; + label: string; + backgroundColor: string; + borderColor: string; + hoverBackgroundColor: string; +} + interface Config { labels: string[]; - datasets: { - data: number[]; - fill: boolean; - backgroundColor: string; - borderColor: string; - hoverBackgroundColor: string; - }[]; + datasets: Dataset[]; } +const COLORS = ['#ff8c00', '#acacac']; + const alphaColor = (hexColor: string): string => ChartJs.helpers.color(hexColor).alpha(0.65).rgbString(); -function calculateOptions (aspectRatio: number, values: Value[], jsonValues: string): State { - const chartData = values.reduce((data, { label, value }): Config => { - const dataset = data.datasets[0]; +function calculateOptions (aspectRatio: number, legends: string[], labels: string[], values: (number | BN)[][], jsonValues: string): State { + const chartData = values.reduce((config, values, index): Config => { + const color = alphaColor(COLORS[index]); + const data = values.map((value): number => BN.isBN(value) ? value.toNumber() : value); - dataset.data.push(bnToBn(value).toNumber()); - data.labels.push(label); + config.datasets.push({ + data, + fill: false, + label: legends[index], + backgroundColor: color, + borderColor: color, + hoverBackgroundColor: color + }); - return data; + return config; }, { - labels: [] as string[], - datasets: [{ - data: [] as number[], - fill: false, - backgroundColor: alphaColor('#ff8c00'), - borderColor: alphaColor('#ff8c00'), - hoverBackgroundColor: alphaColor('#ff8c00') - }] + labels, + datasets: [] as Dataset[] }); return { @@ -80,16 +82,16 @@ function calculateOptions (aspectRatio: number, values: Value[], jsonValues: str }; } -export default function LineChart ({ aspectRatio = 4, className, style, values }: Props): React.ReactElement | null { +export default function LineChart ({ aspectRatio = 10, className, labels, legends, style, values }: Props): React.ReactElement | null { const [{ chartData, chartOptions, jsonValues }, setState] = useState({}); useEffect((): void => { const newJsonValues = JSON.stringify(values); if (newJsonValues !== jsonValues) { - setState(calculateOptions(aspectRatio, values, newJsonValues)); + setState(calculateOptions(aspectRatio, legends, labels, values, newJsonValues)); } - }, [values]); + }, [labels, legends, values]); if (!chartData) { return null; diff --git a/packages/react-components/src/InputAddressSimple.tsx b/packages/react-components/src/InputAddressSimple.tsx index cf945946e354..f9c627546265 100644 --- a/packages/react-components/src/InputAddressSimple.tsx +++ b/packages/react-components/src/InputAddressSimple.tsx @@ -12,13 +12,16 @@ import IdentityIcon from './IdentityIcon'; import Input from './Input'; interface Props extends BareProps { + children?: React.ReactNode; + defaultValue?: string | null; help?: React.ReactNode; label?: React.ReactNode; onChange?: (address: string | null) => void; + onEnter?: () => void; } -function InputAddressSimple ({ className, help, label, onChange }: Props): React.ReactElement { - const [address, setAddress] = useState(null); +function InputAddressSimple ({ children, className, defaultValue, help, label, onChange, onEnter }: Props): React.ReactElement { + const [address, setAddress] = useState(defaultValue || null); const _onChange = (_address: string): void => { const address = addressToAddress(_address) || null; @@ -31,11 +34,15 @@ function InputAddressSimple ({ className, help, label, onChange }: Props): React return (
+ onEnter={onEnter} + > + {children} + = 8" -"@polkadot/api-contract@^0.97.0-beta.2": - version "0.97.0-beta.2" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.2.tgz#50df47306abae1aca8634c7a1da80662ea040c81" - integrity sha512-YSPmfrmXQbgvfeIWJKjEafN7mFhOP/9RH98gAQdefcISGYmTKCTIXQGUQ2CJonO/bNuWylXbgeZ9X3ZpgcT3yw== +"@polkadot/api-contract@^0.97.0-beta.3": + version "0.97.0-beta.3" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.3.tgz#254831a7ebd98bc788b5ec78ca115e4e79315294" + integrity sha512-0t8Cx16h9ekQm83+JDZnPraOiSWBLDhoSzEx/lxZmvtbs/jwcmAh1F5mZ3MQgUYiNrsFuaSkcQbNZCWnAhDSDw== dependencies: "@babel/runtime" "^7.7.1" - "@polkadot/types" "^0.97.0-beta.2" + "@polkadot/types" "^0.97.0-beta.3" -"@polkadot/api-derive@^0.97.0-beta.2": - version "0.97.0-beta.2" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.2.tgz#8d784938bd9f84eb9a050dbea1b91787a4a8bb2f" - integrity sha512-urBDQvfH1zmtZkiPG7vQdbYX5bhJqx5qZ9GO7GiQPhdaumopM1Hgcddw2w9WzLOVB/iQqkf6y1JXJQA6GrcC5Q== +"@polkadot/api-derive@^0.97.0-beta.3": + version "0.97.0-beta.3" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.3.tgz#b6bc465e5d40f1154428dc3ee3a2dda5ff9ad4d0" + integrity sha512-s8I2V+hAufzh/KizOHz9OZ/WbBZccxaU7GCw10gUJNadPDwL46bEAwmcxSWi4CbZk3dEK7+V32zumF3ZQ2mukA== dependencies: "@babel/runtime" "^7.7.1" - "@polkadot/api" "^0.97.0-beta.2" - "@polkadot/types" "^0.97.0-beta.2" + "@polkadot/api" "^0.97.0-beta.3" + "@polkadot/types" "^0.97.0-beta.3" -"@polkadot/api-metadata@^0.97.0-beta.2": - version "0.97.0-beta.2" - resolved "https://registry.yarnpkg.com/@polkadot/api-metadata/-/api-metadata-0.97.0-beta.2.tgz#518a896d0c53042241191b98c7e61761da063956" - integrity sha512-/0PiQ1B1KiUTF8uJ3lczdNyMGctKSvE0w8Ddcy8svc7Wp7nxpU8fZx+WIK8yeyzqvfZJ2vVcYgmPdal54i8dow== +"@polkadot/api@^0.97.0-beta.3": + version "0.97.0-beta.3" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.3.tgz#096200d0afe8ca751135402368979605114c8bb2" + integrity sha512-sLPt+w3pqvhGzQV33cQlHPJSFXZjl4HASari4n7986SXNwfwvznAP8NlzCtm6bKCC4oC1p+kc9AgY9AH7pzgUA== dependencies: "@babel/runtime" "^7.7.1" - "@polkadot/types" "^0.97.0-beta.2" - "@polkadot/util" "^1.7.0-beta.6" - "@polkadot/util-crypto" "^1.7.0-beta.6" - -"@polkadot/api@^0.97.0-beta.2": - version "0.97.0-beta.2" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.2.tgz#839760529e4a6ac9244edce884e7cb4f6a6f92b6" - integrity sha512-jF+10ifwnMPBEe/1S9+hBX/kJS2ONLlQ5JOWaykYtgLT1cjbt+WGLl4DxTSaPfCDVsl+6dj03F0xrmFomIrYNg== - dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/api-derive" "^0.97.0-beta.2" - "@polkadot/api-metadata" "^0.97.0-beta.2" + "@polkadot/api-derive" "^0.97.0-beta.3" "@polkadot/keyring" "^1.7.0-beta.6" - "@polkadot/rpc-core" "^0.97.0-beta.2" - "@polkadot/rpc-provider" "^0.97.0-beta.2" - "@polkadot/types" "^0.97.0-beta.2" + "@polkadot/metadata" "^0.97.0-beta.3" + "@polkadot/rpc-core" "^0.97.0-beta.3" + "@polkadot/rpc-provider" "^0.97.0-beta.3" + "@polkadot/types" "^0.97.0-beta.3" "@polkadot/util-crypto" "^1.7.0-beta.6" "@polkadot/dev-react@^0.32.0-beta.13": @@ -2171,10 +2161,10 @@ dependencies: "@babel/runtime" "^7.7.1" -"@polkadot/jsonrpc@^0.97.0-beta.2": - version "0.97.0-beta.2" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.2.tgz#a9a1190db828a9a68a2967d2a55e3e0a30598e6f" - integrity sha512-pU4C6LW2IiDWRjB31F4zlG1YKE+Fxwine1Kl3lAhdOjcREoC2jQesBKfzjZyWMBCjM2dLeyOHpl2WMWHIYdWzw== +"@polkadot/jsonrpc@^0.97.0-beta.3": + version "0.97.0-beta.3" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.3.tgz#358dde1388a511dbfe232aa128c3e89c8928900f" + integrity sha512-laL7SwVNitXmygHWZYmDMLONDO/SnII+0hqeIcy4DGvLGwt1XWyqUiv8Vkqwo9mgAboFAS05PgN3SsVmJItpFg== dependencies: "@babel/runtime" "^7.7.1" @@ -2187,6 +2177,16 @@ "@polkadot/util" "^1.7.0-beta.6" "@polkadot/util-crypto" "^1.7.0-beta.6" +"@polkadot/metadata@^0.97.0-beta.3": + version "0.97.0-beta.3" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.3.tgz#66108239c342b8bce096b933596fa6ff75552597" + integrity sha512-GBHrLoE9DRVUctUhumMbp/xW441MHNkcUoiByjVvr1g0TtuZbgvTjC63uxJby98xeIIv63TCHKIoGs5xanztQg== + dependencies: + "@babel/runtime" "^7.7.1" + "@polkadot/types" "^0.97.0-beta.3" + "@polkadot/util" "^1.7.0-beta.6" + "@polkadot/util-crypto" "^1.7.0-beta.6" + "@polkadot/react-identicon@^0.47.0-beta.5": version "0.47.0-beta.5" resolved "https://registry.yarnpkg.com/@polkadot/react-identicon/-/react-identicon-0.47.0-beta.5.tgz#705436ffcaa15b1bc0ae966dfd5361abe8a82892" @@ -2212,25 +2212,25 @@ qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.0-beta.2": - version "0.97.0-beta.2" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.2.tgz#035a72d84e85e97e30996a331d50646d0b868dc8" - integrity sha512-fHUgx6Q4QJWG/b8kIsiy3vMMQn4Z+Zf2Jagr/0S7DggyDaIcvUFiolqLTQNM+qNXsOBhN2rJDlUMxNdLhCYN7Q== +"@polkadot/rpc-core@^0.97.0-beta.3": + version "0.97.0-beta.3" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.3.tgz#8374f63fa391882cb6748dd92b9cddfb5f6cd98a" + integrity sha512-ebNuz4AtHj5DHdBtV1lXxGM07WJIAPUBRrbHqaKN4VcLXoimNtAxcQdXfzWeN4TP1MhdjGko7Xe1ZoNXBn8jwQ== dependencies: "@babel/runtime" "^7.7.1" - "@polkadot/jsonrpc" "^0.97.0-beta.2" - "@polkadot/rpc-provider" "^0.97.0-beta.2" - "@polkadot/types" "^0.97.0-beta.2" + "@polkadot/jsonrpc" "^0.97.0-beta.3" + "@polkadot/rpc-provider" "^0.97.0-beta.3" + "@polkadot/types" "^0.97.0-beta.3" "@polkadot/util" "^1.7.0-beta.6" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.0-beta.2": - version "0.97.0-beta.2" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.2.tgz#7951ffc927a9e86b47b51593ff66011d82a56306" - integrity sha512-83Ai2++CTCURBkEhPzYoT6La9Q4nx488q3ekKD+yOFqSXrCIsBJrVZen3cKpSNkxsRllNGEEFY4o6eqa6JIWMw== +"@polkadot/rpc-provider@^0.97.0-beta.3": + version "0.97.0-beta.3" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.3.tgz#492ad6f98a46d8247c56b4db15ca5e957c4e9396" + integrity sha512-Z+G0O0InPUV4eJuuAkgBLG09Q5ZxAANIVH3ywr7IgCEHfg8y4+ZekXfI+hXFjvpLICPjc5RqEtwVWSpfIwEhQg== dependencies: "@babel/runtime" "^7.7.1" - "@polkadot/api-metadata" "^0.97.0-beta.2" + "@polkadot/metadata" "^0.97.0-beta.3" "@polkadot/util" "^1.7.0-beta.6" "@polkadot/util-crypto" "^1.7.0-beta.6" eventemitter3 "^4.0.0" @@ -2244,10 +2244,10 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.0-beta.2": - version "0.97.0-beta.2" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.2.tgz#181a481a62da478b2848c335ea34490177397ed1" - integrity sha512-LSlmDAG778cfZ2r7uF2wy+aEDWc+17J6PHJwHElgJQAwFdmsRuDrilpCIwrCRBASI8lGXq3I88w+z3WkraYyWA== +"@polkadot/types@^0.97.0-beta.3": + version "0.97.0-beta.3" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.3.tgz#8cbb0626ef4192c99ea364a84969ab4878f9a14b" + integrity sha512-7AdPa+y8A5hpDg8dJd0DFN2jZ1TeVrxLhIVnHJER+UE42XqAw5IHiw4bHFvJ+HPTxa8Nj1Aeg45J7shkLS1EiA== dependencies: "@babel/runtime" "^7.7.1" "@polkadot/util" "^1.7.0-beta.6" From 8ba40aed5a98bdf1df3d6aefb00e9f4f2a8b8847 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Tue, 12 Nov 2019 13:44:25 +0000 Subject: [PATCH 016/154] [CI Skip] 0.37.0-beta.73 --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-staking.json | 8 +++++++- packages/apps/public/locales/en/ui.json | 6 +++++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 31 files changed, 79 insertions(+), 69 deletions(-) diff --git a/lerna.json b/lerna.json index a88c5b7ef089..05ebc6a79149 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.72" + "version": "0.37.0-beta.73" } diff --git a/package.json b/package.json index 2fed87d2bdfa..2cc54184a7ea 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 67d850e19d71..198db7d2d19a 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index a382a9dc4b47..315920bf171b 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-components": "^0.37.0-beta.73", "@polkadot/react-qr": "^0.47.0-beta.5", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 66d1edc3b686..a9786823568b 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 187981455c40..b484143f8dbe 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 141c314c966c..90ec44513c57 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/api-contract": "^0.97.0-beta.3", - "@polkadot/react-components": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index cf6201749c8c..eb35691971a6 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", - "@polkadot/react-query": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-query": "^0.37.0-beta.73" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 7ef0aaf596b6..b1aa211018e6 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/apps-routing": "^0.37.0-beta.72", - "@polkadot/react-components": "^0.37.0-beta.72" + "@polkadot/apps-routing": "^0.37.0-beta.73", + "@polkadot/react-components": "^0.37.0-beta.73" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 20d41b5c8a84..2a9fef08b85d 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", - "@polkadot/react-query": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-query": "^0.37.0-beta.73" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 50af4fd276c4..5a04bef6a54d 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index d500db240606..edcf66d46e03 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", - "@polkadot/react-params": "^0.37.0-beta.72", - "@polkadot/react-signer": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-params": "^0.37.0-beta.73", + "@polkadot/react-signer": "^0.37.0-beta.73" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 24fb495d457d..cbe0392d5500 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index d6224f6c224a..17973d548d61 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-components": "^0.37.0-beta.73", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 7189aae83fec..12ae5cd33c7c 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", - "@polkadot/react-query": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-query": "^0.37.0-beta.73" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index cc4e5ac0c983..013b99de03ed 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", - "@polkadot/react-query": "^0.37.0-beta.72", + "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-query": "^0.37.0-beta.73", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 9bcc56daaec7..d16cc859bacb 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/app-explorer": "^0.37.0-beta.72", - "@polkadot/react-components": "^0.37.0-beta.72", - "@polkadot/react-query": "^0.37.0-beta.72" + "@polkadot/app-explorer": "^0.37.0-beta.73", + "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-query": "^0.37.0-beta.73" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 904b96b72191..18e94940262c 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", - "@polkadot/react-params": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-params": "^0.37.0-beta.73" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index fe8c4823dd60..4333ef1e67f2 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 068934c612b2..ec7e52ba2301 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 630b6a964256..2f3ac055a9ae 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", - "@polkadot/react-query": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-query": "^0.37.0-beta.73" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 7f6241497558..d3feeb1fdd4c 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", - "@polkadot/react-query": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-query": "^0.37.0-beta.73" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 1252b035ca89..b1ac61dc9801 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 22c92c5f5773..1b9249f54237 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", - "@polkadot/react-signer": "^0.37.0-beta.72", + "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-signer": "^0.37.0-beta.73", "@polkadot/ui-assets": "^0.47.0-beta.5", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-staking.json b/packages/apps/public/locales/en/app-staking.json index 78ba90d9e965..312f39129cff 100644 --- a/packages/apps/public/locales/en/app-staking.json +++ b/packages/apps/public/locales/en/app-staking.json @@ -98,5 +98,11 @@ "Aye": "Aye", "Nay": "Nay", "blocks per session": "blocks per session", - "transferrable": "transferrable" + "transferrable": "transferrable", + "Validator stats": "Validator stats", + "block hash or number to query": "block hash or number to query", + "Display overview information for the selected validator, including blocks produced.": "Display overview information for the selected validator, including blocks produced.", + "validator to query": "validator to query", + "blocks": "blocks", + "average": "average" } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index ab988bfa08ee..611eca1f56bf 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -615,5 +615,9 @@ "runners up": "", "blocks per session": "", "voting balance": "", - "Max": "" + "Max": "", + "Validator stats": "", + "Display overview information for the selected validator, including blocks produced.": "", + "validator to query": "", + "average": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 6564c92cf58b..c234c88eaf60 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 49b8891b7e00..ea2151beb63f 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/react-api": "^0.37.0-beta.72", + "@polkadot/react-api": "^0.37.0-beta.73", "@polkadot/react-identicon": "^0.47.0-beta.5", - "@polkadot/react-query": "^0.37.0-beta.72", + "@polkadot/react-query": "^0.37.0-beta.73", "@polkadot/ui-keyring": "^0.47.0-beta.5", "@polkadot/ui-settings": "^0.47.0-beta.5", "@types/chart.js": "^2.8.10", diff --git a/packages/react-params/package.json b/packages/react-params/package.json index f189edd8daf2..de9c77e229d2 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72" + "@polkadot/react-components": "^0.37.0-beta.73" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index e6802d0cfde6..2c13a98914fc 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index b00570f30829..6bea422dc49b 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.72", + "version": "0.37.0-beta.73", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.72", + "@polkadot/react-components": "^0.37.0-beta.73", "@polkadot/react-qr": "^0.47.0-beta.5" } } From 03158fb59417c313ef4631fb7fabd8cede846dad Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 12 Nov 2019 18:32:52 +0100 Subject: [PATCH 017/154] Add useFavorites hook (incl. react-hooks package) (#1873) * Add useFavorites hook * useFavorites to Nominate * Fix filter: grayscale positioning --- packages/app-accounts/src/modals/Derive.tsx | 2 +- packages/app-explorer/src/index.tsx | 6 +- .../src/Actions/Account/Nominate.tsx | 6 +- packages/app-staking/src/Overview/Address.tsx | 6 +- .../app-staking/src/Overview/CurrentList.tsx | 18 +- packages/app-staking/src/constants.ts | 2 +- packages/app-staking/src/index.tsx | 4 - packages/apps/src/SideBar/NodeInfo.tsx | 4 - packages/react-components/src/AddressRow.tsx | 2 +- packages/react-components/src/Row.tsx | 11 +- packages/react-hooks/LICENSE | 201 ++++++++++++++++++ packages/react-hooks/README.md | 5 + packages/react-hooks/package.json | 35 +++ .../hooks => react-hooks/src}/debounce.tsx | 0 packages/react-hooks/src/favorites.tsx | 28 +++ .../src/hooks => react-hooks/src}/index.ts | 1 + tsconfig.json | 2 + 17 files changed, 293 insertions(+), 40 deletions(-) create mode 100644 packages/react-hooks/LICENSE create mode 100644 packages/react-hooks/README.md create mode 100644 packages/react-hooks/package.json rename packages/{react-components/src/hooks => react-hooks/src}/debounce.tsx (100%) create mode 100644 packages/react-hooks/src/favorites.tsx rename packages/{react-components/src/hooks => react-hooks/src}/index.ts (82%) diff --git a/packages/app-accounts/src/modals/Derive.tsx b/packages/app-accounts/src/modals/Derive.tsx index 46ace9b59b38..cb92f63abea4 100644 --- a/packages/app-accounts/src/modals/Derive.tsx +++ b/packages/app-accounts/src/modals/Derive.tsx @@ -9,7 +9,7 @@ import { KeypairType } from '@polkadot/util-crypto/types'; import React, { useContext, useEffect, useState } from 'react'; import { AddressRow, Button, Input, InputAddress, Modal, Password, StatusContext } from '@polkadot/react-components'; -import { useDebounce } from '@polkadot/react-components/hooks'; +import { useDebounce } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; import { keyExtractPath } from '@polkadot/util-crypto'; diff --git a/packages/app-explorer/src/index.tsx b/packages/app-explorer/src/index.tsx index efae407204a8..abe7755143e0 100644 --- a/packages/app-explorer/src/index.tsx +++ b/packages/app-explorer/src/index.tsx @@ -77,9 +77,5 @@ function ExplorerApp ({ basePath, className, t }: Props): React.ReactElement | null { - const [favorites] = useState(store.get(STORE_FAVS, [])); + const [favorites] = useFavorites(STORE_FAVS_BASE); const [next, setNext] = useState(); const [{ options, shortlist }, setShortlist] = useState<{ options: KeyringSectionOption[]; shortlist: string[] }>({ options: [], shortlist: [] }); diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx index d76a8486f52d..95a607e9cb3e 100644 --- a/packages/app-staking/src/Overview/Address.tsx +++ b/packages/app-staking/src/Overview/Address.tsx @@ -27,10 +27,10 @@ interface Props extends I18nProps { isFavorite: boolean; lastAuthors?: string[]; myAccounts: string[]; - onFavorite: (accountId: string) => void; points?: Points; recentlyOnline?: DerivedHeartbeats; stakingInfo?: DerivedStaking; + toggleFavorite: (accountId: string) => void; withNominations?: boolean; } @@ -46,7 +46,7 @@ interface StakingState { const WITH_VALIDATOR_PREFS = { validatorPayment: true }; -function Address ({ address, authorsMap, className, defaultName, filter, isElected, isFavorite, lastAuthors, myAccounts, onFavorite, points, recentlyOnline, stakingInfo, t, withNominations = true }: Props): React.ReactElement | null { +function Address ({ address, authorsMap, className, defaultName, filter, isElected, isFavorite, lastAuthors, myAccounts, points, recentlyOnline, stakingInfo, t, toggleFavorite, withNominations = true }: Props): React.ReactElement | null { const { api, isSubstrateV2 } = useContext(ApiContext); const [extraInfo, setExtraInfo] = useState<[React.ReactNode, React.ReactNode][] | undefined>(); const [hasActivity, setHasActivity] = useState(true); @@ -122,7 +122,7 @@ function Address ({ address, authorsMap, className, defaultName, filter, isElect const lastBlockNumber = authorsMap[stashId]; const isAuthor = lastAuthors && lastAuthors.includes(stashId); - const _onFavorite = (): void => onFavorite(stashId); + const _onFavorite = (): void => toggleFavorite(stashId); const _onQueryStats = (): void => { window.location.hash = `/staking/query/${stashId}`; }; diff --git a/packages/app-staking/src/Overview/CurrentList.tsx b/packages/app-staking/src/Overview/CurrentList.tsx index 37e3097afb13..c6ba651c3c53 100644 --- a/packages/app-staking/src/Overview/CurrentList.tsx +++ b/packages/app-staking/src/Overview/CurrentList.tsx @@ -10,10 +10,10 @@ import { ValidatorFilter } from '../types'; import React, { useContext, useEffect, useState } from 'react'; import { ApiContext } from '@polkadot/react-api'; import { Columar, Column, Dropdown, FilterOverlay } from '@polkadot/react-components'; -import store from 'store'; +import { useFavorites } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; -import { STORE_FAVS } from '../constants'; +import { STORE_FAVS_BASE } from '../constants'; import translate from '../translate'; import Address from './Address'; @@ -58,7 +58,7 @@ function accountsToString (accounts: AccountId[]): string[] { function CurrentList ({ authorsMap, lastAuthors, next, recentlyOnline, stakingOverview, t }: Props): React.ReactElement { const { isSubstrateV2 } = useContext(ApiContext); - const [favorites, setFavorites] = useState(store.get(STORE_FAVS, [])); + const [favorites, toggleFavorite] = useFavorites(STORE_FAVS_BASE); const [filter, setFilter] = useState('all'); const [myAccounts] = useState(keyring.getAccounts().map(({ address }): string => address)); const [{ elected, validators, waiting }, setFiltered] = useState<{ elected: AccountExtend[]; validators: AccountExtend[]; waiting: AccountExtend[] }>({ elected: [], validators: [], waiting: [] }); @@ -78,16 +78,6 @@ function CurrentList ({ authorsMap, lastAuthors, next, recentlyOnline, stakingOv } }, [favorites, next, stakingOverview]); - const _onFavorite = (accountId: string): void => - setFavorites( - store.set( - STORE_FAVS, - favorites.includes(accountId) - ? favorites.filter((thisOne): boolean => thisOne !== accountId) - : [...favorites, accountId] - ) - ); - const _renderColumn = (addresses: AccountExtend[], defaultName: string, withOnline: boolean): React.ReactNode => addresses.map(([address, isElected, isFavorite, points]): React.ReactNode => (
)); diff --git a/packages/app-staking/src/constants.ts b/packages/app-staking/src/constants.ts index 29ddae5e77fd..825c9db35058 100644 --- a/packages/app-staking/src/constants.ts +++ b/packages/app-staking/src/constants.ts @@ -2,4 +2,4 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -export const STORE_FAVS = 'staking:favorites'; +export const STORE_FAVS_BASE = 'staking:favorites'; diff --git a/packages/app-staking/src/index.tsx b/packages/app-staking/src/index.tsx index 7c1b321aa4d0..25fb6815517c 100644 --- a/packages/app-staking/src/index.tsx +++ b/packages/app-staking/src/index.tsx @@ -102,10 +102,6 @@ function App ({ allAccounts, allStashesAndControllers: [allStashes, allControlle export default withMulti( styled(App)` - .rx--updated { - background: transparent !important; - } - .staking--hidden { display: none; } diff --git a/packages/apps/src/SideBar/NodeInfo.tsx b/packages/apps/src/SideBar/NodeInfo.tsx index a837304dfad5..4ed6ea4c0f4c 100644 --- a/packages/apps/src/SideBar/NodeInfo.tsx +++ b/packages/apps/src/SideBar/NodeInfo.tsx @@ -49,8 +49,4 @@ export default styled(NodeInfo)` margin-bottom: 0.5rem; } } - - .rx--updated { - background: inherit !important; - } `; diff --git a/packages/react-components/src/AddressRow.tsx b/packages/react-components/src/AddressRow.tsx index de671005d315..4c5d31a6da74 100644 --- a/packages/react-components/src/AddressRow.tsx +++ b/packages/react-components/src/AddressRow.tsx @@ -90,7 +90,7 @@ class AddressRow extends Row { return (
diff --git a/packages/react-components/src/Row.tsx b/packages/react-components/src/Row.tsx index d4503c7b4765..a255b9bc27c4 100644 --- a/packages/react-components/src/Row.tsx +++ b/packages/react-components/src/Row.tsx @@ -17,12 +17,15 @@ import InputTags from './InputTags'; export const styles = ` text-align: left; - &.disabled { - filter: grayscale(100%); + &.isDisabled { opacity: 0.6; + + .ui--IdentityIcon { + filter: grayscale(100%); + } } - &.inline { + &.isInline { display: flex; .ui--Row-accountId { @@ -30,7 +33,7 @@ export const styles = ` } } - &.invalid { + &.isInvalid { .ui--Row-accountId, .ui--Row-icon { filter: grayscale(100); diff --git a/packages/react-hooks/LICENSE b/packages/react-hooks/LICENSE new file mode 100644 index 000000000000..0d381b2e97dc --- /dev/null +++ b/packages/react-hooks/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/packages/react-hooks/README.md b/packages/react-hooks/README.md new file mode 100644 index 000000000000..16475f66001a --- /dev/null +++ b/packages/react-hooks/README.md @@ -0,0 +1,5 @@ +# @polkadot/react-hooks + +WARNING: This is an internal package to [polkadot-js/apps](https://github.com/polkadot-js/apps) so is not inteded (yet) for broad use. Since these are generic components, they will move to the [polkadot-js/ui](https://github.com/polkadot-js/ui) repo once deemed stable and usable. + +For the existing sharable components usable in external React-based projects, take a look at the [polkadot-js/ui documentation](https://polkadot.js.org/ui/) diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json new file mode 100644 index 000000000000..d22d6a6cdfe6 --- /dev/null +++ b/packages/react-hooks/package.json @@ -0,0 +1,35 @@ +{ + "name": "@polkadot/react-hooks", + "version": "0.37.0-beta.73", + "description": "A collection of React hooks the Polkadot JS Apps UI", + "main": "index.js", + "keywords": [ + "Polkadot", + "React", + "RxJs" + ], + "author": "Jaco Greeff ", + "maintainers": [ + "Jaco Greeff " + ], + "contributors": [], + "license": "Apache-2.0", + "engines": { + "node": ">=8.0" + }, + "publishConfig": { + "access": "public", + "registry": "https://registry.npmjs.org" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/polkadot-js/ui.git" + }, + "bugs": { + "url": "https://github.com/polkadot-js/ui/issues" + }, + "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", + "dependencies": { + "@babel/runtime": "^7.7.1" + } +} diff --git a/packages/react-components/src/hooks/debounce.tsx b/packages/react-hooks/src/debounce.tsx similarity index 100% rename from packages/react-components/src/hooks/debounce.tsx rename to packages/react-hooks/src/debounce.tsx diff --git a/packages/react-hooks/src/favorites.tsx b/packages/react-hooks/src/favorites.tsx new file mode 100644 index 000000000000..cc74ff1cd216 --- /dev/null +++ b/packages/react-hooks/src/favorites.tsx @@ -0,0 +1,28 @@ +// Copyright 2017-2019 @polkadot/react-components authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { useContext, useState } from 'react'; +import store from 'store'; +import { ApiContext } from '@polkadot/react-api'; + +// hook for favorites with local storage +export default function useFavorites (storageKeyBase: string): [string[], (address: string) => void] { + const { api, isDevelopment } = useContext(ApiContext); + const keyName = `${storageKeyBase}:${isDevelopment ? 'development' : api.genesisHash}`; + + // retrieve from the new style first, if not available, fallback to old-style + const [favorites, setFavorites] = useState(store.get(keyName) || store.get(storageKeyBase, [])); + + const _toggleFavorite = (address: string): void => + setFavorites( + store.set( + keyName, + favorites.includes(address) + ? favorites.filter((accountId): boolean => address !== accountId) + : [...favorites, address] + ) + ); + + return [favorites, _toggleFavorite]; +} diff --git a/packages/react-components/src/hooks/index.ts b/packages/react-hooks/src/index.ts similarity index 82% rename from packages/react-components/src/hooks/index.ts rename to packages/react-hooks/src/index.ts index 0c61f0e9f174..40a542273c98 100644 --- a/packages/react-components/src/hooks/index.ts +++ b/packages/react-hooks/src/index.ts @@ -3,3 +3,4 @@ // of the Apache-2.0 license. See the LICENSE file for details. export { default as useDebounce } from './debounce'; +export { default as useFavorites } from './favorites'; diff --git a/tsconfig.json b/tsconfig.json index 49443fd44d9a..01579931eb44 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -53,6 +53,8 @@ "@polkadot/react-api/*": [ "packages/react-api/src/*" ], "@polkadot/react-components": [ "packages/react-components/src" ], "@polkadot/react-components/*": [ "packages/react-components/src/*" ], + "@polkadot/react-hooks": [ "packages/react-hooks/src" ], + "@polkadot/react-hooks/*": [ "packages/react-hooks/src/*" ], "@polkadot/react-params": [ "packages/react-params/src" ], "@polkadot/react-params/*": [ "packages/react-params/src/*" ], "@polkadot/react-query": [ "packages/react-query/src" ], From 117903cdf197b0531b75a482212e6711b49079c6 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Tue, 12 Nov 2019 17:37:51 +0000 Subject: [PATCH 018/154] [CI Skip] 0.37.0-beta.74 --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 05ebc6a79149..588088bcd373 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.73" + "version": "0.37.0-beta.74" } diff --git a/package.json b/package.json index 2cc54184a7ea..3a716b4c2952 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 198db7d2d19a..a6732f2a9f80 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 315920bf171b..c0eb9edcc3ca 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-components": "^0.37.0-beta.74", "@polkadot/react-qr": "^0.47.0-beta.5", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index a9786823568b..77b007641fcd 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index b484143f8dbe..b5e5a29c32e3 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 90ec44513c57..0c32e7516fab 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/api-contract": "^0.97.0-beta.3", - "@polkadot/react-components": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index eb35691971a6..ba3e84e6221d 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", - "@polkadot/react-query": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-query": "^0.37.0-beta.74" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index b1aa211018e6..3a327e740f48 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/apps-routing": "^0.37.0-beta.73", - "@polkadot/react-components": "^0.37.0-beta.73" + "@polkadot/apps-routing": "^0.37.0-beta.74", + "@polkadot/react-components": "^0.37.0-beta.74" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 2a9fef08b85d..419e6a31cd03 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", - "@polkadot/react-query": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-query": "^0.37.0-beta.74" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 5a04bef6a54d..15ab288ec92b 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index edcf66d46e03..591c7f14d0c8 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", - "@polkadot/react-params": "^0.37.0-beta.73", - "@polkadot/react-signer": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-params": "^0.37.0-beta.74", + "@polkadot/react-signer": "^0.37.0-beta.74" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index cbe0392d5500..af3bb8fb78cb 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 17973d548d61..8614ecfe11d2 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-components": "^0.37.0-beta.74", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 12ae5cd33c7c..119ca97de03c 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", - "@polkadot/react-query": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-query": "^0.37.0-beta.74" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 013b99de03ed..ab0f0acd3cc1 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", - "@polkadot/react-query": "^0.37.0-beta.73", + "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-query": "^0.37.0-beta.74", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index d16cc859bacb..2c1c4d79e304 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/app-explorer": "^0.37.0-beta.73", - "@polkadot/react-components": "^0.37.0-beta.73", - "@polkadot/react-query": "^0.37.0-beta.73" + "@polkadot/app-explorer": "^0.37.0-beta.74", + "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-query": "^0.37.0-beta.74" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 18e94940262c..196126f2477d 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", - "@polkadot/react-params": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-params": "^0.37.0-beta.74" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 4333ef1e67f2..395296893953 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index ec7e52ba2301..fde1063eb585 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 2f3ac055a9ae..7102d0cb2c67 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", - "@polkadot/react-query": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-query": "^0.37.0-beta.74" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index d3feeb1fdd4c..9f9e2c878684 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", - "@polkadot/react-query": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-query": "^0.37.0-beta.74" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index b1ac61dc9801..f2d86dc6c4f5 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 1b9249f54237..74e8c119d393 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", - "@polkadot/react-signer": "^0.37.0-beta.73", + "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-signer": "^0.37.0-beta.74", "@polkadot/ui-assets": "^0.47.0-beta.5", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index c234c88eaf60..6a04aa40bd5b 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index ea2151beb63f..04411e46ad9e 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/react-api": "^0.37.0-beta.73", + "@polkadot/react-api": "^0.37.0-beta.74", "@polkadot/react-identicon": "^0.47.0-beta.5", - "@polkadot/react-query": "^0.37.0-beta.73", + "@polkadot/react-query": "^0.37.0-beta.74", "@polkadot/ui-keyring": "^0.47.0-beta.5", "@polkadot/ui-settings": "^0.47.0-beta.5", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index d22d6a6cdfe6..50b31a2a373d 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index de9c77e229d2..ce1f72c2116f 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73" + "@polkadot/react-components": "^0.37.0-beta.74" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 2c13a98914fc..185329b1f045 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 6bea422dc49b..e7ae543cc3a0 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.73", + "version": "0.37.0-beta.74", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.73", + "@polkadot/react-components": "^0.37.0-beta.74", "@polkadot/react-qr": "^0.47.0-beta.5" } } From 84f6c008297558b822424a9ef7f9b43af747edd7 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 12 Nov 2019 20:38:15 +0100 Subject: [PATCH 019/154] Add elected stake (#1874) --- packages/app-staking/src/Query/Validator.tsx | 104 +++++++++++++++---- packages/app-staking/src/Query/index.tsx | 15 ++- packages/app-staking/src/index.tsx | 4 +- packages/app-staking/src/types.ts | 2 + packages/react-components/src/Chart/Line.tsx | 14 ++- 5 files changed, 108 insertions(+), 31 deletions(-) diff --git a/packages/app-staking/src/Query/Validator.tsx b/packages/app-staking/src/Query/Validator.tsx index 5f6504775fd8..005a4b5b8081 100644 --- a/packages/app-staking/src/Query/Validator.tsx +++ b/packages/app-staking/src/Query/Validator.tsx @@ -3,13 +3,13 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { I18nProps } from '@polkadot/react-components/types'; -import { SessionIndex } from '@polkadot/types/interfaces'; +import { BlockNumber, Exposure, Hash, SessionIndex } from '@polkadot/types/interfaces'; import BN from 'bn.js'; -import React, { useEffect, useState } from 'react'; -import { Chart } from '@polkadot/react-components'; -import { withCalls } from '@polkadot/react-api'; -import { formatNumber } from '@polkadot/util'; +import React, { useContext, useEffect, useState } from 'react'; +import { Chart, Columar, Column } from '@polkadot/react-components'; +import { ApiContext, withCalls } from '@polkadot/react-api'; +import { formatBalance, formatNumber } from '@polkadot/util'; import translate from '../translate'; @@ -17,10 +17,13 @@ interface Props extends I18nProps { blockCounts?: BN[]; className?: string; currentIndex: SessionIndex; + startNumber: BlockNumber; validatorId: string; } -// assuming 4 hrs sessions, we we grab results for 10 days +type LineData = (BN | number)[][]; + +// assuming 4 hrs sessions, we grab results for 10 days const SESSIONS = 10 * (24 / 4); function getIndexRange (currentIndex: SessionIndex): BN[] { @@ -36,12 +39,55 @@ function getIndexRange (currentIndex: SessionIndex): BN[] { return range.reverse(); } -function Validator ({ blockCounts, className, currentIndex, t }: Props): React.ReactElement { - const [labels, setLabels] = useState([]); - const [{ avgSet, idxSet }, setValues] = useState<{ avgSet: number[]; idxSet: BN[] }>({ avgSet: [], idxSet: [] }); +function Validator ({ blockCounts, className, currentIndex, startNumber, t, validatorId }: Props): React.ReactElement { + const { api } = useContext(ApiContext); + const [blocksLabels, setBlocksLabels] = useState([]); + const [blocksChart, setBlocksChart] = useState(); + const [stakeLabels, setStakeLabels] = useState([]); + const [stakeChart, setStateChart] = useState(); + + useEffect((): void => { + const numbers: BN[] = []; + const checkLength = (api.consts.babe + ? api.consts.babe.epochDuration as BlockNumber + : new BN(500)).muln(2).divn(3); + const divisor = new BN('1'.padEnd(formatBalance.getDefaults().decimals + 1, '0')); + + api.isReady.then((): void => { + let currentNumber: BN = startNumber; + + // here we end up with more-or-less 6.66 days + while (startNumber.gtn(0) && numbers.length < SESSIONS) { + numbers.unshift(currentNumber); + currentNumber = currentNumber.sub(checkLength); + } + + setStakeLabels(numbers.map((bn): string => formatNumber(bn))); + + Promise + .all(numbers.map((at): Promise => + api.rpc.chain.getBlockHash(at as any) + )) + .then((hashes): Promise => + Promise.all(hashes.map((hash): Promise => + api.query.staking.stakers.at(hash, validatorId) as Promise + )) + ) + .then((exposures): void => { + setStateChart([ + exposures.map(({ total }): BN => + total.unwrap().div(divisor)) + // exposures.map(({ own }): BN => + // own.unwrap().div(divisor)), + // exposures.map(({ others }): BN => + // others.reduce((total, { value }): BN => total.add(value.unwrap()), new BN(0)).div(divisor)) + ]); + }); + }); + }, []); useEffect((): void => { - setLabels( + setBlocksLabels( getIndexRange(currentIndex).map((index): string => formatNumber(index)) ); }, [currentIndex]); @@ -60,18 +106,38 @@ function Validator ({ blockCounts, className, currentIndex, t }: Props): React.R return total; }, new BN(0)); - setValues({ avgSet, idxSet }); + setBlocksChart([idxSet, avgSet]); } - }, [blockCounts, labels]); + }, [blockCounts, blocksLabels]); return ( -
-

{t('blocks per session')}

- -
+ + + {blocksChart && ( + + )} + + + {stakeChart && ( + + )} + + ); } diff --git a/packages/app-staking/src/Query/index.tsx b/packages/app-staking/src/Query/index.tsx index f5c5a33f1cc0..c3ff9f5c8de2 100644 --- a/packages/app-staking/src/Query/index.tsx +++ b/packages/app-staking/src/Query/index.tsx @@ -3,9 +3,10 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { I18nProps } from '@polkadot/react-components/types'; +import { BlockNumber } from '@polkadot/types/interfaces'; import { ComponentProps } from '../types'; -import React, { useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { withRouter, RouteComponentProps } from 'react-router-dom'; import { Button, InputAddressSimple } from '@polkadot/react-components'; @@ -46,9 +47,16 @@ interface Props extends I18nProps, ComponentProps, RouteComponentProps<{}> { // /> // -function Query ({ className, stakingOverview, match: { params: { value } }, t }: Props): React.ReactElement { +function Query ({ bestNumber, className, stakingOverview, match: { params: { value } }, t }: Props): React.ReactElement { + const [startNumber, setStartNumber] = useState(); const [validatorId, setValidatorId] = useState(value || null); + useEffect((): void => { + if (bestNumber && !startNumber) { + setStartNumber(bestNumber); + } + }, [bestNumber, startNumber]); + const _onQuery = (): void => { if (validatorId) { window.location.hash = `/staking/query/${validatorId}`; @@ -71,9 +79,10 @@ function Query ({ className, stakingOverview, match: { params: { value } }, t }: onClick={_onQuery} /> - {value && stakingOverview && ( + {value && startNumber && stakingOverview && ( )} diff --git a/packages/app-staking/src/index.tsx b/packages/app-staking/src/index.tsx index 25fb6815517c..9bb8b16acb3d 100644 --- a/packages/app-staking/src/index.tsx +++ b/packages/app-staking/src/index.tsx @@ -36,7 +36,7 @@ interface Props extends AppProps, ApiProps, I18nProps { const EMPY_ACCOUNTS: string[] = []; const EMPTY_ALL: [string[], string[]] = [EMPY_ACCOUNTS, EMPY_ACCOUNTS]; -function App ({ allAccounts, allStashesAndControllers: [allStashes, allControllers] = EMPTY_ALL, basePath, className, recentlyOnline, stakingOverview, t }: Props): React.ReactElement { +function App ({ allAccounts, allStashesAndControllers: [allStashes, allControllers] = EMPTY_ALL, basePath, bestNumber, className, recentlyOnline, stakingOverview, t }: Props): React.ReactElement { const { api } = useContext(ApiContext); const routeMatch = useRouteMatch({ path: basePath, strict: true }); const _renderComponent = (Component: React.ComponentType, className?: string): () => React.ReactNode => { @@ -51,6 +51,7 @@ function App ({ allAccounts, allStashesAndControllers: [allStashes, allControlle allAccounts={allAccounts} allControllers={allControllers} allStashes={allStashes} + bestNumber={bestNumber} className={className} recentlyOnline={recentlyOnline} stakingOverview={stakingOverview} @@ -112,6 +113,7 @@ export default withMulti( `, translate, withCalls( + ['derive.chain.bestNumber', { propName: 'bestNumber' }], ['derive.imOnline.receivedHeartbeats', { propName: 'recentlyOnline' }], ['derive.staking.controllers', { propName: 'allStashesAndControllers', diff --git a/packages/app-staking/src/types.ts b/packages/app-staking/src/types.ts index f7cee5ae3859..b088c143ab13 100644 --- a/packages/app-staking/src/types.ts +++ b/packages/app-staking/src/types.ts @@ -3,6 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { DerivedFees, DerivedBalances, DerivedHeartbeats, DerivedStakingOverview } from '@polkadot/api-derive/types'; +import { BlockNumber } from '@polkadot/types/interfaces'; import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; export type Nominators = Record; @@ -11,6 +12,7 @@ export interface ComponentProps { allAccounts?: SubjectInfo; allControllers: string[]; allStashes: string[]; + bestNumber?: BlockNumber; className?: string; recentlyOnline?: DerivedHeartbeats; stakingOverview?: DerivedStakingOverview; diff --git a/packages/react-components/src/Chart/Line.tsx b/packages/react-components/src/Chart/Line.tsx index 09b5e338729c..7d3c40892af2 100644 --- a/packages/react-components/src/Chart/Line.tsx +++ b/packages/react-components/src/Chart/Line.tsx @@ -10,7 +10,7 @@ import ChartJs from 'chart.js'; import { Line } from 'react-chartjs-2'; interface Props extends BareProps { - aspectRatio?: number; + colors?: (string | undefined)[]; labels: string[]; legends: string[]; values: (number | BN)[][]; @@ -36,14 +36,14 @@ interface Config { datasets: Dataset[]; } -const COLORS = ['#ff8c00', '#acacac']; +const COLORS = ['#ff8c00', '#008c8c', '#8c008c']; const alphaColor = (hexColor: string): string => ChartJs.helpers.color(hexColor).alpha(0.65).rgbString(); -function calculateOptions (aspectRatio: number, legends: string[], labels: string[], values: (number | BN)[][], jsonValues: string): State { +function calculateOptions (colors: (string | undefined)[] = [], legends: string[], labels: string[], values: (number | BN)[][], jsonValues: string): State { const chartData = values.reduce((config, values, index): Config => { - const color = alphaColor(COLORS[index]); + const color = colors[index] || alphaColor(COLORS[index]); const data = values.map((value): number => BN.isBN(value) ? value.toNumber() : value); config.datasets.push({ @@ -64,8 +64,6 @@ function calculateOptions (aspectRatio: number, legends: string[], labels: strin return { chartData, chartOptions: { - // width/height by default this is "1", i.e. a square box - aspectRatio, // no need for the legend, expect the labels contain everything legend: { display: false @@ -82,14 +80,14 @@ function calculateOptions (aspectRatio: number, legends: string[], labels: strin }; } -export default function LineChart ({ aspectRatio = 10, className, labels, legends, style, values }: Props): React.ReactElement | null { +export default function LineChart ({ className, colors, labels, legends, style, values }: Props): React.ReactElement | null { const [{ chartData, chartOptions, jsonValues }, setState] = useState({}); useEffect((): void => { const newJsonValues = JSON.stringify(values); if (newJsonValues !== jsonValues) { - setState(calculateOptions(aspectRatio, legends, labels, values, newJsonValues)); + setState(calculateOptions(colors, legends, labels, values, newJsonValues)); } }, [labels, legends, values]); From 4f01688fe5d6bf4a69267586d216f870f684fa1f Mon Sep 17 00:00:00 2001 From: Github Actions Date: Tue, 12 Nov 2019 19:42:49 +0000 Subject: [PATCH 020/154] [CI Skip] 0.37.0-beta.75 --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-staking.json | 7 ++++++- packages/apps/public/locales/en/ui.json | 6 +++++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 32 files changed, 79 insertions(+), 70 deletions(-) diff --git a/lerna.json b/lerna.json index 588088bcd373..99f4c0806650 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.74" + "version": "0.37.0-beta.75" } diff --git a/package.json b/package.json index 3a716b4c2952..bd5ed9230b53 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index a6732f2a9f80..62d93ebb76b1 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index c0eb9edcc3ca..9bc72baf6200 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-qr": "^0.47.0-beta.5", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 77b007641fcd..33ffafd09634 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index b5e5a29c32e3..51649e01f0ea 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 0c32e7516fab..346fddbe9925 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/api-contract": "^0.97.0-beta.3", - "@polkadot/react-components": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index ba3e84e6221d..09cacc001216 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", - "@polkadot/react-query": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-query": "^0.37.0-beta.75" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 3a327e740f48..dc5410e6a3ec 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/apps-routing": "^0.37.0-beta.74", - "@polkadot/react-components": "^0.37.0-beta.74" + "@polkadot/apps-routing": "^0.37.0-beta.75", + "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 419e6a31cd03..80d532b4ddb9 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", - "@polkadot/react-query": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-query": "^0.37.0-beta.75" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 15ab288ec92b..4adeb9bf67f7 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 591c7f14d0c8..c097e49726bb 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", - "@polkadot/react-params": "^0.37.0-beta.74", - "@polkadot/react-signer": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-params": "^0.37.0-beta.75", + "@polkadot/react-signer": "^0.37.0-beta.75" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index af3bb8fb78cb..ec22bbd822da 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 8614ecfe11d2..af762beec890 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-components": "^0.37.0-beta.75", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 119ca97de03c..bf8b4ac357f3 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", - "@polkadot/react-query": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-query": "^0.37.0-beta.75" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index ab0f0acd3cc1..fc5abbdac4c4 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", - "@polkadot/react-query": "^0.37.0-beta.74", + "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-query": "^0.37.0-beta.75", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 2c1c4d79e304..8741f526b722 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/app-explorer": "^0.37.0-beta.74", - "@polkadot/react-components": "^0.37.0-beta.74", - "@polkadot/react-query": "^0.37.0-beta.74" + "@polkadot/app-explorer": "^0.37.0-beta.75", + "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-query": "^0.37.0-beta.75" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 196126f2477d..96bf49b190c2 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", - "@polkadot/react-params": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-params": "^0.37.0-beta.75" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 395296893953..9d5897e6affe 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index fde1063eb585..a75c74d84e8e 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 7102d0cb2c67..88a009a896d8 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", - "@polkadot/react-query": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-query": "^0.37.0-beta.75" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 9f9e2c878684..c356d604bbba 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", - "@polkadot/react-query": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-query": "^0.37.0-beta.75" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index f2d86dc6c4f5..c42dcf2d90cb 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 74e8c119d393..9db4db5942ec 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", - "@polkadot/react-signer": "^0.37.0-beta.74", + "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-signer": "^0.37.0-beta.75", "@polkadot/ui-assets": "^0.47.0-beta.5", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-staking.json b/packages/apps/public/locales/en/app-staking.json index 312f39129cff..9dc7dfaeb21a 100644 --- a/packages/apps/public/locales/en/app-staking.json +++ b/packages/apps/public/locales/en/app-staking.json @@ -104,5 +104,10 @@ "Display overview information for the selected validator, including blocks produced.": "Display overview information for the selected validator, including blocks produced.", "validator to query": "validator to query", "blocks": "blocks", - "average": "average" + "average": "average", + "Loading data": "Loading data", + "elected stake": "elected stake", + "total": "total", + "own": "own", + "other": "other" } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index 611eca1f56bf..e422aff68f9e 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -619,5 +619,9 @@ "Validator stats": "", "Display overview information for the selected validator, including blocks produced.": "", "validator to query": "", - "average": "" + "average": "", + "Loading data": "", + "elected stake": "", + "own": "", + "other": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 6a04aa40bd5b..dc3ed4768b86 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 04411e46ad9e..d74d5dca4559 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.1", "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/react-api": "^0.37.0-beta.74", + "@polkadot/react-api": "^0.37.0-beta.75", "@polkadot/react-identicon": "^0.47.0-beta.5", - "@polkadot/react-query": "^0.37.0-beta.74", + "@polkadot/react-query": "^0.37.0-beta.75", "@polkadot/ui-keyring": "^0.47.0-beta.5", "@polkadot/ui-settings": "^0.47.0-beta.5", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 50b31a2a373d..8194eda66cd7 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index ce1f72c2116f..b0ffe44129ef 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74" + "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 185329b1f045..7053eda6b506 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index e7ae543cc3a0..c322f9ae6dda 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.74", + "version": "0.37.0-beta.75", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.1", - "@polkadot/react-components": "^0.37.0-beta.74", + "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-qr": "^0.47.0-beta.5" } } From 9035b80d149168e91cb33daeb92a8a809449d6be Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 13 Nov 2019 13:30:35 +0100 Subject: [PATCH 021/154] Bump deps (#1876) --- package.json | 20 +- packages/app-123code/package.json | 2 +- packages/app-accounts/package.json | 4 +- packages/app-address-book/package.json | 2 +- packages/app-claims/package.json | 2 +- packages/app-contracts/package.json | 4 +- packages/app-council/package.json | 2 +- packages/app-dashboard/package.json | 2 +- packages/app-democracy/package.json | 2 +- packages/app-explorer/package.json | 2 +- packages/app-extrinsics/package.json | 2 +- packages/app-generic-asset/package.json | 2 +- packages/app-js/package.json | 2 +- packages/app-parachains/package.json | 2 +- packages/app-settings/package.json | 2 +- packages/app-staking/package.json | 2 +- packages/app-storage/package.json | 2 +- packages/app-sudo/package.json | 2 +- packages/app-toolbox/package.json | 2 +- packages/app-transfer/package.json | 2 +- packages/app-treasury/package.json | 2 +- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 4 +- packages/react-api/package.json | 6 +- packages/react-components/package.json | 10 +- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 2 +- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 +- yarn.lock | 1182 ++++++++++++----------- 30 files changed, 659 insertions(+), 619 deletions(-) diff --git a/package.json b/package.json index bd5ed9230b53..7cc074fcf0e6 100644 --- a/package.json +++ b/package.json @@ -10,12 +10,12 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.3", - "@polkadot/api-contract": "^0.97.0-beta.3", - "@polkadot/keyring": "^1.7.0-beta.6", - "@polkadot/types": "^0.97.0-beta.3", - "@polkadot/util": "^1.7.0-beta.6", - "@polkadot/util-crypto": "^1.7.0-beta.6", + "@polkadot/api": "^0.97.0-beta.4", + "@polkadot/api-contract": "^0.97.0-beta.4", + "@polkadot/keyring": "^1.7.0-beta.7", + "@polkadot/types": "^0.97.0-beta.4", + "@polkadot/util": "^1.7.0-beta.7", + "@polkadot/util-crypto": "^1.7.0-beta.7", "babel-core": "^7.0.0-bridge.0", "typescript": "^3.7.2" }, @@ -34,10 +34,10 @@ "start": "cd packages/apps && webpack --config webpack.config.js" }, "devDependencies": { - "@babel/core": "^7.7.0", - "@babel/runtime": "^7.7.1", - "@polkadot/dev-react": "^0.32.0-beta.13", - "@polkadot/ts": "^0.1.84", + "@babel/core": "^7.7.2", + "@babel/runtime": "^7.7.2", + "@polkadot/dev-react": "^0.32.0-beta.14", + "@polkadot/ts": "^0.1.85", "autoprefixer": "^9.7.1", "empty": "^0.10.1", "html-loader": "^0.5.5", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 62d93ebb76b1..cebcc6bb83a8 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -10,7 +10,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 9bc72baf6200..a38e8452b71e 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -10,9 +10,9 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-qr": "^0.47.0-beta.5", + "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", "babel-plugin-module-resolver": "^3.1.1", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 33ffafd09634..23f942fb839f 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -10,7 +10,7 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 51649e01f0ea..eb4fa84a27b9 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -11,7 +11,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 346fddbe9925..60c944c1f6da 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -10,8 +10,8 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", - "@polkadot/api-contract": "^0.97.0-beta.3", + "@babel/runtime": "^7.7.2", + "@polkadot/api-contract": "^0.97.0-beta.4", "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 09cacc001216..dc3693b728bd 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -10,7 +10,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-query": "^0.37.0-beta.75" } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index dc5410e6a3ec..d14b572fd750 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -10,7 +10,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/apps-routing": "^0.37.0-beta.75", "@polkadot/react-components": "^0.37.0-beta.75" } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 80d532b4ddb9..b74c472db93a 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -10,7 +10,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-query": "^0.37.0-beta.75" } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 4adeb9bf67f7..c6a4d98169e2 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -10,7 +10,7 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index c097e49726bb..37c99b1861bd 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -10,7 +10,7 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-params": "^0.37.0-beta.75", "@polkadot/react-signer": "^0.37.0-beta.75" diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index ec22bbd822da..93d663e8384f 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -10,7 +10,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index af762beec890..944de77564c8 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -10,7 +10,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", "snappyjs": "^0.6.0" } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index bf8b4ac357f3..5c9a1bb34587 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -10,7 +10,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-query": "^0.37.0-beta.75" } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index fc5abbdac4c4..91c5dfb373ca 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -10,7 +10,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-query": "^0.37.0-beta.75", "query-string": "^6.8.3" diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 8741f526b722..7f89c69f8d74 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -10,7 +10,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/app-explorer": "^0.37.0-beta.75", "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-query": "^0.37.0-beta.75" diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 96bf49b190c2..a85c30059be8 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -10,7 +10,7 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-params": "^0.37.0-beta.75" } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 9d5897e6affe..ac91c775c573 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -11,7 +11,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index a75c74d84e8e..b8a7325a8b30 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -10,7 +10,7 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 88a009a896d8..90784f244a64 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -10,7 +10,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-query": "^0.37.0-beta.75" } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index c356d604bbba..2d051ad416d9 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -11,7 +11,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-query": "^0.37.0-beta.75" } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index c42dcf2d90cb..a77157a71b1f 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -10,6 +10,6 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1" + "@babel/runtime": "^7.7.2" } } diff --git a/packages/apps/package.json b/packages/apps/package.json index 9db4db5942ec..0450334a4ada 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -13,10 +13,10 @@ "license": "Apache-2.0", "dependencies": { "@babel/polyfill": "^7.7.0", - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", "@polkadot/react-signer": "^0.37.0-beta.75", - "@polkadot/ui-assets": "^0.47.0-beta.5", + "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index dc3ed4768b86..271a601a5cbc 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -30,9 +30,9 @@ }, "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { - "@babel/runtime": "^7.7.1", - "@polkadot/api": "^0.97.0-beta.3", - "@polkadot/extension-dapp": "^0.14.0-beta.4", + "@babel/runtime": "^7.7.2", + "@polkadot/api": "^0.97.0-beta.4", + "@polkadot/extension-dapp": "^0.14.0-beta.5", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" } diff --git a/packages/react-components/package.json b/packages/react-components/package.json index d74d5dca4559..6bacd8592a59 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -10,13 +10,13 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", - "@polkadot/keyring": "^1.7.0-beta.6", + "@babel/runtime": "^7.7.2", + "@polkadot/keyring": "^1.7.0-beta.7", "@polkadot/react-api": "^0.37.0-beta.75", - "@polkadot/react-identicon": "^0.47.0-beta.5", + "@polkadot/react-identicon": "^0.47.0-beta.6", "@polkadot/react-query": "^0.37.0-beta.75", - "@polkadot/ui-keyring": "^0.47.0-beta.5", - "@polkadot/ui-settings": "^0.47.0-beta.5", + "@polkadot/ui-keyring": "^0.47.0-beta.6", + "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", "@types/i18next": "^13.0.0", "@types/react-copy-to-clipboard": "^4.3.0", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 8194eda66cd7..245af9a78293 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -30,6 +30,6 @@ }, "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { - "@babel/runtime": "^7.7.1" + "@babel/runtime": "^7.7.2" } } diff --git a/packages/react-params/package.json b/packages/react-params/package.json index b0ffe44129ef..000233a00b8f 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -10,7 +10,7 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 7053eda6b506..9fbf294c3dd5 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -30,6 +30,6 @@ }, "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { - "@babel/runtime": "^7.7.1" + "@babel/runtime": "^7.7.2" } } diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index c322f9ae6dda..f0218d0e16c1 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -10,8 +10,8 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-qr": "^0.47.0-beta.5" + "@polkadot/react-qr": "^0.47.0-beta.6" } } diff --git a/yarn.lock b/yarn.lock index 0989b88ba820..4b4535b1fade 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,19 +25,19 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.0.tgz#461d2948b1a7113088baf999499bcbd39a7faa3b" - integrity sha512-Bb1NjZCaiwTQC/ARL+MwDpgocdnwWDCaugvkGt6cxfBzQa8Whv1JybBoUEiBDKl8Ni3H3c7Fykwk7QChUsHRlg== +"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.2.tgz#ea5b99693bcfc058116f42fa1dd54da412b29d91" + integrity sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.7.0" + "@babel/generator" "^7.7.2" "@babel/helpers" "^7.7.0" - "@babel/parser" "^7.7.0" + "@babel/parser" "^7.7.2" "@babel/template" "^7.7.0" - "@babel/traverse" "^7.7.0" - "@babel/types" "^7.7.0" - convert-source-map "^1.1.0" + "@babel/traverse" "^7.7.2" + "@babel/types" "^7.7.2" + convert-source-map "^1.7.0" debug "^4.1.0" json5 "^2.1.0" lodash "^4.17.13" @@ -45,12 +45,12 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.4.0", "@babel/generator@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.0.tgz#c6d4d1f7a0d6e139cbd01aca73170b0bff5425b4" - integrity sha512-1wdJ6UxHyL1XoJQ119JmvuRX27LRih7iYStMPZOWAjQqeAabFg3dYXKMpgihma+to+0ADsTVVt6oRyUxWZw6Mw== +"@babel/generator@^7.4.0", "@babel/generator@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.2.tgz#2f4852d04131a5e17ea4f6645488b5da66ebf3af" + integrity sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ== dependencies: - "@babel/types" "^7.7.0" + "@babel/types" "^7.7.2" jsesc "^2.5.1" lodash "^4.17.13" source-map "^0.5.0" @@ -100,9 +100,9 @@ "@babel/helper-split-export-declaration" "^7.7.0" "@babel/helper-create-regexp-features-plugin@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.0.tgz#2e8badfe201cfafb5d930f46cf1e0b6f1cdcab23" - integrity sha512-ZhagAAVGD3L6MPM9/zZi7RRteonfBFLVUz3kjsnYsMAtr9hOJCKI9BAKIMpqn3NyWicPieoX779UL+7/3BEAOA== + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz#6f20443778c8fce2af2ff4206284afc0ced65db6" + integrity sha512-pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ== dependencies: "@babel/helper-regex" "^7.4.4" regexpu-core "^4.6.0" @@ -256,10 +256,10 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.0.tgz#232618f6e8947bc54b407fa1f1c91a22758e7159" - integrity sha512-GqL+Z0d7B7ADlQBMXlJgvXEbtt5qlqd1YQ5fr12hTSfh7O/vgrEIvJxU2e7aSVrEUn75zTZ6Nd0s8tthrlZnrQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2": + version "7.7.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.3.tgz#5fad457c2529de476a248f75b0f090b3060af043" + integrity sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A== "@babel/plugin-proposal-async-generator-functions@^7.2.0", "@babel/plugin-proposal-async-generator-functions@^7.7.0": version "7.7.0" @@ -698,10 +698,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-typescript@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.0.tgz#182be03fa8bd2ffd0629791a1eaa4373b7589d38" - integrity sha512-y3KYbcfKe+8ziRXiGhhnGrVysDBo5+aJdB+x8sanM0K41cnmK7Q5vBlQLMbOnW/HPjLG9bg7dLgYDQZZG9T09g== +"@babel/plugin-transform-typescript@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.2.tgz#eb9f14c516b5d36f4d6f3a9d7badae6d0fc313d4" + integrity sha512-UWhDaJRqdPUtdK1s0sKYdoRuqK0NepjZto2UZltvuCgMoMZmdjhgz5hcRokie/3aYEaSz3xvusyoayVaq4PjRg== dependencies: "@babel/helper-create-class-features-plugin" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" @@ -840,13 +840,13 @@ "@babel/plugin-transform-react-jsx-self" "^7.0.0" "@babel/plugin-transform-react-jsx-source" "^7.0.0" -"@babel/preset-typescript@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.7.0.tgz#5d7682d938160ceaf51c3d4239e9521ef893474c" - integrity sha512-WZ3qvtAJy8w/i6wqq5PuDnkCUXaLUTHIlJujfGHmHxsT5veAbEdEjl3cC/3nXfyD0bzlWsIiMdUhZgrXjd9QWg== +"@babel/preset-typescript@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.7.2.tgz#f71c8bba2ae02f11b29dbf7d6a35f47bbe011632" + integrity sha512-1B4HthAelaLGfNRyrWqJtBEjXX1ulThCrLQ5B2VOtEAznWFIFXFJahgXImqppy66lx/Oh+cOSCQdJzZqh2Jh5g== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-transform-typescript" "^7.7.0" + "@babel/plugin-transform-typescript" "^7.7.2" "@babel/register@^7.7.0": version "7.7.0" @@ -860,17 +860,17 @@ source-map-support "^0.5.16" "@babel/runtime-corejs2@^7.2.0": - version "7.7.1" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.7.1.tgz#ae94a96dbb020169344b857f12514e39bc3e3dcb" - integrity sha512-nlxajcFXWFyrFOyzOkphfby2izqoB9B4a3+rMqG4dBKMaHZUUS3BkgFBIAbNK6s+VOx0vaGJVgaQL0+3oWnxDQ== + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.7.2.tgz#5a8c4e2f8688ce58adc9eb1d8320b6e7341f96ce" + integrity sha512-GfVnHchOBvIMsweQ13l4jd9lT4brkevnavnVOej5g2y7PpTRY+R4pcQlCjWMZoUla5rMLFzaS/Ll2s59cB1TqQ== dependencies: core-js "^2.6.5" regenerator-runtime "^0.13.2" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.0", "@babel/runtime@^7.7.1": - version "7.7.1" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.1.tgz#b223497bbfbcbbb38116673904debc71470ca528" - integrity sha512-SQ0sS7KUJDvgCI2cpZG0nJygO6002oTbhgSuw4WcocsnbxLwL5Q8I3fqbJdyBAc3uFrWZiR2JomseuxSuci3SQ== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.2.tgz#111a78002a5c25fc8e3361bedc9529c696b85a6a" + integrity sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw== dependencies: regenerator-runtime "^0.13.2" @@ -883,25 +883,25 @@ "@babel/parser" "^7.7.0" "@babel/types" "^7.7.0" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.0.tgz#9f5744346b8d10097fd2ec2eeffcaf19813cbfaf" - integrity sha512-ea/3wRZc//e/uwCpuBX2itrhI0U9l7+FsrKWyKGNyvWbuMcCG7ATKY2VI4wlg2b2TA39HHwIxnvmXvtiKsyn7w== +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09" + integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.7.0" + "@babel/generator" "^7.7.2" "@babel/helper-function-name" "^7.7.0" "@babel/helper-split-export-declaration" "^7.7.0" - "@babel/parser" "^7.7.0" - "@babel/types" "^7.7.0" + "@babel/parser" "^7.7.2" + "@babel/types" "^7.7.2" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.0", "@babel/types@^7.7.1": - version "7.7.1" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.1.tgz#8b08ea368f2baff236613512cf67109e76285827" - integrity sha512-kN/XdANDab9x1z5gcjDc9ePpxexkt+1EQ2MQUiM4XnMvQfvp87/+6kY4Ko2maLXH+tei/DgJ/ybFITeqqRwDiA== +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.0", "@babel/types@^7.7.1", "@babel/types@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.2.tgz#550b82e5571dcd174af576e23f0adba7ffc683f7" + integrity sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA== dependencies: esutils "^2.0.2" lodash "^4.17.13" @@ -1196,72 +1196,72 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^13.0.0" -"@ledgerhq/devices@^4.73.4": - version "4.73.4" - resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-4.73.4.tgz#0a1866fd1f10e2afc57c5f002f60d52ad5e6bb99" - integrity sha512-oEhd1UlbkdRFe5ZQCr8aXZ4Z/uFvrTsIhXv6bDlqA0sR2VYZRqQPR4C0xLdcDo3NG88fP+6Xfi6wq3wBbT5n3A== +"@ledgerhq/devices@^4.73.7": + version "4.73.7" + resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-4.73.7.tgz#848756207082107531f76bf22acbc224dca20f2e" + integrity sha512-6jUv+Jw/unpZdz8I6nZdaYCP838cfiXLsh95S02XnCRE2xxfq3h3QfhEMnaDbxtJqUmJClRqayGZNIm2Go8IvA== dependencies: - "@ledgerhq/errors" "^4.73.4" + "@ledgerhq/errors" "^4.73.7" "@ledgerhq/logs" "^4.72.0" rxjs "^6.5.3" -"@ledgerhq/errors@^4.73.4": - version "4.73.4" - resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-4.73.4.tgz#df4705d11350f252c0f0c202e88a32723f409484" - integrity sha512-5Wz48jm0NozGkipPcYRAAFcwm50xLhCWSpmP96Fs7v8BtM72E1AtqOud5SCyTKS6OP10mPuDB1459b7FGFoBcw== +"@ledgerhq/errors@^4.73.7": + version "4.73.7" + resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-4.73.7.tgz#1c86918798669d5555076c576bfa3a317834935a" + integrity sha512-ybRJlRB3AjF6H19rQi5IuavvuGsBazzHL5ldw3DekvKlbjb+Mmf4ft21f2FKPynl9PlWhHVeVlhyVXXk+tuXOA== -"@ledgerhq/hw-transport-node-hid-noevents@^4.73.4": - version "4.73.4" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-4.73.4.tgz#964d3699a3110a48663247ba861278baeaffcf79" - integrity sha512-UQ8ntXxftN6PeASD9UpWs2rKanEY66BCwPSMeMJ6PpQC1IRO/HYJ0bdfaLrIWiAr+zJ4BjDRPui1jX5uDmMs3A== +"@ledgerhq/hw-transport-node-hid-noevents@^4.73.7": + version "4.73.7" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-4.73.7.tgz#ea457c8eb3cc2c2d53c0e9f5b97c545dcb7d46ec" + integrity sha512-5AL0ahsXAvjQJMcEtnXJsI847y8BHhO9eAJxsXYNZYYFXoKTfXBaMP8zCkUTBEi564GStQawM7aAmTzP+p70tw== dependencies: - "@ledgerhq/devices" "^4.73.4" - "@ledgerhq/errors" "^4.73.4" - "@ledgerhq/hw-transport" "^4.73.4" + "@ledgerhq/devices" "^4.73.7" + "@ledgerhq/errors" "^4.73.7" + "@ledgerhq/hw-transport" "^4.73.7" "@ledgerhq/logs" "^4.72.0" node-hid "^0.7.9" -"@ledgerhq/hw-transport-node-hid@^4.73.4": - version "4.73.4" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.73.4.tgz#ef9efdcfbcb08146a2087beccc47865e99966c78" - integrity sha512-rSzOjnjRzVBkH6hrbKG6Y979LR/oGeihyTE2Bt7UHeY8QepJGgkJavJkmKHq71QK6RbT5ntBfhErbNvrno5B1Q== +"@ledgerhq/hw-transport-node-hid@^4.73.7": + version "4.73.7" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.73.7.tgz#078c2021cdb32b2b20abefea0a1922dfd53ea012" + integrity sha512-vN8UD2CeiKM50VQud24triJtkUiuwuIw04XXV663QQ2GOvMu/ssSdXjodbzXKaIzkBAH2DCZhLOOCMELZGfTJQ== dependencies: - "@ledgerhq/devices" "^4.73.4" - "@ledgerhq/errors" "^4.73.4" - "@ledgerhq/hw-transport" "^4.73.4" - "@ledgerhq/hw-transport-node-hid-noevents" "^4.73.4" + "@ledgerhq/devices" "^4.73.7" + "@ledgerhq/errors" "^4.73.7" + "@ledgerhq/hw-transport" "^4.73.7" + "@ledgerhq/hw-transport-node-hid-noevents" "^4.73.7" "@ledgerhq/logs" "^4.72.0" lodash "^4.17.15" node-hid "^0.7.9" usb "^1.6.0" -"@ledgerhq/hw-transport-u2f@^4.73.4": - version "4.73.4" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-4.73.4.tgz#d18e8c4fa9289fd078441397ba1d3a3ab3b608e2" - integrity sha512-GSi/obZ7p1H5orTed4o3HhCeLV+odbweinY5dSOcY4WWL/YmrZfYUZQ+eFTZrnNVwv1EGrLeBaSEZcdIXdIFXg== +"@ledgerhq/hw-transport-u2f@^4.73.7": + version "4.73.7" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-4.73.7.tgz#fb6f0cb9e3f31890a97142df1d7c8835bc4a5f9a" + integrity sha512-ww6E4jNYsW7NyKqrevHAPF6r8gMvxurp+CajPRBiVfVbZv4l2Qil3SL5F8j2/q749Uc/ZgqDqTbxoOhohYmPyg== dependencies: - "@ledgerhq/errors" "^4.73.4" - "@ledgerhq/hw-transport" "^4.73.4" + "@ledgerhq/errors" "^4.73.7" + "@ledgerhq/hw-transport" "^4.73.7" "@ledgerhq/logs" "^4.72.0" u2f-api "0.2.7" -"@ledgerhq/hw-transport-webusb@^4.73.4": - version "4.73.4" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-4.73.4.tgz#63ade8af29a02b16fd97a3a1c13732531f676d80" - integrity sha512-AKsIqMOhf4vHykSfvCUMvRIvsKkoVyqi92dNMR7M8ExCT1jh+Jh/FyjZvCHaHMJwyd1Dg9L81fUVeQTwvjC3JA== +"@ledgerhq/hw-transport-webusb@^4.73.7": + version "4.73.7" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-4.73.7.tgz#3189342a85e0aceb99d7a6c1f04aed144709d927" + integrity sha512-OpoMA85qgT+xeUdxJ1ERzVfKii3T2vJjgBUl8FUVfRaMc8fW0wJBvec9FYKne3wywRDsVZETIToYDWJ5EsjOEw== dependencies: - "@ledgerhq/devices" "^4.73.4" - "@ledgerhq/errors" "^4.73.4" - "@ledgerhq/hw-transport" "^4.73.4" + "@ledgerhq/devices" "^4.73.7" + "@ledgerhq/errors" "^4.73.7" + "@ledgerhq/hw-transport" "^4.73.7" "@ledgerhq/logs" "^4.72.0" -"@ledgerhq/hw-transport@^4.35.0", "@ledgerhq/hw-transport@^4.73.4": - version "4.73.4" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-4.73.4.tgz#e3b58eebbc99b003406838660b7d17611e02ebc7" - integrity sha512-UAw7v+le8pyEz+q2sA0TVS9WGmifKqGxuwcYz+hN1quJkfTmivvcHCuSF5t7BDCuuuRNoCT36YjnIzf363Tf2w== +"@ledgerhq/hw-transport@^4.35.0", "@ledgerhq/hw-transport@^4.73.7": + version "4.73.7" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-4.73.7.tgz#7a7fe6d8e0445d5723b9bd62c50b11f129894a68" + integrity sha512-X7pwX9kk+BuQMf6W1HrB0a6Qb+zoJtVbvyuOqrCqCGx4vh8pogaKAOHriM8eVKJ5UmDUfTayYpLHG3MbOQLZzg== dependencies: - "@ledgerhq/devices" "^4.73.4" - "@ledgerhq/errors" "^4.73.4" + "@ledgerhq/devices" "^4.73.7" + "@ledgerhq/errors" "^4.73.7" events "^3.0.0" "@ledgerhq/logs@^4.72.0": @@ -1269,15 +1269,15 @@ resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-4.72.0.tgz#43df23af013ad1135407e5cf33ca6e4c4c7708d5" integrity sha512-o+TYF8vBcyySRsb2kqBDv/KMeme8a2nwWoG+lAWzbDmWfb2/MrVWYCVYDYvjXdSoI/Cujqy1i0gIDrkdxa9chA== -"@lerna/add@3.18.0": - version "3.18.0" - resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.18.0.tgz#86e38f14d7a0a7c61315dccb402377feb1c9db83" - integrity sha512-Z5EaQbBnJn1LEPb0zb0Q2o9T8F8zOnlCsj6JYpY6aSke17UUT7xx0QMN98iBK+ueUHKjN/vdFdYlNCYRSIdujA== +"@lerna/add@3.18.4": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.18.4.tgz#0d97c75b64febc10a9a38546a3019f0f2c24b0e6" + integrity sha512-R+9RmYrSbcmnmaFL2aB0HJtTq95ePEa0FMS4r4NnA7Xw07l5buVBPOfxv6P8kFrVvIcNpaa7S0Eo/KkbycMhKA== dependencies: "@evocateur/pacote" "^9.6.3" - "@lerna/bootstrap" "3.18.0" + "@lerna/bootstrap" "3.18.4" "@lerna/command" "3.18.0" - "@lerna/filter-options" "3.18.0" + "@lerna/filter-options" "3.18.4" "@lerna/npm-conf" "3.16.0" "@lerna/validation-error" "3.13.0" dedent "^0.7.0" @@ -1285,13 +1285,13 @@ p-map "^2.1.0" semver "^6.2.0" -"@lerna/bootstrap@3.18.0": - version "3.18.0" - resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.18.0.tgz#705d9eb51a24d549518796a09f24d24526ed975b" - integrity sha512-3DZKWIaKvr7sUImoKqSz6eqn84SsOVMnA5QHwgzXiQjoeZ/5cg9x2r+Xj3+3w/lvLoh0j8U2GNtrIaPNis4bKQ== +"@lerna/bootstrap@3.18.4": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.18.4.tgz#b5340800358e4916e9d2ba728d266a23fdd7665c" + integrity sha512-mvqMyionPSqhbeGhoUQYEBTgbJ47LkONHfQ1AKBET0fJOjIZf6x0pWC17KvfCjsiE017325ySLKDH23z1Kb9ww== dependencies: "@lerna/command" "3.18.0" - "@lerna/filter-options" "3.18.0" + "@lerna/filter-options" "3.18.4" "@lerna/has-npm-version" "3.16.5" "@lerna/npm-install" "3.16.5" "@lerna/package-graph" "3.18.0" @@ -1314,16 +1314,15 @@ read-package-tree "^5.1.6" semver "^6.2.0" -"@lerna/changed@3.18.3": - version "3.18.3" - resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.18.3.tgz#50529e8bd5d7fe2d0ace046a6e274d3de652a493" - integrity sha512-xZW7Rm+DlDIGc0EvKGyJZgT9f8FFa4d52mr/Y752dZuXR2qRmf9tXhVloRG39881s2A6yi3jqLtXZggKhsQW4Q== +"@lerna/changed@3.18.4": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.18.4.tgz#2453ad7b3545554eaa365347a229042918b6decc" + integrity sha512-Ui4UsneDk9gCuJRfTpR5js+Ctt9Je+j+3Q4z7H7HhBn6WeWDTp6FBGJZ7SfrBCdQ47EKK27Mr95LbJ4I77xFfQ== dependencies: "@lerna/collect-updates" "3.18.0" "@lerna/command" "3.18.0" - "@lerna/listable" "3.18.0" + "@lerna/listable" "3.18.4" "@lerna/output" "3.13.0" - "@lerna/version" "3.18.3" "@lerna/check-working-tree@3.16.5": version "3.16.5" @@ -1343,13 +1342,13 @@ execa "^1.0.0" strong-log-transformer "^2.0.0" -"@lerna/clean@3.18.0": - version "3.18.0" - resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.18.0.tgz#cc67d7697db969a70e989992fdf077126308fb2e" - integrity sha512-BiwBELZNkarRQqj+v5NPB1aIzsOX+Y5jkZ9a5UbwHzEdBUQ5lQa0qaMLSOve/fSkaiZQxe6qnTyatN75lOcDMg== +"@lerna/clean@3.18.4": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.18.4.tgz#704b345dfec4610823d6670e37f9984196d58874" + integrity sha512-puuL0sBHIv3Tvq8cdu3kCGfRpdsXuaDGIRha33GVmRPfMBi2GN8nPPysVyWmP99PfgfafO6eT5R3jqXjvASAZA== dependencies: "@lerna/command" "3.18.0" - "@lerna/filter-options" "3.18.0" + "@lerna/filter-options" "3.18.4" "@lerna/prompt" "3.13.0" "@lerna/pulse-till-done" "3.13.0" "@lerna/rimraf-dir" "3.16.5" @@ -1472,22 +1471,22 @@ "@lerna/validation-error" "3.13.0" npmlog "^4.1.2" -"@lerna/exec@3.18.0": - version "3.18.0" - resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.18.0.tgz#d9ec0b7ca06b7521f0b9f14a164e2d4ca5e1b3b9" - integrity sha512-hwkuzg1+38+pbzdZPhGtLIYJ59z498/BCNzR8d4/nfMYm8lFbw9RgJJajLcdbuJ9LJ08cZ93hf8OlzetL84TYg== +"@lerna/exec@3.18.4": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.18.4.tgz#7f722abc3c7074dffe6aa48bca71171e0635f84a" + integrity sha512-BpBFxyCQXcfess9Nmj/OwQ9e1IhzPzNxqF5JK7dPIjko5oBn5Hm2EWVAcgUGSHKPZGLiOWPu3Wx/C92NtDBS1w== dependencies: "@lerna/child-process" "3.16.5" "@lerna/command" "3.18.0" - "@lerna/filter-options" "3.18.0" + "@lerna/filter-options" "3.18.4" "@lerna/run-topologically" "3.18.0" "@lerna/validation-error" "3.13.0" p-map "^2.1.0" -"@lerna/filter-options@3.18.0": - version "3.18.0" - resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.18.0.tgz#406667dc75a8fc813c26a91bde754b6a73e1a868" - integrity sha512-UGVcixs3TGzD8XSmFSbwUVVQnAjaZ6Rmt8Vuq2RcR98ULkGB1LiGNMY89XaNBhaaA8vx7yQWiLmJi2AfmD63Qg== +"@lerna/filter-options@3.18.4": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.18.4.tgz#f5476a7ee2169abed27ad433222e92103f56f9f1" + integrity sha512-4giVQD6tauRwweO/322LP2gfVDOVrt/xN4khkXyfkJDfcsZziFXq+668otD9KSLL8Ps+To4Fah3XbK0MoNuEvA== dependencies: "@lerna/collect-updates" "3.18.0" "@lerna/filter-packages" "3.18.0" @@ -1589,20 +1588,20 @@ p-map "^2.1.0" slash "^2.0.0" -"@lerna/list@3.18.0": - version "3.18.0" - resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.18.0.tgz#6e5fe545ce4ba7c1eeb6d6cf69240d06c02bd496" - integrity sha512-mpB7Q6T+n2CaiPFz0LuOE+rXphDfHm0mKIwShnyS/XDcii8jXv+z9Iytj8p3rfCH2I1L80j2qL6jWzyGy/uzKA== +"@lerna/list@3.18.4": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.18.4.tgz#4320f262cdb2df54b57b3ef0da935c568e30f1e9" + integrity sha512-bgtlhAwhjHOTLq0iIuPs30abeuLbwZvVB60Ym8kPp+chh939obKU3vy2KMyX+Gpxf8pzuQG+k986YXcUBvXVsw== dependencies: "@lerna/command" "3.18.0" - "@lerna/filter-options" "3.18.0" - "@lerna/listable" "3.18.0" + "@lerna/filter-options" "3.18.4" + "@lerna/listable" "3.18.4" "@lerna/output" "3.13.0" -"@lerna/listable@3.18.0": - version "3.18.0" - resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.18.0.tgz#752b014406a9a012486626d22e940edb8205973a" - integrity sha512-9gLGKYNLSKeurD+sJ2RA+nz4Ftulr91U127gefz0RlmAPpYSjwcJkxwa0UfJvpQTXv9C7yzHLnn0BjyAQRjuew== +"@lerna/listable@3.18.4": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.18.4.tgz#45d14ad4eba00d7da71deba839312bed78e02680" + integrity sha512-EKSsnST5k3dZfw+UTwBH1/sHQ1YfgjYjGxXCabyn55mMgc2GjoDekODMYzZ1TNF2NNy6RgIZ24X2JI8G22nZUw== dependencies: "@lerna/query-graph" "3.18.0" chalk "^2.3.1" @@ -1756,10 +1755,10 @@ inquirer "^6.2.0" npmlog "^4.1.2" -"@lerna/publish@3.18.3": - version "3.18.3" - resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.18.3.tgz#478bb94ee712a40b723413e437bcb9e307d3709c" - integrity sha512-XlfWOWIhaSK0Y2sX5ppNWI5Y3CDtlxMcQa1hTbZlC5rrDA6vD32iutbmH6Ix3c6wtvVbSkgA39GWsQEXxPS+7w== +"@lerna/publish@3.18.4": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.18.4.tgz#2f3de9d00ae63ec89b5411199e8bac96445b9f17" + integrity sha512-Q+MqM5DUZvk+uT6hdEyO3khXET6LwED0YEuCu8fRwtHad03HkZ9i8PtTY5h8Sn6D6RCyCOlHTuf8O0KKAUy3ow== dependencies: "@evocateur/libnpmaccess" "^3.1.2" "@evocateur/npm-registry-fetch" "^4.0.0" @@ -1782,7 +1781,7 @@ "@lerna/run-lifecycle" "3.16.2" "@lerna/run-topologically" "3.18.0" "@lerna/validation-error" "3.13.0" - "@lerna/version" "3.18.3" + "@lerna/version" "3.18.4" figgy-pudding "^3.5.1" fs-extra "^8.1.0" npm-package-arg "^6.1.0" @@ -1845,13 +1844,13 @@ figgy-pudding "^3.5.1" p-queue "^4.0.0" -"@lerna/run@3.18.0": - version "3.18.0" - resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.18.0.tgz#b7069880f6313e4c6026b564b7b76e5d0f30a521" - integrity sha512-sblxHBZ9djaaG7wefPcfEicDqzrB7CP1m/jIB0JvPEQwG4C2qp++ewBpkjRw/mBtjtzg0t7v0nNMXzaWYrQckQ== +"@lerna/run@3.18.4": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.18.4.tgz#c3ab3bffe4f098761c210a3215582f3b5b0d7227" + integrity sha512-u2ZNO2fVk5kVEpbpn4DLJZZxZ08LFnIFuaXJMAhxvOgvm12ZF2rabA9kZc3NXp5+DedG5nHHgyoyLVVbStKzBA== dependencies: "@lerna/command" "3.18.0" - "@lerna/filter-options" "3.18.0" + "@lerna/filter-options" "3.18.4" "@lerna/npm-run-script" "3.16.5" "@lerna/output" "3.13.0" "@lerna/run-topologically" "3.18.0" @@ -1894,10 +1893,10 @@ dependencies: npmlog "^4.1.2" -"@lerna/version@3.18.3": - version "3.18.3" - resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.18.3.tgz#01344b39c0749fdeb6c178714733bacbde4d602f" - integrity sha512-IXXRlyM3Q/jrc+QZio+bgjG4ZaK+4LYmY4Yql1xyY0wZhAKsWP/Q6ho7e1EJNjNC5dUJO99Fq7qB05MkDf2OcQ== +"@lerna/version@3.18.4": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.18.4.tgz#48261a8a69d1b15ab40a7cc6400381c4e480ec6b" + integrity sha512-+gR9H89qSP8iqzNi4tRVQUbWlFMOlhbY6+5TXkP72Ibb/z87O+C46DBqizSMVaPQYdSYjS1c9Xfa1oOhEWxGaw== dependencies: "@lerna/check-working-tree" "3.16.5" "@lerna/child-process" "3.16.5" @@ -2006,9 +2005,9 @@ universal-user-agent "^4.0.0" "@octokit/rest@^16.28.4": - version "16.34.1" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.34.1.tgz#e28b5a573ca2f15bb002f90bc010020845ed9c01" - integrity sha512-JUoS12cdktf1fv86rgrjC/RvYLuL+o7p57W7zX1x7ANFJ7OvdV8emvUNkFlcidEaOkYrxK3SoWgQFt3FhNmabA== + version "16.35.0" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.35.0.tgz#7ccc1f802f407d5b8eb21768c6deca44e7b4c0d8" + integrity sha512-9ShFqYWo0CLoGYhA1FdtdykJuMzS/9H6vSbbQWDX4pWr4p9v+15MsH/wpd/3fIU+tSxylaNO48+PIHqOkBRx3w== dependencies: "@octokit/request" "^5.2.0" "@octokit/request-error" "^1.0.2" @@ -2030,54 +2029,54 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^0.97.0-beta.3": - version "0.97.0-beta.3" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.3.tgz#254831a7ebd98bc788b5ec78ca115e4e79315294" - integrity sha512-0t8Cx16h9ekQm83+JDZnPraOiSWBLDhoSzEx/lxZmvtbs/jwcmAh1F5mZ3MQgUYiNrsFuaSkcQbNZCWnAhDSDw== - dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/types" "^0.97.0-beta.3" - -"@polkadot/api-derive@^0.97.0-beta.3": - version "0.97.0-beta.3" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.3.tgz#b6bc465e5d40f1154428dc3ee3a2dda5ff9ad4d0" - integrity sha512-s8I2V+hAufzh/KizOHz9OZ/WbBZccxaU7GCw10gUJNadPDwL46bEAwmcxSWi4CbZk3dEK7+V32zumF3ZQ2mukA== - dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/api" "^0.97.0-beta.3" - "@polkadot/types" "^0.97.0-beta.3" - -"@polkadot/api@^0.97.0-beta.3": - version "0.97.0-beta.3" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.3.tgz#096200d0afe8ca751135402368979605114c8bb2" - integrity sha512-sLPt+w3pqvhGzQV33cQlHPJSFXZjl4HASari4n7986SXNwfwvznAP8NlzCtm6bKCC4oC1p+kc9AgY9AH7pzgUA== - dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/api-derive" "^0.97.0-beta.3" - "@polkadot/keyring" "^1.7.0-beta.6" - "@polkadot/metadata" "^0.97.0-beta.3" - "@polkadot/rpc-core" "^0.97.0-beta.3" - "@polkadot/rpc-provider" "^0.97.0-beta.3" - "@polkadot/types" "^0.97.0-beta.3" - "@polkadot/util-crypto" "^1.7.0-beta.6" - -"@polkadot/dev-react@^0.32.0-beta.13": - version "0.32.0-beta.13" - resolved "https://registry.yarnpkg.com/@polkadot/dev-react/-/dev-react-0.32.0-beta.13.tgz#18b96a314eb7a59d76d63c764fb717b3246c3284" - integrity sha512-ECU3fIimiy/7GJs03UyJW4s7MT114+1n89AvRSOv0M6xG5bXqsOMQ/RPvvr86fPN3bw5nfYeNmighuRpTZTisg== - dependencies: - "@babel/core" "^7.7.0" +"@polkadot/api-contract@^0.97.0-beta.4": + version "0.97.0-beta.4" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.4.tgz#efeb75364ac117f9831f6a7c22330b261d31522c" + integrity sha512-edHfkRMP8Hzev8mIcJ56AIL6FbrQD4+cb7WM8xRH66TADgsbiTKYiQIxfC/dBxKyIdhPWX7vHtaGQCnAchIyuw== + dependencies: + "@babel/runtime" "^7.7.2" + "@polkadot/types" "^0.97.0-beta.4" + +"@polkadot/api-derive@^0.97.0-beta.4": + version "0.97.0-beta.4" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.4.tgz#8d60f85151747282efeef3bc193f7d37d29a8d3b" + integrity sha512-PYk/7osGANTp0vicEzkXDZxWCEEy00wN4v8kyF4Tc7Z0lPYMKfkCdrzhG+NUFC0mswTHH5A4YI494VahTeawfQ== + dependencies: + "@babel/runtime" "^7.7.2" + "@polkadot/api" "^0.97.0-beta.4" + "@polkadot/types" "^0.97.0-beta.4" + +"@polkadot/api@^0.97.0-beta.4": + version "0.97.0-beta.4" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.4.tgz#5393fc2bc29ba751d97009f7ececbeac2c037a5f" + integrity sha512-wJ9tAxH+9eEHUfU6JusQjHoGqwKR0WD0qwUvuIvHclWOwjLLWBXLcXugVm2Y4hnJOqj30rIRJkU8IFSCSQY6BQ== + dependencies: + "@babel/runtime" "^7.7.2" + "@polkadot/api-derive" "^0.97.0-beta.4" + "@polkadot/keyring" "^1.7.0-beta.7" + "@polkadot/metadata" "^0.97.0-beta.4" + "@polkadot/rpc-core" "^0.97.0-beta.4" + "@polkadot/rpc-provider" "^0.97.0-beta.4" + "@polkadot/types" "^0.97.0-beta.4" + "@polkadot/util-crypto" "^1.7.0-beta.7" + +"@polkadot/dev-react@^0.32.0-beta.14": + version "0.32.0-beta.14" + resolved "https://registry.yarnpkg.com/@polkadot/dev-react/-/dev-react-0.32.0-beta.14.tgz#c4ca25acd6280e6cf58daab90164b94a49a4c07a" + integrity sha512-kGI/+9EDzmNUSeaT1myybLC7jwH3LgXn5wbM7h9InvFCsHICm3/Q9SVfMH5+OFWwtkIshNvRAJP325VWSvwzwg== + dependencies: + "@babel/core" "^7.7.2" "@babel/plugin-syntax-dynamic-import" "^7.2.0" "@babel/preset-react" "^7.7.0" - "@polkadot/dev" "^0.32.0-beta.13" + "@polkadot/dev" "^0.32.0-beta.14" "@types/react" "^16.9.11" - "@types/react-dom" "^16.9.3" + "@types/react-dom" "^16.9.4" "@types/react-native" "^0.60.22" - "@types/styled-components" "^4.1.21" + "@types/styled-components" "^4.4.0" babel-loader "^8.0.6" babel-plugin-styled-components "^1.10.6" browserslist "^4.7.2" - copy-webpack-plugin "^5.0.4" + copy-webpack-plugin "^5.0.5" css-loader "^3.2.0" enzyme "^3.10.0" enzyme-adapter-react-16 "^1.15.1" @@ -2088,7 +2087,7 @@ mini-css-extract-plugin "^0.8.0" react "^16.11.0" react-dom "^16.11.0" - react-hot-loader "^4.12.15" + react-hot-loader "^4.12.17" style-loader "^1.0.0" styled-components "^4.4.1" thread-loader "^2.1.3" @@ -2099,13 +2098,13 @@ webpack-serve "^3.2.0" worker-loader "^2.0.0" -"@polkadot/dev@^0.32.0-beta.13": - version "0.32.0-beta.13" - resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.32.0-beta.13.tgz#cf552d0411a8bdcdb322344aff3da2b62634d33a" - integrity sha512-X4/5bsSTc/Wo1Hfy1fZZ4bCKSM925AB7uEJD6PjIU0eYTW6pi+pIjMVgzX/MhSFNz/JfrFtbEyhPONKR2+XcWQ== +"@polkadot/dev@^0.32.0-beta.14": + version "0.32.0-beta.14" + resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.32.0-beta.14.tgz#1a38ff8f98978dc793850df4cd5bc5334ca1a532" + integrity sha512-2ijx+7OzydyDqUA2v+mn4+cPE3J06XXpbcghf/U3dLP0h/X9rG9Wu/18zDmC0XtPuAqWs8DZIRF7/wIJ0QbiNg== dependencies: "@babel/cli" "^7.7.0" - "@babel/core" "^7.7.0" + "@babel/core" "^7.7.2" "@babel/plugin-proposal-class-properties" "^7.7.0" "@babel/plugin-proposal-decorators" "^7.7.0" "@babel/plugin-proposal-object-rest-spread" "^7.6.2" @@ -2113,17 +2112,17 @@ "@babel/plugin-proposal-pipeline-operator" "^7.5.0" "@babel/plugin-transform-runtime" "^7.6.2" "@babel/preset-env" "^7.7.1" - "@babel/preset-typescript" "^7.7.0" + "@babel/preset-typescript" "^7.7.2" "@babel/register" "^7.7.0" - "@babel/runtime" "^7.7.0" - "@types/jest" "^24.0.22" - "@types/node" "^12.12.6" - "@typescript-eslint/eslint-plugin" "2.6.1" - "@typescript-eslint/parser" "2.6.1" + "@babel/runtime" "^7.7.2" + "@types/jest" "^24.0.23" + "@types/node" "^12.12.7" + "@typescript-eslint/eslint-plugin" "2.7.0" + "@typescript-eslint/parser" "2.7.0" babel-core "^7.0.0-bridge.0" babel-jest "^24.9.0" babel-plugin-module-resolver "^3.2.0" - chalk "^2.4.2" + chalk "^3.0.0" coveralls "^3.0.7" cpx "^1.5.0" eslint "^6.6.0" @@ -2137,139 +2136,139 @@ jest "^24.9.0" jest-haste-map "^24.9.0" jest-resolve "^24.9.0" - lerna "^3.18.3" + lerna "^3.18.4" mkdirp "^0.5.1" rimraf "^3.0.0" - typedoc "^0.15.0" + typedoc "^0.15.1" typedoc-plugin-markdown "^2.2.11" typedoc-plugin-no-inherit "^1.1.10" typescript "^3.7.2" vuepress "^1.2.0" -"@polkadot/extension-dapp@^0.14.0-beta.4": - version "0.14.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/extension-dapp/-/extension-dapp-0.14.0-beta.4.tgz#7bc8468a85437e6a74e0d230fd067cd76685a12d" - integrity sha512-JmqEdZA2r0g29d7esOkgVKC/MjsxnY1GpnUojyepgusjc5q5Y0sKBcpLuQEVQfsmQ9myJPxcebGrgG0i4fJACg== +"@polkadot/extension-dapp@^0.14.0-beta.5": + version "0.14.0-beta.5" + resolved "https://registry.yarnpkg.com/@polkadot/extension-dapp/-/extension-dapp-0.14.0-beta.5.tgz#c14cf03412f48ecba762ab70b3a0c169e3b79e81" + integrity sha512-tB8GZV/UJUtM1uDS1WTwQKFKiDhK6uVZ0hnQPPjuRup3FRdV7akVvFKocy2Sfc2AdqCEB0ua+xaLpNlcilq/Fg== dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/extension-inject" "^0.14.0-beta.4" + "@babel/runtime" "^7.7.2" + "@polkadot/extension-inject" "^0.14.0-beta.5" -"@polkadot/extension-inject@^0.14.0-beta.4": - version "0.14.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/extension-inject/-/extension-inject-0.14.0-beta.4.tgz#aae88bba5fe9573595e5c32023b08c4eeaf9387c" - integrity sha512-u7TZrLvcNOf1S9eblj+YEDdTsBYGpJ25diBD3GDHzadiKGzQghda4hyndLDSQm2TwaBfLJveitzHX3ysvPVycg== +"@polkadot/extension-inject@^0.14.0-beta.5": + version "0.14.0-beta.5" + resolved "https://registry.yarnpkg.com/@polkadot/extension-inject/-/extension-inject-0.14.0-beta.5.tgz#9d6d12b3e2df9ee3bddc58d3626356e5a9f8a470" + integrity sha512-DdG6D4AzR2KC5gLQ3e7aBxHbrbp/uLUT6Ipa8s+Yg76hybvUrIQvsC3pOpLJOCqQu9nUYUeZsIWZ/n/aFgRzVw== dependencies: - "@babel/runtime" "^7.7.1" + "@babel/runtime" "^7.7.2" -"@polkadot/jsonrpc@^0.97.0-beta.3": - version "0.97.0-beta.3" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.3.tgz#358dde1388a511dbfe232aa128c3e89c8928900f" - integrity sha512-laL7SwVNitXmygHWZYmDMLONDO/SnII+0hqeIcy4DGvLGwt1XWyqUiv8Vkqwo9mgAboFAS05PgN3SsVmJItpFg== +"@polkadot/jsonrpc@^0.97.0-beta.4": + version "0.97.0-beta.4" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.4.tgz#9936d7cf9af840afc6f6e6634c6c3022d5054122" + integrity sha512-EH6yieyDjiRejUha53R8qE+xQ0vmmFKW74gLYRgSb8Qe/BrCGIk9TkdZFk3tJM6dPsgFHL1bXNz3IRuhZFPrvg== dependencies: - "@babel/runtime" "^7.7.1" + "@babel/runtime" "^7.7.2" -"@polkadot/keyring@^1.7.0-beta.6": - version "1.7.0-beta.6" - resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-1.7.0-beta.6.tgz#c5ae5d684e2cee0037b68d381707f33b35c975eb" - integrity sha512-wSMAn7ZOHEKa+bW2h0K1fM1dNr5LCarCSY3JiPPyNxoY4+M1WtqGm0fU+A5+FLXOnXXJywrPkeripakaLXMocw== +"@polkadot/keyring@^1.7.0-beta.7": + version "1.7.0-beta.7" + resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-1.7.0-beta.7.tgz#a957873c8580b5dbde47c266a97eb41045f3002c" + integrity sha512-SlKoUCYsSw5F0v/bkxfC5yuojNIBwePcScIyH+0bjKTX38pcVMldGcxGfSTVYPz1StWVhz2kMpEHF0568mRilQ== dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/util" "^1.7.0-beta.6" - "@polkadot/util-crypto" "^1.7.0-beta.6" + "@babel/runtime" "^7.7.2" + "@polkadot/util" "^1.7.0-beta.7" + "@polkadot/util-crypto" "^1.7.0-beta.7" -"@polkadot/metadata@^0.97.0-beta.3": - version "0.97.0-beta.3" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.3.tgz#66108239c342b8bce096b933596fa6ff75552597" - integrity sha512-GBHrLoE9DRVUctUhumMbp/xW441MHNkcUoiByjVvr1g0TtuZbgvTjC63uxJby98xeIIv63TCHKIoGs5xanztQg== +"@polkadot/metadata@^0.97.0-beta.4": + version "0.97.0-beta.4" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.4.tgz#d05d10f308237e46916d4903339eab34feb5d1a1" + integrity sha512-UFGo0NNkD02jButVbPu+l8BMVilnVHlc4KBR+unn6e5LLGCBPhXomGBe4skwZT/S6pPgJV53p6CZZZmCKKwrDw== dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/types" "^0.97.0-beta.3" - "@polkadot/util" "^1.7.0-beta.6" - "@polkadot/util-crypto" "^1.7.0-beta.6" + "@babel/runtime" "^7.7.2" + "@polkadot/types" "^0.97.0-beta.4" + "@polkadot/util" "^1.7.0-beta.7" + "@polkadot/util-crypto" "^1.7.0-beta.7" -"@polkadot/react-identicon@^0.47.0-beta.5": - version "0.47.0-beta.5" - resolved "https://registry.yarnpkg.com/@polkadot/react-identicon/-/react-identicon-0.47.0-beta.5.tgz#705436ffcaa15b1bc0ae966dfd5361abe8a82892" - integrity sha512-Z/UgoNKnrPc7dIGJlXRQZswa0f9cQ/FhF1kfH5x+pTz27Xo/iMRqZpCaHP09mqDc80CtVkSazfrBOeRCYIqw8w== +"@polkadot/react-identicon@^0.47.0-beta.6": + version "0.47.0-beta.6" + resolved "https://registry.yarnpkg.com/@polkadot/react-identicon/-/react-identicon-0.47.0-beta.6.tgz#c17321a38465fe88ca4c2f602a16a54581f35ac8" + integrity sha512-4larvdYNETowpODzrakMrDU6p+tu7KH04IQcqjHOn3/A8p7+BugBmwTpVUSoc+n1p4fET6X0BYwWi1sc2Gn4sA== dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/ui-settings" "^0.47.0-beta.5" - "@polkadot/ui-shared" "^0.47.0-beta.5" + "@babel/runtime" "^7.7.2" + "@polkadot/ui-settings" "^0.47.0-beta.6" + "@polkadot/ui-shared" "^0.47.0-beta.6" "@types/color" "^3.0.0" "@types/react-copy-to-clipboard" "^4.3.0" color "^3.1.2" jdenticon "2.2.0" - react-copy-to-clipboard "^5.0.1" + react-copy-to-clipboard "^5.0.2" styled-components "^4.4.1" -"@polkadot/react-qr@^0.47.0-beta.5": - version "0.47.0-beta.5" - resolved "https://registry.yarnpkg.com/@polkadot/react-qr/-/react-qr-0.47.0-beta.5.tgz#23a84b5a4ad947e338a52945980302a478030790" - integrity sha512-YYhAijH5gyRb9+u9Ik7VdRj2C+wPx8migKuBcClGJBND+SYgZI33B2Ted/Bso7nSp6Jb/r718BIBEePRw6VvIA== +"@polkadot/react-qr@^0.47.0-beta.6": + version "0.47.0-beta.6" + resolved "https://registry.yarnpkg.com/@polkadot/react-qr/-/react-qr-0.47.0-beta.6.tgz#f4d76dd0844c001f0dcc8928a4c7db68d698d310" + integrity sha512-q5ZwFu+acKR/DoJaYQRCORzGs1mumK8+qfWP5RvS0EgUs1Jo4eb7M01haJ/CmD3FS0MNXVagp6sMD7XhyytMkQ== dependencies: - "@babel/runtime" "^7.7.1" + "@babel/runtime" "^7.7.2" "@types/react-qr-reader" "^2.1.1" qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.0-beta.3": - version "0.97.0-beta.3" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.3.tgz#8374f63fa391882cb6748dd92b9cddfb5f6cd98a" - integrity sha512-ebNuz4AtHj5DHdBtV1lXxGM07WJIAPUBRrbHqaKN4VcLXoimNtAxcQdXfzWeN4TP1MhdjGko7Xe1ZoNXBn8jwQ== +"@polkadot/rpc-core@^0.97.0-beta.4": + version "0.97.0-beta.4" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.4.tgz#5f189166e8d41419f163943874fdc921b50e1cec" + integrity sha512-f2tViM7br0CNwuwaIJR9GwGgKif9RzoA6PljRYBZr96EGZhCzybZVIaKFO2V1SNz23gvMSrqQ/Muno2ryYLP0w== dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/jsonrpc" "^0.97.0-beta.3" - "@polkadot/rpc-provider" "^0.97.0-beta.3" - "@polkadot/types" "^0.97.0-beta.3" - "@polkadot/util" "^1.7.0-beta.6" + "@babel/runtime" "^7.7.2" + "@polkadot/jsonrpc" "^0.97.0-beta.4" + "@polkadot/rpc-provider" "^0.97.0-beta.4" + "@polkadot/types" "^0.97.0-beta.4" + "@polkadot/util" "^1.7.0-beta.7" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.0-beta.3": - version "0.97.0-beta.3" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.3.tgz#492ad6f98a46d8247c56b4db15ca5e957c4e9396" - integrity sha512-Z+G0O0InPUV4eJuuAkgBLG09Q5ZxAANIVH3ywr7IgCEHfg8y4+ZekXfI+hXFjvpLICPjc5RqEtwVWSpfIwEhQg== +"@polkadot/rpc-provider@^0.97.0-beta.4": + version "0.97.0-beta.4" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.4.tgz#8b36aa6595c12998fa3fe5c3a3cb991bdf52c1af" + integrity sha512-1iDHw4NLpIOB13vjACys/yLpg3qEKWGcmYaWVOTbhLimX4BrCq/nu+cOB+x4ZmbbwHuGorXsXkEvottnXtP/NQ== dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/metadata" "^0.97.0-beta.3" - "@polkadot/util" "^1.7.0-beta.6" - "@polkadot/util-crypto" "^1.7.0-beta.6" + "@babel/runtime" "^7.7.2" + "@polkadot/metadata" "^0.97.0-beta.4" + "@polkadot/util" "^1.7.0-beta.7" + "@polkadot/util-crypto" "^1.7.0-beta.7" eventemitter3 "^4.0.0" isomorphic-fetch "^2.2.1" websocket "^1.0.30" -"@polkadot/ts@^0.1.84": - version "0.1.84" - resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.84.tgz#b9eba8f74d27b31ef8f02a9e647ac10442f95ce3" - integrity sha512-mUjWSSYzwpJfJ4jgwRAEH7DzcpSC4mRLqLpIuR9KvLojK5d5RrH4iIAutB9jUVVSzK3ZsEWYwWY2g9iztjS6BQ== +"@polkadot/ts@^0.1.85": + version "0.1.85" + resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.85.tgz#2ca1f4a4026134cb0bc1986059f7a6ec2cb4f4f1" + integrity sha512-NgTqTz/eaqvBcB9qtes1Ehu+KU815pnIVRVcyBYiIJgpgabs4TyVx3fJnw5q3PrXQBytxvqztXtyaBf/XAzZ7g== dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.0-beta.3": - version "0.97.0-beta.3" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.3.tgz#8cbb0626ef4192c99ea364a84969ab4878f9a14b" - integrity sha512-7AdPa+y8A5hpDg8dJd0DFN2jZ1TeVrxLhIVnHJER+UE42XqAw5IHiw4bHFvJ+HPTxa8Nj1Aeg45J7shkLS1EiA== +"@polkadot/types@^0.97.0-beta.4": + version "0.97.0-beta.4" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.4.tgz#28dcd15101a12e3f41ef0a343985bb59005623a9" + integrity sha512-E/5uT5zcr4sE+Wzl57drfBFxibDRWyxCwolK+e/Dwo3Dutoa/At9/j+/qgwaJHLtDlzzJyv1vpB9PB+u0r4hrw== dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/util" "^1.7.0-beta.6" - "@polkadot/util-crypto" "^1.7.0-beta.6" + "@babel/runtime" "^7.7.2" + "@polkadot/util" "^1.7.0-beta.7" + "@polkadot/util-crypto" "^1.7.0-beta.7" "@types/memoizee" "^0.4.3" memoizee "^0.4.14" -"@polkadot/ui-assets@^0.47.0-beta.5": - version "0.47.0-beta.5" - resolved "https://registry.yarnpkg.com/@polkadot/ui-assets/-/ui-assets-0.47.0-beta.5.tgz#57daba00e887cdd3cb9bdec4661cb49d6a9f33a8" - integrity sha512-ThE6Y+22pEKKxcs+iuagFIl+xnHn2IVUsw/1Wa7MnfNGAJXhYd9UzRbsOFBxXxhuLOUKjVm+tbPuZQwm/d68Bg== +"@polkadot/ui-assets@^0.47.0-beta.6": + version "0.47.0-beta.6" + resolved "https://registry.yarnpkg.com/@polkadot/ui-assets/-/ui-assets-0.47.0-beta.6.tgz#30e1c0381c88cf547ffe0179cdc6921a40889e7d" + integrity sha512-B4L7A3PCyb/aVzcbq+7ozCOx1Q+WAGVkUi8gKO2Wq7h/Xb/JlsAuysAL+Sn9WpOVZdN+JW7e+wv1OsV5EHD4wQ== dependencies: - "@babel/runtime" "^7.7.1" + "@babel/runtime" "^7.7.2" -"@polkadot/ui-keyring@^0.47.0-beta.5": - version "0.47.0-beta.5" - resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.47.0-beta.5.tgz#30a660657239071115f22fbfcaee248950531f72" - integrity sha512-1Yg6RS0nXwstbEwSOBcOzh2BUZxl5hvjFJuQDt8xmM66OcoDqw9QCp6psLzXp2mnvZpxNGeCYjX5B6WKAiWY8w== +"@polkadot/ui-keyring@^0.47.0-beta.6": + version "0.47.0-beta.6" + resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.47.0-beta.6.tgz#1891d962a68c2c943311aeaad7d73ada83c25894" + integrity sha512-d1oSi9k11Cld4Ckdp3anpKnijShIdZzmN7g3RWaeTI6J8LLxAw9TpAK0JWWTnLU3UTNTPcX1LiGoqPeyc/dp3g== dependencies: - "@babel/runtime" "^7.7.1" - "@ledgerhq/hw-transport-u2f" "^4.73.4" - "@ledgerhq/hw-transport-webusb" "^4.73.4" + "@babel/runtime" "^7.7.2" + "@ledgerhq/hw-transport-u2f" "^4.73.7" + "@ledgerhq/hw-transport-webusb" "^4.73.7" "@types/ledgerhq__hw-transport-node-hid" "^4.21.1" "@types/ledgerhq__hw-transport-u2f" "^4.21.1" "@types/mkdirp" "^0.5.2" @@ -2279,33 +2278,33 @@ mkdirp "^0.5.1" store "^2.0.12" optionalDependencies: - "@ledgerhq/hw-transport-node-hid" "^4.73.4" + "@ledgerhq/hw-transport-node-hid" "^4.73.7" -"@polkadot/ui-settings@^0.47.0-beta.5": - version "0.47.0-beta.5" - resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.47.0-beta.5.tgz#4b0290fc97863a0839c4ca28592204c5af25268e" - integrity sha512-AZesUl5G4OXjcwlQfMBlF1gJXLZr0Uu8V/Sxplk+c1kA/c5mB+U6XU+T2+zkwi/Z6boUEd8vvvpy8BiwASmU9w== +"@polkadot/ui-settings@^0.47.0-beta.6": + version "0.47.0-beta.6" + resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.47.0-beta.6.tgz#daddb974daec76d212b4fa05a3f6056ade5afdbc" + integrity sha512-/RocydiLh2poZOqdhPFjWugftKnqVfW9IFfAS7biuSMa7vquFBfu16Iyo9Bsafv9ZjEpKEzN0QFdvmMCoMx7xQ== dependencies: - "@babel/runtime" "^7.7.1" + "@babel/runtime" "^7.7.2" "@types/store" "^2.0.2" store "^2.0.12" -"@polkadot/ui-shared@^0.47.0-beta.5": - version "0.47.0-beta.5" - resolved "https://registry.yarnpkg.com/@polkadot/ui-shared/-/ui-shared-0.47.0-beta.5.tgz#35ec43f18de03eb2847f06e0f6d7292fc185cbe9" - integrity sha512-dGxxWPilfqT9ON07hYSdvbNi+cxheqQrsjTdzJhZIcIdjya14wxWVVhBklQo5v8of9kLVnudsc8ZyGIhWYsL5g== +"@polkadot/ui-shared@^0.47.0-beta.6": + version "0.47.0-beta.6" + resolved "https://registry.yarnpkg.com/@polkadot/ui-shared/-/ui-shared-0.47.0-beta.6.tgz#5474d28a84685adabe0df7014b0a1c07eb73c1a9" + integrity sha512-3kwWgf8HLXsukYYoSKLWcfkGYpMZb1kQSBuSTn1TdjGH0VCf+nqr0QcIVdsVppUN0x8ttRa0LvevbjPaQZIT5Q== dependencies: - "@babel/runtime" "^7.7.1" + "@babel/runtime" "^7.7.2" "@types/color" "^3.0.0" color "^3.1.2" -"@polkadot/util-crypto@^1.7.0-beta.6": - version "1.7.0-beta.6" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-1.7.0-beta.6.tgz#48161cdc6fe06002aedbe5806ab241cfb4bac3bb" - integrity sha512-QXXJLhv/4YmCRSWGEjTghFq/FmVkejIokgVn71PUMqOx2/0H+9jgaMv9DCZC1UfrP8h4f4sPBSP9AKnHbNTs6w== +"@polkadot/util-crypto@^1.7.0-beta.7": + version "1.7.0-beta.7" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-1.7.0-beta.7.tgz#aeef137a42c976397d510d8ae49dcb3810c7016d" + integrity sha512-GPbewx2WkZ7t6dpNYNWvZ39kAfpuc5/leK+r9tp58cpOfyCtWesO5iq/A9fVv3i10LLBeF04NEAH4gR3k7Gz6g== dependencies: - "@babel/runtime" "^7.7.1" - "@polkadot/util" "^1.7.0-beta.6" + "@babel/runtime" "^7.7.2" + "@polkadot/util" "^1.7.0-beta.7" "@polkadot/wasm-crypto" "^0.14.1" "@types/bip39" "^2.4.2" "@types/bs58" "^4.0.0" @@ -2321,16 +2320,16 @@ tweetnacl "^1.0.1" xxhashjs "^0.2.2" -"@polkadot/util@^1.7.0-beta.6": - version "1.7.0-beta.6" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-1.7.0-beta.6.tgz#82712376f2b999f079f4021c5ec08d4a8f0a57cd" - integrity sha512-QyOz5a0DaK7FMN+GtE7nOHO1JgOmPf5RcPcA3pXsEQgpIFlx8pctU18kXI2uY/Q+124rV8OECM7IVMaypJeNnA== +"@polkadot/util@^1.7.0-beta.7": + version "1.7.0-beta.7" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-1.7.0-beta.7.tgz#c1612df32fc1c87ace91c5fab0f7967276fdb092" + integrity sha512-70P9r1bLixz/Xv34GrwqlxIxnVYwQ/++q4UnEmCTrAiesTxcXEz7KsPlZX4S3GccF2qAwTRCGMaAxQUMdjTO4g== dependencies: - "@babel/runtime" "^7.7.1" + "@babel/runtime" "^7.7.2" "@types/bn.js" "^4.11.5" bn.js "^4.11.8" camelcase "^5.3.1" - chalk "^2.4.2" + chalk "^3.0.0" ip-regex "^4.1.0" moment "^2.24.0" @@ -2426,9 +2425,9 @@ "@types/base-x" "*" "@types/chart.js@^2.8.10": - version "2.8.10" - resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.8.10.tgz#df3a74630e25310e42e4a90a17c51b5a2e0691f4" - integrity sha512-lqfq12r5midn9wr+TfzAnRpVRkHwwQcyLnXI2URy7+cQLp+xTItKFCM1K5hDuQSz8zOvye9c8DrFNqZrTs6WCQ== + version "2.8.11" + resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.8.11.tgz#acf52ec2a29b8fcb71e77d6fae54b89b77be9b22" + integrity sha512-ALmOqIBl6re4dFZbvd4OTCrZpCN1l3s6/Ool84JLowlychK0kJmNmcHGeVw4ol3KNme579tHCFEaNfTT/S3xmQ== "@types/chrome@^0.0.91": version "0.0.91" @@ -2444,7 +2443,7 @@ dependencies: "@types/color-name" "*" -"@types/color-name@*": +"@types/color-name@*", "@types/color-name@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== @@ -2524,17 +2523,12 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" -"@types/jest-diff@*": - version "20.0.1" - resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89" - integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA== - -"@types/jest@^24.0.22": - version "24.0.22" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.22.tgz#08a50be08e78aba850a1185626e71d31e2336145" - integrity sha512-t2OvhNZnrNjlzi2i0/cxbLVM59WN15I2r1Qtb7wDv28PnV9IzrPtagFRey/S9ezdLD0zyh1XGMQIEQND2YEfrw== +"@types/jest@^24.0.23": + version "24.0.23" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.23.tgz#046f8e2ade026fe831623e361a36b6fb9a4463e4" + integrity sha512-L7MBvwfNpe7yVPTXLn32df/EK+AMBFAFvZrRuArGs7npEWnlziUXK+5GMIUTI4NIuwok3XibsjXCs5HxviYXjg== dependencies: - "@types/jest-diff" "*" + jest-diff "^24.3.0" "@types/json-schema@^7.0.3": version "7.0.3" @@ -2589,10 +2583,10 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@>= 8", "@types/node@^12.12.6": - version "12.12.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.6.tgz#a47240c10d86a9a57bb0c633f0b2e0aea9ce9253" - integrity sha512-FjsYUPzEJdGXjwKqSpE0/9QEh6kzhTAeObA54rn6j3rR4C/mzpI9L0KNfoeASSPMMdxIsoJuCLDWcM/rVjIsSA== +"@types/node@*", "@types/node@>= 8", "@types/node@^12.12.7": + version "12.12.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.7.tgz#01e4ea724d9e3bd50d90c11fd5980ba317d8fa11" + integrity sha512-E6Zn0rffhgd130zbCbAr/JdXfXkoOUFAKNs/rF8qnafSJ8KYaA/j3oz7dcwal+lYjLA7xvdd5J4wdYpCTlP8+w== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -2628,7 +2622,7 @@ dependencies: "@types/react" "*" -"@types/react-dom@^16.9.3": +"@types/react-dom@^16.9.4": version "16.9.4" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.4.tgz#0b58df09a60961dcb77f62d4f1832427513420df" integrity sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw== @@ -2674,7 +2668,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^15.0.0 || ^16.0.0", "@types/react@^16.9.11": +"@types/react@*", "@types/react@^16.9.11": version "16.9.11" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.11.tgz#70e0b7ad79058a7842f25ccf2999807076ada120" integrity sha512-UBT4GZ3PokTXSWmdgC/GeCGEJXE5ofWyibCcecRLUVN2ZBpXQGVgQGtG2foS7CrTKFKlQVVswLvf7Js6XA/CVQ== @@ -2699,10 +2693,10 @@ resolved "https://registry.yarnpkg.com/@types/store/-/store-2.0.2.tgz#6263d4f1aab225032ea55b17d94f3b725a21c943" integrity sha512-ZPHnXkzmGMfk+pHqAGzTSpA9CbsHmJLgkvOl5w52LZ0XTxB1ZIHWZzQ7lEtjTNWScBbsQekg8TjApMXkMe4nkw== -"@types/styled-components@*", "@types/styled-components@^4.1.21": - version "4.1.21" - resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-4.1.21.tgz#514157b1706c4cea63abeba03a43ac4d6618f7ad" - integrity sha512-uJ930+ypit+PAd9M4Mw7c7x3RRBQ4ZB15FN1bH7VjDrDSS1ECueK1xp/aAwXIOaplUrHBurN8lzBOcMpk3Je7w== +"@types/styled-components@*", "@types/styled-components@^4.1.21", "@types/styled-components@^4.4.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-4.4.0.tgz#15a3d59533fd3a5bd013db4a7c4422ec542c59d2" + integrity sha512-QFl+w3hQJNHE64Or3PXMFpC3HAQDiuQLi5o9m1XPEwYWfgCZtAribO5ksjxnO8U0LG8Parh0ESCgVxo4VfxlHg== dependencies: "@types/react" "*" "@types/react-native" "*" @@ -2735,40 +2729,40 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.6.1.tgz#e34972a24f8aba0861f9ccf7130acd74fd11e079" - integrity sha512-Z0rddsGqioKbvqfohg7BwkFC3PuNLsB+GE9QkFza7tiDzuHoy0y823Y+oGNDzxNZrYyLjqkZtCTl4vCqOmEN4g== +"@typescript-eslint/eslint-plugin@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.7.0.tgz#dff176bdb73dfd7e2e43062452189bd1b9db6021" + integrity sha512-H5G7yi0b0FgmqaEUpzyBlVh0d9lq4cWG2ap0RKa6BkF3rpBb6IrAoubt1NWh9R2kRs/f0k6XwRDiDz3X/FqXhQ== dependencies: - "@typescript-eslint/experimental-utils" "2.6.1" + "@typescript-eslint/experimental-utils" "2.7.0" eslint-utils "^1.4.2" functional-red-black-tree "^1.0.1" regexpp "^2.0.1" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.6.1.tgz#eddaca17a399ebf93a8628923233b4f93793acfd" - integrity sha512-EVrrUhl5yBt7fC7c62lWmriq4MIc49zpN3JmrKqfiFXPXCM5ErfEcZYfKOhZXkW6MBjFcJ5kGZqu1b+lyyExUw== +"@typescript-eslint/experimental-utils@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.7.0.tgz#58d790a3884df3041b5a5e08f9e5e6b7c41864b5" + integrity sha512-9/L/OJh2a5G2ltgBWJpHRfGnt61AgDeH6rsdg59BH0naQseSwR7abwHq3D5/op0KYD/zFT4LS5gGvWcMmegTEg== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.6.1" + "@typescript-eslint/typescript-estree" "2.7.0" eslint-scope "^5.0.0" -"@typescript-eslint/parser@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.6.1.tgz#3c00116baa0d696bc334ca18ac5286b34793993c" - integrity sha512-PDPkUkZ4c7yA+FWqigjwf3ngPUgoLaGjMlFh6TRtbjhqxFBnkElDfckSjm98q9cMr4xRzZ15VrS/xKm6QHYf0w== +"@typescript-eslint/parser@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.7.0.tgz#b5e6a4944e2b68dba1e7fbfd5242e09ff552fd12" + integrity sha512-ctC0g0ZvYclxMh/xI+tyqP0EC2fAo6KicN9Wm2EIao+8OppLfxji7KAGJosQHSGBj3TcqUrA96AjgXuKa5ob2g== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.6.1" - "@typescript-eslint/typescript-estree" "2.6.1" + "@typescript-eslint/experimental-utils" "2.7.0" + "@typescript-eslint/typescript-estree" "2.7.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.6.1.tgz#fb363dd4ca23384745c5ea4b7f4c867432b00d31" - integrity sha512-+sTnssW6bcbDZKE8Ce7VV6LdzkQz2Bxk7jzk1J8H1rovoTxnm6iXvYIyncvNsaB/kBCOM63j/LNJfm27bNdUoA== +"@typescript-eslint/typescript-estree@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.7.0.tgz#34fd98c77a07b40d04d5b4203eddd3abeab909f4" + integrity sha512-vVCE/DY72N4RiJ/2f10PTyYekX2OLaltuSIBqeHYI44GQ940VCYioInIb8jKMrK9u855OEJdFC+HmWAZTnC+Ag== dependencies: debug "^4.1.1" glob "^7.1.4" @@ -2782,10 +2776,10 @@ resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040" integrity sha512-6tyf5Cqm4m6v7buITuwS+jHzPlIPxbFzEhXR5JGZpbrvOcp1hiQKckd305/3C7C36wFekNTQSxAtgeM0j0yoUw== -"@vue/babel-plugin-transform-vue-jsx@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.0.0.tgz#ebcbf39c312c94114c8c4f407ee4f6c97aa45432" - integrity sha512-U+JNwVQSmaLKjO3lzCUC3cNXxprgezV1N+jOdqbP4xWNaqtWUCJnkjTVcgECM18A/AinDKPcUUeoyhU7yxUxXQ== +"@vue/babel-plugin-transform-vue-jsx@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.1.2.tgz#c0a3e6efc022e75e4247b448a8fc6b86f03e91c0" + integrity sha512-YfdaoSMvD1nj7+DsrwfTvTnhDXI7bsuh+Y5qWwvQXlD24uLgnsoww3qbiZvWf/EoviZMrvqkqN4CBw0W3BWUTQ== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/plugin-syntax-jsx" "^7.2.0" @@ -2814,50 +2808,50 @@ core-js "^2.6.5" "@vue/babel-preset-jsx@^1.0.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.1.tgz#3a74642ca0ecea10aae13649df5ff70f9d24a6f5" - integrity sha512-SeyndwQZc8MAOkhbJaC34ocTwcKekKkwrwnTMC3YF8VmGp5IQWW5gPIU66bqO9WFBXFA3J3ANsUbP2pj8q8KdQ== + version "1.1.2" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.2.tgz#2e169eb4c204ea37ca66c2ea85a880bfc99d4f20" + integrity sha512-zDpVnFpeC9YXmvGIDSsKNdL7qCG2rA3gjywLYHPCKDT10erjxF4U+6ay9X6TW5fl4GsDlJp9bVfAVQAAVzxxvQ== dependencies: "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0" - "@vue/babel-plugin-transform-vue-jsx" "^1.0.0" - "@vue/babel-sugar-functional-vue" "^1.0.0" - "@vue/babel-sugar-inject-h" "^1.0.0" - "@vue/babel-sugar-v-model" "^1.1.1" - "@vue/babel-sugar-v-on" "^1.1.0" + "@vue/babel-plugin-transform-vue-jsx" "^1.1.2" + "@vue/babel-sugar-functional-vue" "^1.1.2" + "@vue/babel-sugar-inject-h" "^1.1.2" + "@vue/babel-sugar-v-model" "^1.1.2" + "@vue/babel-sugar-v-on" "^1.1.2" -"@vue/babel-sugar-functional-vue@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.0.0.tgz#17e2c4ca27b74b244da3b923240ec91d10048cb3" - integrity sha512-XE/jNaaorTuhWayCz+QClk5AB9OV5HzrwbzEC6sIUY0J60A28ONQKeTwxfidW42egOkqNH/UU6eE3KLfmiDj0Q== +"@vue/babel-sugar-functional-vue@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.1.2.tgz#f7e24fba09e6f1ee70104560a8808057555f1a9a" + integrity sha512-YhmdJQSVEFF5ETJXzrMpj0nkCXEa39TvVxJTuVjzvP2rgKhdMmQzlJuMv/HpadhZaRVMCCF3AEjjJcK5q/cYzQ== dependencies: "@babel/plugin-syntax-jsx" "^7.2.0" -"@vue/babel-sugar-inject-h@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.0.0.tgz#e5efb6c5b5b7988dc03831af6d133bf7bcde6347" - integrity sha512-NxWU+DqtbZgfGvd25GPoFMj+rvyQ8ZA1pHj8vIeqRij+vx3sXoKkObjA9ulZunvWw5F6uG9xYy4ytpxab/X+Hg== +"@vue/babel-sugar-inject-h@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.1.2.tgz#8a5276b6d8e2ed16ffc8078aad94236274e6edf0" + integrity sha512-VRSENdTvD5htpnVp7i7DNuChR5rVMcORdXjvv5HVvpdKHzDZAYiLSD+GhnhxLm3/dMuk8pSzV+k28ECkiN5m8w== dependencies: "@babel/plugin-syntax-jsx" "^7.2.0" -"@vue/babel-sugar-v-model@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.1.1.tgz#a0f0750fcee20769805a20178299eebd4babf25a" - integrity sha512-qiPbdUTiqNQdhXzvWQMVfrYGHCiMmscY7j/cudLxdxWZ8AFhgPRVlniVgaWIT7A1iOjs92e8U6qVyqkf0d4ZrA== +"@vue/babel-sugar-v-model@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.1.2.tgz#1ff6fd1b800223fc9cb1e84dceb5e52d737a8192" + integrity sha512-vLXPvNq8vDtt0u9LqFdpGM9W9IWDmCmCyJXuozlq4F4UYVleXJ2Fa+3JsnTZNJcG+pLjjfnEGHci2339Kj5sGg== dependencies: "@babel/plugin-syntax-jsx" "^7.2.0" "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0" - "@vue/babel-plugin-transform-vue-jsx" "^1.0.0" + "@vue/babel-plugin-transform-vue-jsx" "^1.1.2" camelcase "^5.0.0" html-tags "^2.0.0" svg-tags "^1.0.0" -"@vue/babel-sugar-v-on@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.1.0.tgz#1f2b35eeeabb87eaf8925931f4d34fd8e6404a45" - integrity sha512-8DwAj/RLpmrDP4eZ3erJcKcyuLArLUYagNODTsSQrMdG5zmLJoFFtEjODfYRh/XxM2wXv9Wxe+HAB41FQxxwQA== +"@vue/babel-sugar-v-on@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.1.2.tgz#b2ef99b8f2fab09fbead25aad70ef42e1cf5b13b" + integrity sha512-T8ZCwC8Jp2uRtcZ88YwZtZXe7eQrJcfRq0uTFy6ShbwYJyz5qWskRFoVsdTi9o0WEhmQXxhQUewodOSCUPVmsQ== dependencies: "@babel/plugin-syntax-jsx" "^7.2.0" - "@vue/babel-plugin-transform-vue-jsx" "^1.0.0" + "@vue/babel-plugin-transform-vue-jsx" "^1.1.2" camelcase "^5.0.0" "@vue/component-compiler-utils@^3.0.0": @@ -3177,9 +3171,9 @@ JSONStream@^1.0.4, JSONStream@^1.3.4: through ">=2.2.7 <3" abab@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.2.tgz#a2fba1b122c69a85caa02d10f9270c7219709a9d" - integrity sha512-2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg== + version "2.0.3" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a" + integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg== abbrev@1: version "1.1.1" @@ -3418,6 +3412,11 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -3430,6 +3429,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172" + integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + any-promise@^1.0.0, any-promise@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -4155,9 +4162,9 @@ buffer-xor@^1.0.3: integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= buffer@^4.3.0: - version "4.9.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" - integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg= + version "4.9.2" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" + integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== dependencies: base64-js "^1.0.2" ieee754 "^1.1.4" @@ -4339,9 +4346,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001004, caniuse-lite@^1.0.30001006: - version "1.0.30001008" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001008.tgz#b8841b1df78a9f5ed9702537ef592f1f8772c0d9" - integrity sha512-b8DJyb+VVXZGRgJUa30cbk8gKHZ3LOZTBLaUEEVr2P4xpmFigOCc62CO4uzquW641Ouq1Rm9N+rWLWdSYDaDIw== + version "1.0.30001009" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001009.tgz#69b77997b882a7aee6af24c8d7d2fa27ee41f348" + integrity sha512-M3rEqHN6SaVjgo4bIik7HsGcWXsi+lI9WA0p51RPMFx5gXfduyOXWJrc0R4xBkSK1pgNf4CNgy5M+6H+WiEP8g== canvas-renderer@~2.1.1: version "2.1.1" @@ -4380,6 +4387,14 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + character-entities-legacy@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz#3c729991d9293da0ede6dddcaf1f2ce1009ee8b4" @@ -4653,12 +4668,19 @@ color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@^1.0.0: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== @@ -4811,9 +4833,9 @@ connect-history-api-fallback@^1.5.0, connect-history-api-fallback@^1.6.0: integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== consola@^2.6.0: - version "2.10.1" - resolved "https://registry.yarnpkg.com/consola/-/consola-2.10.1.tgz#4693edba714677c878d520e4c7e4f69306b4b927" - integrity sha512-4sxpH6SGFYLADfUip4vuY65f/gEogrzJoniVhNUYkJHtng0l8ZjnDCqxxrSVRHOHwKxsy8Vm5ONZh1wOR3/l/w== + version "2.11.0" + resolved "https://registry.yarnpkg.com/consola/-/consola-2.11.0.tgz#9bb35d850d8cecde894ce2eb4d792fa6b90d9013" + integrity sha512-2bcAqHastlPSCvZ+ur8bgHInGAWvUnysWz3h3xRX+/XZoCY7avolJJnVXOPGoVoyCcg1b231XixonoArmgxaoA== console-browserify@^1.1.0: version "1.2.0" @@ -4855,9 +4877,9 @@ content-type@^1.0.4, content-type@~1.0.4: integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== conventional-changelog-angular@^5.0.3: - version "5.0.5" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.5.tgz#69b541bcf3e538a8578b1e5fbaabe9bd8f572b57" - integrity sha512-RrkdWnL/TVyWV1ayWmSsrWorsTDqjL/VwG5ZSEneBQrd65ONcfeA1cW7FLtNweQyMiKOyriCMTKRSlk18DjTrw== + version "5.0.6" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz#269540c624553aded809c29a3508fdc2b544c059" + integrity sha512-QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA== dependencies: compare-func "^1.3.1" q "^1.5.1" @@ -4882,21 +4904,21 @@ conventional-changelog-core@^3.1.6: through2 "^3.0.0" conventional-changelog-preset-loader@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.2.0.tgz#571e2b3d7b53d65587bea9eedf6e37faa5db4fcc" - integrity sha512-zXB+5vF7D5Y3Cb/rJfSyCCvFphCVmF8mFqOdncX3BmjZwAtGAPfYrBcT225udilCKvBbHgyzgxqz2GWDB5xShQ== + version "2.3.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.0.tgz#580fa8ab02cef22c24294d25e52d7ccd247a9a6a" + integrity sha512-/rHb32J2EJnEXeK4NpDgMaAVTFZS3o1ExmjKMtYVgIC4MQn0vkNSbYpdGRotkfGGRWiqk3Ri3FBkiZGbAfIfOQ== conventional-changelog-writer@^4.0.6: - version "4.0.9" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.9.tgz#44ac4c48121bc90e71cb2947e1ea1a6c222ccd7f" - integrity sha512-2Y3QfiAM37WvDMjkVNaRtZgxVzWKj73HE61YQ/95T53yle+CRwTVSl6Gbv/lWVKXeZcM5af9n9TDVf0k7Xh+cw== + version "4.0.10" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.10.tgz#39f6458cca62a8151b3ce582a57ff71fd2b0ff7a" + integrity sha512-vtO9vBAVh7XnSpGLTB1BOGgsGTz1MdvFjzbSXLrtapWCHWwuVOZFgwdLhlS0MaXwlF1dksWdEb6tnr42Ie2INw== dependencies: compare-func "^1.3.1" conventional-commits-filter "^2.0.2" dateformat "^3.0.0" handlebars "^4.4.0" json-stringify-safe "^5.0.1" - lodash "^4.2.1" + lodash "^4.17.15" meow "^4.0.0" semver "^6.0.0" split "^1.0.0" @@ -4911,13 +4933,13 @@ conventional-commits-filter@^2.0.2: modify-values "^1.0.0" conventional-commits-parser@^3.0.3: - version "3.0.5" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.5.tgz#df471d6cb3f6fecfd1356ac72e0b577dbdae0a9c" - integrity sha512-qVz9+5JwdJzsbt7JbJ6P7NOXBGt8CyLFJYSjKAuPSgO+5UGfcsbk9EMR+lI8Unlvx6qwIc2YDJlrGIfay2ehNA== + version "3.0.7" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.7.tgz#55b6cde6a2d0b4a7ab399392777d527134a8d05c" + integrity sha512-4mx/FRC92z0yIiXGyRVYQFhn0jWDwvxnj2UuLaUi3hJSG4Thall6GXA8YOPHQK2qvotciJandJIVmuSvLgDLbQ== dependencies: JSONStream "^1.0.4" - is-text-path "^2.0.0" - lodash "^4.2.1" + is-text-path "^1.0.1" + lodash "^4.17.15" meow "^4.0.0" split2 "^2.0.0" through2 "^3.0.0" @@ -4937,7 +4959,7 @@ conventional-recommended-bump@^5.0.0: meow "^4.0.0" q "^1.5.1" -convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0: +convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== @@ -4986,7 +5008,7 @@ copy-to-clipboard@^3: dependencies: toggle-selection "^1.0.6" -copy-webpack-plugin@^5.0.2, copy-webpack-plugin@^5.0.4: +copy-webpack-plugin@^5.0.2, copy-webpack-plugin@^5.0.5: version "5.0.5" resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.5.tgz#731df6a837a2ef0f8f8e2345bdfe9b7c62a2da68" integrity sha512-7N68eIoQTyudAuxkfPT7HzGoQ+TsmArN/I3HFwG+lVE3FNzqvZKIiaxtYh4o3BIznioxUvx9j26+Rtsc9htQUQ== @@ -5005,9 +5027,9 @@ copy-webpack-plugin@^5.0.2, copy-webpack-plugin@^5.0.4: webpack-log "^2.0.0" core-js-compat@^3.1.1: - version "3.4.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.0.tgz#2a47c51d3dc026d290018cacd987495f68a47c75" - integrity sha512-pgQUcgT2+v9/yxHgMynYjNj7nmxLRXv3UC39rjCjDwpe63ev2rioQTju1PKLYUBbPCQQvZNWvQC8tBJd65q11g== + version "3.4.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.1.tgz#e12c5a3ef9fcb50fd9d9a32805bfe674f9139246" + integrity sha512-YdeJI26gLc0CQJ9asLE5obEgBz2I0+CIgnoTbS2T0d5IPQw/OCgCIFR527RmpduxjrB3gSEHoGOCTq9sigOyfw== dependencies: browserslist "^4.7.2" semver "^6.3.0" @@ -5235,12 +5257,12 @@ css-select@^1.1.0, css-select@~1.2.0: nth-check "~1.0.1" css-select@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz#ab4386cec9e1f668855564b17c3733b43b2a5ede" - integrity sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" + integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== dependencies: boolbase "^1.0.0" - css-what "^2.1.2" + css-what "^3.2.1" domutils "^1.7.0" nth-check "^1.0.2" @@ -5266,11 +5288,16 @@ css-unit-converter@^1.1.1: resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996" integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY= -css-what@2.1, css-what@^2.1.2: +css-what@2.1: version "2.1.3" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== +css-what@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz#f4a8f12421064621b456755e34a03a2c22df5da1" + integrity sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw== + css@^2.0.0: version "2.2.4" resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" @@ -5517,9 +5544,9 @@ dedent@^0.7.0: integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= deep-equal@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz#3103cdf8ab6d32cf4a8df7865458f2b8d33f3745" - integrity sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw== + version "1.1.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== dependencies: is-arguments "^1.0.4" is-date-object "^1.0.1" @@ -5646,9 +5673,9 @@ deprecation@^2.0.0: integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== des.js@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" - integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw= + version "1.0.1" + resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" + integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== dependencies: inherits "^2.0.1" minimalistic-assert "^1.0.0" @@ -5810,9 +5837,9 @@ dom-converter@^0.2: utila "~0.4" dom-serializer@0, dom-serializer@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.1.tgz#13650c850daffea35d8b626a4cfc4d3a17643fdb" - integrity sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q== + version "0.2.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== dependencies: domelementtype "^2.0.1" entities "^2.0.0" @@ -5942,7 +5969,7 @@ edgeware-node-types@^1.0.10: resolved "https://registry.yarnpkg.com/edgeware-node-types/-/edgeware-node-types-1.0.10.tgz#eb40ef4308f84d64975edc99d12ac5da891ee6a3" integrity sha512-iGMjkxtaT0FE5TR8DTucF+63IbtGHiieNxNkPTlsGYGt1JaPc6aP0ApnSQKYu2NiQaVcg1RB+BDMmGfFk1bnhw== -editions@^2.1.3: +editions@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/editions/-/editions-2.2.0.tgz#dacd0c2a9441ebef592bba316a6264febb337f35" integrity sha512-RYg3iEA2BDLCNVe8PUkD+ox5vAKxB9XS/mAhx1bdxGCF0CpX077C0pyTA9t5D6idCYA3avl5/XDHKPsHFrygfw== @@ -5961,9 +5988,9 @@ ejs@^2.7.1: integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ== electron-to-chromium@^1.3.295: - version "1.3.304" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.304.tgz#49b47d961f8143116174c2f70fbfee3aabf43015" - integrity sha512-a5mqa13jCdBc+Crgk3Gyr7vpXCiFWfFq23YDCEmrPYeiDOQKZDVE6EX/Q4Xdv97n3XkcjiSBDOY0IS19yP2yeA== + version "1.3.306" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.306.tgz#e8265301d053d5f74e36cb876486830261fbe946" + integrity sha512-frDqXvrIROoYvikSKTIKbHbzO6M3/qC6kCIt/1FOa9kALe++c4VAJnwjSFvf1tYLEUsP2n9XZ4XSCyqc3l7A/A== elliptic@^6.0.0, elliptic@^6.4.1: version "6.5.1" @@ -6156,11 +6183,11 @@ err-code@^1.0.0: integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= errlop@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/errlop/-/errlop-1.1.2.tgz#a99a48f37aa264d614e342ffdbbaa49eec9220e0" - integrity sha512-djkRp+urJ+SmqDBd7F6LUgm4Be1TTYBxia2bhjNdFBuBDQtJDHExD2VbxR6eyst3h1TZy3qPRCdqb6FBoFttTA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/errlop/-/errlop-1.2.0.tgz#15d02f8232e788da39b6472fb76809fff423a7d8" + integrity sha512-xlbC/1TA2kMaPYy0DtlL0sLyu6T5ZYpLNnOY5EtvDbHRnzUAipUqW1eKObQgwWbRDiudE2IJaxJAgw4fF39Lcw== dependencies: - editions "^2.1.3" + editions "^2.2.0" errno@^0.1.3, errno@~0.1.7: version "0.1.7" @@ -6198,9 +6225,9 @@ es-abstract@^1.12.0, es-abstract@^1.13.0, es-abstract@^1.15.0, es-abstract@^1.5. string.prototype.trimright "^2.1.0" es-to-primitive@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" - integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg== + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== dependencies: is-callable "^1.1.4" is-date-object "^1.0.1" @@ -6545,9 +6572,9 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: safe-buffer "^5.1.1" exec-sh@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b" - integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg== + version "0.3.4" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" + integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A== execa@^1.0.0: version "1.0.0" @@ -6675,9 +6702,9 @@ express@^4.17.1: vary "~1.1.2" ext@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.1.2.tgz#d1d216c83641bb4cb7684622b063cff44a19ce35" - integrity sha512-/KLjJdTNyDepCihrk4HQt57nAE1IRCEo5jUt+WgWGCr1oARhibDvmI2DMcSNWood1T9AUWwq+jaV1wvRqaXfnA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/ext/-/ext-1.2.0.tgz#8dd8d2dd21bcced3045be09621fa0cbf73908ba4" + integrity sha512-0ccUQK/9e3NreLFg6K6np8aPyRgwycx+oFGtfx1dSp7Wj00Ozw9r05FgBRlzjf2XBM7LAzwgLyDscRrtSU91hA== dependencies: type "^2.0.0" @@ -7580,7 +7607,7 @@ handle-thing@^2.0.0: resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ== -handlebars@^4.1.2, handlebars@^4.4.0: +handlebars@^4.1.2, handlebars@^4.4.0, handlebars@^4.5.1: version "4.5.1" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.1.tgz#8a01c382c180272260d07f2d1aa3ae745715c7ba" integrity sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA== @@ -7621,6 +7648,11 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + has-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" @@ -7705,7 +7737,7 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -highlight.js@^9.15.8: +highlight.js@^9.16.2: version "9.16.2" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e" integrity sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw== @@ -8121,9 +8153,9 @@ import-fresh@^2.0.0: resolve-from "^3.0.0" import-fresh@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118" - integrity sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.0.tgz#fed4d772a13949de7d9894b647e77297db14dedf" + integrity sha512-w1waegcRoBrRQ6kfX2+KWc3lIaVUvHiib7F1ZpggbL5+GyZZrpbOnOVNNuylJonNHO6aCJubjfDUzH6J8HmwSA== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -8707,12 +8739,12 @@ is-symbol@^1.0.2: dependencies: has-symbols "^1.0.0" -is-text-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-2.0.0.tgz#b2484e2b720a633feb2e85b67dc193ff72c75636" - integrity sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw== +is-text-path@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e" + integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4= dependencies: - text-extensions "^2.0.0" + text-extensions "^1.0.0" is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" @@ -8920,7 +8952,7 @@ jest-config@^24.9.0: pretty-format "^24.9.0" realpath-native "^1.1.0" -jest-diff@^24.9.0: +jest-diff@^24.3.0, jest-diff@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da" integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ== @@ -9588,26 +9620,26 @@ left-pad@^1.3.0: resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== -lerna@^3.18.3: - version "3.18.3" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.18.3.tgz#c94556e76f98df9c7ae4ed3bc0166117cc42cd13" - integrity sha512-Bnr/RjyDSVA2Vu+NArK7do4UIpyy+EShOON7tignfAekPbi7cNDnMMGgSmbCQdKITkqPACMfCMdyq0hJlg6n3g== +lerna@^3.18.4: + version "3.18.4" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.18.4.tgz#132858cabb8fc8393341ddddbbbd85dd0ca82a79" + integrity sha512-DiU53cvMxaU07Bj2HwBwUQ2O3c/ORNq/QwKj1vGJH4vSkZSTUxPryp2baSNlt8PmnLNXOVpw0vOTRkEF+6n/cA== dependencies: - "@lerna/add" "3.18.0" - "@lerna/bootstrap" "3.18.0" - "@lerna/changed" "3.18.3" - "@lerna/clean" "3.18.0" + "@lerna/add" "3.18.4" + "@lerna/bootstrap" "3.18.4" + "@lerna/changed" "3.18.4" + "@lerna/clean" "3.18.4" "@lerna/cli" "3.18.0" "@lerna/create" "3.18.0" "@lerna/diff" "3.18.0" - "@lerna/exec" "3.18.0" + "@lerna/exec" "3.18.4" "@lerna/import" "3.18.0" "@lerna/init" "3.18.0" "@lerna/link" "3.18.0" - "@lerna/list" "3.18.0" - "@lerna/publish" "3.18.3" - "@lerna/run" "3.18.0" - "@lerna/version" "3.18.3" + "@lerna/list" "3.18.4" + "@lerna/publish" "3.18.4" + "@lerna/run" "3.18.4" + "@lerna/version" "3.18.4" import-local "^2.0.0" npmlog "^4.1.2" @@ -9831,9 +9863,9 @@ log-driver@^1.2.7: integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg== loglevel@^1.6.4: - version "1.6.4" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz#f408f4f006db8354d0577dcf6d33485b3cb90d56" - integrity sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g== + version "1.6.6" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312" + integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ== loglevelnext@^3.0.0: version "3.0.1" @@ -9882,7 +9914,7 @@ lru-queue@0.1: dependencies: es5-ext "~0.10.2" -lunr@^2.3.6: +lunr@^2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.8.tgz#a8b89c31f30b5a044b97d2d28e2da191b6ba2072" integrity sha512-oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg== @@ -10220,22 +10252,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.40.0: - version "1.40.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" - integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== - -"mime-db@>= 1.40.0 < 2": +mime-db@1.42.0, "mime-db@>= 1.40.0 < 2": version "1.42.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac" integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ== mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.24" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81" - integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ== + version "2.1.25" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437" + integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg== dependencies: - mime-db "1.40.0" + mime-db "1.42.0" mime@1.6.0: version "1.6.0" @@ -10718,9 +10745,9 @@ node-pre-gyp@^0.12.0: tar "^4" node-releases@^1.1.38: - version "1.1.39" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.39.tgz#c1011f30343aff5b633153b10ff691d278d08e8d" - integrity sha512-8MRC/ErwNCHOlAFycy9OPca46fQYUjbJRDcZTHVWIGXIjYLM73k70vv3WkYutVnM4cCo4hE0MqBVVZjP6vjISA== + version "1.1.40" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.40.tgz#a94facfa8e2d612302601ca1361741d529c4515a" + integrity sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ== dependencies: semver "^6.3.0" @@ -10931,9 +10958,9 @@ object-copy@^0.1.0: kind-of "^3.0.3" object-inspect@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b" - integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ== + version "1.7.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" + integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== object-is@^1.0.1: version "1.0.1" @@ -11496,9 +11523,9 @@ path-to-regexp@0.1.7: integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= path-to-regexp@^1.2.0, path-to-regexp@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d" - integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30= + version "1.8.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== dependencies: isarray "0.0.1" @@ -12273,12 +12300,12 @@ postcss-safe-parser@^4.0.1: postcss "^7.0.0" postcss-sass@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.1.tgz#6177205d2c287973551bd2938fc4b375961e3173" - integrity sha512-YDdykeDHylqiD2CdXuP7K1aDz7hCflGVB6H6lqabWVab5mVOWhguUuWZYpFU22/E12AEGiMlOfZnLqr343zhVA== + version "0.4.2" + resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.2.tgz#7d1f8ddf6960d329de28fb3ff43c9c42013646bc" + integrity sha512-hcRgnd91OQ6Ot9R90PE/khUDCJHG8Uxxd3F7Y0+9VHjBiJgNv7sK5FxyHMCBtoLmmkzVbSj3M3OlqUfLJpq0CQ== dependencies: gonzales-pe "^4.2.4" - postcss "^7.0.14" + postcss "^7.0.21" postcss-selector-matches@^4.0.0: version "4.0.0" @@ -12396,7 +12423,7 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.1 source-map "^0.6.1" supports-color "^6.1.0" -prebuild-install@^5.2.4, prebuild-install@^5.3.0: +prebuild-install@^5.3.0, prebuild-install@^5.3.3: version "5.3.3" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.3.tgz#ef4052baac60d465f5ba6bf003c9c1de79b9da8e" integrity sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g== @@ -12451,9 +12478,9 @@ preserve@^0.2.0: integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= prettier@^1.18.2: - version "1.18.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" - integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== pretty-error@^2.0.2: version "2.1.1" @@ -12519,9 +12546,9 @@ promise-retry@^1.1.1: retry "^0.10.0" prompts@^2.0.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.2.1.tgz#f901dd2a2dfee080359c0e20059b24188d75ad35" - integrity sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw== + version "2.3.0" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.0.tgz#a444e968fa4cc7e86689a74050685ac8006c4cc4" + integrity sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg== dependencies: kleur "^3.0.3" sisteransi "^1.0.3" @@ -12681,9 +12708,9 @@ query-string@^5.0.1: strict-uri-encode "^1.0.0" query-string@^6.8.3: - version "6.8.3" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.8.3.tgz#fd9fb7ffb068b79062b43383685611ee47777d4b" - integrity sha512-llcxWccnyaWlODe7A9hRjkvdCKamEKTh+wH8ITdTc3OhchaqUZteiSCX/2ablWHVrkVIe04dntnaZJ7BdyW0lQ== + version "6.9.0" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.9.0.tgz#1c3b727c370cf00f177c99f328fda2108f8fa3dd" + integrity sha512-KG4bhCFYapExLsUHrFt+kQVEegF2agm4cpF/VNc6pZVthIfCc/GK8t8VyNIE3nyXG9DK3Tf2EGkxjR6/uRdYsA== dependencies: decode-uri-component "^0.2.0" split-on-first "^1.0.0" @@ -12791,10 +12818,10 @@ react-chartjs-2@^2.8.0: lodash "^4.17.4" prop-types "^15.5.8" -react-copy-to-clipboard@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz#8eae107bb400be73132ed3b6a7b4fb156090208e" - integrity sha512-ELKq31/E3zjFs5rDWNCfFL4NvNFQvGRoJdAKReD/rUPA+xxiLPQmZBZBvy2vgH7V0GE9isIQpT9WXbwIVErYdA== +react-copy-to-clipboard@^5.0.1, react-copy-to-clipboard@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.2.tgz#d82a437e081e68dfca3761fbd57dbf2abdda1316" + integrity sha512-/2t5mLMMPuN5GmdXo6TebFa8IoFxZ+KTDDqYhcDm0PhkgEzSxVvIX26G20s1EB02A4h2UZgwtfymZ3lGJm0OLg== dependencies: copy-to-clipboard "^3" prop-types "^15.5.8" @@ -12818,12 +12845,11 @@ react-dropzone@^10.1.10: file-selector "^0.1.11" prop-types "^15.7.2" -react-hot-loader@^4.12.15: - version "4.12.16" - resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.12.16.tgz#353bd07fbb08f791b5720535f86b0a8f9b651317" - integrity sha512-KC33uTBacgdunMtfpZFP2pgPpyvKIcCwuh0XmWESbeFrkWLqUtCFN91zyaTdU5OiAM982+E8xh1gjE5EINumaw== +react-hot-loader@^4.12.17: + version "4.12.17" + resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.12.17.tgz#e48815848865342edd829861634637b8c0d22bed" + integrity sha512-nee5q4Xip6+wD8DrCWxVUH0zT488K1zRG1KezJTb8oEbRO1JZvnEizbOG7BwnRfxxjk5QSyx6fPXeBf2fToBhw== dependencies: - "@types/react" "^15.0.0 || ^16.0.0" fast-levenshtein "^2.0.6" global "^4.3.0" hoist-non-react-statics "^3.3.0" @@ -12834,9 +12860,9 @@ react-hot-loader@^4.12.15: source-map "^0.7.3" react-i18next@^11.0.1: - version "11.0.1" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.0.1.tgz#179b10cf0026677739fa96df0a7b5494df435bd1" - integrity sha512-TazSMob+cEztaaMcX3IQQLltzv4+b3cl6dfs9tUMVj2fD0TRDbTsQ75AaLncw6jqZf08I0yAGHeJnqbBE0eZDw== + version "11.2.0" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.2.0.tgz#ef49dc2205408b192e51cc449a6b572ae2af0670" + integrity sha512-V+TmORi4ImmhdEiJslXDF0XO1wETI/eKfVi3J3tFpcAW0M6BFJYKYBSV/dkGNjiZb1CgRrTImJnApSaeXFyHag== dependencies: "@babel/runtime" "^7.3.1" html-parse-stringify2 "2.0.1" @@ -12866,9 +12892,9 @@ react-markdown@^4.2.2: xtend "^4.0.1" react-popper@^1.3.4: - version "1.3.5" - resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.5.tgz#3a785f2a6271af59902a45ec9870180d26d2d9c1" - integrity sha512-Wi5WewcQ7O4fP4YArjWXY7JXRkDX+7sAjE9AeEahgPg6PdAHvQibek+nVqxO1lS8aX2v3iWzCC5Jgm3cuVfdCQ== + version "1.3.6" + resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.6.tgz#32122f83af8fda01bdd4f86625ddacaf64fdd06d" + integrity sha512-kLTfa9z8n+0jJvRVal9+vIuirg41rObg4Bbrvv/ZfsGPQDN9reyVVSxqnHF1ZNgXgV7x11PeUfd5ItF8DZnqhg== dependencies: "@babel/runtime" "^7.1.2" create-react-context "^0.3.0" @@ -13925,9 +13951,9 @@ simple-swizzle@^0.2.2: is-arrayish "^0.3.1" sisteransi@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.3.tgz#98168d62b79e3a5e758e27ae63c4a053d748f4eb" - integrity sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg== + version "1.0.4" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3" + integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig== slash@^1.0.0: version "1.0.0" @@ -14054,11 +14080,11 @@ sort-keys@^2.0.0: is-plain-obj "^1.0.0" sortobject@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/sortobject/-/sortobject-1.2.0.tgz#f24dbd1c1eb53013823f4045c5cae75e0aea273a" - integrity sha512-b/UBYCIXcloH6NO0CSG+/8dYsDA+egku07g0oeYPBmmt8CS64pORXPYmQ/W65UBGxYz7dTacjWgBVlq/TzxmQQ== + version "1.3.0" + resolved "https://registry.yarnpkg.com/sortobject/-/sortobject-1.3.0.tgz#bc8ce57014c567bdbf78e89ae6c484e64d51e9dc" + integrity sha512-rr0RrgE3ZoWaREnHiidnywzXLaeqmxDKfB4Htdbzu4WBzsVeZEJrhz7AR4ZF+gzHgbog/lQoNXxCWHaXeLc1Dg== dependencies: - editions "^2.1.3" + editions "^2.2.0" source-list-map@^2.0.0: version "2.0.1" @@ -14357,13 +14383,13 @@ string-width@^3.0.0, string-width@^3.1.0: strip-ansi "^5.1.0" string-width@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff" - integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ== + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" - strip-ansi "^5.2.0" + strip-ansi "^6.0.0" string.prototype.trim@^1.1.2: version "1.2.0" @@ -14425,6 +14451,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + strip-bom-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" @@ -14609,6 +14642,13 @@ supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: dependencies: has-flag "^3.0.0" +supports-color@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + dependencies: + has-flag "^4.0.0" + svg-tags@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" @@ -14732,9 +14772,9 @@ terser-webpack-plugin@^1.4.1: worker-farm "^1.7.0" terser@^4.1.2: - version "4.3.9" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz#e4be37f80553d02645668727777687dad26bbca8" - integrity sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA== + version "4.4.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.0.tgz#22c46b4817cf4c9565434bfe6ad47336af259ac3" + integrity sha512-oDG16n2WKm27JO8h4y/w3iqBGAOSCtq7k8dRmrn4Wf9NouL0b2WpMHGChFGZq4nFAQy1FsNJrVQHfurXOSTmOA== dependencies: commander "^2.20.0" source-map "~0.6.1" @@ -14750,10 +14790,10 @@ test-exclude@^5.2.3: read-pkg-up "^4.0.0" require-main-filename "^2.0.0" -text-extensions@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-2.0.0.tgz#43eabd1b495482fae4a2bf65e5f56c29f69220f6" - integrity sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ== +text-extensions@^1.0.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" + integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ== text-table@^0.2.0: version "0.2.0" @@ -15106,14 +15146,14 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typedoc-default-themes@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.6.0.tgz#7e73bf54dd9e11550dd0fb576d5176b758f8f8b5" - integrity sha512-MdTROOojxod78CEv22rIA69o7crMPLnVZPefuDLt/WepXqJwgiSu8Xxq+H36x0Jj3YGc7lOglI2vPJ2GhoOybw== +typedoc-default-themes@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.6.1.tgz#e2e471188983df995f4f9df49f713044fced6802" + integrity sha512-z5AWKqQDz7igl9WkUuafx8cEm4MPVQGMpbWE+3lwVOaq+U4UoLKBMnpFQWh/4fqQ3bGysXpOstMxy2OOzHezyw== dependencies: backbone "^1.4.0" jquery "^3.4.1" - lunr "^2.3.6" + lunr "^2.3.8" underscore "^1.9.1" typedoc-plugin-markdown@^2.2.11: @@ -15128,24 +15168,24 @@ typedoc-plugin-no-inherit@^1.1.10: resolved "https://registry.yarnpkg.com/typedoc-plugin-no-inherit/-/typedoc-plugin-no-inherit-1.1.10.tgz#559d2fa68bc5d31052bf058399c2c135f9af2f68" integrity sha512-BhSFAWlBTh9Bf6PSfruIqdQBM8gd/Gj8hVuRk5pVWkHu4I/SB24LzFr5gAo52ZlaQSeN72+VOkkRD6tNYl8Enw== -typedoc@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.15.0.tgz#21eaf4db41cf2797bad027a74f2a75cd08ae0c2d" - integrity sha512-NOtfq5Tis4EFt+J2ozhVq9RCeUnfEYMFKoU6nCXCXUULJz1UQynOM+yH3TkfZCPLzigbqB0tQYGVlktUWweKlw== +typedoc@^0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.15.1.tgz#9e2acfe9a36fb9891a30bb3382dd97a382a31a12" + integrity sha512-zm/rWq2seVqaop9isXc5jMK5vqOjPHni3/t9OVWmuZYKNbYdlxbtM10CbpuaLdHn7ry2HLtMx7IP236B/F6Xwg== dependencies: "@types/minimatch" "3.0.3" fs-extra "^8.1.0" - handlebars "^4.1.2" - highlight.js "^9.15.8" + handlebars "^4.5.1" + highlight.js "^9.16.2" lodash "^4.17.15" marked "^0.7.0" minimatch "^3.0.0" progress "^2.0.3" shelljs "^0.8.3" - typedoc-default-themes "^0.6.0" - typescript "3.5.x" + typedoc-default-themes "^0.6.1" + typescript "3.7.x" -typescript@3.5.x, typescript@^3.7.2: +typescript@3.7.x, typescript@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb" integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ== @@ -15169,9 +15209,9 @@ uglify-js@3.4.x: source-map "~0.6.1" uglify-js@^3.1.4: - version "3.6.8" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.8.tgz#5edcbcf9d49cbb0403dc49f856fe81530d65145e" - integrity sha512-XhHJ3S3ZyMwP8kY1Gkugqx3CJh2C3O0y8NPiSxtm1tyD/pktLAkFZsFGpuNfTZddKDQ/bbDBLAd2YyA1pbi8HQ== + version "3.6.9" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.9.tgz#85d353edb6ddfb62a9d798f36e91792249320611" + integrity sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw== dependencies: commander "~2.20.3" source-map "~0.6.1" @@ -15287,9 +15327,9 @@ unist-util-is@^3.0.0: integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A== unist-util-remove-position@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz#d91aa8b89b30cb38bad2924da11072faa64fd972" - integrity sha512-CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA== + version "1.1.4" + resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz#ec037348b6102c897703eee6d0294ca4755a2020" + integrity sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A== dependencies: unist-util-visit "^1.1.0" @@ -15409,13 +15449,13 @@ url@^0.11.0: querystring "0.2.0" usb@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/usb/-/usb-1.6.0.tgz#bc5d4decf4ffca32d1136717edcf73366137a789" - integrity sha512-52DyWlCk9K+iw3LnvY95WXSnpHjxJoI++aGkV8HiMNPc4zmvDQlYvWAzrkbJ2JH3oUcx26XfU5sZcG4RAcVkMg== + version "1.6.1" + resolved "https://registry.yarnpkg.com/usb/-/usb-1.6.1.tgz#1cc6e82548f62135e2ddc13e0b351bb423d34e2a" + integrity sha512-iZRGRsdbCvhBpeufY+cpy7LS9OMrh1hobvHaxa6/HNr1mgqrfeNpfbzoRCBofkG9MpLsujKieBFzqdPWcMugYQ== dependencies: bindings "^1.4.0" nan "2.13.2" - prebuild-install "^5.2.4" + prebuild-install "^5.3.3" use@^3.1.0: version "3.1.1" @@ -15526,9 +15566,9 @@ verror@1.10.0: extsprintf "^1.2.0" vfile-location@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.5.tgz#c83eb02f8040228a8d2b3f10e485be3e3433e0a2" - integrity sha512-Pa1ey0OzYBkLPxPZI3d9E+S4BmvfVwNAAXrrqGbwTVXWaX2p9kM1zZ+n35UtVM06shmWKH4RPRN8KI80qE3wNQ== + version "2.0.6" + resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz#8a274f39411b8719ea5728802e10d9e0dff1519e" + integrity sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA== vfile-message@^1.0.0: version "1.1.1" From fd8427d3b518b4eb710beeb034a6830013d62caa Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 13 Nov 2019 12:35:27 +0000 Subject: [PATCH 022/154] [CI Skip] 0.37.0-beta.76 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 99f4c0806650..7b7911d03dd8 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.75" + "version": "0.37.0-beta.76" } diff --git a/package.json b/package.json index 7cc074fcf0e6..dca698c376f7 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index cebcc6bb83a8..b9247bf5706e 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index a38e8452b71e..bb60f3f3d3d6 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-components": "^0.37.0-beta.76", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 23f942fb839f..3da87c40c6cd 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index eb4fa84a27b9..469efb07fbac 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 60c944c1f6da..2667aeb86170 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.4", - "@polkadot/react-components": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index dc3693b728bd..6c149ea50f25 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-query": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-query": "^0.37.0-beta.76" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index d14b572fd750..2232def88583 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.75", - "@polkadot/react-components": "^0.37.0-beta.75" + "@polkadot/apps-routing": "^0.37.0-beta.76", + "@polkadot/react-components": "^0.37.0-beta.76" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index b74c472db93a..52eee4ef294a 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-query": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-query": "^0.37.0-beta.76" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index c6a4d98169e2..f1029836feb0 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 37c99b1861bd..a80ebfe6ba1b 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-params": "^0.37.0-beta.75", - "@polkadot/react-signer": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-params": "^0.37.0-beta.76", + "@polkadot/react-signer": "^0.37.0-beta.76" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 93d663e8384f..88fc6e1f190a 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 944de77564c8..59f877889ae9 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-components": "^0.37.0-beta.76", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 5c9a1bb34587..6a4b0e5275d3 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-query": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-query": "^0.37.0-beta.76" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 91c5dfb373ca..fa055c5ebce5 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-query": "^0.37.0-beta.75", + "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-query": "^0.37.0-beta.76", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 7f89c69f8d74..23c131535232 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.75", - "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-query": "^0.37.0-beta.75" + "@polkadot/app-explorer": "^0.37.0-beta.76", + "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-query": "^0.37.0-beta.76" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index a85c30059be8..000eb5c1fad1 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-params": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-params": "^0.37.0-beta.76" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index ac91c775c573..0d0f93f6d231 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index b8a7325a8b30..a53d06796966 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 90784f244a64..f076cf69aefe 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-query": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-query": "^0.37.0-beta.76" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 2d051ad416d9..d1976978daaa 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-query": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-query": "^0.37.0-beta.76" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index a77157a71b1f..adffd70462aa 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 0450334a4ada..f2a85d5c0f16 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", - "@polkadot/react-signer": "^0.37.0-beta.75", + "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-signer": "^0.37.0-beta.76", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 271a601a5cbc..3eece9c6e28e 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 6bacd8592a59..da03e82f5af8 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.75", + "@polkadot/react-api": "^0.37.0-beta.76", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.75", + "@polkadot/react-query": "^0.37.0-beta.76", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 245af9a78293..8f1193ea2f6b 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 000233a00b8f..99982541bfc5 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75" + "@polkadot/react-components": "^0.37.0-beta.76" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 9fbf294c3dd5..d441db8433b7 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index f0218d0e16c1..dfedde275ac4 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.75", + "version": "0.37.0-beta.76", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.75", + "@polkadot/react-components": "^0.37.0-beta.76", "@polkadot/react-qr": "^0.47.0-beta.6" } } From 5e19af9810907ea1d860be41aa70983bd0a446dc Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 13 Nov 2019 15:34:31 +0100 Subject: [PATCH 023/154] Extract getHistory query (re-use) (#1877) --- packages/app-staking/src/Query/Validator.tsx | 56 +++++++------------- packages/react-api/src/util/hashes.ts | 33 ++++++++++++ packages/react-api/src/util/historic.ts | 25 +++++++++ packages/react-api/src/util/index.ts | 4 ++ 4 files changed, 81 insertions(+), 37 deletions(-) create mode 100644 packages/react-api/src/util/hashes.ts create mode 100644 packages/react-api/src/util/historic.ts diff --git a/packages/app-staking/src/Query/Validator.tsx b/packages/app-staking/src/Query/Validator.tsx index 005a4b5b8081..085e614a0312 100644 --- a/packages/app-staking/src/Query/Validator.tsx +++ b/packages/app-staking/src/Query/Validator.tsx @@ -3,12 +3,13 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { I18nProps } from '@polkadot/react-components/types'; -import { BlockNumber, Exposure, Hash, SessionIndex } from '@polkadot/types/interfaces'; +import { BlockNumber, Exposure, SessionIndex } from '@polkadot/types/interfaces'; import BN from 'bn.js'; import React, { useContext, useEffect, useState } from 'react'; import { Chart, Columar, Column } from '@polkadot/react-components'; import { ApiContext, withCalls } from '@polkadot/react-api'; +import { getHistoric } from '@polkadot/react-api/util'; import { formatBalance, formatNumber } from '@polkadot/util'; import translate from '../translate'; @@ -47,42 +48,23 @@ function Validator ({ blockCounts, className, currentIndex, startNumber, t, vali const [stakeChart, setStateChart] = useState(); useEffect((): void => { - const numbers: BN[] = []; - const checkLength = (api.consts.babe - ? api.consts.babe.epochDuration as BlockNumber - : new BN(500)).muln(2).divn(3); - const divisor = new BN('1'.padEnd(formatBalance.getDefaults().decimals + 1, '0')); - - api.isReady.then((): void => { - let currentNumber: BN = startNumber; - - // here we end up with more-or-less 6.66 days - while (startNumber.gtn(0) && numbers.length < SESSIONS) { - numbers.unshift(currentNumber); - currentNumber = currentNumber.sub(checkLength); - } - - setStakeLabels(numbers.map((bn): string => formatNumber(bn))); - - Promise - .all(numbers.map((at): Promise => - api.rpc.chain.getBlockHash(at as any) - )) - .then((hashes): Promise => - Promise.all(hashes.map((hash): Promise => - api.query.staking.stakers.at(hash, validatorId) as Promise - )) - ) - .then((exposures): void => { - setStateChart([ - exposures.map(({ total }): BN => - total.unwrap().div(divisor)) - // exposures.map(({ own }): BN => - // own.unwrap().div(divisor)), - // exposures.map(({ others }): BN => - // others.reduce((total, { value }): BN => total.add(value.unwrap()), new BN(0)).div(divisor)) - ]); - }); + api.isReady.then(async (): Promise => { + const divisor = new BN('1'.padEnd(formatBalance.getDefaults().decimals + 1, '0')); + const values = await getHistoric(api, 'staking.stakers', [validatorId], { + interval: (api.consts.babe?.epochDuration as BlockNumber || new BN(500)).muln(2).divn(3), + max: SESSIONS, + startNumber + }); + + setStakeLabels(values.map(([bn]): string => formatNumber(bn))); + setStateChart([ + values.map(([,, { total }]): BN => + total.unwrap().div(divisor)) + // exposures.map(({ own }): BN => + // own.unwrap().div(divisor)), + // exposures.map(({ others }): BN => + // others.reduce((total, { value }): BN => total.add(value.unwrap()), new BN(0)).div(divisor)) + ]); }); }, []); diff --git a/packages/react-api/src/util/hashes.ts b/packages/react-api/src/util/hashes.ts new file mode 100644 index 000000000000..59889f9de97d --- /dev/null +++ b/packages/react-api/src/util/hashes.ts @@ -0,0 +1,33 @@ +// Copyright 2017-2019 @polkadot/react-api authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { Hash } from '@polkadot/types/interfaces'; + +import BN from 'bn.js'; +import ApiPromise from '@polkadot/api/promise'; +import { bnToBn } from '@polkadot/util'; + +export interface HashesOptions { + interval: BN | number; + max: number; + startNumber: BN; +} + +export default async function getHashes (api: ApiPromise, { interval, max, startNumber }: HashesOptions): Promise<[BN, Hash][]> { + const numbers: BN[] = []; + const _interval = bnToBn(interval); + let currentNumber: BN = startNumber; + + while (numbers.length < max && currentNumber.gtn(0)) { + numbers.unshift(currentNumber); + + currentNumber = currentNumber.sub(_interval); + } + + const hashes = await Promise.all( + numbers.map((at): Promise => api.rpc.chain.getBlockHash(at as any)) + ); + + return numbers.map((bn, index): [BN, Hash] => [bn, hashes[index]]); +} diff --git a/packages/react-api/src/util/historic.ts b/packages/react-api/src/util/historic.ts new file mode 100644 index 000000000000..8a5421c32fd0 --- /dev/null +++ b/packages/react-api/src/util/historic.ts @@ -0,0 +1,25 @@ +// Copyright 2017-2019 @polkadot/react-api authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { Hash } from '@polkadot/types/interfaces'; +import { Codec } from '@polkadot/types/types'; + +import BN from 'bn.js'; +import ApiPromise from '@polkadot/api/promise'; + +import getHashes, { HashesOptions } from './hashes'; + +export default async function getHistory (api: ApiPromise, endpoint: string, params: any[], options: HashesOptions): Promise<[BN, Hash, T][]> { + const [mod, fn] = endpoint.split('.'); + const numbers = await getHashes(api, options); + const results = await Promise.all(numbers.map(([, hash]): Promise => + api.query[mod][fn].at(hash, ...params) as Promise + )); + + return results.map((value, index): [BN, Hash, T] => [ + numbers[index][0], + numbers[index][1], + value + ]); +} diff --git a/packages/react-api/src/util/index.ts b/packages/react-api/src/util/index.ts index 057ba6f7e838..21801a5e8fe3 100644 --- a/packages/react-api/src/util/index.ts +++ b/packages/react-api/src/util/index.ts @@ -2,11 +2,15 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +import getHashes from './hashes'; +import getHistoric from './historic'; import intervalObservable from './intervalObservable'; import isEqual from './isEqual'; import triggerChange from './triggerChange'; export { + getHashes, + getHistoric, intervalObservable, isEqual, triggerChange From c666a9f17e10e7d38a7ede8164745670b4c7673b Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 13 Nov 2019 14:39:11 +0000 Subject: [PATCH 024/154] [CI Skip] 0.37.0-beta.77 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 7b7911d03dd8..7a6075ce65dc 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.76" + "version": "0.37.0-beta.77" } diff --git a/package.json b/package.json index dca698c376f7..13e2849d5351 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index b9247bf5706e..baa45c35f35c 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index bb60f3f3d3d6..891d992ab3b9 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-components": "^0.37.0-beta.77", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 3da87c40c6cd..5d4e8269a896 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 469efb07fbac..143eab62d22b 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 2667aeb86170..37c859b87e05 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.4", - "@polkadot/react-components": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 6c149ea50f25..7c1ab68b863f 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", - "@polkadot/react-query": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-query": "^0.37.0-beta.77" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 2232def88583..b7cabb7617d9 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.76", - "@polkadot/react-components": "^0.37.0-beta.76" + "@polkadot/apps-routing": "^0.37.0-beta.77", + "@polkadot/react-components": "^0.37.0-beta.77" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 52eee4ef294a..f6679ebcca28 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", - "@polkadot/react-query": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-query": "^0.37.0-beta.77" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index f1029836feb0..dd97c7e2f75d 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index a80ebfe6ba1b..4bb4c25f0bf6 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", - "@polkadot/react-params": "^0.37.0-beta.76", - "@polkadot/react-signer": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-params": "^0.37.0-beta.77", + "@polkadot/react-signer": "^0.37.0-beta.77" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 88fc6e1f190a..88dceee43a91 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 59f877889ae9..dce8c746cf9b 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-components": "^0.37.0-beta.77", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 6a4b0e5275d3..2bd52d05ba34 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", - "@polkadot/react-query": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-query": "^0.37.0-beta.77" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index fa055c5ebce5..9299245e89fb 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", - "@polkadot/react-query": "^0.37.0-beta.76", + "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-query": "^0.37.0-beta.77", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 23c131535232..cb2ed737ecd2 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.76", - "@polkadot/react-components": "^0.37.0-beta.76", - "@polkadot/react-query": "^0.37.0-beta.76" + "@polkadot/app-explorer": "^0.37.0-beta.77", + "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-query": "^0.37.0-beta.77" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 000eb5c1fad1..de9d36aa1870 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", - "@polkadot/react-params": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-params": "^0.37.0-beta.77" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 0d0f93f6d231..2e1cd0398e32 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index a53d06796966..a613f8642ec2 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index f076cf69aefe..fc4c1b763dc3 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", - "@polkadot/react-query": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-query": "^0.37.0-beta.77" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index d1976978daaa..a052045dbe35 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", - "@polkadot/react-query": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-query": "^0.37.0-beta.77" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index adffd70462aa..8fd9da85116b 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index f2a85d5c0f16..4d8804d816d0 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", - "@polkadot/react-signer": "^0.37.0-beta.76", + "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-signer": "^0.37.0-beta.77", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 3eece9c6e28e..2e3c3c60d099 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index da03e82f5af8..ddf1a3a36c2d 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.76", + "@polkadot/react-api": "^0.37.0-beta.77", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.76", + "@polkadot/react-query": "^0.37.0-beta.77", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 8f1193ea2f6b..d6d287f83399 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 99982541bfc5..18088334f2cc 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76" + "@polkadot/react-components": "^0.37.0-beta.77" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index d441db8433b7..0407e75829c4 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index dfedde275ac4..4f9973fecea7 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.76", + "version": "0.37.0-beta.77", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.76", + "@polkadot/react-components": "^0.37.0-beta.77", "@polkadot/react-qr": "^0.47.0-beta.6" } } From c05c1b86ec00c16a4209d6232907642621fb78b0 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 14 Nov 2019 09:29:09 +0100 Subject: [PATCH 025/154] Adjust extrinsic selection display, UI alignment (#1878) --- packages/app-extrinsics/src/Selection.tsx | 36 +++------------------- packages/react-query/src/BalanceFree.tsx | 36 ++++++++++++++++++++++ packages/react-query/src/BalanceVoting.tsx | 2 +- packages/react-query/src/FormatBalance.tsx | 4 ++- packages/react-query/src/index.ts | 3 +- 5 files changed, 47 insertions(+), 34 deletions(-) create mode 100644 packages/react-query/src/BalanceFree.tsx diff --git a/packages/app-extrinsics/src/Selection.tsx b/packages/app-extrinsics/src/Selection.tsx index ccf216493b22..2ab6a3263d2e 100644 --- a/packages/app-extrinsics/src/Selection.tsx +++ b/packages/app-extrinsics/src/Selection.tsx @@ -8,13 +8,11 @@ import { QueueTxExtrinsicAdd } from '@polkadot/react-components/Status/types'; import { ApiProps } from '@polkadot/react-api/types'; import { SubmittableExtrinsic } from '@polkadot/api/promise/types'; -import BN from 'bn.js'; import React from 'react'; -import { Button, Extrinsic, InputAddress, Labelled, TxButton, TxComponent } from '@polkadot/react-components'; +import { Button, Extrinsic, InputAddress, TxButton, TxComponent } from '@polkadot/react-components'; import { withApi, withMulti } from '@polkadot/react-api'; -import { Nonce } from '@polkadot/react-query'; +import { BalanceFree } from '@polkadot/react-query'; -import Balance from './Balance'; import translate from './translate'; interface Props extends ApiProps, I18nProps { @@ -25,7 +23,6 @@ interface State { isValid: boolean; isValidUnsigned: boolean; method: Call | null; - accountNonce?: BN; accountId?: string | null; } @@ -45,34 +42,16 @@ class Selection extends TxComponent {
{t('free balance')}} params={accountId} />} onChange={this.onChangeSender} type='account' /> -
- - - - -
-

-

{ private nextState (newState: Partial): void { this.setState( (prevState: State): State => { - const { method = prevState.method, accountNonce = prevState.accountNonce, accountId = prevState.accountId } = newState; + const { method = prevState.method, accountId = prevState.accountId } = newState; const isValid = !!( accountId && accountId.length && @@ -111,7 +90,6 @@ class Selection extends TxComponent { method, isValid, isValidUnsigned: !!method, - accountNonce, accountId }; } @@ -122,12 +100,8 @@ class Selection extends TxComponent { this.nextState({ method }); } - private onChangeNonce = (accountNonce: BN = new BN(0)): void => { - this.nextState({ accountNonce }); - } - private onChangeSender = (accountId: string | null): void => { - this.nextState({ accountId, accountNonce: new BN(0) }); + this.nextState({ accountId }); } private getExtrinsic (): SubmittableExtrinsic | null { diff --git a/packages/react-query/src/BalanceFree.tsx b/packages/react-query/src/BalanceFree.tsx new file mode 100644 index 000000000000..6568bf03d9e5 --- /dev/null +++ b/packages/react-query/src/BalanceFree.tsx @@ -0,0 +1,36 @@ +/* eslint-disable @typescript-eslint/camelcase */ +// Copyright 2017-2019 @polkadot/react-query authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { BareProps, CallProps } from '@polkadot/react-api/types'; +import { DerivedBalances } from '@polkadot/api-derive/types'; +import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces'; + +import React from 'react'; +import { withCalls } from '@polkadot/react-api'; + +import FormatBalance from './FormatBalance'; + +interface Props extends BareProps, CallProps { + balances_all?: DerivedBalances; + children?: React.ReactNode; + label?: React.ReactNode; + params?: AccountId | AccountIndex | Address | string | Uint8Array | null; +} + +function BalanceFree ({ balances_all, children, className, label }: Props): React.ReactElement { + return ( + + {children} + + ); +} + +export default withCalls( + ['derive.balances.all', { paramName: 'params' }] +)(BalanceFree); diff --git a/packages/react-query/src/BalanceVoting.tsx b/packages/react-query/src/BalanceVoting.tsx index 2ac5be92c2c8..733fbaee273e 100644 --- a/packages/react-query/src/BalanceVoting.tsx +++ b/packages/react-query/src/BalanceVoting.tsx @@ -24,7 +24,7 @@ function BalanceVoting ({ balances_all, children, className, label }: Props): Re {children} diff --git a/packages/react-query/src/FormatBalance.tsx b/packages/react-query/src/FormatBalance.tsx index d91a5f90ae9b..4ab4425c23a9 100644 --- a/packages/react-query/src/FormatBalance.tsx +++ b/packages/react-query/src/FormatBalance.tsx @@ -41,11 +41,13 @@ export default styled(FormatBalance)` vertical-align: middle; * { - vertical-align: middle; + vertical-align: baseline; } > label, > .label { + display: inline; margin-right: 0.25rem; + vertical-align: baseline; } `; diff --git a/packages/react-query/src/index.ts b/packages/react-query/src/index.ts index 4b40d6267997..f7c5b7948c12 100644 --- a/packages/react-query/src/index.ts +++ b/packages/react-query/src/index.ts @@ -6,7 +6,7 @@ export { default as AccountIndex } from './AccountIndex'; export { default as AccountName } from './AccountName'; export { default as Available } from './Available'; export { default as Balance } from './Balance'; -export { default as FormatBalance } from './FormatBalance'; +export { default as BalanceFree } from './BalanceFree'; export { default as BalanceVoting } from './BalanceVoting'; export { BlockAuthors, BlockAuthorsContext } from './BlockAuthors'; export { default as Bonded } from './Bonded'; @@ -15,6 +15,7 @@ export { default as BestNumber } from './BestNumber'; export { default as Chain } from './Chain'; export { default as Elapsed } from './Elapsed'; export { Events, EventsContext } from './Events'; +export { default as FormatBalance } from './FormatBalance'; export { default as LockedVote } from './LockedVote'; export { default as NodeName } from './NodeName'; export { default as NodeVersion } from './NodeVersion'; From c85062d839efe563f733ee3b142201c71fb4da9c Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 14 Nov 2019 08:34:09 +0000 Subject: [PATCH 026/154] [CI Skip] 0.37.0-beta.78 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-extrinsics.json | 3 ++- packages/apps/public/locales/en/ui.json | 3 ++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 32 files changed, 72 insertions(+), 70 deletions(-) diff --git a/lerna.json b/lerna.json index 7a6075ce65dc..323850c20084 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.77" + "version": "0.37.0-beta.78" } diff --git a/package.json b/package.json index 13e2849d5351..7da4d96590a7 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index baa45c35f35c..70227c745d94 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 891d992ab3b9..415d2c620d6f 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-components": "^0.37.0-beta.78", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 5d4e8269a896..c4764b1ffa9b 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 143eab62d22b..3680f1ebec4d 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 37c859b87e05..62acd64c94ba 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.4", - "@polkadot/react-components": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 7c1ab68b863f..8de22bd63390 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", - "@polkadot/react-query": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-query": "^0.37.0-beta.78" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index b7cabb7617d9..9cee54afb84f 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.77", - "@polkadot/react-components": "^0.37.0-beta.77" + "@polkadot/apps-routing": "^0.37.0-beta.78", + "@polkadot/react-components": "^0.37.0-beta.78" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index f6679ebcca28..62e0c170522b 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", - "@polkadot/react-query": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-query": "^0.37.0-beta.78" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index dd97c7e2f75d..259cc763f015 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 4bb4c25f0bf6..46555a01ac6d 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", - "@polkadot/react-params": "^0.37.0-beta.77", - "@polkadot/react-signer": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-params": "^0.37.0-beta.78", + "@polkadot/react-signer": "^0.37.0-beta.78" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 88dceee43a91..3892b72cb6e9 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index dce8c746cf9b..13e1265ebfff 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-components": "^0.37.0-beta.78", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 2bd52d05ba34..ef90f9e8aca1 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", - "@polkadot/react-query": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-query": "^0.37.0-beta.78" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 9299245e89fb..06b3e023d9cb 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", - "@polkadot/react-query": "^0.37.0-beta.77", + "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-query": "^0.37.0-beta.78", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index cb2ed737ecd2..3e27c33f0f88 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.77", - "@polkadot/react-components": "^0.37.0-beta.77", - "@polkadot/react-query": "^0.37.0-beta.77" + "@polkadot/app-explorer": "^0.37.0-beta.78", + "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-query": "^0.37.0-beta.78" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index de9d36aa1870..91685ad6255c 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", - "@polkadot/react-params": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-params": "^0.37.0-beta.78" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 2e1cd0398e32..ff90a6ea75ce 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index a613f8642ec2..c2dd2dda1da4 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index fc4c1b763dc3..e9082759951e 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", - "@polkadot/react-query": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-query": "^0.37.0-beta.78" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index a052045dbe35..e5f54c74e92d 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", - "@polkadot/react-query": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-query": "^0.37.0-beta.78" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 8fd9da85116b..00f98452f528 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 4d8804d816d0..96246e69a9f4 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", - "@polkadot/react-signer": "^0.37.0-beta.77", + "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-signer": "^0.37.0-beta.78", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-extrinsics.json b/packages/apps/public/locales/en/app-extrinsics.json index 6bcd850bbb15..0dd8b2ceeb8a 100644 --- a/packages/apps/public/locales/en/app-extrinsics.json +++ b/packages/apps/public/locales/en/app-extrinsics.json @@ -5,5 +5,6 @@ "with a transaction nonce": "with a transaction nonce", "submit the following extrinsic": "submit the following extrinsic", "Submit Unsigned": "Submit Unsigned", - "Submit Transaction": "Submit Transaction" + "Submit Transaction": "Submit Transaction", + "free balance": "free balance" } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index e422aff68f9e..0dc57b06a688 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -623,5 +623,6 @@ "Loading data": "", "elected stake": "", "own": "", - "other": "" + "other": "", + "free balance": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 2e3c3c60d099..d3f7d6c7a587 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index ddf1a3a36c2d..b7c6287ddc5a 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.77", + "@polkadot/react-api": "^0.37.0-beta.78", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.77", + "@polkadot/react-query": "^0.37.0-beta.78", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index d6d287f83399..c0dfad31a74a 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 18088334f2cc..83213a6abe88 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77" + "@polkadot/react-components": "^0.37.0-beta.78" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 0407e75829c4..1ae8cccc50d5 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 4f9973fecea7..efe15f0189d6 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.77", + "version": "0.37.0-beta.78", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.77", + "@polkadot/react-components": "^0.37.0-beta.78", "@polkadot/react-qr": "^0.47.0-beta.6" } } From 918822f48a24e1efaabe12a5fbcee2e6a0c4fdb2 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 14 Nov 2019 10:44:15 +0100 Subject: [PATCH 027/154] Auto-populate Vote balance (#1879) * Auto-populate Vote balance * Commenting --- .../app-council/src/Overview/VoteValue.tsx | 57 ++++++++++++++++--- .../react-components/src/InputBalance.tsx | 8 ++- packages/react-components/src/InputNumber.tsx | 8 ++- 3 files changed, 61 insertions(+), 12 deletions(-) diff --git a/packages/app-council/src/Overview/VoteValue.tsx b/packages/app-council/src/Overview/VoteValue.tsx index 031450de0c99..238cd831b6d2 100644 --- a/packages/app-council/src/Overview/VoteValue.tsx +++ b/packages/app-council/src/Overview/VoteValue.tsx @@ -6,9 +6,11 @@ import { DerivedBalances } from '@polkadot/api-derive/types'; import { I18nProps } from '@polkadot/react-components/types'; import BN from 'bn.js'; -import React from 'react'; +import React, { useEffect, useState } from 'react'; +import { withCalls } from '@polkadot/react-api'; import { InputBalance } from '@polkadot/react-components'; import { BalanceVoting } from '@polkadot/react-query'; +import { formatBalance, isBn } from '@polkadot/util'; import translate from '../translate'; @@ -18,21 +20,60 @@ interface Props extends I18nProps { onChange: (value: BN) => void; } -const ZERO = new BN(0); +interface ValueState { + selectedId?: string | null; + value?: BN | string; +} + +function VoteValue ({ accountId, allBalances, onChange, t }: Props): React.ReactElement | null { + const [{ selectedId, value }, setValue] = useState({}); + + // TODO This may be useful elsewhere, so figure out a way to make this a utility + useEffect((): void => { + // if the set accountId changes and the new balances is for that id, set it + if (accountId !== selectedId && allBalances?.accountId.eq(accountId)) { + // format, removing ',' separators + const formatted = formatBalance(allBalances.lockedBalance, { forceUnit: '-', withSi: false }).replace(',', ''); + // format the balance + // - if > 0 just take the significant portion + // - if == 0, just display 0 + // - if < 0, display the 3 decimal formatted value + const value = allBalances.lockedBalance.gtn(0) + ? formatted.split('.')[0] + // if = + : allBalances.lockedBalance.eqn(0) + ? '0' + : formatted; + + // set both the selected id (for future checks) and the formatted value + setValue({ selectedId: accountId, value }); + } + }, [accountId, selectedId, allBalances]); + + // only do onChange to parent when the BN value comes in, not our formatted version + useEffect((): void => { + isBn(value) && onChange(value); + }, [value]); -function VoteValue ({ accountId, onChange, t }: Props): React.ReactElement { - const _setVoteValue = (value?: BN): void => { - onChange(value || ZERO); - }; + const _setValue = (value?: BN): void => setValue({ selectedId, value }); return ( {t('voting balance')}} params={accountId} />} - onChange={_setVoteValue} + maxValue={allBalances?.votingBalance} + onChange={_setValue} + value={value} /> ); } -export default translate(VoteValue); +export default translate( + withCalls( + ['derive.balances.all', { + paramName: 'accountId', + propName: 'allBalances' + }] + )(VoteValue) +); diff --git a/packages/react-components/src/InputBalance.tsx b/packages/react-components/src/InputBalance.tsx index 3a036da9ba3f..b2175534f800 100644 --- a/packages/react-components/src/InputBalance.tsx +++ b/packages/react-components/src/InputBalance.tsx @@ -32,13 +32,17 @@ interface Props extends BareProps { const DEFAULT_BITLENGTH = BitLengthOption.CHAIN_SPEC as BitLength; -function InputBalance ({ autoFocus, className, defaultValue, help, isDisabled, isError, isZeroable, label, labelExtra, maxValue, onChange, onEnter, placeholder, style, value, withEllipsis, withLabel, withMax }: Props): React.ReactElement { +function InputBalance ({ autoFocus, className, defaultValue: inDefault, help, isDisabled, isError, isZeroable, label, labelExtra, maxValue, onChange, onEnter, placeholder, style, value, withEllipsis, withLabel, withMax }: Props): React.ReactElement { + const defaultValue = inDefault + ? formatBalance(value, { forceUnit: '-', withSi: false }) + : inDefault; + return ( than allowed max !bn.lt(getGlobalMaxValue(bitLength)) || + // check if 0 and it should be a value (!isZeroable && bn.eq(ZERO)) || + // check that the bitlengths fit bn.bitLength() > (bitLength || DEFAULT_BITLENGTH) || + // cannot be > max (if specified) (maxValue && maxValue.gtn(0) && bn.gt(maxValue)) ) { return false; @@ -197,7 +202,7 @@ function InputNumber (props: Props): React.ReactElement { ); useEffect((): void => { - if (!!propsValue && isNewPropsValue(propsValue, value, valueBn)) { + if (propsValue && isNewPropsValue(propsValue, value, valueBn)) { setValues(getValues(propsValue, si, props)); } }, [propsValue]); @@ -225,7 +230,6 @@ function InputNumber (props: Props): React.ReactElement { const newValue = `${value.substring(0, i || 0)}${event.key}${value.substring(j || 0)}`; if (!getRegex(isDecimal || !!si).test(newValue)) { - console.log(newValue, getRegex(isDecimal || !!si)); event.preventDefault(); } } From 6a92aea32b50f78713ca49a48f3603700e703177 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 14 Nov 2019 09:48:51 +0000 Subject: [PATCH 028/154] [CI Skip] 0.37.0-beta.79 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 323850c20084..30e474551ba4 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.78" + "version": "0.37.0-beta.79" } diff --git a/package.json b/package.json index 7da4d96590a7..cc0fa31ebc3c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 70227c745d94..7000ddf6aaec 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 415d2c620d6f..a099ad1c4193 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-components": "^0.37.0-beta.79", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index c4764b1ffa9b..5a3a5c6924c3 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 3680f1ebec4d..94b5729f2e46 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 62acd64c94ba..81ce3189c48f 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.4", - "@polkadot/react-components": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 8de22bd63390..929e17596fba 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", - "@polkadot/react-query": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-query": "^0.37.0-beta.79" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 9cee54afb84f..e7ccb8a678e3 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.78", - "@polkadot/react-components": "^0.37.0-beta.78" + "@polkadot/apps-routing": "^0.37.0-beta.79", + "@polkadot/react-components": "^0.37.0-beta.79" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 62e0c170522b..73d4a834c317 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", - "@polkadot/react-query": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-query": "^0.37.0-beta.79" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 259cc763f015..2042ab9e7e14 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 46555a01ac6d..0242684247f9 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", - "@polkadot/react-params": "^0.37.0-beta.78", - "@polkadot/react-signer": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-params": "^0.37.0-beta.79", + "@polkadot/react-signer": "^0.37.0-beta.79" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 3892b72cb6e9..aebfc991ae20 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 13e1265ebfff..53d4e027e45e 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-components": "^0.37.0-beta.79", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index ef90f9e8aca1..dceb8307f70b 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", - "@polkadot/react-query": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-query": "^0.37.0-beta.79" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 06b3e023d9cb..5e28c877b9ef 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", - "@polkadot/react-query": "^0.37.0-beta.78", + "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-query": "^0.37.0-beta.79", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 3e27c33f0f88..3f2380b86da6 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.78", - "@polkadot/react-components": "^0.37.0-beta.78", - "@polkadot/react-query": "^0.37.0-beta.78" + "@polkadot/app-explorer": "^0.37.0-beta.79", + "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-query": "^0.37.0-beta.79" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 91685ad6255c..d1560595e54f 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", - "@polkadot/react-params": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-params": "^0.37.0-beta.79" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index ff90a6ea75ce..cc447d64f32c 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index c2dd2dda1da4..428d84827811 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index e9082759951e..cb7d51ab4efb 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", - "@polkadot/react-query": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-query": "^0.37.0-beta.79" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index e5f54c74e92d..df8ea45de569 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", - "@polkadot/react-query": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-query": "^0.37.0-beta.79" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 00f98452f528..c5103681ad93 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 96246e69a9f4..4a9874e058e6 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", - "@polkadot/react-signer": "^0.37.0-beta.78", + "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-signer": "^0.37.0-beta.79", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index d3f7d6c7a587..d6d52422e74b 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index b7c6287ddc5a..efb6c1624172 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.78", + "@polkadot/react-api": "^0.37.0-beta.79", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.78", + "@polkadot/react-query": "^0.37.0-beta.79", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index c0dfad31a74a..4e563c1bf8c2 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 83213a6abe88..fafa6da3fa92 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78" + "@polkadot/react-components": "^0.37.0-beta.79" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 1ae8cccc50d5..c86a65da5a17 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index efe15f0189d6..8af79d272318 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.78", + "version": "0.37.0-beta.79", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.78", + "@polkadot/react-components": "^0.37.0-beta.79", "@polkadot/react-qr": "^0.47.0-beta.6" } } From be039f9d5ab7d709ed3a051cd007c4092f4eda36 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 14 Nov 2019 11:44:40 +0100 Subject: [PATCH 029/154] Fix InputBalance default display (#1880) --- packages/app-council/src/Overview/Vote.tsx | 4 ++-- packages/app-council/src/Overview/VoteValue.tsx | 2 +- packages/react-components/src/InputBalance.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/app-council/src/Overview/Vote.tsx b/packages/app-council/src/Overview/Vote.tsx index 4abe55b82ebe..7ca1dab78924 100644 --- a/packages/app-council/src/Overview/Vote.tsx +++ b/packages/app-council/src/Overview/Vote.tsx @@ -243,8 +243,8 @@ class Vote extends TxModal { ); } - private setVoteValue = (voteValue?: BN): void => { - this.setState({ voteValue: voteValue || new BN(0) }); + private setVoteValue = (voteValue: BN): void => { + this.setState({ voteValue }); } private fetchApprovals = (accountId: string | null): void => { diff --git a/packages/app-council/src/Overview/VoteValue.tsx b/packages/app-council/src/Overview/VoteValue.tsx index 238cd831b6d2..b69e32dd337c 100644 --- a/packages/app-council/src/Overview/VoteValue.tsx +++ b/packages/app-council/src/Overview/VoteValue.tsx @@ -50,7 +50,7 @@ function VoteValue ({ accountId, allBalances, onChange, t }: Props): React.React } }, [accountId, selectedId, allBalances]); - // only do onChange to parent when the BN value comes in, not our formatted version + // only do onChange to parent when the BN value comes in, not our formatted version useEffect((): void => { isBn(value) && onChange(value); }, [value]); diff --git a/packages/react-components/src/InputBalance.tsx b/packages/react-components/src/InputBalance.tsx index b2175534f800..fe7a9812f15b 100644 --- a/packages/react-components/src/InputBalance.tsx +++ b/packages/react-components/src/InputBalance.tsx @@ -34,7 +34,7 @@ const DEFAULT_BITLENGTH = BitLengthOption.CHAIN_SPEC as BitLength; function InputBalance ({ autoFocus, className, defaultValue: inDefault, help, isDisabled, isError, isZeroable, label, labelExtra, maxValue, onChange, onEnter, placeholder, style, value, withEllipsis, withLabel, withMax }: Props): React.ReactElement { const defaultValue = inDefault - ? formatBalance(value, { forceUnit: '-', withSi: false }) + ? formatBalance(inDefault, { forceUnit: '-', withSi: false }).replace(',', isDisabled ? ',' : '') : inDefault; return ( From 7236bf32193669f2d7a4a151c283e2d0dd0a76f0 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 14 Nov 2019 10:49:20 +0000 Subject: [PATCH 030/154] [CI Skip] 0.37.0-beta.80 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 30e474551ba4..7ac3f1f8f496 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.79" + "version": "0.37.0-beta.80" } diff --git a/package.json b/package.json index cc0fa31ebc3c..f91d369a663a 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 7000ddf6aaec..1617d1b85be8 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index a099ad1c4193..5df2ac2ed2e4 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-components": "^0.37.0-beta.80", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 5a3a5c6924c3..d84a4c3ea9f8 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 94b5729f2e46..3e0a36c0b69d 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 81ce3189c48f..8e47d1300a49 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.4", - "@polkadot/react-components": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 929e17596fba..0cf798347056 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", - "@polkadot/react-query": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-query": "^0.37.0-beta.80" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index e7ccb8a678e3..e29f0212cd82 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.79", - "@polkadot/react-components": "^0.37.0-beta.79" + "@polkadot/apps-routing": "^0.37.0-beta.80", + "@polkadot/react-components": "^0.37.0-beta.80" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 73d4a834c317..7ab837f94814 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", - "@polkadot/react-query": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-query": "^0.37.0-beta.80" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 2042ab9e7e14..a8f874034869 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 0242684247f9..9309526f8c28 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", - "@polkadot/react-params": "^0.37.0-beta.79", - "@polkadot/react-signer": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-params": "^0.37.0-beta.80", + "@polkadot/react-signer": "^0.37.0-beta.80" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index aebfc991ae20..01683ce70d1d 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 53d4e027e45e..c254988ddf41 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-components": "^0.37.0-beta.80", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index dceb8307f70b..791743bc69e9 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", - "@polkadot/react-query": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-query": "^0.37.0-beta.80" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 5e28c877b9ef..0f51c2c4d942 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", - "@polkadot/react-query": "^0.37.0-beta.79", + "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-query": "^0.37.0-beta.80", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 3f2380b86da6..f8a6dbd058b1 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.79", - "@polkadot/react-components": "^0.37.0-beta.79", - "@polkadot/react-query": "^0.37.0-beta.79" + "@polkadot/app-explorer": "^0.37.0-beta.80", + "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-query": "^0.37.0-beta.80" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index d1560595e54f..21dde62cf81d 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", - "@polkadot/react-params": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-params": "^0.37.0-beta.80" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index cc447d64f32c..7079bb45b902 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 428d84827811..657e09672761 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index cb7d51ab4efb..e8e974e416d2 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", - "@polkadot/react-query": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-query": "^0.37.0-beta.80" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index df8ea45de569..aaf6996be6db 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", - "@polkadot/react-query": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-query": "^0.37.0-beta.80" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index c5103681ad93..7cc1c6a092f6 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 4a9874e058e6..4feadbf3a00c 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", - "@polkadot/react-signer": "^0.37.0-beta.79", + "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-signer": "^0.37.0-beta.80", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index d6d52422e74b..a058492386b0 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index efb6c1624172..269a481817bf 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.79", + "@polkadot/react-api": "^0.37.0-beta.80", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.79", + "@polkadot/react-query": "^0.37.0-beta.80", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 4e563c1bf8c2..1275e804f37e 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index fafa6da3fa92..d7d5e6f19586 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79" + "@polkadot/react-components": "^0.37.0-beta.80" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index c86a65da5a17..2e91fb6e4b5f 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 8af79d272318..09e2901df398 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.79", + "version": "0.37.0-beta.80", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.79", + "@polkadot/react-components": "^0.37.0-beta.80", "@polkadot/react-qr": "^0.47.0-beta.6" } } From cf67b1e9ec340edee5d26e74e1f775816dcfe59c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 14 Nov 2019 12:17:42 +0100 Subject: [PATCH 031/154] Bump deps (#1881) * Bump deps * Massive numbers tweaks --- package.json | 6 +- packages/app-contracts/package.json | 2 +- packages/react-api/package.json | 2 +- packages/react-query/src/FormatBalance.tsx | 23 ++++-- yarn.lock | 90 +++++++++++----------- 5 files changed, 65 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index f91d369a663a..542e8526d150 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.4", - "@polkadot/api-contract": "^0.97.0-beta.4", + "@polkadot/api": "^0.97.0-beta.5", + "@polkadot/api-contract": "^0.97.0-beta.5", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/types": "^0.97.0-beta.4", + "@polkadot/types": "^0.97.0-beta.5", "@polkadot/util": "^1.7.0-beta.7", "@polkadot/util-crypto": "^1.7.0-beta.7", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 8e47d1300a49..e47891c77462 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api-contract": "^0.97.0-beta.4", + "@polkadot/api-contract": "^0.97.0-beta.5", "@polkadot/react-components": "^0.37.0-beta.80" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index a058492386b0..507a00276586 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api": "^0.97.0-beta.4", + "@polkadot/api": "^0.97.0-beta.5", "@polkadot/extension-dapp": "^0.14.0-beta.5", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/packages/react-query/src/FormatBalance.tsx b/packages/react-query/src/FormatBalance.tsx index 4ab4425c23a9..adc16d107a0c 100644 --- a/packages/react-query/src/FormatBalance.tsx +++ b/packages/react-query/src/FormatBalance.tsx @@ -16,29 +16,36 @@ interface Props extends BareProps { value?: Compact | BN | string | null; } -function format (value: Compact | BN | string): string { +// for million, 2 * 3-grouping + comma +const M_LENGTH = 6 + 1; + +function format (value: Compact | BN | string, currency: string): string { const [prefix, postfix] = formatBalance(value, { forceUnit: '-', withSi: false }).split('.'); - return `${prefix}.${`000${postfix || ''}`.slice(-3)}`; + if (prefix.length > M_LENGTH) { + return formatBalance(value); + } + + return `${prefix}.${`000${postfix || ''}`.slice(-3)} ${currency}`; } export function FormatBalance ({ children, className, label = '', value }: Props): React.ReactElement { - const [unit] = useState(formatBalance.getDefaults().unit); + const [currency] = useState(formatBalance.getDefaults().unit); return (
{label}{ value - ? format(value) + ? format(value, currency) : '-' - } {unit}{children} + }{children}
); } export default styled(FormatBalance)` - display: inline; - vertical-align: middle; + display: inline-block; + vertical-align: baseline; * { vertical-align: baseline; @@ -46,7 +53,7 @@ export default styled(FormatBalance)` > label, > .label { - display: inline; + display: inline-block; margin-right: 0.25rem; vertical-align: baseline; } diff --git a/yarn.lock b/yarn.lock index 4b4535b1fade..a9b74ad7aec9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,35 +2029,35 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^0.97.0-beta.4": - version "0.97.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.4.tgz#efeb75364ac117f9831f6a7c22330b261d31522c" - integrity sha512-edHfkRMP8Hzev8mIcJ56AIL6FbrQD4+cb7WM8xRH66TADgsbiTKYiQIxfC/dBxKyIdhPWX7vHtaGQCnAchIyuw== +"@polkadot/api-contract@^0.97.0-beta.5": + version "0.97.0-beta.5" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.5.tgz#739caa1fcccbb8a9715d988d8c5d51a459711445" + integrity sha512-eqPub7O66uNP4XNaE29LYpPrR4k4UG0mVIkKCY9db4qni8lUqT+Atr2COL0+kkc3IXtgzThvDDGkerBPvrqniQ== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/types" "^0.97.0-beta.4" + "@polkadot/types" "^0.97.0-beta.5" -"@polkadot/api-derive@^0.97.0-beta.4": - version "0.97.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.4.tgz#8d60f85151747282efeef3bc193f7d37d29a8d3b" - integrity sha512-PYk/7osGANTp0vicEzkXDZxWCEEy00wN4v8kyF4Tc7Z0lPYMKfkCdrzhG+NUFC0mswTHH5A4YI494VahTeawfQ== +"@polkadot/api-derive@^0.97.0-beta.5": + version "0.97.0-beta.5" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.5.tgz#040f05412ac11395513bef3159781f6b49e0e8da" + integrity sha512-jWVQxQztgw9buYwTNlftkfk/MtEU+8RNcWQclR4uRnUnyuvLOAK80Slzualmmocrae6/1277xXWrdFfBZXG/tw== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/api" "^0.97.0-beta.4" - "@polkadot/types" "^0.97.0-beta.4" + "@polkadot/api" "^0.97.0-beta.5" + "@polkadot/types" "^0.97.0-beta.5" -"@polkadot/api@^0.97.0-beta.4": - version "0.97.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.4.tgz#5393fc2bc29ba751d97009f7ececbeac2c037a5f" - integrity sha512-wJ9tAxH+9eEHUfU6JusQjHoGqwKR0WD0qwUvuIvHclWOwjLLWBXLcXugVm2Y4hnJOqj30rIRJkU8IFSCSQY6BQ== +"@polkadot/api@^0.97.0-beta.5": + version "0.97.0-beta.5" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.5.tgz#5e731252a7f8fc5aff8a7a1e283389f5a44141bb" + integrity sha512-g802gsX0CflqygBzy6PoUbjOaC4K//RmrZljt7MbBymzbxHgjtRLA3NF8eu38uDIYgoajf55+x0CimOYGpsXpA== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/api-derive" "^0.97.0-beta.4" + "@polkadot/api-derive" "^0.97.0-beta.5" "@polkadot/keyring" "^1.7.0-beta.7" - "@polkadot/metadata" "^0.97.0-beta.4" - "@polkadot/rpc-core" "^0.97.0-beta.4" - "@polkadot/rpc-provider" "^0.97.0-beta.4" - "@polkadot/types" "^0.97.0-beta.4" + "@polkadot/metadata" "^0.97.0-beta.5" + "@polkadot/rpc-core" "^0.97.0-beta.5" + "@polkadot/rpc-provider" "^0.97.0-beta.5" + "@polkadot/types" "^0.97.0-beta.5" "@polkadot/util-crypto" "^1.7.0-beta.7" "@polkadot/dev-react@^0.32.0-beta.14": @@ -2160,10 +2160,10 @@ dependencies: "@babel/runtime" "^7.7.2" -"@polkadot/jsonrpc@^0.97.0-beta.4": - version "0.97.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.4.tgz#9936d7cf9af840afc6f6e6634c6c3022d5054122" - integrity sha512-EH6yieyDjiRejUha53R8qE+xQ0vmmFKW74gLYRgSb8Qe/BrCGIk9TkdZFk3tJM6dPsgFHL1bXNz3IRuhZFPrvg== +"@polkadot/jsonrpc@^0.97.0-beta.5": + version "0.97.0-beta.5" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.5.tgz#5ca57a181880732d09c4a1dead8029c99825b79a" + integrity sha512-r99Kc3u4D5SAQ7Uc8gC8QEq/ofcQAozD4ISfzfWSPRSmFUE+UkxCqUrTLq+bfeEOLc9LkG3wIMWJ+3QlcY5hyw== dependencies: "@babel/runtime" "^7.7.2" @@ -2176,13 +2176,13 @@ "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" -"@polkadot/metadata@^0.97.0-beta.4": - version "0.97.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.4.tgz#d05d10f308237e46916d4903339eab34feb5d1a1" - integrity sha512-UFGo0NNkD02jButVbPu+l8BMVilnVHlc4KBR+unn6e5LLGCBPhXomGBe4skwZT/S6pPgJV53p6CZZZmCKKwrDw== +"@polkadot/metadata@^0.97.0-beta.5": + version "0.97.0-beta.5" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.5.tgz#7c16a5bd134a8de644f8a8c2b83b2701bdfc7c8a" + integrity sha512-IVyKFJX7WH+mfOrOetwV5FP5JweHdn4df2Gmmh+7pTGbo2IYSUnTwwKzjPdGFtLWg7oCBFwtRGYK/4CucsUL2w== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/types" "^0.97.0-beta.4" + "@polkadot/types" "^0.97.0-beta.5" "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" @@ -2211,25 +2211,25 @@ qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.0-beta.4": - version "0.97.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.4.tgz#5f189166e8d41419f163943874fdc921b50e1cec" - integrity sha512-f2tViM7br0CNwuwaIJR9GwGgKif9RzoA6PljRYBZr96EGZhCzybZVIaKFO2V1SNz23gvMSrqQ/Muno2ryYLP0w== +"@polkadot/rpc-core@^0.97.0-beta.5": + version "0.97.0-beta.5" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.5.tgz#53643d8ce11b2a3b28ed1e4f0afdb73b1e853321" + integrity sha512-VhiDsvaVnLUgUwLI5eibVGxbe7fj00s4fW4dEjeUnWEzfX5gja18P4gkqjskvjLNkkHQ5TljKwAXmVS9X8IvQQ== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/jsonrpc" "^0.97.0-beta.4" - "@polkadot/rpc-provider" "^0.97.0-beta.4" - "@polkadot/types" "^0.97.0-beta.4" + "@polkadot/jsonrpc" "^0.97.0-beta.5" + "@polkadot/rpc-provider" "^0.97.0-beta.5" + "@polkadot/types" "^0.97.0-beta.5" "@polkadot/util" "^1.7.0-beta.7" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.0-beta.4": - version "0.97.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.4.tgz#8b36aa6595c12998fa3fe5c3a3cb991bdf52c1af" - integrity sha512-1iDHw4NLpIOB13vjACys/yLpg3qEKWGcmYaWVOTbhLimX4BrCq/nu+cOB+x4ZmbbwHuGorXsXkEvottnXtP/NQ== +"@polkadot/rpc-provider@^0.97.0-beta.5": + version "0.97.0-beta.5" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.5.tgz#c616d2bf56c00c6718f2c5879997aa5c7cc16a2b" + integrity sha512-b814LzO51VFhysX6NoGZq6w4MBqKzHSJk6ZBZrTdHJN1USquK5GtR72wPtYD3gzpb10sYFiFQpsk29hO3be26w== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/metadata" "^0.97.0-beta.4" + "@polkadot/metadata" "^0.97.0-beta.5" "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" eventemitter3 "^4.0.0" @@ -2243,10 +2243,10 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.0-beta.4": - version "0.97.0-beta.4" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.4.tgz#28dcd15101a12e3f41ef0a343985bb59005623a9" - integrity sha512-E/5uT5zcr4sE+Wzl57drfBFxibDRWyxCwolK+e/Dwo3Dutoa/At9/j+/qgwaJHLtDlzzJyv1vpB9PB+u0r4hrw== +"@polkadot/types@^0.97.0-beta.5": + version "0.97.0-beta.5" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.5.tgz#4596ca133c79ec32912ba5d29055a9812e849b5b" + integrity sha512-tTYOVhEd5FLOXFb8mYij1LRzTMaiU66v1sQWBfuvfg4MTWOf6cJ+f4SSm4gLuTQPiY6G9cxzeKPFWEs0Xk8OeA== dependencies: "@babel/runtime" "^7.7.2" "@polkadot/util" "^1.7.0-beta.7" From 7a10113b64742dc34e10becf09bf066f45b77a0f Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 14 Nov 2019 11:22:07 +0000 Subject: [PATCH 032/154] [CI Skip] 0.37.0-beta.81 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 7ac3f1f8f496..e3c38fbaa987 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.80" + "version": "0.37.0-beta.81" } diff --git a/package.json b/package.json index 542e8526d150..70556b9687f6 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 1617d1b85be8..d34479595c0b 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 5df2ac2ed2e4..1cfb683dbb50 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-components": "^0.37.0-beta.81", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index d84a4c3ea9f8..1a9e1cdb3394 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 3e0a36c0b69d..5ce1aba2a2e1 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index e47891c77462..cae7314423b7 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.5", - "@polkadot/react-components": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 0cf798347056..070392ac1918 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", - "@polkadot/react-query": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-query": "^0.37.0-beta.81" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index e29f0212cd82..0fab077bbffe 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.80", - "@polkadot/react-components": "^0.37.0-beta.80" + "@polkadot/apps-routing": "^0.37.0-beta.81", + "@polkadot/react-components": "^0.37.0-beta.81" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 7ab837f94814..ab3a53b737b4 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", - "@polkadot/react-query": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-query": "^0.37.0-beta.81" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index a8f874034869..0af8d95ecffa 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 9309526f8c28..a79b90a98898 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", - "@polkadot/react-params": "^0.37.0-beta.80", - "@polkadot/react-signer": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-params": "^0.37.0-beta.81", + "@polkadot/react-signer": "^0.37.0-beta.81" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 01683ce70d1d..a5dbbe97ae98 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index c254988ddf41..c11b0c707df7 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-components": "^0.37.0-beta.81", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 791743bc69e9..de7141f6e914 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", - "@polkadot/react-query": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-query": "^0.37.0-beta.81" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 0f51c2c4d942..37069cac870b 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", - "@polkadot/react-query": "^0.37.0-beta.80", + "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-query": "^0.37.0-beta.81", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index f8a6dbd058b1..73f86853db2a 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.80", - "@polkadot/react-components": "^0.37.0-beta.80", - "@polkadot/react-query": "^0.37.0-beta.80" + "@polkadot/app-explorer": "^0.37.0-beta.81", + "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-query": "^0.37.0-beta.81" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 21dde62cf81d..3092ba43c53f 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", - "@polkadot/react-params": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-params": "^0.37.0-beta.81" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 7079bb45b902..552463b2bc5a 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 657e09672761..5e25d00905a3 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index e8e974e416d2..de39838bef47 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", - "@polkadot/react-query": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-query": "^0.37.0-beta.81" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index aaf6996be6db..7b0f55475af0 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", - "@polkadot/react-query": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-query": "^0.37.0-beta.81" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 7cc1c6a092f6..163a5799dc61 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 4feadbf3a00c..c9baf56c1bf2 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", - "@polkadot/react-signer": "^0.37.0-beta.80", + "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-signer": "^0.37.0-beta.81", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 507a00276586..4bf4e91fd624 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 269a481817bf..a1abad67119c 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.80", + "@polkadot/react-api": "^0.37.0-beta.81", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.80", + "@polkadot/react-query": "^0.37.0-beta.81", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 1275e804f37e..ce4693e24f1a 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index d7d5e6f19586..cf721133d961 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80" + "@polkadot/react-components": "^0.37.0-beta.81" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 2e91fb6e4b5f..cde32cd5aadf 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 09e2901df398..38ad39870177 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.80", + "version": "0.37.0-beta.81", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.80", + "@polkadot/react-components": "^0.37.0-beta.81", "@polkadot/react-qr": "^0.47.0-beta.6" } } From 39dcdca1908da48ded81a5fc8afab7d653625777 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 14 Nov 2019 14:35:49 +0100 Subject: [PATCH 033/154] Staker breakdown graph (#1882) --- packages/app-staking/src/Query/Validator.tsx | 122 +++++++++++++----- packages/app-staking/src/index.tsx | 8 ++ .../react-components/src/Chart/HorizBar.tsx | 14 +- 3 files changed, 105 insertions(+), 39 deletions(-) diff --git a/packages/app-staking/src/Query/Validator.tsx b/packages/app-staking/src/Query/Validator.tsx index 085e614a0312..a8147d45637c 100644 --- a/packages/app-staking/src/Query/Validator.tsx +++ b/packages/app-staking/src/Query/Validator.tsx @@ -3,11 +3,12 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { I18nProps } from '@polkadot/react-components/types'; -import { BlockNumber, Exposure, SessionIndex } from '@polkadot/types/interfaces'; +import { Balance, BlockNumber, Hash, Exposure, SessionIndex } from '@polkadot/types/interfaces'; import BN from 'bn.js'; import React, { useContext, useEffect, useState } from 'react'; import { Chart, Columar, Column } from '@polkadot/react-components'; +import { toShortAddress } from '@polkadot/react-components/util'; import { ApiContext, withCalls } from '@polkadot/react-api'; import { getHistoric } from '@polkadot/react-api/util'; import { formatBalance, formatNumber } from '@polkadot/util'; @@ -24,9 +25,21 @@ interface Props extends I18nProps { type LineData = (BN | number)[][]; +interface SplitEntry { + colors: string[]; + label: string; + value: number; +} + +type SplitData = SplitEntry[]; + // assuming 4 hrs sessions, we grab results for 10 days const SESSIONS = 10 * (24 / 4); +const COLORS_MINE = ['#ff8c00']; +const COLORS_OTHER = ['#acacac']; +const COLORS_BLOCKS = [undefined, '#acacac']; + function getIndexRange (currentIndex: SessionIndex): BN[] { const range: BN[] = []; let thisIndex: BN = currentIndex; @@ -40,12 +53,46 @@ function getIndexRange (currentIndex: SessionIndex): BN[] { return range.reverse(); } +function extractStake (values: [BN, Hash, Exposure][], divisor: BN): [string[], LineData] { + return [ + values.map(([bn]): string => formatNumber(bn)), + [ + values.map(([,, { total }]): BN => + total.unwrap().div(divisor)) + // exposures.map(({ own }): BN => + // own.unwrap().div(divisor)), + // exposures.map(({ others }): BN => + // others.reduce((total, { value }): BN => total.add(value.unwrap()), new BN(0)).div(divisor)) + ] + ]; +} + +function extractSplit (values: [BN, Hash, Exposure][], validatorId: string): SplitData | null { + const last = values[values.length - 1][2]; + const total = last.total.unwrap(); + + if (total.eqn(0)) { + return null; + } + + return [{ accountId: validatorId, isOwn: true, value: last.own.unwrap() }] + .concat(last.others.map(({ who, value }): { accountId: string; isOwn: boolean; value: Balance } => ({ + accountId: who.toString(), isOwn: false, value: value.unwrap() + }))) + .sort((a, b): number => b.value.cmp(a.value)) + .map(({ accountId, isOwn, value }): SplitEntry => ({ + colors: isOwn ? COLORS_MINE : COLORS_OTHER, + label: toShortAddress(accountId), + value: value.muln(10000).div(total).toNumber() / 100 + })); +} + function Validator ({ blockCounts, className, currentIndex, startNumber, t, validatorId }: Props): React.ReactElement { const { api } = useContext(ApiContext); const [blocksLabels, setBlocksLabels] = useState([]); - const [blocksChart, setBlocksChart] = useState(); - const [stakeLabels, setStakeLabels] = useState([]); - const [stakeChart, setStateChart] = useState(); + const [blocksChart, setBlocksChart] = useState(null); + const [splitChart, setSplitInfo] = useState(null); + const [{ stakeChart, stakeLabels }, setStakeInfo] = useState<{ stakeChart: LineData | null; stakeLabels: string[]}>({ stakeChart: null, stakeLabels: [] }); useEffect((): void => { api.isReady.then(async (): Promise => { @@ -55,16 +102,11 @@ function Validator ({ blockCounts, className, currentIndex, startNumber, t, vali max: SESSIONS, startNumber }); + const [stakeLabels, stakeChart] = extractStake(values, divisor); + const splitChart = extractSplit(values, validatorId); - setStakeLabels(values.map(([bn]): string => formatNumber(bn))); - setStateChart([ - values.map(([,, { total }]): BN => - total.unwrap().div(divisor)) - // exposures.map(({ own }): BN => - // own.unwrap().div(divisor)), - // exposures.map(({ others }): BN => - // others.reduce((total, { value }): BN => total.add(value.unwrap()), new BN(0)).div(divisor)) - ]); + setStakeInfo({ stakeChart, stakeLabels }); + setSplitInfo(splitChart); }); }, []); @@ -94,29 +136,43 @@ function Validator ({ blockCounts, className, currentIndex, startNumber, t, vali return ( - + {blocksChart && ( - +
+

{t('blocks per session')}

+ +
)}
- - {stakeChart && ( - + + {(stakeChart || splitChart) && ( + <> + {stakeChart && ( +
+

{t('elected stake')}

+ +
+ )} + {splitChart && ( +
+

{t('staker percentages')}

+ +
+ )} + )}
diff --git a/packages/app-staking/src/index.tsx b/packages/app-staking/src/index.tsx index 9bb8b16acb3d..83c8a3480090 100644 --- a/packages/app-staking/src/index.tsx +++ b/packages/app-staking/src/index.tsx @@ -110,6 +110,14 @@ export default withMulti( .staking--queryInput { margin-bottom: 1.5rem; } + + .staking--Chart h1 { + margin-bottom: 0.5rem; + } + + .staking--Chart+.staking--Chart { + margin-top: 1.5rem; + } `, translate, withCalls( diff --git a/packages/react-components/src/Chart/HorizBar.tsx b/packages/react-components/src/Chart/HorizBar.tsx index 813c8dc2cba2..98f00febfac8 100644 --- a/packages/react-components/src/Chart/HorizBar.tsx +++ b/packages/react-components/src/Chart/HorizBar.tsx @@ -8,7 +8,7 @@ import BN from 'bn.js'; import React, { useEffect, useState } from 'react'; import ChartJs from 'chart.js'; import { HorizontalBar } from 'react-chartjs-2'; -import { bnToBn } from '@polkadot/util'; +import { bnToBn, isNumber } from '@polkadot/util'; interface Value { colors: string[]; @@ -18,7 +18,9 @@ interface Value { interface Props extends BareProps { aspectRatio?: number; + max?: number; values: Value[]; + withColors?: boolean; } interface State { @@ -39,13 +41,13 @@ interface Config { const alphaColor = (hexColor: string): string => ChartJs.helpers.color(hexColor).alpha(0.65).rgbString(); -function calculateOptions (aspectRatio: number, values: Value[], jsonValues: string): State { +function calculateOptions (aspectRatio: number, values: Value[], jsonValues: string, max: number): State { const chartData = values.reduce((data, { colors: [normalColor = '#00f', hoverColor], label, value }): Config => { const dataset = data.datasets[0]; dataset.backgroundColor.push(alphaColor(normalColor)); dataset.hoverBackgroundColor.push(alphaColor(hoverColor || normalColor)); - dataset.data.push(bnToBn(value).toNumber()); + dataset.data.push(isNumber(value) ? value : bnToBn(value).toNumber()); data.labels.push(label); return data; @@ -71,7 +73,7 @@ function calculateOptions (aspectRatio: number, values: Value[], jsonValues: str xAxes: [{ ticks: { beginAtZero: true, - max: 100 + max } }] } @@ -80,14 +82,14 @@ function calculateOptions (aspectRatio: number, values: Value[], jsonValues: str }; } -export default function ChartHorizBar ({ aspectRatio = 4, className, style, values }: Props): React.ReactElement | null { +export default function ChartHorizBar ({ aspectRatio = 4, className, max = 100, style, values }: Props): React.ReactElement | null { const [{ chartData, chartOptions, jsonValues }, setState] = useState({}); useEffect((): void => { const newJsonValues = JSON.stringify(values); if (newJsonValues !== jsonValues) { - setState(calculateOptions(aspectRatio, values, newJsonValues)); + setState(calculateOptions(aspectRatio, values, newJsonValues, max)); } }, [values]); From 45a54bc1b0955e25ceee12499d18264320880f22 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 14 Nov 2019 13:40:23 +0000 Subject: [PATCH 034/154] [CI Skip] 0.37.0-beta.82 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-staking.json | 5 ++++- packages/apps/public/locales/en/ui.json | 5 ++++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 32 files changed, 76 insertions(+), 70 deletions(-) diff --git a/lerna.json b/lerna.json index e3c38fbaa987..c3abec5884cf 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.81" + "version": "0.37.0-beta.82" } diff --git a/package.json b/package.json index 70556b9687f6..30f6d844e0b1 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index d34479595c0b..a79395e2dac9 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 1cfb683dbb50..399a6f9dc9d4 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-components": "^0.37.0-beta.82", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 1a9e1cdb3394..69c4cde58af5 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 5ce1aba2a2e1..912c48f7088f 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index cae7314423b7..00920dd3642d 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.5", - "@polkadot/react-components": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 070392ac1918..92d3a6e1ea43 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", - "@polkadot/react-query": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82", + "@polkadot/react-query": "^0.37.0-beta.82" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 0fab077bbffe..168fbbfd0171 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.81", - "@polkadot/react-components": "^0.37.0-beta.81" + "@polkadot/apps-routing": "^0.37.0-beta.82", + "@polkadot/react-components": "^0.37.0-beta.82" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index ab3a53b737b4..21ccd3f8384f 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", - "@polkadot/react-query": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82", + "@polkadot/react-query": "^0.37.0-beta.82" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 0af8d95ecffa..46594a7b63cf 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index a79b90a98898..37fff0bef7d5 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", - "@polkadot/react-params": "^0.37.0-beta.81", - "@polkadot/react-signer": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82", + "@polkadot/react-params": "^0.37.0-beta.82", + "@polkadot/react-signer": "^0.37.0-beta.82" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index a5dbbe97ae98..98aa1c9ec166 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index c11b0c707df7..043290df4a4b 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-components": "^0.37.0-beta.82", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index de7141f6e914..c2b86bad764e 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", - "@polkadot/react-query": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82", + "@polkadot/react-query": "^0.37.0-beta.82" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 37069cac870b..5f1da648da46 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", - "@polkadot/react-query": "^0.37.0-beta.81", + "@polkadot/react-components": "^0.37.0-beta.82", + "@polkadot/react-query": "^0.37.0-beta.82", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 73f86853db2a..7945749ef1b7 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.81", - "@polkadot/react-components": "^0.37.0-beta.81", - "@polkadot/react-query": "^0.37.0-beta.81" + "@polkadot/app-explorer": "^0.37.0-beta.82", + "@polkadot/react-components": "^0.37.0-beta.82", + "@polkadot/react-query": "^0.37.0-beta.82" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 3092ba43c53f..c09d9d50743b 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", - "@polkadot/react-params": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82", + "@polkadot/react-params": "^0.37.0-beta.82" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 552463b2bc5a..3028f828a30b 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 5e25d00905a3..627cb1cbe411 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index de39838bef47..ba285bab588b 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", - "@polkadot/react-query": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82", + "@polkadot/react-query": "^0.37.0-beta.82" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 7b0f55475af0..987653b791f7 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", - "@polkadot/react-query": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82", + "@polkadot/react-query": "^0.37.0-beta.82" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 163a5799dc61..f2ea657f45c5 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index c9baf56c1bf2..a9dce59d1c19 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", - "@polkadot/react-signer": "^0.37.0-beta.81", + "@polkadot/react-components": "^0.37.0-beta.82", + "@polkadot/react-signer": "^0.37.0-beta.82", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-staking.json b/packages/apps/public/locales/en/app-staking.json index 9dc7dfaeb21a..c3abf82d3d3e 100644 --- a/packages/apps/public/locales/en/app-staking.json +++ b/packages/apps/public/locales/en/app-staking.json @@ -109,5 +109,8 @@ "elected stake": "elected stake", "total": "total", "own": "own", - "other": "other" + "other": "other", + "Loading block data": "Loading block data", + "Loading staker data": "Loading staker data", + "staker percentages": "staker percentages" } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index 0dc57b06a688..3955be8343b2 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -624,5 +624,8 @@ "elected stake": "", "own": "", "other": "", - "free balance": "" + "free balance": "", + "Loading block data": "", + "Loading staker data": "", + "staker percentages": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 4bf4e91fd624..edd6f293a89c 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index a1abad67119c..d6fff435e810 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.81", + "@polkadot/react-api": "^0.37.0-beta.82", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.81", + "@polkadot/react-query": "^0.37.0-beta.82", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index ce4693e24f1a..56987445e237 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index cf721133d961..d254b942d1a7 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81" + "@polkadot/react-components": "^0.37.0-beta.82" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index cde32cd5aadf..6949fd745ce1 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 38ad39870177..fc2214c6ae6c 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.81", + "version": "0.37.0-beta.82", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.81", + "@polkadot/react-components": "^0.37.0-beta.82", "@polkadot/react-qr": "^0.47.0-beta.6" } } From 2663a4259cf4855c67d5339b43190b05c377651b Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 14 Nov 2019 18:52:01 +0100 Subject: [PATCH 035/154] Bump API, display vested (#1883) * Bump API, display vested * Add isVesting to constants --- package.json | 6 +- packages/app-contracts/package.json | 2 +- packages/react-api/package.json | 2 +- packages/react-components/src/AddressInfo.tsx | 15 +++- packages/react-signer/src/Checks/constants.ts | 1 + yarn.lock | 90 +++++++++---------- 6 files changed, 64 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index 30f6d844e0b1..7c79b2ded12f 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.5", - "@polkadot/api-contract": "^0.97.0-beta.5", + "@polkadot/api": "^0.97.0-beta.8", + "@polkadot/api-contract": "^0.97.0-beta.8", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/types": "^0.97.0-beta.5", + "@polkadot/types": "^0.97.0-beta.8", "@polkadot/util": "^1.7.0-beta.7", "@polkadot/util-crypto": "^1.7.0-beta.7", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 00920dd3642d..9111823f8852 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api-contract": "^0.97.0-beta.5", + "@polkadot/api-contract": "^0.97.0-beta.8", "@polkadot/react-components": "^0.37.0-beta.82" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index edd6f293a89c..3c70596ff72d 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api": "^0.97.0-beta.5", + "@polkadot/api": "^0.97.0-beta.8", "@polkadot/extension-dapp": "^0.14.0-beta.5", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/packages/react-components/src/AddressInfo.tsx b/packages/react-components/src/AddressInfo.tsx index fa7e1def5f2a..29d952db09a6 100644 --- a/packages/react-components/src/AddressInfo.tsx +++ b/packages/react-components/src/AddressInfo.tsx @@ -28,6 +28,7 @@ export interface BalanceActiveType { reserved?: boolean; total?: boolean; unlocking?: boolean; + vested?: boolean; } export interface CryptoActiveType { @@ -60,7 +61,8 @@ const DEFAULT_BALANCES: BalanceActiveType = { redeemable: true, reserved: true, total: true, - unlocking: true + unlocking: true, + vested: true }; const DEFAULT_EXTENDED = { crypto: true, @@ -77,7 +79,7 @@ function skipBalancesIf ({ withBalance = true, withExtended = false }: Props): b return false; } else if (isObject(withBalance)) { // these all pull from the all balances - if (withBalance.available || withBalance.locked || withBalance.reserved || withBalance.total) { + if (withBalance.available || withBalance.locked || withBalance.reserved || withBalance.total || withBalance.vested) { return false; } } else if (isObject(withExtended)) { @@ -254,6 +256,15 @@ function renderBalances (props: Props): React.ReactNode { /> )} + {balancesAll && balanceDisplay.vested && balancesAll.isVesting && ( + <> +
From 999f7063afff29807c364470f39e563d27290600 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Fri, 15 Nov 2019 02:51:16 +0000 Subject: [PATCH 044/154] [CI Skip] 0.37.0-beta.87 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index cfa87a5db88c..6fedf9f23aa4 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.86" + "version": "0.37.0-beta.87" } diff --git a/package.json b/package.json index 73402be5b898..df022acf92f4 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index d6f0c129f20d..1b4c920256b8 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 587eb264f697..17d0a0809dd2 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", + "@polkadot/react-components": "^0.37.0-beta.87", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index c5b884dfeddd..444e9296419a 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 6e7345ea9d70..92147a2e0d53 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 6d27c7f0f018..3e2be65dfbe2 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.8", - "@polkadot/react-components": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index da3acb38c960..1483656ea706 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", - "@polkadot/react-query": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-query": "^0.37.0-beta.87" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 6e5756728c8a..05e7b7e15c68 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.86", - "@polkadot/react-components": "^0.37.0-beta.86" + "@polkadot/apps-routing": "^0.37.0-beta.87", + "@polkadot/react-components": "^0.37.0-beta.87" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index a5fe2de60de1..07535042172b 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", - "@polkadot/react-query": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-query": "^0.37.0-beta.87" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 91bb8b549a27..2804254314b9 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 3790084a7b67..45fd49a6c8fb 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", - "@polkadot/react-params": "^0.37.0-beta.86", - "@polkadot/react-signer": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-params": "^0.37.0-beta.87", + "@polkadot/react-signer": "^0.37.0-beta.87" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 8f8d41f92d86..c942c99019f7 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 824d43c7ca40..3677d207dcd7 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", + "@polkadot/react-components": "^0.37.0-beta.87", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 0f0a51927c7a..c031d7b51485 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", - "@polkadot/react-query": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-query": "^0.37.0-beta.87" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 9077ecea791f..0cf2f73f9f8e 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", - "@polkadot/react-query": "^0.37.0-beta.86", + "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-query": "^0.37.0-beta.87", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 5686dfd68fbf..9251d0aa71f7 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.86", - "@polkadot/react-components": "^0.37.0-beta.86", - "@polkadot/react-query": "^0.37.0-beta.86" + "@polkadot/app-explorer": "^0.37.0-beta.87", + "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-query": "^0.37.0-beta.87" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 9d4c8b55a1c9..d888963eeb08 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", - "@polkadot/react-params": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-params": "^0.37.0-beta.87" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 38eff4998271..71efda262486 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 8aa82b4cc562..d8864c801edd 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 93b2550c337d..ae7c881aba85 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", - "@polkadot/react-query": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-query": "^0.37.0-beta.87" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 0d83c8f1d7d0..a996e8972823 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", - "@polkadot/react-query": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-query": "^0.37.0-beta.87" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 024780fa79e0..401a6ff7ce29 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 64bb6c3f09f6..7bbd3a5265a8 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", - "@polkadot/react-signer": "^0.37.0-beta.86", + "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-signer": "^0.37.0-beta.87", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index d476f26155db..a9d98067c032 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index b1c40cb1b5dd..9ee4b4d7b80e 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.86", + "@polkadot/react-api": "^0.37.0-beta.87", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.86", + "@polkadot/react-query": "^0.37.0-beta.87", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 55bd592e91d3..7d46a8d0b9f5 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 9e69bd74a1c3..e653b76219e0 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86" + "@polkadot/react-components": "^0.37.0-beta.87" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 2f22be7a2999..bc9afb98adb0 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 4a0d950be2c4..f20489686e81 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.86", + "version": "0.37.0-beta.87", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.86", + "@polkadot/react-components": "^0.37.0-beta.87", "@polkadot/react-qr": "^0.47.0-beta.6" } } From c16722784508ca8b6084f8c3a99b45f8c4d3ed29 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 15 Nov 2019 10:51:12 +0100 Subject: [PATCH 045/154] Add useApiContext (#1890) * Add useApiContext * Add missing withApiContext import * useCacheKey, rename headers * Adjustment on sessionRewards naming * Renames based on defacto standards --- packages/app-123code/src/SummaryBar.tsx | 7 ++- packages/app-accounts/src/modals/Create.tsx | 6 +- packages/app-accounts/src/modals/Transfer.tsx | 6 +- packages/app-claims/src/Claim.tsx | 6 +- packages/app-explorer/src/Forks.tsx | 6 +- packages/app-explorer/src/NodeInfo/index.tsx | 6 +- packages/app-explorer/src/index.tsx | 4 +- packages/app-generic-asset/src/Transfer.tsx | 7 ++- packages/app-js/src/Playground.tsx | 6 +- .../src/Actions/Account/SetSessionKey.tsx | 6 +- packages/app-staking/src/Overview/Address.tsx | 7 ++- .../app-staking/src/Overview/CurrentList.tsx | 7 +-- packages/app-staking/src/Overview/index.tsx | 4 +- packages/app-staking/src/Query/Validator.tsx | 15 ++--- packages/app-staking/src/Query/index.tsx | 4 +- packages/app-staking/src/index.tsx | 12 ++-- packages/app-staking/src/types.ts | 2 +- packages/app-storage/src/Selection/Consts.tsx | 6 +- .../app-storage/src/Selection/Modules.tsx | 6 +- packages/app-storage/src/Selection/index.tsx | 6 +- packages/apps/src/Content/index.tsx | 4 +- packages/apps/src/SideBar/Item.tsx | 7 ++- packages/apps/src/SideBar/NodeInfo.tsx | 6 +- packages/apps/src/SideBar/index.tsx | 6 +- packages/apps/src/overlays/Connecting.tsx | 6 +- packages/react-components/src/ChainImg.tsx | 6 +- packages/react-components/src/ChainLock.tsx | 6 +- .../react-components/src/IdentityIcon.tsx | 5 +- .../src/InputConsts/index.tsx | 6 +- .../src/InputExtrinsic/index.tsx | 6 +- .../react-components/src/InputRpc/index.tsx | 6 +- .../src/InputStorage/SelectKey.tsx | 6 +- .../src/InputStorage/index.tsx | 6 +- .../react-components/src/LinkPolkascan.tsx | 6 +- packages/react-components/src/Params/Call.tsx | 6 +- .../react-components/src/Params/Proposal.tsx | 6 +- .../react-components/src/TreasuryProposal.tsx | 6 +- packages/react-hooks/src/index.ts | 9 +-- packages/react-hooks/src/useApiContext.tsx | 12 ++++ packages/react-hooks/src/useCacheKey.ts | 17 +++++ .../src/{debounce.tsx => useDebounce.tsx} | 2 +- .../src/{favorites.tsx => useFavorites.tsx} | 15 +++-- ...ssionSlashes.tsx => useSessionRewards.tsx} | 63 ++++++++----------- packages/react-query/src/BlockAuthors.tsx | 6 +- packages/react-query/src/Chain.tsx | 6 +- packages/react-query/src/Events.tsx | 6 +- packages/react-query/src/NodeName.tsx | 6 +- packages/react-query/src/NodeVersion.tsx | 6 +- packages/react-signer/src/Checks/index.tsx | 7 ++- 49 files changed, 205 insertions(+), 179 deletions(-) create mode 100644 packages/react-hooks/src/useApiContext.tsx create mode 100644 packages/react-hooks/src/useCacheKey.ts rename packages/react-hooks/src/{debounce.tsx => useDebounce.tsx} (89%) rename packages/react-hooks/src/{favorites.tsx => useFavorites.tsx} (58%) rename packages/react-hooks/src/{sessionSlashes.tsx => useSessionRewards.tsx} (74%) diff --git a/packages/app-123code/src/SummaryBar.tsx b/packages/app-123code/src/SummaryBar.tsx index 92426445979b..1dcd41fe80e8 100644 --- a/packages/app-123code/src/SummaryBar.tsx +++ b/packages/app-123code/src/SummaryBar.tsx @@ -7,9 +7,10 @@ import { AccountId } from '@polkadot/types/interfaces'; import { BareProps, I18nProps } from '@polkadot/react-components/types'; import BN from 'bn.js'; -import React, { useContext } from 'react'; -import { ApiContext, withCalls } from '@polkadot/react-api'; +import React from 'react'; +import { withCalls } from '@polkadot/react-api'; import { Bubble, IdentityIcon } from '@polkadot/react-components'; +import { useApiContext } from '@polkadot/react-hooks'; import { formatBalance, formatNumber } from '@polkadot/util'; import translate from './translate'; @@ -22,7 +23,7 @@ interface Props extends BareProps, I18nProps { } function SummaryBar ({ balances_totalIssuance, chain_bestNumber, chain_bestNumberLag, staking_validators }: Props): React.ReactElement { - const { api, systemChain, systemName, systemVersion } = useContext(ApiContext); + const { api, systemChain, systemName, systemVersion } = useApiContext(); return ( diff --git a/packages/app-accounts/src/modals/Create.tsx b/packages/app-accounts/src/modals/Create.tsx index d8239e5127aa..8838b0fbded9 100644 --- a/packages/app-accounts/src/modals/Create.tsx +++ b/packages/app-accounts/src/modals/Create.tsx @@ -9,11 +9,11 @@ import { KeypairType } from '@polkadot/util-crypto/types'; import { ModalProps } from '../types'; import FileSaver from 'file-saver'; -import React, { useContext, useState } from 'react'; +import React, { useState } from 'react'; import styled from 'styled-components'; import { DEV_PHRASE } from '@polkadot/keyring/defaults'; -import { ApiContext } from '@polkadot/react-api'; import { AddressRow, Button, Dropdown, Input, InputAddress, Modal, Password } from '@polkadot/react-components'; +import { useApiContext } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; import uiSettings from '@polkadot/ui-settings'; import { isHex, u8aToHex } from '@polkadot/util'; @@ -151,7 +151,7 @@ function createAccount (suri: string, pairType: KeypairType, name: string, passw } function Create ({ className, onClose, onStatusChange, seed: propsSeed, t, type: propsType }: Props): React.ReactElement { - const { isDevelopment } = useContext(ApiContext); + const { isDevelopment } = useApiContext(); const [{ address, deriveError, derivePath, isSeedValid, pairType, seed, seedType }, setAddress] = useState(generateSeed(propsSeed, '', propsSeed ? 'raw' : 'bip', propsType)); const [isConfirmationOpen, setIsConfirmationOpen] = useState(false); const [{ isNameValid, name }, setName] = useState({ isNameValid: false, name: '' }); diff --git a/packages/app-accounts/src/modals/Transfer.tsx b/packages/app-accounts/src/modals/Transfer.tsx index 3ce8f8bc6111..6b9b05d95333 100644 --- a/packages/app-accounts/src/modals/Transfer.tsx +++ b/packages/app-accounts/src/modals/Transfer.tsx @@ -8,12 +8,12 @@ import { DerivedFees } from '@polkadot/api-derive/types'; import { I18nProps } from '@polkadot/react-components/types'; import BN from 'bn.js'; -import React, { useContext, useEffect, useState } from 'react'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; import { Button, InputAddress, InputBalance, Modal, TxButton } from '@polkadot/react-components'; +import { useApiContext } from '@polkadot/react-hooks'; import { Available } from '@polkadot/react-query'; import Checks from '@polkadot/react-signer/Checks'; -import { ApiContext } from '@polkadot/react-api'; import translate from '../translate'; @@ -65,7 +65,7 @@ const ZERO = new BN(0); // } function Transfer ({ className, onClose, recipientId: propRecipientId, senderId: propSenderId, t }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [amount, setAmount] = useState(new BN(0)); const [extrinsic, setExtrinsic] = useState(null); const [hasAvailable, setHasAvailable] = useState(true); diff --git a/packages/app-claims/src/Claim.tsx b/packages/app-claims/src/Claim.tsx index f598d3425b45..d5d9e7b71aa9 100644 --- a/packages/app-claims/src/Claim.tsx +++ b/packages/app-claims/src/Claim.tsx @@ -6,10 +6,10 @@ import { Option } from '@polkadot/types'; import { BalanceOf, EthereumAddress } from '@polkadot/types/interfaces'; import { I18nProps } from '@polkadot/react-components/types'; -import React, { useContext, useEffect, useState } from 'react'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { ApiContext } from '@polkadot/react-api'; import { Button, Card } from '@polkadot/react-components'; +import { useApiContext } from '@polkadot/react-hooks'; import { FormatBalance } from '@polkadot/react-query'; import translate from './translate'; @@ -21,7 +21,7 @@ interface Props extends I18nProps { } function Claim ({ button, className, ethereumAddress, t }: Props): React.ReactElement | null { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [claimValue, setClaimValue] = useState(null); const [claimAddress, setClaimAddress] = useState(null); const [isBusy, setIsBusy] = useState(false); diff --git a/packages/app-explorer/src/Forks.tsx b/packages/app-explorer/src/Forks.tsx index c1ecce814ccc..cc1cf77a63bb 100644 --- a/packages/app-explorer/src/Forks.tsx +++ b/packages/app-explorer/src/Forks.tsx @@ -7,10 +7,10 @@ import { ApiProps } from '@polkadot/react-api/types'; import { I18nProps } from '@polkadot/react-components/types'; import { Header } from '@polkadot/types/interfaces'; -import React, { useContext, useEffect, useRef, useState } from 'react'; +import React, { useEffect, useRef, useState } from 'react'; import styled from 'styled-components'; -import { ApiContext } from '@polkadot/react-api'; import { CardSummary, IdentityIcon, SummaryBox } from '@polkadot/react-components'; +import { useApiContext } from '@polkadot/react-hooks'; import { formatNumber } from '@polkadot/util'; import translate from './translate'; @@ -204,7 +204,7 @@ function renderRows (rows: Row[]): React.ReactNode[] { } function Forks ({ className, t }: Props): React.ReactElement | null { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [tree, setTree] = useState(null); const childrenRef = useRef>(new Map([['root', []]])); const countRef = useRef({ numBlocks: 0, numForks: 0 }); diff --git a/packages/app-explorer/src/NodeInfo/index.tsx b/packages/app-explorer/src/NodeInfo/index.tsx index 4ee86b19e751..4e9d3ac2562a 100644 --- a/packages/app-explorer/src/NodeInfo/index.tsx +++ b/packages/app-explorer/src/NodeInfo/index.tsx @@ -5,9 +5,9 @@ import { I18nProps as Props } from '@polkadot/react-components/types'; import { Info } from './types'; -import React, { useContext, useEffect, useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { ApiPromise } from '@polkadot/api'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import Extrinsics from '../BlockInfo/Extrinsics'; import Peers from './Peers'; @@ -32,7 +32,7 @@ async function retrieveInfo (api: ApiPromise): Promise> { } function NodeInfo ({ t }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [info, setInfo] = useState>({}); const [nextRefresh, setNextRefresh] = useState(Date.now()); diff --git a/packages/app-explorer/src/index.tsx b/packages/app-explorer/src/index.tsx index abe7755143e0..8bf6028456c0 100644 --- a/packages/app-explorer/src/index.tsx +++ b/packages/app-explorer/src/index.tsx @@ -8,8 +8,8 @@ import { KeyedEvent } from './types'; import React, { useContext } from 'react'; import { Route, Switch } from 'react-router'; import styled from 'styled-components'; -import { ApiContext } from '@polkadot/react-api'; import Tabs from '@polkadot/react-components/Tabs'; +import { useApiContext } from '@polkadot/react-hooks'; import { BlockAuthorsContext, EventsContext } from '@polkadot/react-query'; import uiSettings from '@polkadot/ui-settings'; @@ -24,7 +24,7 @@ interface Props extends AppProps, BareProps, I18nProps { } function ExplorerApp ({ basePath, className, t }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const { lastHeaders } = useContext(BlockAuthorsContext); const events = useContext(EventsContext); diff --git a/packages/app-generic-asset/src/Transfer.tsx b/packages/app-generic-asset/src/Transfer.tsx index 5c171d90a215..0ee6abd332cf 100644 --- a/packages/app-generic-asset/src/Transfer.tsx +++ b/packages/app-generic-asset/src/Transfer.tsx @@ -6,12 +6,13 @@ import { SubmittableExtrinsic } from '@polkadot/api/promise/types'; import { I18nProps } from '@polkadot/react-components/types'; import BN from 'bn.js'; -import React, { useContext, useEffect, useState } from 'react'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; import { Button, InputAddress, InputBalance, TxButton, Dropdown } from '@polkadot/react-components'; +import { useApiContext } from '@polkadot/react-hooks'; import { Available } from '@polkadot/react-query'; import Checks from '@polkadot/react-signer/Checks'; -import { ApiContext, withMulti, withObservable } from '@polkadot/react-api'; +import { withMulti, withObservable } from '@polkadot/react-api'; import assetRegistry, { AssetsSubjectInfo } from './assetsRegistry'; import translate from './translate'; @@ -30,7 +31,7 @@ interface Option { } function Transfer ({ assets, className, onClose, recipientId: propRecipientId, senderId: propSenderId, t }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [assetId, setAssetId] = useState('0'); const [amount, setAmount] = useState(new BN(0)); const [extrinsic, setExtrinsic] = useState(null); diff --git a/packages/app-js/src/Playground.tsx b/packages/app-js/src/Playground.tsx index 6eafb0eaa4ee..427297dc7a70 100644 --- a/packages/app-js/src/Playground.tsx +++ b/packages/app-js/src/Playground.tsx @@ -7,13 +7,13 @@ import { KeyringInstance } from '@polkadot/keyring/types'; import { AppProps, I18nProps } from '@polkadot/react-components/types'; import { Log, LogType, Snippet } from './types'; -import React, { useContext, useRef, useState, useEffect } from 'react'; +import React, { useRef, useState, useEffect } from 'react'; import { withRouter, RouteComponentProps } from 'react-router'; import { Transition } from 'semantic-ui-react'; import snappy from 'snappyjs'; import styled from 'styled-components'; -import { ApiContext } from '@polkadot/react-api'; import { Button, Dropdown, Editor } from '@polkadot/react-components'; +import { useApiContext } from '@polkadot/react-hooks'; import uiKeyring from '@polkadot/ui-keyring'; import * as types from '@polkadot/types'; import * as util from '@polkadot/util'; @@ -90,7 +90,7 @@ function decodeBase64 (base64: string): Snippet { // FIXME This... ladies & gentlemen, is a mess that should be untangled function Playground ({ className, history, match: { params: { base64 } }, t }: Props): React.ReactElement { - const { api, isDevelopment } = useContext(ApiContext); + const { api, isDevelopment } = useApiContext(); const injectedRef = useRef(null); const [code, setCode] = useState(''); const [isAnimated, setIsAnimated] = useState(true); diff --git a/packages/app-staking/src/Actions/Account/SetSessionKey.tsx b/packages/app-staking/src/Actions/Account/SetSessionKey.tsx index 365be7bb9e8b..39673f1c23fc 100644 --- a/packages/app-staking/src/Actions/Account/SetSessionKey.tsx +++ b/packages/app-staking/src/Actions/Account/SetSessionKey.tsx @@ -4,9 +4,9 @@ import { I18nProps } from '@polkadot/react-components/types'; -import React, { useContext, useState } from 'react'; +import React, { useState } from 'react'; import { Button, InputAddress, Input, Modal, TxButton } from '@polkadot/react-components'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import ValidationSessionKey from './InputValidationSessionKey'; import translate from '../../translate'; @@ -22,7 +22,7 @@ interface Props extends I18nProps { const EMPTY_PROOF = new Uint8Array(); function SetSessionKey ({ controllerId, isOpen, onClose, sessionIds, stashId, t }: Props): React.ReactElement | null { - const { isSubstrateV2 } = useContext(ApiContext); + const { isSubstrateV2 } = useApiContext(); const [keysError, setKeysError] = useState(null); const [keys, setKeys] = useState( isSubstrateV2 diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx index 95a607e9cb3e..eda08efea284 100644 --- a/packages/app-staking/src/Overview/Address.tsx +++ b/packages/app-staking/src/Overview/Address.tsx @@ -8,11 +8,12 @@ import { I18nProps } from '@polkadot/react-components/types'; import { ValidatorFilter } from '../types'; import BN from 'bn.js'; -import React, { useContext, useEffect, useState } from 'react'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { ApiContext, withCalls, withMulti } from '@polkadot/react-api'; +import { withCalls, withMulti } from '@polkadot/react-api'; import { AddressCard, AddressMini, Badge, Expander, Icon } from '@polkadot/react-components'; import { classes } from '@polkadot/react-components/util'; +import { useApiContext } from '@polkadot/react-hooks'; import { formatNumber } from '@polkadot/util'; import translate from '../translate'; @@ -47,7 +48,7 @@ interface StakingState { const WITH_VALIDATOR_PREFS = { validatorPayment: true }; function Address ({ address, authorsMap, className, defaultName, filter, isElected, isFavorite, lastAuthors, myAccounts, points, recentlyOnline, stakingInfo, t, toggleFavorite, withNominations = true }: Props): React.ReactElement | null { - const { api, isSubstrateV2 } = useContext(ApiContext); + const { api, isSubstrateV2 } = useApiContext(); const [extraInfo, setExtraInfo] = useState<[React.ReactNode, React.ReactNode][] | undefined>(); const [hasActivity, setHasActivity] = useState(true); const [{ balanceOpts, controllerId, hasNominators, isNominatorMe, nominators, sessionId, stashId }, setStakingState] = useState({ diff --git a/packages/app-staking/src/Overview/CurrentList.tsx b/packages/app-staking/src/Overview/CurrentList.tsx index c6ba651c3c53..44e6a8216eaa 100644 --- a/packages/app-staking/src/Overview/CurrentList.tsx +++ b/packages/app-staking/src/Overview/CurrentList.tsx @@ -7,10 +7,9 @@ import { I18nProps } from '@polkadot/react-components/types'; import { AccountId, EraPoints, Points } from '@polkadot/types/interfaces'; import { ValidatorFilter } from '../types'; -import React, { useContext, useEffect, useState } from 'react'; -import { ApiContext } from '@polkadot/react-api'; +import React, { useEffect, useState } from 'react'; import { Columar, Column, Dropdown, FilterOverlay } from '@polkadot/react-components'; -import { useFavorites } from '@polkadot/react-hooks'; +import { useApiContext, useFavorites } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; import { STORE_FAVS_BASE } from '../constants'; @@ -57,7 +56,7 @@ function accountsToString (accounts: AccountId[]): string[] { } function CurrentList ({ authorsMap, lastAuthors, next, recentlyOnline, stakingOverview, t }: Props): React.ReactElement { - const { isSubstrateV2 } = useContext(ApiContext); + const { isSubstrateV2 } = useApiContext(); const [favorites, toggleFavorite] = useFavorites(STORE_FAVS_BASE); const [filter, setFilter] = useState('all'); const [myAccounts] = useState(keyring.getAccounts().map(({ address }): string => address)); diff --git a/packages/app-staking/src/Overview/index.tsx b/packages/app-staking/src/Overview/index.tsx index a488b429b9c7..b7efc4f5a6fd 100644 --- a/packages/app-staking/src/Overview/index.tsx +++ b/packages/app-staking/src/Overview/index.tsx @@ -6,7 +6,7 @@ import { BareProps } from '@polkadot/react-components/types'; import { ComponentProps } from '../types'; import React, { useContext, useEffect, useState } from 'react'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import { BlockAuthorsContext } from '@polkadot/react-query'; import CurrentList from './CurrentList'; @@ -15,7 +15,7 @@ import Summary from './Summary'; interface Props extends BareProps, ComponentProps {} export default function Overview ({ allControllers, allStashes, className, recentlyOnline, stakingOverview }: Props): React.ReactElement { - const { isSubstrateV2 } = useContext(ApiContext); + const { isSubstrateV2 } = useApiContext(); const { byAuthor, lastBlockAuthors, lastBlockNumber } = useContext(BlockAuthorsContext); const [next, setNext] = useState([]); const validators = stakingOverview && stakingOverview.validators; diff --git a/packages/app-staking/src/Query/Validator.tsx b/packages/app-staking/src/Query/Validator.tsx index e59d9014ab92..0cc2f695e283 100644 --- a/packages/app-staking/src/Query/Validator.tsx +++ b/packages/app-staking/src/Query/Validator.tsx @@ -7,11 +7,12 @@ import { Balance, BlockNumber, Hash, Exposure, SessionIndex } from '@polkadot/ty import { SessionRewards, Slash } from '@polkadot/react-hooks/types'; import BN from 'bn.js'; -import React, { useContext, useEffect, useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { Chart, Columar, Column } from '@polkadot/react-components'; import { toShortAddress } from '@polkadot/react-components/util'; -import { ApiContext, withCalls } from '@polkadot/react-api'; +import { withCalls } from '@polkadot/react-api'; import { getHistoric } from '@polkadot/react-api/util'; +import { useApiContext } from '@polkadot/react-hooks'; import { formatBalance, formatNumber } from '@polkadot/util'; import { MAX_SESSIONS } from '../constants'; @@ -21,7 +22,7 @@ interface Props extends I18nProps { blockCounts?: BN[]; className?: string; currentIndex: SessionIndex; - stakingRewards: SessionRewards[]; + sessionRewards: SessionRewards[]; startNumber: BlockNumber; validatorId: string; } @@ -95,8 +96,8 @@ function extractEraSlash (validatorId: string, slashes: Slash[]): BN { }, new BN(0)); } -function Validator ({ blockCounts, className, currentIndex, stakingRewards, startNumber, t, validatorId }: Props): React.ReactElement { - const { api } = useContext(ApiContext); +function Validator ({ blockCounts, className, currentIndex, sessionRewards, startNumber, t, validatorId }: Props): React.ReactElement { + const { api } = useApiContext(); const [blocksLabels, setBlocksLabels] = useState([]); const [blocksChart, setBlocksChart] = useState(null); const [{ rewardsChart, rewardsLabels }, setRewardsInfo] = useState<{ rewardsChart: LineData | null; rewardsLabels: string[] }>({ rewardsChart: null, rewardsLabels: [] }); @@ -124,7 +125,7 @@ function Validator ({ blockCounts, className, currentIndex, stakingRewards, star const rewardsLabels: string[] = []; const rewardsChart: LineData = [[]]; - stakingRewards.forEach(({ sessionIndex, slashes }): void => { + sessionRewards.forEach(({ sessionIndex, slashes }): void => { // this shows the start of the new era, however rewards are for previous rewardsLabels.push(formatNumber(sessionIndex.subn(1))); @@ -135,7 +136,7 @@ function Validator ({ blockCounts, className, currentIndex, stakingRewards, star }); setRewardsInfo({ rewardsChart, rewardsLabels }); - }, [stakingRewards, validatorId]); + }, [sessionRewards, validatorId]); useEffect((): void => { setBlocksLabels( diff --git a/packages/app-staking/src/Query/index.tsx b/packages/app-staking/src/Query/index.tsx index 743823a96293..12c410d9affb 100644 --- a/packages/app-staking/src/Query/index.tsx +++ b/packages/app-staking/src/Query/index.tsx @@ -47,7 +47,7 @@ interface Props extends I18nProps, ComponentProps, RouteComponentProps<{}> { // /> // -function Query ({ bestNumber, className, stakingRewards, stakingOverview, match: { params: { value } }, t }: Props): React.ReactElement { +function Query ({ bestNumber, className, sessionRewards, stakingOverview, match: { params: { value } }, t }: Props): React.ReactElement { const [startNumber, setStartNumber] = useState(); const [validatorId, setValidatorId] = useState(value || null); @@ -82,7 +82,7 @@ function Query ({ bestNumber, className, stakingRewards, stakingOverview, match: {value && startNumber && stakingOverview && ( diff --git a/packages/app-staking/src/index.tsx b/packages/app-staking/src/index.tsx index eb8880203eeb..c43758e69f07 100644 --- a/packages/app-staking/src/index.tsx +++ b/packages/app-staking/src/index.tsx @@ -9,15 +9,15 @@ import { AccountId, BlockNumber } from '@polkadot/types/interfaces'; import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import { ComponentProps } from './types'; -import React, { useContext } from 'react'; +import React from 'react'; import { Route, Switch } from 'react-router'; import { useRouteMatch } from 'react-router-dom'; import styled from 'styled-components'; import { Option } from '@polkadot/types'; import { HelpOverlay } from '@polkadot/react-components'; import Tabs from '@polkadot/react-components/Tabs'; -import { ApiContext, withCalls, withMulti, withObservable } from '@polkadot/react-api'; -import { useSessionSlashes } from '@polkadot/react-hooks'; +import { withCalls, withMulti, withObservable } from '@polkadot/react-api'; +import { useApiContext, useSessionRewards } from '@polkadot/react-hooks'; import accountObservable from '@polkadot/ui-keyring/observable/accounts'; import Accounts from './Actions/Accounts'; @@ -39,8 +39,8 @@ const EMPY_ACCOUNTS: string[] = []; const EMPTY_ALL: [string[], string[]] = [EMPY_ACCOUNTS, EMPY_ACCOUNTS]; function App ({ allAccounts, allStashesAndControllers: [allStashes, allControllers] = EMPTY_ALL, basePath, bestNumber, className, recentlyOnline, stakingOverview, t }: Props): React.ReactElement { - const { api } = useContext(ApiContext); - const stakingRewards = useSessionSlashes(MAX_SESSIONS); + const { api } = useApiContext(); + const sessionRewards = useSessionRewards(MAX_SESSIONS); const routeMatch = useRouteMatch({ path: basePath, strict: true }); const _renderComponent = (Component: React.ComponentType, className?: string): () => React.ReactNode => { // eslint-disable-next-line react/display-name @@ -57,7 +57,7 @@ function App ({ allAccounts, allStashesAndControllers: [allStashes, allControlle bestNumber={bestNumber} className={className} recentlyOnline={recentlyOnline} - stakingRewards={stakingRewards} + sessionRewards={sessionRewards} stakingOverview={stakingOverview} /> ); diff --git a/packages/app-staking/src/types.ts b/packages/app-staking/src/types.ts index a8c1f15812e5..17700b8d986c 100644 --- a/packages/app-staking/src/types.ts +++ b/packages/app-staking/src/types.ts @@ -16,7 +16,7 @@ export interface ComponentProps { bestNumber?: BlockNumber; className?: string; recentlyOnline?: DerivedHeartbeats; - stakingRewards: SessionRewards[]; + sessionRewards: SessionRewards[]; stakingOverview?: DerivedStakingOverview; } diff --git a/packages/app-storage/src/Selection/Consts.tsx b/packages/app-storage/src/Selection/Consts.tsx index 3195e5421e1f..883f60721fcd 100644 --- a/packages/app-storage/src/Selection/Consts.tsx +++ b/packages/app-storage/src/Selection/Consts.tsx @@ -7,16 +7,16 @@ import { I18nProps } from '@polkadot/react-components/types'; import { ConstValue } from '@polkadot/react-components/InputConsts/types'; import { ComponentProps } from '../types'; -import React, { useContext, useState } from 'react'; -import { ApiContext } from '@polkadot/react-api'; +import React, { useState } from 'react'; import { Button, InputConsts } from '@polkadot/react-components'; +import { useApiContext } from '@polkadot/react-hooks'; import translate from '../translate'; interface Props extends ComponentProps, I18nProps {} function Consts ({ onAdd, t }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [defaultValue] = useState((): ConstValue => { const section = Object.keys(api.consts)[0]; const method = Object.keys(api.consts[section])[0]; diff --git a/packages/app-storage/src/Selection/Modules.tsx b/packages/app-storage/src/Selection/Modules.tsx index f1ae9487db3d..ca2c20dc519d 100644 --- a/packages/app-storage/src/Selection/Modules.tsx +++ b/packages/app-storage/src/Selection/Modules.tsx @@ -7,11 +7,11 @@ import { I18nProps } from '@polkadot/react-components/types'; import { RawParams } from '@polkadot/react-params/types'; import { ComponentProps, StorageEntryPromise } from '../types'; -import React, { useContext, useState } from 'react'; +import React, { useState } from 'react'; import { getTypeDef } from '@polkadot/types'; import { Button, InputStorage } from '@polkadot/react-components'; import Params from '@polkadot/react-params'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import { isNull, isUndefined } from '@polkadot/util'; import translate from '../translate'; @@ -32,7 +32,7 @@ function areParamsValid (values: RawParams): boolean { } function Modules ({ onAdd, t }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [{ defaultValues, isLinked, key, params }, setKey] = useState<{ defaultValues: RawParams | undefined | null; isLinked: boolean; key: StorageEntryPromise; params: ParamsType }>({ defaultValues: undefined, isLinked: false, key: api.query.timestamp.now, params: [] }); const [{ isValid, values }, setValues] = useState<{ isValid: boolean; values: RawParams }>({ isValid: true, values: [] }); diff --git a/packages/app-storage/src/Selection/index.tsx b/packages/app-storage/src/Selection/index.tsx index 272a20a318fe..9b7eaaa637cb 100644 --- a/packages/app-storage/src/Selection/index.tsx +++ b/packages/app-storage/src/Selection/index.tsx @@ -5,10 +5,10 @@ import { I18nProps } from '@polkadot/react-components/types'; import { ComponentProps, QueryTypes, ParitalQueryTypes } from '../types'; -import React, { useContext } from 'react'; +import React from 'react'; import { Route, Switch } from 'react-router'; -import { ApiContext } from '@polkadot/react-api'; import { Tabs } from '@polkadot/react-components'; +import { useApiContext } from '@polkadot/react-hooks'; import Consts from './Consts'; import Modules from './Modules'; @@ -23,7 +23,7 @@ interface Props extends I18nProps { let id = -1; function Selection ({ basePath, onAdd, t }: Props): React.ReactElement { - const { isSubstrateV2 } = useContext(ApiContext); + const { isSubstrateV2 } = useApiContext(); const _onAdd = (query: ParitalQueryTypes): void => onAdd({ ...query, id: ++id }); const _renderComponent = (Component: React.ComponentType): () => React.ReactNode => // eslint-disable-next-line react/display-name diff --git a/packages/apps/src/Content/index.tsx b/packages/apps/src/Content/index.tsx index 0e2057f728dd..8200ea142ad7 100644 --- a/packages/apps/src/Content/index.tsx +++ b/packages/apps/src/Content/index.tsx @@ -8,8 +8,8 @@ import React, { useContext } from 'react'; import { withRouter, RouteComponentProps } from 'react-router'; import styled from 'styled-components'; import routing from '@polkadot/apps-routing'; -import { ApiContext } from '@polkadot/react-api'; import { StatusContext } from '@polkadot/react-components'; +import { useApiContext } from '@polkadot/react-hooks'; import Status from './Status'; import translate from '../translate'; @@ -26,7 +26,7 @@ const unknown = { }; function Content ({ className, location, t }: Props): React.ReactElement { - const { isApiConnected, isApiReady } = useContext(ApiContext); + const { isApiConnected, isApiReady } = useApiContext(); const { queueAction, stqueue, txqueue } = useContext(StatusContext); const app = location.pathname.slice(1) || ''; const { Component, display: { needsApi }, name } = routing.routes.find((route): boolean => diff --git a/packages/apps/src/SideBar/Item.tsx b/packages/apps/src/SideBar/Item.tsx index 2758538f25ef..7dd550ee4d08 100644 --- a/packages/apps/src/SideBar/Item.tsx +++ b/packages/apps/src/SideBar/Item.tsx @@ -8,12 +8,13 @@ import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import { Route } from '@polkadot/apps-routing/types'; import { AccountId } from '@polkadot/types/interfaces'; -import React, { useContext, useEffect, useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { NavLink } from 'react-router-dom'; import { ApiPromise } from '@polkadot/api'; import { Icon, Menu, Tooltip } from '@polkadot/react-components'; import accountObservable from '@polkadot/ui-keyring/observable/accounts'; -import { ApiContext, withCalls, withMulti, withObservable } from '@polkadot/react-api'; +import { withCalls, withMulti, withObservable } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import { isFunction } from '@polkadot/util'; import translate from '../translate'; @@ -77,7 +78,7 @@ function checkVisible (name: string, { api, isApiReady, isApiConnected }: ApiPro } function Item ({ allAccounts, route: { Modal, display, i18n, icon, name }, t, isCollapsed, onClick, sudoKey }: Props): React.ReactElement | null { - const apiProps = useContext(ApiContext); + const apiProps = useApiContext(); const [hasAccounts, setHasAccounts] = useState(false); const [hasSudo, setHasSudo] = useState(false); const [isVisible, setIsVisible] = useState(false); diff --git a/packages/apps/src/SideBar/NodeInfo.tsx b/packages/apps/src/SideBar/NodeInfo.tsx index 4ed6ea4c0f4c..a4295da4f22a 100644 --- a/packages/apps/src/SideBar/NodeInfo.tsx +++ b/packages/apps/src/SideBar/NodeInfo.tsx @@ -4,9 +4,9 @@ import { BareProps as Props } from '@polkadot/react-components/types'; -import React, { useContext } from 'react'; +import React from 'react'; import styled from 'styled-components'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import { NodeName, NodeVersion } from '@polkadot/react-query'; // eslint-disable-next-line @typescript-eslint/no-var-requires @@ -15,7 +15,7 @@ const pkgJson = require('../../package.json'); const uiInfo = `apps v${pkgJson.version}`; function NodeInfo ({ className }: Props): React.ReactElement { - const { api, isApiReady } = useContext(ApiContext); + const { api, isApiReady } = useApiContext(); return (
diff --git a/packages/apps/src/SideBar/index.tsx b/packages/apps/src/SideBar/index.tsx index c78825930fa9..e5fb457e98e7 100644 --- a/packages/apps/src/SideBar/index.tsx +++ b/packages/apps/src/SideBar/index.tsx @@ -7,12 +7,12 @@ import { SIDEBAR_MENU_THRESHOLD } from '../constants'; import './SideBar.css'; -import React, { useContext, useState } from 'react'; +import React, { useState } from 'react'; import styled from 'styled-components'; import { Responsive } from 'semantic-ui-react'; import routing from '@polkadot/apps-routing'; -import { ApiContext } from '@polkadot/react-api'; import { Button, ChainImg, Icon, Menu, media } from '@polkadot/react-components'; +import { useApiContext } from '@polkadot/react-hooks'; import { classes } from '@polkadot/react-components/util'; import { BestNumber, Chain } from '@polkadot/react-query'; @@ -31,7 +31,7 @@ interface Props extends I18nProps { } function SideBar ({ className, collapse, handleResize, isCollapsed, toggleMenu, menuOpen }: Props): React.ReactElement { - const { api, isApiReady } = useContext(ApiContext); + const { api, isApiReady } = useApiContext(); const [modals, setModals] = useState>( routing.routes.reduce((result: Record, route): Record => { if (route && route.Modal) { diff --git a/packages/apps/src/overlays/Connecting.tsx b/packages/apps/src/overlays/Connecting.tsx index bf27e04846ab..cee9564fd8c9 100644 --- a/packages/apps/src/overlays/Connecting.tsx +++ b/packages/apps/src/overlays/Connecting.tsx @@ -5,9 +5,9 @@ import { ApiProps } from '@polkadot/react-api/types'; import { I18nProps as Props } from '@polkadot/react-components/types'; -import React, { useContext } from 'react'; +import React from 'react'; import styled from 'styled-components'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import settings from '@polkadot/ui-settings'; import translate from '../translate'; @@ -60,7 +60,7 @@ function ConnectOverlay ({ className, isApiConnected, t }: ApiProps & Props): Re } function Connecting (props: Props): React.ReactElement | null { - const api = useContext(ApiContext); + const api = useApiContext(); return ExtensionOverlay({ ...props, ...api }) || ConnectOverlay({ ...props, ...api }); } diff --git a/packages/react-components/src/ChainImg.tsx b/packages/react-components/src/ChainImg.tsx index d5237cec8cda..b9fd24689a96 100644 --- a/packages/react-components/src/ChainImg.tsx +++ b/packages/react-components/src/ChainImg.tsx @@ -2,9 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import React, { useContext } from 'react'; +import React from 'react'; import styled from 'styled-components'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; // the imports here as a bit all-over, non-aphabetical - since we expect this to grow, // rather organise based on type, grouping chains and nodes as opposed to location @@ -54,7 +54,7 @@ interface Props { } function ChainImg ({ className, logo = '', onClick }: Props): React.ReactElement { - const { systemChain, systemName } = useContext(ApiContext); + const { systemChain, systemName } = useApiContext(); const img = LOGOS[logo] || CHAINS[systemChain] || NODES[systemName] || EMPTY; return ( diff --git a/packages/react-components/src/ChainLock.tsx b/packages/react-components/src/ChainLock.tsx index fbcdc5ed4b8f..bb44ca73ce71 100644 --- a/packages/react-components/src/ChainLock.tsx +++ b/packages/react-components/src/ChainLock.tsx @@ -4,8 +4,8 @@ import { I18nProps } from '@polkadot/react-components/types'; -import React, { useContext } from 'react'; -import { ApiContext } from '@polkadot/react-api'; +import React from 'react'; +import { useApiContext } from '@polkadot/react-hooks'; import translate from './translate'; import Toggle from './Toggle'; @@ -17,7 +17,7 @@ interface Props extends I18nProps { } function ChainLock ({ genesisHash, onChange, t }: Props): React.ReactElement | null { - const { isDevelopment, api } = useContext(ApiContext); + const { isDevelopment, api } = useApiContext(); if (isDevelopment) { return null; diff --git a/packages/react-components/src/IdentityIcon.tsx b/packages/react-components/src/IdentityIcon.tsx index 616688250ad4..0b3dd0f79e6d 100644 --- a/packages/react-components/src/IdentityIcon.tsx +++ b/packages/react-components/src/IdentityIcon.tsx @@ -7,7 +7,8 @@ import { IdentityProps } from '@polkadot/react-identicon/types'; import { I18nProps } from './types'; import React, { useContext, useEffect, useState } from 'react'; -import { ApiContext, withCalls, withMulti } from '@polkadot/react-api'; +import { withCalls, withMulti } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import BaseIdentityIcon from '@polkadot/react-identicon'; import uiSettings from '@polkadot/ui-settings'; @@ -33,7 +34,7 @@ export function getIdentityTheme (systemName: string): 'empty' { } function IdentityIcon ({ className, onCopy, prefix, size, style, t, theme, validators, value }: Props): React.ReactElement { - const { systemName } = useContext(ApiContext); + const { systemName } = useApiContext(); const { queueAction } = useContext(StatusContext); const [address, setAddress] = useState(); const [isValidator, setIsValidator] = useState(false); diff --git a/packages/react-components/src/InputConsts/index.tsx b/packages/react-components/src/InputConsts/index.tsx index 31655ad4db3b..8b6bc8ff0f43 100644 --- a/packages/react-components/src/InputConsts/index.tsx +++ b/packages/react-components/src/InputConsts/index.tsx @@ -9,9 +9,9 @@ import { ConstValue, ConstValueBase } from './types'; import '../InputExtrinsic/InputExtrinsic.css'; -import React, { useContext, useState } from 'react'; +import React, { useState } from 'react'; import { ApiPromise } from '@polkadot/api'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import Labelled from '../Labelled'; import translate from '../translate'; @@ -43,7 +43,7 @@ function getValue (api: ApiPromise, { method, section }: ConstValueBase): ConstV } function InputConsts ({ className, defaultValue, help, label, onChange, style, withLabel }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [optionsMethod, setOptionsMethod] = useState(keyOptions(api, defaultValue.section)); const [optionsSection] = useState(sectionOptions(api)); const [value, setValue] = useState(getValue(api, defaultValue)); diff --git a/packages/react-components/src/InputExtrinsic/index.tsx b/packages/react-components/src/InputExtrinsic/index.tsx index fe17e00cef37..5da3de4d7c39 100644 --- a/packages/react-components/src/InputExtrinsic/index.tsx +++ b/packages/react-components/src/InputExtrinsic/index.tsx @@ -8,8 +8,8 @@ import { DropdownOptions } from '../util/types'; import './InputExtrinsic.css'; -import React, { useContext, useState } from 'react'; -import { ApiContext } from '@polkadot/react-api'; +import React, { useState } from 'react'; +import { useApiContext } from '@polkadot/react-hooks'; import Labelled from '../Labelled'; import translate from '../translate'; @@ -30,7 +30,7 @@ interface Props extends I18nProps { } function InputExtrinsic ({ className, defaultValue, help, label, onChange, style, withLabel }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [optionsMethod, setOptionsMethod] = useState(methodOptions(api, defaultValue.section)); const [optionsSection] = useState(sectionOptions(api)); const [value, setValue] = useState((): CallFunction => defaultValue); diff --git a/packages/react-components/src/InputRpc/index.tsx b/packages/react-components/src/InputRpc/index.tsx index bbace3b9a05a..1f1325748ab8 100644 --- a/packages/react-components/src/InputRpc/index.tsx +++ b/packages/react-components/src/InputRpc/index.tsx @@ -10,9 +10,9 @@ import { I18nProps } from '../types'; import '../InputExtrinsic/InputExtrinsic.css'; -import React, { useContext, useState } from 'react'; +import React, { useState } from 'react'; import map from '@polkadot/jsonrpc'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import Labelled from '../Labelled'; import translate from '../translate'; @@ -31,7 +31,7 @@ interface Props extends I18nProps { } function InputRpc ({ className, defaultValue, help, label, onChange, style, withLabel }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [optionsMethod, setOptionsMethod] = useState(methodOptions(api, defaultValue.section)); const [optionsSection] = useState(sectionOptions(api)); const [value, setValue] = useState((): RpcMethod => defaultValue); diff --git a/packages/react-components/src/InputStorage/SelectKey.tsx b/packages/react-components/src/InputStorage/SelectKey.tsx index 9cebedb87d53..95130499cbac 100644 --- a/packages/react-components/src/InputStorage/SelectKey.tsx +++ b/packages/react-components/src/InputStorage/SelectKey.tsx @@ -6,9 +6,9 @@ import { DropdownOptions } from '../util/types'; import { BareProps } from '../types'; import { StorageEntryPromise } from './types'; -import React, { useContext } from 'react'; +import React from 'react'; import { ApiPromise } from '@polkadot/api'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import Dropdown from '../Dropdown'; import { classes } from '../util'; @@ -29,7 +29,7 @@ function transform (api: ApiPromise, { value }: Props): (method: string) => Stor } export default function SelectKey (props: Props): React.ReactElement | null { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const { className, isError, onChange, options, style, value } = props; if (!options.length) { diff --git a/packages/react-components/src/InputStorage/index.tsx b/packages/react-components/src/InputStorage/index.tsx index 04bb2669f270..fde76b6a30ed 100644 --- a/packages/react-components/src/InputStorage/index.tsx +++ b/packages/react-components/src/InputStorage/index.tsx @@ -10,8 +10,8 @@ import { StorageEntryPromise } from './types'; import '../InputExtrinsic/InputExtrinsic.css'; -import React, { useContext, useState } from 'react'; -import { ApiContext } from '@polkadot/react-api'; +import React, { useState } from 'react'; +import { useApiContext } from '@polkadot/react-hooks'; import Labelled from '../Labelled'; import translate from '../translate'; @@ -30,7 +30,7 @@ interface Props extends I18nProps { } function InputStorage ({ className, defaultValue, help, label, onChange, style, withLabel }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [optionsMethod, setOptionsMethod] = useState(keyOptions(api, defaultValue.creator.section)); const [optionsSection] = useState(sectionOptions(api)); const [value, setValue] = useState((): StorageEntryPromise => defaultValue); diff --git a/packages/react-components/src/LinkPolkascan.tsx b/packages/react-components/src/LinkPolkascan.tsx index 51e645fd37e4..4cb8c655d9e2 100644 --- a/packages/react-components/src/LinkPolkascan.tsx +++ b/packages/react-components/src/LinkPolkascan.tsx @@ -4,9 +4,9 @@ import { I18nProps } from './types'; -import React, { useContext } from 'react'; +import React from 'react'; import styled from 'styled-components'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import translate from './translate'; @@ -34,7 +34,7 @@ const TYPES: Record = { }; function LinkPolkascan ({ className, data, t, type }: Props): React.ReactElement | null { - const { systemChain } = useContext(ApiContext); + const { systemChain } = useApiContext(); const extChain = CHAINS[systemChain]; const extType = TYPES[type]; diff --git a/packages/react-components/src/Params/Call.tsx b/packages/react-components/src/Params/Call.tsx index be3511fb5c36..a3d8b412d95f 100644 --- a/packages/react-components/src/Params/Call.tsx +++ b/packages/react-components/src/Params/Call.tsx @@ -5,13 +5,13 @@ import { SubmittableExtrinsicFunction } from '@polkadot/api/types'; import { Props } from '@polkadot/react-params/types'; -import React, { useContext } from 'react'; -import { ApiContext } from '@polkadot/react-api'; +import React from 'react'; +import { useApiContext } from '@polkadot/react-hooks'; import Extrinsic from './Extrinsic'; export default function Call ({ className, isDisabled, isError, label, onChange, onEnter, style, withLabel }: Props): React.ReactElement { - const { api, apiDefaultTx } = useContext(ApiContext); + const { api, apiDefaultTx } = useApiContext(); const defaultValue = ((): SubmittableExtrinsicFunction<'promise'> => { try { diff --git a/packages/react-components/src/Params/Proposal.tsx b/packages/react-components/src/Params/Proposal.tsx index 4e098295cc7a..5054d944e34d 100644 --- a/packages/react-components/src/Params/Proposal.tsx +++ b/packages/react-components/src/Params/Proposal.tsx @@ -4,9 +4,9 @@ import { Props, RawParam } from '@polkadot/react-params/types'; -import React, { useContext } from 'react'; +import React from 'react'; import { createType } from '@polkadot/types'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import ExtrinsicDisplay from './Extrinsic'; @@ -26,7 +26,7 @@ function onChange ({ onChange }: Props): (_: RawParam) => void { } export default function ProposalDisplay (props: Props): React.ReactElement { - const { apiDefaultTxSudo } = useContext(ApiContext); + const { apiDefaultTxSudo } = useApiContext(); const { className, isDisabled, isError, label, onEnter, style, withLabel } = props; return ( diff --git a/packages/react-components/src/TreasuryProposal.tsx b/packages/react-components/src/TreasuryProposal.tsx index d917b2a61945..0a36807d5b63 100644 --- a/packages/react-components/src/TreasuryProposal.tsx +++ b/packages/react-components/src/TreasuryProposal.tsx @@ -5,9 +5,9 @@ import { TreasuryProposal as TreasuryProposalType } from '@polkadot/types/interfaces'; import { I18nProps } from '@polkadot/react-components/types'; -import React, { useContext, useEffect, useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { InputAddress, Labelled, Static } from '@polkadot/react-components'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import { Option } from '@polkadot/types'; import { FormatBalance } from '@polkadot/react-query'; @@ -26,7 +26,7 @@ interface Props extends I18nProps { function TreasuryProposal ({ className, asInset, insetProps, onClick, proposal, proposalId, t }: Props): React.ReactElement | null { const [stateProposal, setProposal] = useState(null); - const { api } = useContext(ApiContext); + const { api } = useApiContext(); useEffect((): void => { if (!proposal && proposalId) { diff --git a/packages/react-hooks/src/index.ts b/packages/react-hooks/src/index.ts index e42b45bc3571..a9740861ea0c 100644 --- a/packages/react-hooks/src/index.ts +++ b/packages/react-hooks/src/index.ts @@ -1,7 +1,8 @@ -// Copyright 2017-2019 @polkadot/react-components authors & contributors +// Copyright 2017-2019 @polkadot/react-hooks authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -export { default as useDebounce } from './debounce'; -export { default as useFavorites } from './favorites'; -export { default as useSessionSlashes } from './sessionSlashes'; +export { default as useApiContext } from './useApiContext'; +export { default as useDebounce } from './useDebounce'; +export { default as useFavorites } from './useFavorites'; +export { default as useSessionRewards } from './useSessionRewards'; diff --git a/packages/react-hooks/src/useApiContext.tsx b/packages/react-hooks/src/useApiContext.tsx new file mode 100644 index 000000000000..7f131b9bab0f --- /dev/null +++ b/packages/react-hooks/src/useApiContext.tsx @@ -0,0 +1,12 @@ +// Copyright 2017-2019 @polkadot/react-hooks authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { ApiProps } from '@polkadot/react-api/types'; + +import { useContext } from 'react'; +import { ApiContext } from '@polkadot/react-api'; + +export default function useApiContext (): ApiProps { + return useContext(ApiContext); +} diff --git a/packages/react-hooks/src/useCacheKey.ts b/packages/react-hooks/src/useCacheKey.ts new file mode 100644 index 000000000000..ff3622272852 --- /dev/null +++ b/packages/react-hooks/src/useCacheKey.ts @@ -0,0 +1,17 @@ +// Copyright 2017-2019 @polkadot/react-hooks authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import store from 'store'; +import useApiContext from './useApiContext'; + +// create a chain-specific key for the local cache +export default function useCacheKey (storageKeyBase: string): [(defaultValue?: T) => T | undefined, (value: T) => T] { + const { api, isDevelopment } = useApiContext(); + const STORAGE_KEY = `${storageKeyBase}:${isDevelopment ? 'development' : api.genesisHash}`; + + return [ + (): T | undefined => store.get(STORAGE_KEY), + (value: T): T => store.set(STORAGE_KEY, value) + ]; +} diff --git a/packages/react-hooks/src/debounce.tsx b/packages/react-hooks/src/useDebounce.tsx similarity index 89% rename from packages/react-hooks/src/debounce.tsx rename to packages/react-hooks/src/useDebounce.tsx index cb48b4722d5f..ba5904f37d48 100644 --- a/packages/react-hooks/src/debounce.tsx +++ b/packages/react-hooks/src/useDebounce.tsx @@ -1,4 +1,4 @@ -// Copyright 2017-2019 @polkadot/react-components authors & contributors +// Copyright 2017-2019 @polkadot/react-hooks authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. diff --git a/packages/react-hooks/src/favorites.tsx b/packages/react-hooks/src/useFavorites.tsx similarity index 58% rename from packages/react-hooks/src/favorites.tsx rename to packages/react-hooks/src/useFavorites.tsx index cc74ff1cd216..df3de9ad9e3e 100644 --- a/packages/react-hooks/src/favorites.tsx +++ b/packages/react-hooks/src/useFavorites.tsx @@ -1,23 +1,22 @@ -// Copyright 2017-2019 @polkadot/react-components authors & contributors +// Copyright 2017-2019 @polkadot/react-hooks authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { useContext, useState } from 'react'; +import { useState } from 'react'; import store from 'store'; -import { ApiContext } from '@polkadot/react-api'; + +import useCacheKey from './useCacheKey'; // hook for favorites with local storage export default function useFavorites (storageKeyBase: string): [string[], (address: string) => void] { - const { api, isDevelopment } = useContext(ApiContext); - const keyName = `${storageKeyBase}:${isDevelopment ? 'development' : api.genesisHash}`; + const [getCache, setCache] = useCacheKey(storageKeyBase); // retrieve from the new style first, if not available, fallback to old-style - const [favorites, setFavorites] = useState(store.get(keyName) || store.get(storageKeyBase, [])); + const [favorites, setFavorites] = useState(getCache() || store.get(storageKeyBase, [])); const _toggleFavorite = (address: string): void => setFavorites( - store.set( - keyName, + setCache( favorites.includes(address) ? favorites.filter((accountId): boolean => address !== accountId) : [...favorites, address] diff --git a/packages/react-hooks/src/sessionSlashes.tsx b/packages/react-hooks/src/useSessionRewards.tsx similarity index 74% rename from packages/react-hooks/src/sessionSlashes.tsx rename to packages/react-hooks/src/useSessionRewards.tsx index ed422aabb339..571982e49630 100644 --- a/packages/react-hooks/src/sessionSlashes.tsx +++ b/packages/react-hooks/src/useSessionRewards.tsx @@ -1,4 +1,4 @@ -// Copyright 2017-2019 @polkadot/react-components authors & contributors +// Copyright 2017-2019 @polkadot/react-hooks authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. @@ -6,33 +6,29 @@ import { Balance, BlockNumber, EventRecord, Hash, Header } from '@polkadot/types import { Slash, SessionRewards } from './types'; import BN from 'bn.js'; -import { useContext, useEffect, useState } from 'react'; -import store from 'store'; +import { useEffect, useState } from 'react'; import { ApiPromise } from '@polkadot/api'; -import { ApiContext } from '@polkadot/react-api'; import { createType } from '@polkadot/types'; import { bnMax, u8aToU8a } from '@polkadot/util'; -interface SlashSer { +import useApiContext from './useApiContext'; +import useCacheKey from './useCacheKey'; + +interface SerializedSlash { accountId: string; amount: string; } -interface SessionResultSer { +interface Serialized { blockHash: string; blockNumber: string; isEventsEmpty: boolean; reward: string; sessionIndex: string; - slashes: SlashSer[]; + slashes: SerializedSlash[]; } -// assuming 4 hrs sessions, we grab results for 10 days -const MAX_SESSIONS = 10 * (24 / 4); - -function getStorage (storageKey: string): SessionRewards[] { - const sessions: SessionResultSer[] = store.get(storageKey, []); - +function fromJSON (sessions: Serialized[]): SessionRewards[] { return sessions.map(({ blockHash, blockNumber, isEventsEmpty, reward, sessionIndex, slashes }): SessionRewards => ({ blockHash: createType('Hash', blockHash), blockNumber: createType('BlockNumber', blockNumber), @@ -46,23 +42,18 @@ function getStorage (storageKey: string): SessionRewards[] { })); } -function setStorage (storageKey: string, sessions: SessionRewards[], maxSessions: number): SessionResultSer[] { - return store.set( - storageKey, - sessions - .map(({ blockHash, blockNumber, isEventsEmpty, reward, sessionIndex, slashes }): SessionResultSer => ({ - blockHash: blockHash.toHex(), - blockNumber: blockNumber.toHex(), - isEventsEmpty, - reward: reward.toHex(), - sessionIndex: sessionIndex.toHex(), - slashes: slashes.map(({ accountId, amount }): SlashSer => ({ - accountId: accountId.toString(), - amount: amount.toHex() - })) - })) - .slice(-maxSessions) - ); +function toJSON (sessions: SessionRewards[], maxSessions: number): Serialized[] { + return sessions.map(({ blockHash, blockNumber, isEventsEmpty, reward, sessionIndex, slashes }): Serialized => ({ + blockHash: blockHash.toHex(), + blockNumber: blockNumber.toHex(), + isEventsEmpty, + reward: reward.toHex(), + sessionIndex: sessionIndex.toHex(), + slashes: slashes.map(({ accountId, amount }): SerializedSlash => ({ + accountId: accountId.toString(), + amount: amount.toHex() + })) + })).slice(-maxSessions); } function mergeResults (sessions: SessionRewards[], newSessions: SessionRewards[]): SessionRewards[] { @@ -90,7 +81,7 @@ async function loadSome (api: ApiPromise, fromHash: Hash, toHash: Hash): Promise .then((records): EventRecord[] => records.filter(({ event: { section } }): boolean => section === 'staking') ) - .catch((): EventRecord[] => []) // undecodable may throw + .catch((): EventRecord[] => []) // may throw, update metadata for old ) ); const slashes: Slash[][] = events.map((info): Slash[] => @@ -117,10 +108,10 @@ async function loadSome (api: ApiPromise, fromHash: Hash, toHash: Hash): Promise })); } -export default function useSessionSlashes (maxSessions = MAX_SESSIONS): SessionRewards[] { - const { api } = useContext(ApiContext); - const STORAGE_KEY = `hooks:sessionSlashes:${api.genesisHash}`; - const [results, setResults] = useState(getStorage(STORAGE_KEY)); +export default function useSessionRewards (maxSessions: number): SessionRewards[] { + const { api } = useApiContext(); + const [getCache, setCache] = useCacheKey('hooks:sessionSlashes'); + const [results, setResults] = useState(fromJSON(getCache() || [])); const [filtered, setFiltered] = useState([]); useEffect((): void => { @@ -146,7 +137,7 @@ export default function useSessionSlashes (maxSessions = MAX_SESSIONS): SessionR toNumber = fromNumber; fromNumber = bnMax(toNumber.subn(count), new BN(1)); - setStorage(STORAGE_KEY, workQueue, maxSessionsStore); + setCache(toJSON(workQueue, maxSessionsStore)); setResults(workQueue); const lastNumber = workQueue[workQueue.length - 1]?.blockNumber; diff --git a/packages/react-query/src/BlockAuthors.tsx b/packages/react-query/src/BlockAuthors.tsx index e0c5babfb49f..02acec95b051 100644 --- a/packages/react-query/src/BlockAuthors.tsx +++ b/packages/react-query/src/BlockAuthors.tsx @@ -2,9 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import React, { useContext, useEffect, useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { HeaderExtended } from '@polkadot/api-derive'; -import { ApiContext } from '@polkadot/react-api'; +import { useApiContext } from '@polkadot/react-hooks'; import { formatNumber } from '@polkadot/util'; interface Authors { @@ -25,7 +25,7 @@ const byAuthor: Record = {}; const BlockAuthorsContext: React.Context = React.createContext({ byAuthor, lastHeaders: [] }); function BlockAuthors ({ children }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [state, setState] = useState({ byAuthor, lastHeaders: [] }); useEffect((): void => { diff --git a/packages/react-query/src/Chain.tsx b/packages/react-query/src/Chain.tsx index e36d27029558..495e189da783 100644 --- a/packages/react-query/src/Chain.tsx +++ b/packages/react-query/src/Chain.tsx @@ -5,8 +5,8 @@ import { BareProps } from '@polkadot/react-api/types'; -import React, { useContext } from 'react'; -import { ApiContext } from '@polkadot/react-api'; +import React from 'react'; +import { useApiContext } from '@polkadot/react-hooks'; interface Props extends BareProps { children?: React.ReactNode; @@ -14,7 +14,7 @@ interface Props extends BareProps { } export default function Chain ({ children, className, label = '', style }: Props): React.ReactElement { - const { systemChain } = useContext(ApiContext); + const { systemChain } = useApiContext(); return (
= React.createContext([]); function Events ({ children }: Props): React.ReactElement { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [state, setState] = useState([]); useEffect((): void => { diff --git a/packages/react-query/src/NodeName.tsx b/packages/react-query/src/NodeName.tsx index d0e622d28469..a44e3b942afe 100644 --- a/packages/react-query/src/NodeName.tsx +++ b/packages/react-query/src/NodeName.tsx @@ -5,8 +5,8 @@ import { BareProps } from '@polkadot/react-api/types'; -import React, { useContext } from 'react'; -import { ApiContext } from '@polkadot/react-api'; +import React from 'react'; +import { useApiContext } from '@polkadot/react-hooks'; interface Props extends BareProps { children?: React.ReactNode; @@ -14,7 +14,7 @@ interface Props extends BareProps { } export default function NodeName ({ children, className, label = '', style }: Props): React.ReactElement { - const { systemName } = useContext(ApiContext); + const { systemName } = useApiContext(); return (
{ - const { systemVersion } = useContext(ApiContext); + const { systemVersion } = useApiContext(); return (
| null { - const { api } = useContext(ApiContext); + const { api } = useApiContext(); const [state, setState] = useState({ allFees: ZERO, allTotal: ZERO, From d5857436fec0874d2cb53147f10a3173200f7f75 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Fri, 15 Nov 2019 09:56:08 +0000 Subject: [PATCH 046/154] [CI Skip] 0.37.0-beta.88 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 6fedf9f23aa4..717ab8feb04f 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.87" + "version": "0.37.0-beta.88" } diff --git a/package.json b/package.json index df022acf92f4..774db44f240f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 1b4c920256b8..289e12acc55a 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 17d0a0809dd2..4e45942d85b0 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-components": "^0.37.0-beta.88", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 444e9296419a..6e370c5c876e 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 92147a2e0d53..75b35134faef 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 3e2be65dfbe2..16da038118e7 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.8", - "@polkadot/react-components": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 1483656ea706..909583ef2e20 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", - "@polkadot/react-query": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88", + "@polkadot/react-query": "^0.37.0-beta.88" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 05e7b7e15c68..739109d8c1ae 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.87", - "@polkadot/react-components": "^0.37.0-beta.87" + "@polkadot/apps-routing": "^0.37.0-beta.88", + "@polkadot/react-components": "^0.37.0-beta.88" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 07535042172b..b37e4b60a878 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", - "@polkadot/react-query": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88", + "@polkadot/react-query": "^0.37.0-beta.88" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 2804254314b9..74268c523bee 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 45fd49a6c8fb..3c62c9576b08 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", - "@polkadot/react-params": "^0.37.0-beta.87", - "@polkadot/react-signer": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88", + "@polkadot/react-params": "^0.37.0-beta.88", + "@polkadot/react-signer": "^0.37.0-beta.88" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index c942c99019f7..8ea58bbe7a4e 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 3677d207dcd7..7828e52aedcf 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-components": "^0.37.0-beta.88", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index c031d7b51485..e9b7fd5ea7d4 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", - "@polkadot/react-query": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88", + "@polkadot/react-query": "^0.37.0-beta.88" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 0cf2f73f9f8e..7bc57d676fff 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", - "@polkadot/react-query": "^0.37.0-beta.87", + "@polkadot/react-components": "^0.37.0-beta.88", + "@polkadot/react-query": "^0.37.0-beta.88", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 9251d0aa71f7..f293d5f41f93 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.87", - "@polkadot/react-components": "^0.37.0-beta.87", - "@polkadot/react-query": "^0.37.0-beta.87" + "@polkadot/app-explorer": "^0.37.0-beta.88", + "@polkadot/react-components": "^0.37.0-beta.88", + "@polkadot/react-query": "^0.37.0-beta.88" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index d888963eeb08..88f7faad2391 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", - "@polkadot/react-params": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88", + "@polkadot/react-params": "^0.37.0-beta.88" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 71efda262486..5f51991d390d 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index d8864c801edd..bd0cdef3ac17 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index ae7c881aba85..9336098e044c 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", - "@polkadot/react-query": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88", + "@polkadot/react-query": "^0.37.0-beta.88" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index a996e8972823..5eceb9604270 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", - "@polkadot/react-query": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88", + "@polkadot/react-query": "^0.37.0-beta.88" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 401a6ff7ce29..da59065ceeaf 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 7bbd3a5265a8..8ada775e06a2 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", - "@polkadot/react-signer": "^0.37.0-beta.87", + "@polkadot/react-components": "^0.37.0-beta.88", + "@polkadot/react-signer": "^0.37.0-beta.88", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index a9d98067c032..8708280d0c31 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 9ee4b4d7b80e..69deadaabd36 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.87", + "@polkadot/react-api": "^0.37.0-beta.88", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.87", + "@polkadot/react-query": "^0.37.0-beta.88", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 7d46a8d0b9f5..4ff72f75a081 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index e653b76219e0..1bfdba223e03 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87" + "@polkadot/react-components": "^0.37.0-beta.88" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index bc9afb98adb0..0a976724381c 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index f20489686e81..02417bf9a1fb 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.87", + "version": "0.37.0-beta.88", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.87", + "@polkadot/react-components": "^0.37.0-beta.88", "@polkadot/react-qr": "^0.47.0-beta.6" } } From 488bfef0c4de02b5e53d3f465f596c815c0848f6 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 15 Nov 2019 15:06:47 +0100 Subject: [PATCH 047/154] Add trackStream, impl. in staking overview (#1891) * Add trackStream, impl. in staking overview * Use trackStream in Address * Fix linting * Add reward displays --- packages/app-staking/src/Overview/Address.tsx | 22 +-- .../app-staking/src/Overview/CurrentList.tsx | 4 +- packages/app-staking/src/Overview/index.tsx | 3 +- packages/app-staking/src/Query/Validator.tsx | 155 +++++++++--------- packages/app-staking/src/Query/index.tsx | 16 +- packages/app-staking/src/index.tsx | 49 +++--- packages/app-staking/src/types.ts | 2 + packages/react-api/src/util/historic.ts | 13 +- packages/react-hooks/src/index.ts | 1 + packages/react-hooks/src/trackStream.tsx | 90 ++++++++++ 10 files changed, 213 insertions(+), 142 deletions(-) create mode 100644 packages/react-hooks/src/trackStream.tsx diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx index eda08efea284..f2d921eb2053 100644 --- a/packages/app-staking/src/Overview/Address.tsx +++ b/packages/app-staking/src/Overview/Address.tsx @@ -10,10 +10,9 @@ import { ValidatorFilter } from '../types'; import BN from 'bn.js'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { withCalls, withMulti } from '@polkadot/react-api'; import { AddressCard, AddressMini, Badge, Expander, Icon } from '@polkadot/react-components'; import { classes } from '@polkadot/react-components/util'; -import { useApiContext } from '@polkadot/react-hooks'; +import { trackStream, useApiContext } from '@polkadot/react-hooks'; import { formatNumber } from '@polkadot/util'; import translate from '../translate'; @@ -24,13 +23,13 @@ interface Props extends I18nProps { className?: string; defaultName: string; filter: ValidatorFilter; + hasQueries: boolean; isElected: boolean; isFavorite: boolean; lastAuthors?: string[]; myAccounts: string[]; points?: Points; recentlyOnline?: DerivedHeartbeats; - stakingInfo?: DerivedStaking; toggleFavorite: (accountId: string) => void; withNominations?: boolean; } @@ -47,8 +46,10 @@ interface StakingState { const WITH_VALIDATOR_PREFS = { validatorPayment: true }; -function Address ({ address, authorsMap, className, defaultName, filter, isElected, isFavorite, lastAuthors, myAccounts, points, recentlyOnline, stakingInfo, t, toggleFavorite, withNominations = true }: Props): React.ReactElement | null { +function Address ({ address, authorsMap, className, defaultName, filter, hasQueries, isElected, isFavorite, lastAuthors, myAccounts, points, recentlyOnline, t, toggleFavorite, withNominations = true }: Props): React.ReactElement | null { const { api, isSubstrateV2 } = useApiContext(); + // FIXME Any horrors, caused by trackStream + const stakingInfo = trackStream(api.derive.staking.info as any, [address]); const [extraInfo, setExtraInfo] = useState<[React.ReactNode, React.ReactNode][] | undefined>(); const [hasActivity, setHasActivity] = useState(true); const [{ balanceOpts, controllerId, hasNominators, isNominatorMe, nominators, sessionId, stashId }, setStakingState] = useState({ @@ -188,7 +189,7 @@ function Address ({ address, authorsMap, className, defaultName, filter, isElect } isDisabled={isSubstrateV2 && !hasActivity} overlay={ - api.query.imOnline?.authoredBlocks && ( + hasQueries && api.query.imOnline?.authoredBlocks && ( ( - ['derive.staking.info', { - paramName: 'address', - propName: 'stakingInfo' - }] - ) + ` ); diff --git a/packages/app-staking/src/Overview/CurrentList.tsx b/packages/app-staking/src/Overview/CurrentList.tsx index 44e6a8216eaa..6f3fccd9e9fc 100644 --- a/packages/app-staking/src/Overview/CurrentList.tsx +++ b/packages/app-staking/src/Overview/CurrentList.tsx @@ -18,6 +18,7 @@ import Address from './Address'; interface Props extends I18nProps { authorsMap: Record; + hasQueries: boolean; lastAuthors?: string[]; next: string[]; recentlyOnline?: DerivedHeartbeats; @@ -55,7 +56,7 @@ function accountsToString (accounts: AccountId[]): string[] { return accounts.map((accountId): string => accountId.toString()); } -function CurrentList ({ authorsMap, lastAuthors, next, recentlyOnline, stakingOverview, t }: Props): React.ReactElement { +function CurrentList ({ authorsMap, hasQueries, lastAuthors, next, recentlyOnline, stakingOverview, t }: Props): React.ReactElement { const { isSubstrateV2 } = useApiContext(); const [favorites, toggleFavorite] = useFavorites(STORE_FAVS_BASE); const [filter, setFilter] = useState('all'); @@ -84,6 +85,7 @@ function CurrentList ({ authorsMap, lastAuthors, next, recentlyOnline, stakingOv authorsMap={authorsMap} defaultName={defaultName} filter={filter} + hasQueries={hasQueries} isElected={isElected} isFavorite={isFavorite} lastAuthors={lastAuthors} diff --git a/packages/app-staking/src/Overview/index.tsx b/packages/app-staking/src/Overview/index.tsx index b7efc4f5a6fd..be59b4eafec5 100644 --- a/packages/app-staking/src/Overview/index.tsx +++ b/packages/app-staking/src/Overview/index.tsx @@ -14,7 +14,7 @@ import Summary from './Summary'; interface Props extends BareProps, ComponentProps {} -export default function Overview ({ allControllers, allStashes, className, recentlyOnline, stakingOverview }: Props): React.ReactElement { +export default function Overview ({ allControllers, hasQueries, allStashes, className, recentlyOnline, stakingOverview }: Props): React.ReactElement { const { isSubstrateV2 } = useApiContext(); const { byAuthor, lastBlockAuthors, lastBlockNumber } = useContext(BlockAuthorsContext); const [next, setNext] = useState([]); @@ -41,6 +41,7 @@ export default function Overview ({ allControllers, allStashes, className, recen /> formatNumber(bn)), - [ - values.map(([,, { total }]): BN => - total.unwrap().div(divisor)) - // exposures.map(({ own }): BN => - // own.unwrap().div(divisor)), - // exposures.map(({ others }): BN => - // others.reduce((total, { value }): BN => total.add(value.unwrap()), new BN(0)).div(divisor)) - ] + values.map(([, { total }]): BN => + total.unwrap().div(divisor)) + // exposures.map(({ own }): BN => + // own.unwrap().div(divisor)), + // exposures.map(({ others }): BN => + // others.reduce((total, { value }): BN => total.add(value.unwrap()), new BN(0)).div(divisor)) ]; } -function extractSplit (values: [BN, Hash, Exposure][], validatorId: string): SplitData | null { - const last = values[values.length - 1][2]; +function extractSplit (values: [Hash, Exposure][], validatorId: string): SplitData | null { + const last = values[values.length - 1][1]; const total = last.total.unwrap(); if (total.eqn(0)) { @@ -96,8 +79,17 @@ function extractEraSlash (validatorId: string, slashes: Slash[]): BN { }, new BN(0)); } -function Validator ({ blockCounts, className, currentIndex, sessionRewards, startNumber, t, validatorId }: Props): React.ReactElement { +function balanceToNumber (amount: BN, divisor: BN): number { + return amount.muln(1000).div(divisor).toNumber() / 1000; +} + +function Validator ({ className, sessionRewards, t, validatorId }: Props): React.ReactElement { const { api } = useApiContext(); + // FIXME There is something seriously wrong in these two with "any" horrors + const blockCounts = trackStream(api.query.imOnline?.authoredBlocks?.multi as any, [sessionRewards, validatorId], { + paramMap: ([sessionRewards, validatorId]: [SessionRewards[], string]): any => + [sessionRewards.map(({ sessionIndex }): [SessionIndex, string] => [sessionIndex, validatorId])] + }); const [blocksLabels, setBlocksLabels] = useState([]); const [blocksChart, setBlocksChart] = useState(null); const [{ rewardsChart, rewardsLabels }, setRewardsInfo] = useState<{ rewardsChart: LineData | null; rewardsLabels: string[] }>({ rewardsChart: null, rewardsLabels: [] }); @@ -106,53 +98,65 @@ function Validator ({ blockCounts, className, currentIndex, sessionRewards, star const divisor = new BN('1'.padEnd(formatBalance.getDefaults().decimals + 1, '0')); useEffect((): void => { - api.isReady.then(async (): Promise => { - const values = await getHistoric(api, 'staking.stakers', [validatorId], { - interval: (api.consts.babe?.epochDuration as BlockNumber || new BN(500)).muln(2).divn(3), - max: MAX_SESSIONS, - startNumber + if (!splitChart) { + const hashes = sessionRewards.map(({ blockHash }): Hash => blockHash); + const stakeLabels = sessionRewards.map(({ sessionIndex }): string => formatNumber(sessionIndex)); + + api.isReady.then(async (): Promise => { + const values = await getHistoric(api, 'staking.stakers', [validatorId], hashes); + const stakeChart = extractStake(values, divisor); + const splitChart = extractSplit(values, validatorId); + const splitMax = splitChart ? Math.min(Math.ceil(splitChart[0].value), 100) : 100; + + setStakeInfo({ stakeChart, stakeLabels }); + setSplitInfo({ splitChart, splitMax }); }); - const [stakeLabels, stakeChart] = extractStake(values, divisor); - const splitChart = extractSplit(values, validatorId); - const splitMax = splitChart ? Math.min(Math.ceil(splitChart[0].value), 100) : 100; - - setStakeInfo({ stakeChart, stakeLabels }); - setSplitInfo({ splitChart, splitMax }); - }); - }, []); + } + }, [sessionRewards, splitChart]); useEffect((): void => { - const rewardsLabels: string[] = []; - const rewardsChart: LineData = [[]]; - - sessionRewards.forEach(({ sessionIndex, slashes }): void => { - // this shows the start of the new era, however rewards are for previous - rewardsLabels.push(formatNumber(sessionIndex.subn(1))); - - // calculate and format to 3 decimals - rewardsChart[0].push( - extractEraSlash(validatorId, slashes).muln(1000).div(divisor).toNumber() / 1000 - ); - }); + if (blockCounts) { + const rewardsLabels: string[] = []; + const rewardsChart: LineData = [[], [], []]; + let total = new BN(0); + + sessionRewards.forEach(({ blockNumber, reward, sessionIndex, slashes }, index): void => { + // this shows the start of the new era, however rewards are for previous + rewardsLabels.push(formatNumber(sessionIndex.subn(1))); + + const neg = extractEraSlash(validatorId, slashes); + const pos = index + ? reward.mul(blockCounts[index - 1]).div(blockNumber.sub(sessionRewards[index - 1].blockNumber)) + : new BN(0); + + // add this to the total + total = total.add(neg).add(pos); + + // calculate and format to 3 decimals + rewardsChart[0].push(balanceToNumber(neg, divisor)); + rewardsChart[1].push(balanceToNumber(pos, divisor)); + rewardsChart[2].push(balanceToNumber(total.divn(index), divisor)); + }); - setRewardsInfo({ rewardsChart, rewardsLabels }); - }, [sessionRewards, validatorId]); + setRewardsInfo({ rewardsChart, rewardsLabels }); + } + }, [blockCounts, sessionRewards, validatorId]); useEffect((): void => { setBlocksLabels( - getIndexRange(currentIndex).map((index): string => formatNumber(index)) + sessionRewards.map(({ sessionIndex }): string => formatNumber(sessionIndex)) ); - }, [currentIndex]); + }, [sessionRewards]); useEffect((): void => { if (blockCounts) { const avgSet: number[] = []; const idxSet: BN[] = []; - blockCounts.reduce((total: BN, value, index): BN => { + blockCounts.reduce((total: BN, value: u32, index: number): BN => { total = total.add(value); - avgSet.push(total.toNumber() / (index + 1)); + avgSet.push(total.muln(100).divn(index + 1).toNumber() / 100); idxSet.push(value); return total; @@ -160,7 +164,7 @@ function Validator ({ blockCounts, className, currentIndex, sessionRewards, star setBlocksChart([idxSet, avgSet]); } - }, [blockCounts, blocksLabels]); + }, [blockCounts]); return ( @@ -169,7 +173,7 @@ function Validator ({ blockCounts, className, currentIndex, sessionRewards, star <> {blocksChart && (
-

{t('blocks per session')}

+

{t('blocks produced')}

-

{t('slashed per session')}

+

{t('rewards & slashes')}

@@ -222,13 +226,4 @@ function Validator ({ blockCounts, className, currentIndex, sessionRewards, star ); } -export default translate( - withCalls( - ['query.imOnline.authoredBlocks', { - isMulti: true, - propName: 'blockCounts', - paramPick: ({ currentIndex, validatorId }: Props): [BN, string][] => - getIndexRange(currentIndex).map((index): [BN, string] => [index, validatorId]) - }] - )(Validator) -); +export default translate(Validator); diff --git a/packages/app-staking/src/Query/index.tsx b/packages/app-staking/src/Query/index.tsx index 12c410d9affb..93cae7326ec9 100644 --- a/packages/app-staking/src/Query/index.tsx +++ b/packages/app-staking/src/Query/index.tsx @@ -3,10 +3,9 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { I18nProps } from '@polkadot/react-components/types'; -import { BlockNumber } from '@polkadot/types/interfaces'; import { ComponentProps } from '../types'; -import React, { useEffect, useState } from 'react'; +import React, { useState } from 'react'; import { withRouter, RouteComponentProps } from 'react-router-dom'; import { Button, InputAddressSimple } from '@polkadot/react-components'; @@ -47,16 +46,9 @@ interface Props extends I18nProps, ComponentProps, RouteComponentProps<{}> { // /> // -function Query ({ bestNumber, className, sessionRewards, stakingOverview, match: { params: { value } }, t }: Props): React.ReactElement { - const [startNumber, setStartNumber] = useState(); +function Query ({ className, sessionRewards, match: { params: { value } }, t }: Props): React.ReactElement { const [validatorId, setValidatorId] = useState(value || null); - useEffect((): void => { - if (bestNumber && !startNumber) { - setStartNumber(bestNumber); - } - }, [bestNumber, startNumber]); - const _onQuery = (): void => { if (validatorId) { window.location.hash = `/staking/query/${validatorId}`; @@ -79,11 +71,9 @@ function Query ({ bestNumber, className, sessionRewards, stakingOverview, match: onClick={_onQuery} /> - {value && startNumber && stakingOverview && ( + {value && ( )} diff --git a/packages/app-staking/src/index.tsx b/packages/app-staking/src/index.tsx index c43758e69f07..955e26b72e54 100644 --- a/packages/app-staking/src/index.tsx +++ b/packages/app-staking/src/index.tsx @@ -16,8 +16,8 @@ import styled from 'styled-components'; import { Option } from '@polkadot/types'; import { HelpOverlay } from '@polkadot/react-components'; import Tabs from '@polkadot/react-components/Tabs'; -import { withCalls, withMulti, withObservable } from '@polkadot/react-api'; -import { useApiContext, useSessionRewards } from '@polkadot/react-hooks'; +import { withMulti, withObservable } from '@polkadot/react-api'; +import { trackStream, useApiContext, useSessionRewards } from '@polkadot/react-hooks'; import accountObservable from '@polkadot/ui-keyring/observable/accounts'; import Accounts from './Actions/Accounts'; @@ -29,19 +29,32 @@ import translate from './translate'; interface Props extends AppProps, ApiProps, I18nProps { allAccounts?: SubjectInfo; - allStashesAndControllers?: [string[], string[]]; - bestNumber?: BlockNumber; - recentlyOnline?: DerivedHeartbeats; - stakingOverview?: DerivedStakingOverview; } const EMPY_ACCOUNTS: string[] = []; const EMPTY_ALL: [string[], string[]] = [EMPY_ACCOUNTS, EMPY_ACCOUNTS]; -function App ({ allAccounts, allStashesAndControllers: [allStashes, allControllers] = EMPTY_ALL, basePath, bestNumber, className, recentlyOnline, stakingOverview, t }: Props): React.ReactElement { +function transformStakingControllers ([stashes, controllers]: [AccountId[], Option[]]): [string[], string[]] { + return [ + stashes.map((accountId): string => accountId.toString()), + controllers + .filter((optId): boolean => optId.isSome) + .map((accountId): string => accountId.unwrap().toString()) + ]; +} + +function App ({ allAccounts, basePath, className, t }: Props): React.ReactElement { const { api } = useApiContext(); + const stakingControllers = trackStream<[string[], string[]]>(api.derive.staking.controllers, [], { transform: transformStakingControllers }); + const bestNumber = trackStream(api.derive.chain.bestNumber, []); + const recentlyOnline = trackStream(api.derive.imOnline.receivedHeartbeats, []); + const stakingOverview = trackStream(api.derive.staking.overview, []); const sessionRewards = useSessionRewards(MAX_SESSIONS); const routeMatch = useRouteMatch({ path: basePath, strict: true }); + + const hasAccounts = !!allAccounts && Object.keys(allAccounts).length !== 0; + const hasQueries = hasAccounts && !!(api.query.imOnline?.authoredBlocks); + const [allStashes, allControllers] = stakingControllers || EMPTY_ALL; const _renderComponent = (Component: React.ComponentType, className?: string): () => React.ReactNode => { // eslint-disable-next-line react/display-name return (): React.ReactNode => { @@ -56,6 +69,8 @@ function App ({ allAccounts, allStashesAndControllers: [allStashes, allControlle allStashes={allStashes} bestNumber={bestNumber} className={className} + hasAccounts={hasAccounts} + hasQueries={hasQueries} recentlyOnline={recentlyOnline} sessionRewards={sessionRewards} stakingOverview={stakingOverview} @@ -71,11 +86,11 @@ function App ({ allAccounts, allStashesAndControllers: [allStashes, allControlle
@@ -207,7 +208,7 @@ function Validator ({ className, sessionRewards, t, validatorId }: Props): React

{t('elected stake')}

diff --git a/packages/react-hooks/src/trackStream.tsx b/packages/react-hooks/src/trackStream.tsx index 14aefd806de5..5c84de8fdef7 100644 --- a/packages/react-hooks/src/trackStream.tsx +++ b/packages/react-hooks/src/trackStream.tsx @@ -47,7 +47,7 @@ function extractParams (params: any[], paramMap: (params: any[]) => any): [strin // - returns a promise with an unsubscription // - has a callback to set the value // FIXME The typings here need some serious TLC -export default function trackStream (fn: TrackFn | undefined, params: any, { paramMap = transformIdentity, transform = transformIdentity }: Options = {}): T | undefined { +export default function trackStream (fn: TrackFn | undefined, params: any, { paramMap = transformIdentity, transform = transformIdentity }: Options = {}): T | undefined { const [value, setValue] = useState(); const tracker = useRef<{ serialized: string | null; subscriber: Promise }>({ serialized: null, subscriber: dummySubscribe }); From ce141a4b4cc7a1d9bbad5c6d78b326cd2e2e2ee8 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Fri, 15 Nov 2019 21:23:34 +0000 Subject: [PATCH 056/154] [CI Skip] 0.37.0-beta.93 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-staking.json | 8 +++++++- packages/apps/public/locales/en/ui.json | 8 +++++++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 32 files changed, 82 insertions(+), 70 deletions(-) diff --git a/lerna.json b/lerna.json index 45911477d4d3..f567ffaaea10 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.92" + "version": "0.37.0-beta.93" } diff --git a/package.json b/package.json index 68ac4c876ecb..9fb35c3d6d77 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 7bc9bcec2085..8ec5bfeafec4 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index cd378b550fc5..50f4a6c99003 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", + "@polkadot/react-components": "^0.37.0-beta.93", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index f0f306966b1f..352cfe24aa8a 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 82b66a178bb4..c37626d38d7e 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 457bf0b7bba5..cacf7d86e961 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.9", - "@polkadot/react-components": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 869c981e7771..84b2300ee375 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", - "@polkadot/react-query": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-query": "^0.37.0-beta.93" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index b60918a130ff..c9a88ddc33c4 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.92", - "@polkadot/react-components": "^0.37.0-beta.92" + "@polkadot/apps-routing": "^0.37.0-beta.93", + "@polkadot/react-components": "^0.37.0-beta.93" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 3b28be816bb5..4b9c532d16e9 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", - "@polkadot/react-query": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-query": "^0.37.0-beta.93" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 0def7f68a267..6a7c1cc53b82 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index dd142754c909..e196d8304895 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", - "@polkadot/react-params": "^0.37.0-beta.92", - "@polkadot/react-signer": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-params": "^0.37.0-beta.93", + "@polkadot/react-signer": "^0.37.0-beta.93" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index d92423694d34..00f742164f72 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 516256240431..51200e4dc49b 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", + "@polkadot/react-components": "^0.37.0-beta.93", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 6bb7658a6eac..a3cdc7361a55 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", - "@polkadot/react-query": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-query": "^0.37.0-beta.93" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 581d976f6744..f476cedeb281 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", - "@polkadot/react-query": "^0.37.0-beta.92", + "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-query": "^0.37.0-beta.93", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 6a650776530b..4a87eedd53ad 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.92", - "@polkadot/react-components": "^0.37.0-beta.92", - "@polkadot/react-query": "^0.37.0-beta.92" + "@polkadot/app-explorer": "^0.37.0-beta.93", + "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-query": "^0.37.0-beta.93" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index b8de3b94d2b3..dc2ed62e0b3f 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", - "@polkadot/react-params": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-params": "^0.37.0-beta.93" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index f7c92f34e3ca..912371f48bb0 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 3c81d4fe5f45..6640e6e7f28f 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 23450f45245e..62624f89379c 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", - "@polkadot/react-query": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-query": "^0.37.0-beta.93" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 8092559b581e..5e29e34e0936 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", - "@polkadot/react-query": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-query": "^0.37.0-beta.93" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 4d7264f9d50b..ca8f971228ab 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index bfdfb96b769c..b9080cffbeba 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", - "@polkadot/react-signer": "^0.37.0-beta.92", + "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-signer": "^0.37.0-beta.93", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-staking.json b/packages/apps/public/locales/en/app-staking.json index 89b4d5659d5d..6000415c3588 100644 --- a/packages/apps/public/locales/en/app-staking.json +++ b/packages/apps/public/locales/en/app-staking.json @@ -118,5 +118,11 @@ "rewarded": "rewarded", "blocks produced": "blocks produced", "rewards & slashes": "rewards & slashes", - "rewards (est.)": "rewards (est.)" + "rewards (est.)": "rewards (est.)", + "{{currency}} slashed": "{{currency}} slashed", + "{{currency}} rewards (est.)": "{{currency}} rewards (est.)", + "{{currency}} average": "{{currency}} average", + "{{currency}} total": "{{currency}} total", + "{{currency}} own": "{{currency}} own", + "{{currency}} other": "{{currency}} other" } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index b9fb364d3005..ed03f81e8661 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -634,5 +634,11 @@ "rewarded": "", "blocks produced": "", "rewards & slashes": "", - "rewards (est.)": "" + "rewards (est.)": "", + "{{currency}} slashed": "", + "{{currency}} rewards (est.)": "", + "{{currency}} average": "", + "{{currency}} total": "", + "{{currency}} own": "", + "{{currency}} other": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 97c325037bad..767216fbd7f9 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 26f2584a5bb0..a9740e0e7d2d 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.92", + "@polkadot/react-api": "^0.37.0-beta.93", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.92", + "@polkadot/react-query": "^0.37.0-beta.93", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 094e2fca3fb5..3a137dd494c8 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index fb64eaed56e2..343ea98422f0 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92" + "@polkadot/react-components": "^0.37.0-beta.93" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 724d6f646025..5e0a3d6788ae 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 2cfead60a83c..9fc92680d903 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.92", + "version": "0.37.0-beta.93", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.92", + "@polkadot/react-components": "^0.37.0-beta.93", "@polkadot/react-qr": "^0.47.0-beta.6" } } From e0acd15b430dcc3c5592acddcc22efb4635fe5a3 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 16 Nov 2019 10:13:07 +0100 Subject: [PATCH 057/154] useAccounts hook (#1898) * useAccounts hook * Drop some withRouter * Add setImmediate to trackStream * Combine unsubscribe into subscribe * Use before define * Ass trackPromise * Cleanup mapping for params * Addressbook display --- packages/app-accounts/src/Overview.tsx | 19 +-- packages/app-accounts/src/index.tsx | 44 ++---- packages/app-accounts/src/types.ts | 9 +- packages/app-address-book/src/Overview.tsx | 18 +-- packages/app-address-book/src/index.tsx | 19 +-- .../app-democracy/src/Overview/Seconding.tsx | 15 +- .../app-democracy/src/Overview/Voting.tsx | 15 +- packages/app-explorer/src/BlockInfo/index.tsx | 19 +-- packages/app-js/src/Playground.tsx | 22 +-- packages/app-staking/src/Actions/Accounts.tsx | 38 ++--- packages/app-staking/src/Query/index.tsx | 17 +-- packages/app-staking/src/index.tsx | 64 ++++----- packages/app-staking/src/types.ts | 3 +- packages/app-sudo/src/SetKey.tsx | 3 +- packages/app-sudo/src/index.tsx | 28 +--- packages/app-sudo/src/types.ts | 4 +- packages/app-toolbox/src/index.tsx | 15 +- .../app-treasury/src/Overview/Proposal.tsx | 15 +- .../app-treasury/src/Overview/Proposals.tsx | 10 +- packages/apps/src/Content/index.tsx | 47 +++---- packages/apps/src/SideBar/Item.tsx | 20 +-- packages/apps/src/overlays/Accounts.tsx | 41 ++---- packages/react-components/src/ActionItem.tsx | 6 +- packages/react-components/src/Inset.tsx | 132 +++++++++--------- packages/react-hooks/src/index.ts | 5 +- .../react-hooks/src/track/trackPromise.tsx | 58 ++++++++ .../src/{ => track}/trackStream.tsx | 51 +++---- packages/react-hooks/src/track/types.ts | 10 ++ packages/react-hooks/src/track/util.ts | 25 ++++ packages/react-hooks/src/useAccounts.tsx | 30 ++++ packages/react-hooks/src/useAddresses.tsx | 30 ++++ .../react-hooks/src/useSessionRewards.tsx | 53 ++++--- 32 files changed, 425 insertions(+), 460 deletions(-) create mode 100644 packages/react-hooks/src/track/trackPromise.tsx rename packages/react-hooks/src/{ => track}/trackStream.tsx (62%) create mode 100644 packages/react-hooks/src/track/types.ts create mode 100644 packages/react-hooks/src/track/util.ts create mode 100644 packages/react-hooks/src/useAccounts.tsx create mode 100644 packages/react-hooks/src/useAddresses.tsx diff --git a/packages/app-accounts/src/Overview.tsx b/packages/app-accounts/src/Overview.tsx index 7b3e2d3e9e15..dfb611eb7ed4 100644 --- a/packages/app-accounts/src/Overview.tsx +++ b/packages/app-accounts/src/Overview.tsx @@ -3,13 +3,12 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { I18nProps } from '@polkadot/react-components/types'; -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import { ComponentProps } from './types'; import React, { useState } from 'react'; import keyring from '@polkadot/ui-keyring'; -import accountObservable from '@polkadot/ui-keyring/observable/accounts'; -import { getLedger, isLedger, withMulti, withObservable } from '@polkadot/react-api'; +import { getLedger, isLedger } from '@polkadot/react-api'; +import { useAccounts } from '@polkadot/react-hooks'; import { Button, CardGrid } from '@polkadot/react-components'; import CreateModal from './modals/Create'; @@ -20,7 +19,6 @@ import Banner from './Banner'; import translate from './translate'; interface Props extends ComponentProps, I18nProps { - accounts?: SubjectInfo[]; } // query the ledger for the address, adding it to the keyring @@ -36,11 +34,12 @@ async function queryLedger (): Promise { } } -function Overview ({ accounts, onStatusChange, t }: Props): React.ReactElement { +function Overview ({ onStatusChange, t }: Props): React.ReactElement { + const { allAccounts, hasAccounts } = useAccounts(); const [isCreateOpen, setIsCreateOpen] = useState(false); const [isImportOpen, setIsImportOpen] = useState(false); const [isQrOpen, setIsQrOpen] = useState(false); - const emptyScreen = !(isCreateOpen || isImportOpen || isQrOpen) && accounts && (Object.keys(accounts).length === 0); + const emptyScreen = !(isCreateOpen || isImportOpen || isQrOpen) && !hasAccounts; const _toggleCreate = (): void => setIsCreateOpen(!isCreateOpen); const _toggleImport = (): void => setIsImportOpen(!isImportOpen); @@ -105,7 +104,7 @@ function Overview ({ accounts, onStatusChange, t }: Props): React.ReactElement

)} - {accounts && Object.keys(accounts).map((address): React.ReactNode => ( + {allAccounts.map((address): React.ReactNode => ( { +function AccountsApp ({ basePath, onStatusChange, t }: Props): React.ReactElement { + const { hasAccounts } = useAccounts(); const [hidden, setHidden] = useState(['vanity']); useEffect((): void => { setHidden( - Object.keys(allAccounts).length !== 0 + hasAccounts ? [] : ['vanity'] ); - }, [allAccounts]); + }, [hasAccounts]); - const _renderComponent = (Component: React.ComponentType): (props: LocationProps) => React.ReactNode => { - // eslint-disable-next-line react/display-name - return ({ match }: LocationProps): React.ReactNode => { - return ( - - ); - }; - }; + const _renderComponent = (Component: React.ComponentType): React.ReactNode => ( + + ); return (

@@ -68,15 +58,11 @@ function AccountsApp ({ allAccounts = {}, basePath, location, onStatusChange, t /> - - + {_renderComponent(Vanity)} + {_renderComponent(Overview)}
); } -export default withMulti( - AccountsApp, - translate, - withObservable(accountObservable.subject, { propName: 'allAccounts' }) -); +export default translate(AccountsApp); diff --git a/packages/app-accounts/src/types.ts b/packages/app-accounts/src/types.ts index 81962b95909f..936b4a1e12fa 100644 --- a/packages/app-accounts/src/types.ts +++ b/packages/app-accounts/src/types.ts @@ -7,13 +7,6 @@ import { ActionStatus } from '@polkadot/react-components/Status/types'; import { WithTranslation } from 'react-i18next'; -export interface LocationProps { - location: any; - match: { - params: Record; - }; -} - export interface BareProps { className?: string; style?: Record; @@ -21,7 +14,7 @@ export interface BareProps { export type I18nProps = BareProps & WithTranslation; -export type ComponentProps = AppProps & LocationProps; +export type ComponentProps = AppProps; export interface ModalProps { onClose: () => void; diff --git a/packages/app-address-book/src/Overview.tsx b/packages/app-address-book/src/Overview.tsx index b54cf8209e20..c10191c9e6f3 100644 --- a/packages/app-address-book/src/Overview.tsx +++ b/packages/app-address-book/src/Overview.tsx @@ -3,25 +3,23 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { I18nProps } from '@polkadot/react-components/types'; -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import { ComponentProps } from './types'; import React, { useState } from 'react'; import { Button, CardGrid } from '@polkadot/react-components'; -import addressObservable from '@polkadot/ui-keyring/observable/addresses'; -import { withMulti, withObservable } from '@polkadot/react-api'; +import { useAddresses } from '@polkadot/react-hooks'; import CreateModal from './modals/Create'; import Address from './Address'; import translate from './translate'; interface Props extends ComponentProps, I18nProps { - addresses?: SubjectInfo[]; } -function Overview ({ addresses, onStatusChange, t }: Props): React.ReactElement { +function Overview ({ onStatusChange, t }: Props): React.ReactElement { + const { hasAddresses, allAddresses } = useAddresses(); const [isCreateOpen, setIsCreateOpen] = useState(false); - const emptyScreen = !isCreateOpen && (!addresses || Object.keys(addresses).length === 0); + const emptyScreen = !isCreateOpen && !hasAddresses; const _toggleCreate = (): void => setIsCreateOpen(!isCreateOpen); @@ -46,7 +44,7 @@ function Overview ({ addresses, onStatusChange, t }: Props): React.ReactElement< onStatusChange={onStatusChange} /> )} - {addresses && Object.keys(addresses).map((address): React.ReactNode => ( + {allAddresses.map((address): React.ReactNode => (
{ - const _renderComponent = (Component: React.ComponentType): () => React.ReactNode => { - // eslint-disable-next-line react/display-name - return (): React.ReactNode => - ; - }; - return (
@@ -47,7 +36,13 @@ function AddressBookApp ({ basePath, onStatusChange, t }: Props): React.ReactEle /> - + + +
); diff --git a/packages/app-democracy/src/Overview/Seconding.tsx b/packages/app-democracy/src/Overview/Seconding.tsx index f38eba81b1ae..84385653f2f7 100644 --- a/packages/app-democracy/src/Overview/Seconding.tsx +++ b/packages/app-democracy/src/Overview/Seconding.tsx @@ -4,26 +4,23 @@ import { AccountId } from '@polkadot/types/interfaces'; import { I18nProps } from '@polkadot/react-components/types'; -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import BN from 'bn.js'; import React, { useState } from 'react'; import { Button, InputAddress, Modal, TxButton } from '@polkadot/react-components'; -import accountObservable from '@polkadot/ui-keyring/observable/accounts'; -import { withMulti, withObservable } from '@polkadot/react-api'; +import { useAccounts } from '@polkadot/react-hooks'; import translate from '../translate'; interface Props extends I18nProps { - allAccounts?: SubjectInfo; depositors: AccountId[]; proposalId: BN | number; } -function Seconding ({ allAccounts, depositors, proposalId, t }: Props): React.ReactElement | null { +function Seconding ({ depositors, proposalId, t }: Props): React.ReactElement | null { + const { hasAccounts } = useAccounts(); const [accountId, setAccountId] = useState(null); const [isSecondingOpen, setIsSecondingOpen] = useState(false); - const hasAccounts = allAccounts && Object.keys(allAccounts).length !== 0; if (!hasAccounts) { return null; @@ -85,8 +82,4 @@ function Seconding ({ allAccounts, depositors, proposalId, t }: Props): React.Re ); } -export default withMulti( - Seconding, - translate, - withObservable(accountObservable.subject, { propName: 'allAccounts' }) -); +export default translate(Seconding); diff --git a/packages/app-democracy/src/Overview/Voting.tsx b/packages/app-democracy/src/Overview/Voting.tsx index ff901325e6fe..66b9eb9576d2 100644 --- a/packages/app-democracy/src/Overview/Voting.tsx +++ b/packages/app-democracy/src/Overview/Voting.tsx @@ -3,26 +3,23 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { I18nProps } from '@polkadot/react-components/types'; -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import BN from 'bn.js'; import React, { useState } from 'react'; import { Button, Dropdown, InputAddress, Modal, TxButton } from '@polkadot/react-components'; -import accountObservable from '@polkadot/ui-keyring/observable/accounts'; -import { withMulti, withObservable } from '@polkadot/react-api'; +import { useAccounts } from '@polkadot/react-hooks'; import translate from '../translate'; interface Props extends I18nProps { - allAccounts?: SubjectInfo; referendumId: BN | number; } -function Voting ({ allAccounts, referendumId, t }: Props): React.ReactElement | null { +function Voting ({ referendumId, t }: Props): React.ReactElement | null { + const { hasAccounts } = useAccounts(); const [accountId, setAccountId] = useState(null); const [isVotingOpen, setIsVotingOpen] = useState(false); const [voteValue, setVoteValue] = useState(true); - const hasAccounts = allAccounts && Object.keys(allAccounts).length !== 0; if (!hasAccounts) { return null; @@ -93,8 +90,4 @@ function Voting ({ allAccounts, referendumId, t }: Props): React.ReactElement | null { - const [stateValue, setStateValue] = useState(value); +function Entry ({ chain_bestNumber }: Props): React.ReactElement | null { + const { value } = useParams(); + const [stateValue, setStateValue] = useState(value); useEffect((): void => { if (value && value !== stateValue) { @@ -54,7 +50,4 @@ function Entry ({ chain_bestNumber, match: { params: { value } } }: Props): Reac ); } -export default withMulti( - withRouter(Entry), - withCalls('derive.chain.bestNumber') -); +export default withCalls('derive.chain.bestNumber')(Entry); diff --git a/packages/app-js/src/Playground.tsx b/packages/app-js/src/Playground.tsx index 427297dc7a70..46d839ff919f 100644 --- a/packages/app-js/src/Playground.tsx +++ b/packages/app-js/src/Playground.tsx @@ -8,7 +8,7 @@ import { AppProps, I18nProps } from '@polkadot/react-components/types'; import { Log, LogType, Snippet } from './types'; import React, { useRef, useState, useEffect } from 'react'; -import { withRouter, RouteComponentProps } from 'react-router'; +import { useHistory, useParams } from 'react-router-dom'; import { Transition } from 'semantic-ui-react'; import snappy from 'snappyjs'; import styled from 'styled-components'; @@ -41,17 +41,7 @@ interface Injected { window: null; } -interface Props extends AppProps, I18nProps, RouteComponentProps<{}> { - match: { - isExact: boolean; - params: { - base64?: string; - }; - path: string; - url: string; - }; - // FIXME wait for proper eslint integration in tslint, then hopefully remove this - history: any; +interface Props extends AppProps, I18nProps { } const snippets: Snippet[] = JSON.parse(JSON.stringify(allSnippets)); @@ -89,8 +79,10 @@ function decodeBase64 (base64: string): Snippet { } // FIXME This... ladies & gentlemen, is a mess that should be untangled -function Playground ({ className, history, match: { params: { base64 } }, t }: Props): React.ReactElement { +function Playground ({ className, t }: Props): React.ReactElement { const { api, isDevelopment } = useApiContext(); + const history = useHistory(); + const { base64 } = useParams(); const injectedRef = useRef(null); const [code, setCode] = useState(''); const [isAnimated, setIsAnimated] = useState(true); @@ -334,10 +326,8 @@ function Playground ({ className, history, match: { params: { base64 } }, t }: P ); } -const Routed = withRouter(Playground); - export default translate( - styled(Routed)` + styled(Playground)` display: flex; flex-direction: column; height: 100vh; diff --git a/packages/app-staking/src/Actions/Accounts.tsx b/packages/app-staking/src/Actions/Accounts.tsx index 101133b939b4..39fdbbb50bf8 100644 --- a/packages/app-staking/src/Actions/Accounts.tsx +++ b/packages/app-staking/src/Actions/Accounts.tsx @@ -2,17 +2,15 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { ApiProps } from '@polkadot/react-api/types'; import { I18nProps } from '@polkadot/react-components/types'; -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import { KeyringSectionOption } from '@polkadot/ui-keyring/options/types'; import { AccountId, StakingLedger } from '@polkadot/types/interfaces'; import { ComponentProps } from '../types'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { withCalls, withMulti } from '@polkadot/react-api/with'; import { Button, CardGrid } from '@polkadot/react-components'; +import { trackStream, useApiContext } from '@polkadot/react-hooks'; import { AccountName } from '@polkadot/react-query'; import { Option } from '@polkadot/types'; import createOption from '@polkadot/ui-keyring/options/item'; @@ -21,12 +19,10 @@ import Account from './Account'; import StartStaking from './NewStake'; import translate from '../translate'; -interface Props extends I18nProps, ComponentProps, ApiProps { - queryBonded?: Option[]; - queryLedger?: Option[]; +interface Props extends I18nProps, ComponentProps { } -function getMyStashes (queryBonded?: Option[], queryLedger?: Option[], allAccounts?: SubjectInfo): string[] | null { +function getMyStashes (allAccounts: string[], queryBonded?: Option[], queryLedger?: Option[]): string[] | null { const result: string[] = []; if (!queryBonded || !queryLedger) { @@ -34,7 +30,7 @@ function getMyStashes (queryBonded?: Option[], queryLedger?: Option { - value.isSome && allAccounts && result.push(Object.keys(allAccounts)[index]); + value.isSome && result.push(allAccounts[index]); }); queryLedger.forEach((ledger): void => { @@ -48,9 +44,12 @@ function getMyStashes (queryBonded?: Option[], queryLedger?: Option { +function Accounts ({ allAccounts, allStashes, className, recentlyOnline, t }: Props): React.ReactElement { + const { api } = useApiContext(); + const queryBonded = trackStream[]>(api.query.staking.bonded.multi as any, [allAccounts]); + const queryLedger = trackStream[]>(api.query.staking.ledger.multi as any, [allAccounts]); const [isNewStakeOpen, setIsNewStateOpen] = useState(false); - const foundStashes = getMyStashes(queryBonded, queryLedger, allAccounts); + const foundStashes = getMyStashes(allAccounts, queryBonded, queryLedger); const stashOptions = allStashes.map((stashId): KeyringSectionOption => createOption(stashId, () as any) ); @@ -91,25 +90,10 @@ function Accounts ({ allAccounts, allStashes, className, queryBonded, queryLedge ); } -export default withMulti( +export default translate( styled(Accounts)` .ui--CardGrid-buttons { text-align: right; } - `, - translate, - withCalls( - ['query.staking.bonded', { - isMulti: true, - propName: 'queryBonded', - paramPick: ({ allAccounts }: Props): undefined | string[] => - allAccounts && Object.keys(allAccounts) - }], - ['query.staking.ledger', { - isMulti: true, - propName: 'queryLedger', - paramPick: ({ allAccounts }: Props): undefined | string[] => - allAccounts && Object.keys(allAccounts) - }] - ) + ` ); diff --git a/packages/app-staking/src/Query/index.tsx b/packages/app-staking/src/Query/index.tsx index 93cae7326ec9..efd738531245 100644 --- a/packages/app-staking/src/Query/index.tsx +++ b/packages/app-staking/src/Query/index.tsx @@ -6,21 +6,13 @@ import { I18nProps } from '@polkadot/react-components/types'; import { ComponentProps } from '../types'; import React, { useState } from 'react'; -import { withRouter, RouteComponentProps } from 'react-router-dom'; +import { useParams } from 'react-router-dom'; import { Button, InputAddressSimple } from '@polkadot/react-components'; import translate from '../translate'; import Validator from './Validator'; -interface Props extends I18nProps, ComponentProps, RouteComponentProps<{}> { - match: { - isExact: boolean; - params: { - value: string; - }; - path: string; - url: string; - }; +interface Props extends I18nProps, ComponentProps { } // const _onQuery = (): void => { @@ -46,7 +38,8 @@ interface Props extends I18nProps, ComponentProps, RouteComponentProps<{}> { // /> // -function Query ({ className, sessionRewards, match: { params: { value } }, t }: Props): React.ReactElement { +function Query ({ className, sessionRewards, t }: Props): React.ReactElement { + const { value } = useParams(); const [validatorId, setValidatorId] = useState(value || null); const _onQuery = (): void => { @@ -81,4 +74,4 @@ function Query ({ className, sessionRewards, match: { params: { value } }, t }: ); } -export default translate(withRouter(Query)); +export default translate(Query); diff --git a/packages/app-staking/src/index.tsx b/packages/app-staking/src/index.tsx index 955e26b72e54..2d453b0f1833 100644 --- a/packages/app-staking/src/index.tsx +++ b/packages/app-staking/src/index.tsx @@ -4,9 +4,7 @@ import { DerivedHeartbeats, DerivedStakingOverview } from '@polkadot/api-derive/types'; import { AppProps, I18nProps } from '@polkadot/react-components/types'; -import { ApiProps } from '@polkadot/react-api/types'; import { AccountId, BlockNumber } from '@polkadot/types/interfaces'; -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import { ComponentProps } from './types'; import React from 'react'; @@ -16,9 +14,7 @@ import styled from 'styled-components'; import { Option } from '@polkadot/types'; import { HelpOverlay } from '@polkadot/react-components'; import Tabs from '@polkadot/react-components/Tabs'; -import { withMulti, withObservable } from '@polkadot/react-api'; -import { trackStream, useApiContext, useSessionRewards } from '@polkadot/react-hooks'; -import accountObservable from '@polkadot/ui-keyring/observable/accounts'; +import { trackStream, useAccounts, useApiContext, useSessionRewards } from '@polkadot/react-hooks'; import Accounts from './Actions/Accounts'; import basicMd from './md/basic.md'; @@ -27,8 +23,7 @@ import Query from './Query'; import { MAX_SESSIONS } from './constants'; import translate from './translate'; -interface Props extends AppProps, ApiProps, I18nProps { - allAccounts?: SubjectInfo; +interface Props extends AppProps, I18nProps { } const EMPY_ACCOUNTS: string[] = []; @@ -43,8 +38,9 @@ function transformStakingControllers ([stashes, controllers]: [AccountId[], Opti ]; } -function App ({ allAccounts, basePath, className, t }: Props): React.ReactElement { +function App ({ basePath, className, t }: Props): React.ReactElement { const { api } = useApiContext(); + const { allAccounts, hasAccounts } = useAccounts(); const stakingControllers = trackStream<[string[], string[]]>(api.derive.staking.controllers, [], { transform: transformStakingControllers }); const bestNumber = trackStream(api.derive.chain.bestNumber, []); const recentlyOnline = trackStream(api.derive.imOnline.receivedHeartbeats, []); @@ -52,32 +48,22 @@ function App ({ allAccounts, basePath, className, t }: Props): React.ReactElemen const sessionRewards = useSessionRewards(MAX_SESSIONS); const routeMatch = useRouteMatch({ path: basePath, strict: true }); - const hasAccounts = !!allAccounts && Object.keys(allAccounts).length !== 0; const hasQueries = hasAccounts && !!(api.query.imOnline?.authoredBlocks); const [allStashes, allControllers] = stakingControllers || EMPTY_ALL; - const _renderComponent = (Component: React.ComponentType, className?: string): () => React.ReactNode => { - // eslint-disable-next-line react/display-name - return (): React.ReactNode => { - if (!allAccounts) { - return null; - } - - return ( - - ); - }; - }; + const _renderComponent = (Component: React.ComponentType, className?: string): React.ReactNode => ( + + ); return (
@@ -111,16 +97,16 @@ function App ({ allAccounts, basePath, className, t }: Props): React.ReactElemen /> - - - + {_renderComponent(Accounts)} + {_renderComponent(Query)} + {_renderComponent(Query)} - {_renderComponent(Overview, routeMatch?.isExact ? '' : 'staking--hidden')()} + {_renderComponent(Overview, routeMatch?.isExact ? '' : 'staking--hidden')}
); } -export default withMulti( +export default translate( styled(App)` .staking--hidden { display: none; @@ -137,7 +123,5 @@ export default withMulti( .staking--Chart+.staking--Chart { margin-top: 1.5rem; } - `, - translate, - withObservable(accountObservable.subject, { propName: 'allAccounts' }) + ` ); diff --git a/packages/app-staking/src/types.ts b/packages/app-staking/src/types.ts index ddbe66eccdcf..919148f1cffe 100644 --- a/packages/app-staking/src/types.ts +++ b/packages/app-staking/src/types.ts @@ -5,12 +5,11 @@ import { DerivedFees, DerivedBalances, DerivedHeartbeats, DerivedStakingOverview } from '@polkadot/api-derive/types'; import { BlockNumber } from '@polkadot/types/interfaces'; import { SessionRewards } from '@polkadot/react-hooks/types'; -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; export type Nominators = Record; export interface ComponentProps { - allAccounts?: SubjectInfo; + allAccounts: string[]; allControllers: string[]; allStashes: string[]; bestNumber?: BlockNumber; diff --git a/packages/app-sudo/src/SetKey.tsx b/packages/app-sudo/src/SetKey.tsx index f25b68cf0264..b85530b2b783 100644 --- a/packages/app-sudo/src/SetKey.tsx +++ b/packages/app-sudo/src/SetKey.tsx @@ -23,10 +23,9 @@ function SetKey ({ allAccounts, className, isMine, sudoKey, t }: Props): React.R }, [selected, sudoKey]); const willLose = isMine && - !!Object.keys(allAccounts).length && !!selected && selected !== sudoKey && - !Object.keys(allAccounts).find((s): boolean => s === selected); + allAccounts.some((s): boolean => s === selected); return (
diff --git a/packages/app-sudo/src/index.tsx b/packages/app-sudo/src/index.tsx index fe018a11e9c2..011adab330ed 100644 --- a/packages/app-sudo/src/index.tsx +++ b/packages/app-sudo/src/index.tsx @@ -4,14 +4,12 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { AppProps, I18nProps } from '@polkadot/react-components/types'; -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import { ComponentProps } from './types'; import React, { useEffect, useState } from 'react'; import { Route, Switch } from 'react-router'; import { Icon, Tabs } from '@polkadot/react-components'; -import { withCalls, withMulti, withObservable } from '@polkadot/react-api'; -import accountObservable from '@polkadot/ui-keyring/observable/accounts'; +import { trackStream, useAccounts, useApiContext } from '@polkadot/react-hooks'; import SetKey from './SetKey'; import Sudo from './Sudo'; @@ -19,17 +17,16 @@ import Sudo from './Sudo'; import translate from './translate'; interface Props extends AppProps, I18nProps { - allAccounts: SubjectInfo; - sudoKey?: string; } -function App ({ allAccounts, basePath, sudoKey, t }: Props): React.ReactElement { +function App ({ basePath, t }: Props): React.ReactElement { + const { api } = useApiContext(); + const sudoKey = trackStream(api.query.sudo.key, [], { transform: (k): string => k.toString() }); + const { allAccounts } = useAccounts(); const [isMine, setIsMine] = useState(false); useEffect((): void => { - setIsMine( - !!sudoKey && !!allAccounts && Object.keys(allAccounts).some((key): boolean => key === sudoKey) - ); + setIsMine(!!sudoKey && allAccounts.some((key): boolean => key === sudoKey)); }, [allAccounts, sudoKey]); const _renderComponent = (Component: React.ComponentType): () => React.ReactNode => { @@ -83,15 +80,4 @@ function App ({ allAccounts, basePath, sudoKey, t }: Props): React.ReactElement< ); } -export default withMulti( - App, - translate, - withCalls( - ['query.sudo.key', { - propName: 'sudoKey', - transform: (key): string => - key.toString() - }] - ), - withObservable(accountObservable.subject, { propName: 'allAccounts' }) -); +export default translate(App); diff --git a/packages/app-sudo/src/types.ts b/packages/app-sudo/src/types.ts index 78e0f326d61c..7687cefeb754 100644 --- a/packages/app-sudo/src/types.ts +++ b/packages/app-sudo/src/types.ts @@ -2,10 +2,8 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; - export interface ComponentProps { - allAccounts: SubjectInfo; + allAccounts: string[]; isMine: boolean; sudoKey?: string; } diff --git a/packages/app-toolbox/src/index.tsx b/packages/app-toolbox/src/index.tsx index 956e12f0914f..512c4e3956ee 100644 --- a/packages/app-toolbox/src/index.tsx +++ b/packages/app-toolbox/src/index.tsx @@ -3,13 +3,11 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { AppProps, I18nProps } from '@polkadot/react-components/types'; -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import React from 'react'; import { Route, Switch } from 'react-router'; import Tabs from '@polkadot/react-components/Tabs'; -import accountObservable from '@polkadot/ui-keyring/observable/accounts'; -import { withMulti, withObservable } from '@polkadot/react-api'; +import { useAccounts } from '@polkadot/react-hooks'; import Hash from './Hash'; import Rpc from './Rpc'; @@ -18,11 +16,10 @@ import Verify from './Verify'; import translate from './translate'; interface Props extends AppProps, I18nProps { - allAccounts?: SubjectInfo; } -function ToolboxApp ({ allAccounts, basePath, t }: Props): React.ReactElement { - const hasAccounts = allAccounts && Object.keys(allAccounts).length !== 0; +function ToolboxApp ({ basePath, t }: Props): React.ReactElement { + const { hasAccounts } = useAccounts(); const tabs = [ { isRoot: true, @@ -64,8 +61,4 @@ function ToolboxApp ({ allAccounts, basePath, t }: Props): React.ReactElement void; } -function ProposalDisplay ({ allAccounts, isApproved, onPopulate, onRespond, proposal, proposalId, t }: Props): React.ReactElement | null { +function ProposalDisplay ({ isApproved, onPopulate, onRespond, proposal, proposalId, t }: Props): React.ReactElement | null { + const { hasAccounts } = useAccounts(); + useEffect((): void => { onPopulate(); }, [proposal]); @@ -39,8 +39,6 @@ function ProposalDisplay ({ allAccounts, isApproved, onPopulate, onRespond, prop return null; } - const hasAccounts = allAccounts && Object.keys(allAccounts).length !== 0; - return ( ): TreasuryProposalType | null => value.unwrapOr(null) }] - ), - withObservable(keyring.accounts.subject, { propName: 'allAccounts' }) + ) ); diff --git a/packages/app-treasury/src/Overview/Proposals.tsx b/packages/app-treasury/src/Overview/Proposals.tsx index 78f75f5f2a6a..279ed9ebda8b 100644 --- a/packages/app-treasury/src/Overview/Proposals.tsx +++ b/packages/app-treasury/src/Overview/Proposals.tsx @@ -8,21 +8,21 @@ import { I18nProps } from '@polkadot/react-components/types'; import BN from 'bn.js'; import React, { useEffect, useState } from 'react'; -import { RouteComponentProps } from 'react-router'; -import { withRouter } from 'react-router-dom'; +import { useHistory } from 'react-router-dom'; import { withCalls, withMulti } from '@polkadot/react-api'; import { Column } from '@polkadot/react-components'; import Proposal from './Proposal'; import translate from '../translate'; -interface Props extends I18nProps, RouteComponentProps<{}> { +interface Props extends I18nProps { isApprovals?: boolean; treasury_approvals?: BN[]; treasury_proposalCount?: BN; } -function ProposalsBase ({ history, isApprovals = false, treasury_approvals, treasury_proposalCount, t }: Props): React.ReactElement { +function ProposalsBase ({ isApprovals = false, treasury_approvals, treasury_proposalCount, t }: Props): React.ReactElement { + const history = useHistory(); const [isEmpty, setIsEmpty] = useState(true); const [proposalIndices, setProposalIndices] = useState([]); @@ -71,7 +71,7 @@ function ProposalsBase ({ history, isApprovals = false, treasury_approvals, trea } const Proposals = withMulti( - withRouter(ProposalsBase), + ProposalsBase, translate, withCalls( ['query.treasury.approvals', { diff --git a/packages/apps/src/Content/index.tsx b/packages/apps/src/Content/index.tsx index 8200ea142ad7..6fa7a3b33693 100644 --- a/packages/apps/src/Content/index.tsx +++ b/packages/apps/src/Content/index.tsx @@ -2,10 +2,10 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { I18nProps } from '@polkadot/react-components/types'; +import { I18nProps as Props } from '@polkadot/react-components/types'; import React, { useContext } from 'react'; -import { withRouter, RouteComponentProps } from 'react-router'; +import { useLocation } from 'react-router-dom'; import styled from 'styled-components'; import routing from '@polkadot/apps-routing'; import { StatusContext } from '@polkadot/react-components'; @@ -15,8 +15,6 @@ import Status from './Status'; import translate from '../translate'; import NotFound from './NotFound'; -interface Props extends I18nProps, RouteComponentProps {} - const unknown = { display: { needsApi: undefined @@ -25,7 +23,8 @@ const unknown = { name: '' }; -function Content ({ className, location, t }: Props): React.ReactElement { +function Content ({ className, t }: Props): React.ReactElement { + const location = useLocation(); const { isApiConnected, isApiReady } = useApiContext(); const { queueAction, stqueue, txqueue } = useContext(StatusContext); const app = location.pathname.slice(1) || ''; @@ -58,26 +57,24 @@ function Content ({ className, location, t }: Props): React.ReactElement // React-router needs to be first, otherwise we have blocked updates export default translate( - withRouter( - styled(Content)` - background: #fafafa; - display: flex; - flex-direction: column; - flex-grow: 1; - height: 100%; - min-height: 100vh; - overflow-x: hidden; - overflow-y: auto; - width: 100%; - padding: 0 2rem; + styled(Content)` + background: #fafafa; + display: flex; + flex-direction: column; + flex-grow: 1; + height: 100%; + min-height: 100vh; + overflow-x: hidden; + overflow-y: auto; + width: 100%; + padding: 0 2rem; - @media(max-width: 768px) { - padding: 0 0.5rem; - } + @media(max-width: 768px) { + padding: 0 0.5rem; + } - .connecting { - padding: 1rem 0; - } - ` - ) + .connecting { + padding: 1rem 0; + } + ` ); diff --git a/packages/apps/src/SideBar/Item.tsx b/packages/apps/src/SideBar/Item.tsx index 7dd550ee4d08..122dde1d9e95 100644 --- a/packages/apps/src/SideBar/Item.tsx +++ b/packages/apps/src/SideBar/Item.tsx @@ -4,7 +4,6 @@ import { ApiProps } from '@polkadot/react-api/types'; import { I18nProps } from '@polkadot/react-components/types'; -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; import { Route } from '@polkadot/apps-routing/types'; import { AccountId } from '@polkadot/types/interfaces'; @@ -12,9 +11,8 @@ import React, { useEffect, useState } from 'react'; import { NavLink } from 'react-router-dom'; import { ApiPromise } from '@polkadot/api'; import { Icon, Menu, Tooltip } from '@polkadot/react-components'; -import accountObservable from '@polkadot/ui-keyring/observable/accounts'; -import { withCalls, withMulti, withObservable } from '@polkadot/react-api'; -import { useApiContext } from '@polkadot/react-hooks'; +import { withCalls, withMulti } from '@polkadot/react-api'; +import { useAccounts, useApiContext } from '@polkadot/react-hooks'; import { isFunction } from '@polkadot/util'; import translate from '../translate'; @@ -22,7 +20,6 @@ import translate from '../translate'; interface Props extends I18nProps { isCollapsed: boolean; onClick: () => void; - allAccounts?: SubjectInfo; route: Route; sudoKey?: AccountId; } @@ -77,18 +74,14 @@ function checkVisible (name: string, { api, isApiReady, isApiConnected }: ApiPro return notFound.length === 0; } -function Item ({ allAccounts, route: { Modal, display, i18n, icon, name }, t, isCollapsed, onClick, sudoKey }: Props): React.ReactElement | null { +function Item ({ route: { Modal, display, i18n, icon, name }, t, isCollapsed, onClick, sudoKey }: Props): React.ReactElement | null { + const { allAccounts, hasAccounts } = useAccounts(); const apiProps = useApiContext(); - const [hasAccounts, setHasAccounts] = useState(false); const [hasSudo, setHasSudo] = useState(false); const [isVisible, setIsVisible] = useState(false); useEffect((): void => { - setHasAccounts(Object.keys(allAccounts || {}).length !== 0); - }, [allAccounts]); - - useEffect((): void => { - setHasSudo(!!sudoKey && Object.keys(allAccounts || {}).some((address): boolean => sudoKey.eq(address))); + setHasSudo(!!sudoKey && allAccounts.some((address): boolean => sudoKey.eq(address))); }, [allAccounts, sudoKey]); useEffect((): void => { @@ -149,6 +142,5 @@ export default withMulti( translate, withCalls( ['query.sudo.key', { propName: 'sudoKey' }] - ), - withObservable(accountObservable.subject, { propName: 'allAccounts' }) + ) ); diff --git a/packages/apps/src/overlays/Accounts.tsx b/packages/apps/src/overlays/Accounts.tsx index ac5b90a92be2..54a4d8bba8ee 100644 --- a/packages/apps/src/overlays/Accounts.tsx +++ b/packages/apps/src/overlays/Accounts.tsx @@ -2,45 +2,27 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { I18nProps } from '@polkadot/react-components/types'; -import { ApiProps } from '@polkadot/react-api/types'; -import { SubjectInfo } from '@polkadot/ui-keyring/observable/types'; +import { I18nProps as Props } from '@polkadot/react-components/types'; -import React, { useEffect, useState } from 'react'; +import React, { useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { withApi, withMulti, withObservable } from '@polkadot/react-api'; -import accountObservable from '@polkadot/ui-keyring/observable/accounts'; +import { useAccounts, useApiContext } from '@polkadot/react-hooks'; import translate from '../translate'; import BaseOverlay from './Base'; -interface Props extends I18nProps, ApiProps { - allAccounts?: SubjectInfo; -} - -function Accounts ({ allAccounts, isApiReady, className, t }: Props): React.ReactElement | null { - const [hasAccounts, setHasAccounts] = useState(false); +function Accounts ({ className, t }: Props): React.ReactElement | null { + const { hasAccounts } = useAccounts(); + const { isApiReady } = useApiContext(); const [isHidden, setIsHidden] = useState(false); - useEffect((): void => { - if (!allAccounts) { - return; - } - - const newHas = Object.keys(allAccounts).length !== 0; - - if (newHas !== hasAccounts) { - setHasAccounts(newHas); - } - }, [allAccounts]); - - const _onClose = (): void => setIsHidden(true); - if (!isApiReady || hasAccounts || isHidden) { return null; } + const _onClose = (): void => setIsHidden(true); + return ( | null { +function Inset ({ children, className, header, href, isCollapsible, isError, isSuccess, withBottomMargin, withTopMargin }: InsetProps): React.ReactElement | null { + const history = useHistory(); const [isCollapsed, setIsCollapsed] = useState(true); if (!children) { @@ -71,84 +71,82 @@ function Inset ({ children, className, header, history, href, isCollapsible, isE ); } -export default withRouter( - styled(Inset)` - & { - box-shadow: 0 3px 3px rgba(0,0,0,.2); - position: relative; - background: #fefefe; - padding: 1rem; - transition: all 0.2s; - display: flex; - flex-direction: column; - - &.bottom-margin { - margin-bottom: 2rem; - } +export default styled(Inset)` + & { + box-shadow: 0 3px 3px rgba(0,0,0,.2); + position: relative; + background: #fefefe; + padding: 1rem; + transition: all 0.2s; + display: flex; + flex-direction: column; + + &.bottom-margin { + margin-bottom: 2rem; + } - &.top-margin { - margin-top: 2rem; - } + &.top-margin { + margin-top: 2rem; + } - &.error { - background: rgba(255, 0, 0, 0.05); + &.error { + background: rgba(255, 0, 0, 0.05); - &, h1, h2, h3, h4, h5, h6, p { - color: rgba(156, 0, 0) !important; - } + &, h1, h2, h3, h4, h5, h6, p { + color: rgba(156, 0, 0) !important; } + } - &.success { - border: 1px solid rgb(168, 255, 136); - background: rgba(0, 255, 0, 0.05); + &.success { + border: 1px solid rgb(168, 255, 136); + background: rgba(0, 255, 0, 0.05); - &, h1, h2, h3, h4, h5, h6, p { - color: rgba(34, 125, 0) !important; - } + &, h1, h2, h3, h4, h5, h6, p { + color: rgba(34, 125, 0) !important; } + } - .header { - cursor: pointer; - height: 2rem; - width: 100%; - - h3 { - line-height: 2rem; - margin-bottom: 0; - } + .header { + cursor: pointer; + height: 2rem; + width: 100%; - .icon { - height: 4rem; - width: 4rem; - font-size: 2rem; - color: rgba(0,0,0,0.35); - position: absolute; - right: 0; - top: 0; - line-height: 4rem; - transition: all 0.2s; - transform-origin: center center; - - &.collapsed { - transform: rotate(180deg); - } - } + h3 { + line-height: 2rem; + margin-bottom: 0; } - .children { + .icon { + height: 4rem; + width: 4rem; + font-size: 2rem; + color: rgba(0,0,0,0.35); + position: absolute; + right: 0; + top: 0; + line-height: 4rem; + transition: all 0.2s; + transform-origin: center center; + &.collapsed { - display: none; + transform: rotate(180deg); } } + } - &.as-link { - cursor: pointer; + .children { + &.collapsed { + display: none; + } + } - &:hover { - box-shadow: 0 5px 5px rgba(0,0,0,.2); - transform: translateY(-2px); - } + &.as-link { + cursor: pointer; + + &:hover { + box-shadow: 0 5px 5px rgba(0,0,0,.2); + transform: translateY(-2px); } } - ` -); + } +`; diff --git a/packages/react-hooks/src/index.ts b/packages/react-hooks/src/index.ts index 55f1cb88cff2..00cb074109c6 100644 --- a/packages/react-hooks/src/index.ts +++ b/packages/react-hooks/src/index.ts @@ -2,7 +2,10 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -export { default as trackStream } from './trackStream'; +export { default as trackPromise } from './track/trackPromise'; +export { default as trackStream } from './track/trackStream'; +export { default as useAccounts } from './useAccounts'; +export { default as useAddresses } from './useAddresses'; export { default as useApiContext } from './useApiContext'; export { default as useDebounce } from './useDebounce'; export { default as useFavorites } from './useFavorites'; diff --git a/packages/react-hooks/src/track/trackPromise.tsx b/packages/react-hooks/src/track/trackPromise.tsx new file mode 100644 index 000000000000..34e5cba0e5be --- /dev/null +++ b/packages/react-hooks/src/track/trackPromise.tsx @@ -0,0 +1,58 @@ +// Copyright 2017-2019 @polkadot/react-hooks authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { Options, Params } from './types'; + +import { useEffect, useRef, useState } from 'react'; + +import { extractParams, transformIdentity } from './util'; + +interface TrackFn { + (a: any, b: any, c: any): Promise; + (a: any, b: any): Promise; + (a: any): Promise; + (): Promise; +} + +// tracks a promise, typically an api.* call that +// - returns a promise with the value +// FIXME The typings here need some serious TLC +export default function trackPromise (fn: TrackFn | undefined, params: any, { paramMap = transformIdentity, transform = transformIdentity }: Options = {}): T | undefined { + const [value, setValue] = useState(); + const tracker = useRef<{ serialized: string | null }>({ serialized: null }); + + const _subscribe = (params: Params): void => { + setImmediate((): void => { + if (fn) { + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore + // @ts-ignore We tried to get the typings right, close but no cigar... + fn(...params).then((value: any): void => setValue(transform(value))); + } + }); + }; + + // initial round, subscribe once + useEffect((): void => { + const [serialized, mappedParams] = extractParams(params, paramMap); + + tracker.current.serialized = serialized; + + if (mappedParams) { + _subscribe(mappedParams); + } + }, []); + + // on changes, re-get + useEffect((): void => { + const [serialized, mappedParams] = extractParams(params, paramMap); + + if (mappedParams && serialized !== tracker.current.serialized) { + tracker.current.serialized = serialized; + + _subscribe(mappedParams); + } + }, [params]); + + return value; +} diff --git a/packages/react-hooks/src/trackStream.tsx b/packages/react-hooks/src/track/trackStream.tsx similarity index 62% rename from packages/react-hooks/src/trackStream.tsx rename to packages/react-hooks/src/track/trackStream.tsx index 5c84de8fdef7..16d92fe3e78c 100644 --- a/packages/react-hooks/src/trackStream.tsx +++ b/packages/react-hooks/src/track/trackStream.tsx @@ -2,15 +2,11 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { useEffect, useRef, useState } from 'react'; -import { isNull, isUndefined } from '@polkadot/util'; +import { Options, Params } from './types'; -type Params = [] | [any] | [any, any] | [any, any, any]; +import { useEffect, useRef, useState } from 'react'; -interface Options { - paramMap?: (params: any) => any; - transform?: (value: any) => T; -} +import { dummyPromise, extractParams, transformIdentity } from './util'; interface TrackFnCallback { (value: T): void; @@ -25,41 +21,28 @@ interface TrackFn { (cb: TrackFnCallback): Promise; } -const dummySubscribe = Promise.resolve((): void => { - // we do nothing, this is a noop -}); - -function transformIdentity (value: any): any { - return value; -} - -// extract the serialized and mapped params, all ready for use in our call -function extractParams (params: any[], paramMap: (params: any[]) => any): [string, Params | null] { - return [ - JSON.stringify({ a: params }), - params.length === 0 || !params.some((param): boolean => isNull(param) || isUndefined(null)) - ? paramMap(params) - : null - ]; -} - // tracks a stream, typically an api.* call that // - returns a promise with an unsubscription // - has a callback to set the value // FIXME The typings here need some serious TLC export default function trackStream (fn: TrackFn | undefined, params: any, { paramMap = transformIdentity, transform = transformIdentity }: Options = {}): T | undefined { const [value, setValue] = useState(); - const tracker = useRef<{ serialized: string | null; subscriber: Promise }>({ serialized: null, subscriber: dummySubscribe }); + const tracker = useRef<{ serialized: string | null; subscriber: Promise }>({ serialized: null, subscriber: dummyPromise }); - const _subscribe = (params: Params): void => { - tracker.current.subscriber = fn - // eslint-disable-next-line @typescript-eslint/ban-ts-ignore - // @ts-ignore We tried to get the typings right, close but no cigar... - ? fn(...params, (value: any): T => setValue(transform(value))) - : dummySubscribe; - }; const _unsubscribe = (): void => { tracker.current.subscriber.then((fn): void => fn()); + tracker.current.subscriber = dummyPromise; + }; + const _subscribe = (params: Params): void => { + _unsubscribe(); + + setImmediate((): void => { + tracker.current.subscriber = fn + // eslint-disable-next-line @typescript-eslint/ban-ts-ignore + // @ts-ignore We tried to get the typings right, close but no cigar... + ? fn(...params, (value: any): void => setValue(transform(value))) + : dummyPromise; + }); }; // initial round, subscribe once @@ -81,7 +64,7 @@ export default function trackStream (fn: TrackFn | undefined, params: a if (mappedParams && serialized !== tracker.current.serialized) { tracker.current.serialized = serialized; - _unsubscribe(); + _subscribe(mappedParams); } }, [params]); diff --git a/packages/react-hooks/src/track/types.ts b/packages/react-hooks/src/track/types.ts new file mode 100644 index 000000000000..46e3fc167d52 --- /dev/null +++ b/packages/react-hooks/src/track/types.ts @@ -0,0 +1,10 @@ +// Copyright 2017-2019 @polkadot/react-hooks authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +export type Params = [] | [any] | [any, any] | [any, any, any]; + +export interface Options { + paramMap?: (params: any) => any; + transform?: (value: any) => T; +} diff --git a/packages/react-hooks/src/track/util.ts b/packages/react-hooks/src/track/util.ts new file mode 100644 index 000000000000..adfd31723427 --- /dev/null +++ b/packages/react-hooks/src/track/util.ts @@ -0,0 +1,25 @@ +// Copyright 2017-2019 @polkadot/react-hooks authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { Params } from './types'; + +import { isNull, isUndefined } from '@polkadot/util'; + +export const dummyPromise = Promise.resolve((): void => { + // we do nothing, this is a noop +}); + +export function transformIdentity (value: any): any { + return value; +} + +// extract the serialized and mapped params, all ready for use in our call +export function extractParams (params: any[], paramMap: (params: any[]) => any): [string, Params | null] { + return [ + JSON.stringify({ a: params }), + params.length === 0 || !params.some((param): boolean => isNull(param) || isUndefined(null)) + ? paramMap(params) + : null + ]; +} diff --git a/packages/react-hooks/src/useAccounts.tsx b/packages/react-hooks/src/useAccounts.tsx new file mode 100644 index 000000000000..87181ddb1bb0 --- /dev/null +++ b/packages/react-hooks/src/useAccounts.tsx @@ -0,0 +1,30 @@ +// Copyright 2017-2019 @polkadot/react-hooks authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { useEffect, useState } from 'react'; +import accountObservable from '@polkadot/ui-keyring/observable/accounts'; + +interface UseAccounts { + allAccounts: string[]; + hasAccounts: boolean; +} + +export default function useAccounts (): UseAccounts { + const [state, setState] = useState({ allAccounts: [], hasAccounts: false }); + + useEffect((): () => void => { + const subscription = accountObservable.subject.subscribe((accounts): void => { + const allAccounts = accounts ? Object.keys(accounts) : []; + const hasAccounts = allAccounts.length !== 0; + + setState({ allAccounts, hasAccounts }); + }); + + return (): void => { + subscription.unsubscribe(); + }; + }, []); + + return state; +} diff --git a/packages/react-hooks/src/useAddresses.tsx b/packages/react-hooks/src/useAddresses.tsx new file mode 100644 index 000000000000..8b8a89ffdcf8 --- /dev/null +++ b/packages/react-hooks/src/useAddresses.tsx @@ -0,0 +1,30 @@ +// Copyright 2017-2019 @polkadot/react-hooks authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { useEffect, useState } from 'react'; +import addressObservable from '@polkadot/ui-keyring/observable/addresses'; + +interface UseAccounts { + allAddresses: string[]; + hasAddresses: boolean; +} + +export default function useAccounts (): UseAccounts { + const [state, setState] = useState({ allAddresses: [], hasAddresses: false }); + + useEffect((): () => void => { + const subscription = addressObservable.subject.subscribe((addresses): void => { + const allAddresses = addresses ? Object.keys(addresses) : []; + const hasAddresses = allAddresses.length !== 0; + + setState({ allAddresses, hasAddresses }); + }); + + return (): void => { + subscription.unsubscribe(); + }; + }, []); + + return state; +} diff --git a/packages/react-hooks/src/useSessionRewards.tsx b/packages/react-hooks/src/useSessionRewards.tsx index 096ce0df36f9..3f8ec08f3f01 100644 --- a/packages/react-hooks/src/useSessionRewards.tsx +++ b/packages/react-hooks/src/useSessionRewards.tsx @@ -113,47 +113,44 @@ async function loadSome (api: ApiPromise, fromHash: Hash, toHash: Hash): Promise export default function useSessionRewards (maxSessions: number): SessionRewards[] { const { api } = useApiContext(); const [getCache, setCache] = useCacheKey('hooks:sessionSlashes'); - const [results, setResults] = useState(fromJSON(getCache() || [])); const [filtered, setFiltered] = useState([]); useEffect((): void => { - let workQueue = results; + let workQueue = fromJSON(getCache() || []); - api.isReady.then(async (): Promise => { - const maxSessionsStore = maxSessions + 1; // assuming first is a bust - const sessionLength = (api.consts.babe?.epochDuration as BlockNumber || new BN(500)); - const count = Math.min(sessionLength.muln(maxSessionsStore).divn(10).toNumber(), 10000); - const bestHeader = await api.rpc.chain.getHeader(); - let toHash = bestHeader.hash; - let toNumber = bestHeader.number.unwrap().toBn(); - let fromHash = api.genesisHash; - let fromNumber = bnMax(toNumber.subn(count), new BN(1)); + setImmediate((): void => { + api.isReady.then(async (): Promise => { + const maxSessionsStore = maxSessions + 1; // assuming first is a bust + const sessionLength = (api.consts.babe?.epochDuration as BlockNumber || new BN(500)); + const count = Math.min(sessionLength.muln(maxSessionsStore).divn(10).toNumber(), 10000); + const bestHeader = await api.rpc.chain.getHeader(); + let toHash = bestHeader.hash; + let toNumber = bestHeader.number.unwrap().toBn(); + let fromHash = api.genesisHash; + let fromNumber = bnMax(toNumber.subn(count), new BN(1)); - while (true) { - fromHash = await api.rpc.chain.getBlockHash(fromNumber as any); + while (true) { + fromHash = await api.rpc.chain.getBlockHash(fromNumber as any); - const newQueue = await loadSome(api, fromHash, toHash); + const newQueue = await loadSome(api, fromHash, toHash); - workQueue = mergeResults(workQueue, newQueue); - toHash = fromHash; - toNumber = fromNumber; - fromNumber = bnMax(toNumber.subn(count), new BN(1)); + workQueue = mergeResults(workQueue, newQueue); + toHash = fromHash; + toNumber = fromNumber; + fromNumber = bnMax(toNumber.subn(count), new BN(1)); - setCache(toJSON(workQueue, maxSessionsStore)); - setResults(workQueue); + setCache(toJSON(workQueue, maxSessionsStore)); + setFiltered(workQueue.slice(-maxSessions)); - const lastNumber = workQueue[workQueue.length - 1]?.blockNumber; + const lastNumber = workQueue[workQueue.length - 1]?.blockNumber; - if (!lastNumber || fromNumber.eqn(1) || ((workQueue.length >= maxSessionsStore) && fromNumber.lt(lastNumber))) { - break; + if (!lastNumber || fromNumber.eqn(1) || ((workQueue.length >= maxSessionsStore) && fromNumber.lt(lastNumber))) { + break; + } } - } + }); }); }, []); - useEffect((): void => { - setFiltered(results.slice(-maxSessions)); - }, [results]); - return filtered; } From ebdbadc2d3556d3562b32a3310dcc217f2735687 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Sat, 16 Nov 2019 09:17:59 +0000 Subject: [PATCH 058/154] [CI Skip] 0.37.0-beta.94 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index f567ffaaea10..3fc22afd5e16 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.93" + "version": "0.37.0-beta.94" } diff --git a/package.json b/package.json index 9fb35c3d6d77..c2885dae340a 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 8ec5bfeafec4..f2aa69c4707f 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 50f4a6c99003..220c422ed39c 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-components": "^0.37.0-beta.94", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 352cfe24aa8a..1ff9d52cb14f 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index c37626d38d7e..6c9705482cd7 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index cacf7d86e961..6da76b459359 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.9", - "@polkadot/react-components": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 84b2300ee375..9c6d14b5ed59 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", - "@polkadot/react-query": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-query": "^0.37.0-beta.94" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index c9a88ddc33c4..235752967745 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.93", - "@polkadot/react-components": "^0.37.0-beta.93" + "@polkadot/apps-routing": "^0.37.0-beta.94", + "@polkadot/react-components": "^0.37.0-beta.94" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 4b9c532d16e9..12677d9200cb 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", - "@polkadot/react-query": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-query": "^0.37.0-beta.94" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 6a7c1cc53b82..893d79f91614 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index e196d8304895..34645b4390d8 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", - "@polkadot/react-params": "^0.37.0-beta.93", - "@polkadot/react-signer": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-params": "^0.37.0-beta.94", + "@polkadot/react-signer": "^0.37.0-beta.94" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 00f742164f72..bcc6ba0b421e 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 51200e4dc49b..6c00f3748f3f 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-components": "^0.37.0-beta.94", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index a3cdc7361a55..d1f62e269943 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", - "@polkadot/react-query": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-query": "^0.37.0-beta.94" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index f476cedeb281..8b40553aff56 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", - "@polkadot/react-query": "^0.37.0-beta.93", + "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-query": "^0.37.0-beta.94", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 4a87eedd53ad..0184495d29f9 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.93", - "@polkadot/react-components": "^0.37.0-beta.93", - "@polkadot/react-query": "^0.37.0-beta.93" + "@polkadot/app-explorer": "^0.37.0-beta.94", + "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-query": "^0.37.0-beta.94" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index dc2ed62e0b3f..0cdd30187f5c 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", - "@polkadot/react-params": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-params": "^0.37.0-beta.94" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 912371f48bb0..14ffbe1f6821 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 6640e6e7f28f..4ddd38bb03f5 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 62624f89379c..8f714a67e489 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", - "@polkadot/react-query": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-query": "^0.37.0-beta.94" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 5e29e34e0936..beddc65eac17 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", - "@polkadot/react-query": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-query": "^0.37.0-beta.94" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index ca8f971228ab..a35511c1e209 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index b9080cffbeba..b5895deeab10 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", - "@polkadot/react-signer": "^0.37.0-beta.93", + "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-signer": "^0.37.0-beta.94", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 767216fbd7f9..283d3812bec4 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index a9740e0e7d2d..f2e387cfcb58 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.93", + "@polkadot/react-api": "^0.37.0-beta.94", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.93", + "@polkadot/react-query": "^0.37.0-beta.94", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 3a137dd494c8..c2fce6525ad4 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 343ea98422f0..6270876912f4 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93" + "@polkadot/react-components": "^0.37.0-beta.94" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 5e0a3d6788ae..fc956cbb9232 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 9fc92680d903..fde20d0b5e99 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.93", + "version": "0.37.0-beta.94", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.93", + "@polkadot/react-components": "^0.37.0-beta.94", "@polkadot/react-qr": "^0.47.0-beta.6" } } From 971c514a6a8b4c82a3b3159140b9f1dc982c3596 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 16 Nov 2019 14:58:04 +0100 Subject: [PATCH 059/154] Allow basic chart display w/ non-archive (#1899) --- packages/app-staking/src/Query/Validator.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/app-staking/src/Query/Validator.tsx b/packages/app-staking/src/Query/Validator.tsx index 64c20bdd2068..835bdbe345bf 100644 --- a/packages/app-staking/src/Query/Validator.tsx +++ b/packages/app-staking/src/Query/Validator.tsx @@ -59,6 +59,10 @@ function extractStake (values: [Hash, Exposure][], divisor: BN): LineData { } function extractSplit (values: [Hash, Exposure][], validatorId: string): SplitData | null { + if (!values.length) { + return null; + } + const last = values[values.length - 1][1]; const total = last.total.unwrap(); @@ -129,7 +133,7 @@ function Validator ({ className, sessionRewards, t, validatorId }: Props): React rewardsLabels.push(formatNumber(sessionIndex.subn(1))); const neg = extractEraSlash(validatorId, slashes); - const pos = index + const pos = index && blockCounts[index - 1] ? reward.mul(blockCounts[index - 1]).div(blockNumber.sub(sessionRewards[index - 1].blockNumber)) : new BN(0); @@ -203,7 +207,7 @@ function Validator ({ className, sessionRewards, t, validatorId }: Props): React {(stakeChart || splitChart) && ( <> - {stakeChart && ( + {stakeChart && stakeChart[0].length !== 0 && (

{t('elected stake')}

Date: Sat, 16 Nov 2019 14:02:55 +0000 Subject: [PATCH 060/154] [CI Skip] 0.37.0-beta.95 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 3fc22afd5e16..b56f4531266c 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.94" + "version": "0.37.0-beta.95" } diff --git a/package.json b/package.json index c2885dae340a..95fb9206e319 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index f2aa69c4707f..ff20fb3dbc2f 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 220c422ed39c..f8d2208345b6 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-components": "^0.37.0-beta.95", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 1ff9d52cb14f..85f3c6b4b94b 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 6c9705482cd7..c68e02319327 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 6da76b459359..614913dbc8df 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.9", - "@polkadot/react-components": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 9c6d14b5ed59..fc35addce5fe 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", - "@polkadot/react-query": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-query": "^0.37.0-beta.95" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 235752967745..bcab3a52e20a 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.94", - "@polkadot/react-components": "^0.37.0-beta.94" + "@polkadot/apps-routing": "^0.37.0-beta.95", + "@polkadot/react-components": "^0.37.0-beta.95" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 12677d9200cb..dd1358c04dae 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", - "@polkadot/react-query": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-query": "^0.37.0-beta.95" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 893d79f91614..4c80fa79f26f 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 34645b4390d8..aa20982fe30c 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", - "@polkadot/react-params": "^0.37.0-beta.94", - "@polkadot/react-signer": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-params": "^0.37.0-beta.95", + "@polkadot/react-signer": "^0.37.0-beta.95" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index bcc6ba0b421e..977c0cf2dc89 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 6c00f3748f3f..4134795e1a1f 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-components": "^0.37.0-beta.95", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index d1f62e269943..a00df4c8ace4 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", - "@polkadot/react-query": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-query": "^0.37.0-beta.95" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 8b40553aff56..629a4d229f15 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", - "@polkadot/react-query": "^0.37.0-beta.94", + "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-query": "^0.37.0-beta.95", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 0184495d29f9..756f7f9f2f41 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.94", - "@polkadot/react-components": "^0.37.0-beta.94", - "@polkadot/react-query": "^0.37.0-beta.94" + "@polkadot/app-explorer": "^0.37.0-beta.95", + "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-query": "^0.37.0-beta.95" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 0cdd30187f5c..0b65a27ef6f4 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", - "@polkadot/react-params": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-params": "^0.37.0-beta.95" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 14ffbe1f6821..87b42cc5db6f 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 4ddd38bb03f5..e8814e8781c2 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 8f714a67e489..af9f4210b766 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", - "@polkadot/react-query": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-query": "^0.37.0-beta.95" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index beddc65eac17..57327947d5ce 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", - "@polkadot/react-query": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-query": "^0.37.0-beta.95" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index a35511c1e209..8d38fd7d71cf 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index b5895deeab10..7d44fa3edeae 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", - "@polkadot/react-signer": "^0.37.0-beta.94", + "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-signer": "^0.37.0-beta.95", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 283d3812bec4..18ebabbbe854 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index f2e387cfcb58..b85f887b6e4d 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.94", + "@polkadot/react-api": "^0.37.0-beta.95", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.94", + "@polkadot/react-query": "^0.37.0-beta.95", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index c2fce6525ad4..d352cd2d8e38 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 6270876912f4..ee81506c8e2f 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94" + "@polkadot/react-components": "^0.37.0-beta.95" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index fc956cbb9232..e1cdffa96377 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index fde20d0b5e99..3996dfd745b2 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.94", + "version": "0.37.0-beta.95", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.94", + "@polkadot/react-components": "^0.37.0-beta.95", "@polkadot/react-qr": "^0.47.0-beta.6" } } From c3e16ac040ba4cc3b194493e5b746eb08ca325bd Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 16 Nov 2019 20:21:46 +0100 Subject: [PATCH 061/154] s/useApiContext/useApi/ (#1900) --- packages/app-123code/src/SummaryBar.tsx | 4 ++-- packages/app-accounts/src/modals/Create.tsx | 4 ++-- packages/app-accounts/src/modals/Transfer.tsx | 4 ++-- packages/app-claims/src/Claim.tsx | 4 ++-- packages/app-explorer/src/Forks.tsx | 4 ++-- packages/app-explorer/src/NodeInfo/index.tsx | 4 ++-- packages/app-explorer/src/index.tsx | 4 ++-- packages/app-generic-asset/src/Transfer.tsx | 4 ++-- packages/app-js/src/Playground.tsx | 4 ++-- packages/app-staking/src/Actions/Account/SetSessionKey.tsx | 4 ++-- packages/app-staking/src/Actions/Accounts.tsx | 4 ++-- packages/app-staking/src/Overview/Address.tsx | 4 ++-- packages/app-staking/src/Overview/CurrentList.tsx | 4 ++-- packages/app-staking/src/Overview/index.tsx | 4 ++-- packages/app-staking/src/Query/Validator.tsx | 4 ++-- packages/app-staking/src/index.tsx | 4 ++-- packages/app-storage/src/Selection/Consts.tsx | 4 ++-- packages/app-storage/src/Selection/Modules.tsx | 4 ++-- packages/app-storage/src/Selection/index.tsx | 4 ++-- packages/app-sudo/src/index.tsx | 4 ++-- packages/apps/src/Content/index.tsx | 4 ++-- packages/apps/src/SideBar/Item.tsx | 4 ++-- packages/apps/src/SideBar/NodeInfo.tsx | 4 ++-- packages/apps/src/SideBar/index.tsx | 4 ++-- packages/apps/src/overlays/Accounts.tsx | 4 ++-- packages/apps/src/overlays/Connecting.tsx | 4 ++-- packages/react-components/src/ChainImg.tsx | 4 ++-- packages/react-components/src/ChainLock.tsx | 4 ++-- packages/react-components/src/IdentityIcon.tsx | 4 ++-- packages/react-components/src/InputConsts/index.tsx | 4 ++-- packages/react-components/src/InputExtrinsic/index.tsx | 4 ++-- packages/react-components/src/InputRpc/index.tsx | 4 ++-- packages/react-components/src/InputStorage/SelectKey.tsx | 4 ++-- packages/react-components/src/InputStorage/index.tsx | 4 ++-- packages/react-components/src/LinkPolkascan.tsx | 4 ++-- packages/react-components/src/Params/Call.tsx | 4 ++-- packages/react-components/src/Params/Proposal.tsx | 4 ++-- packages/react-components/src/TreasuryProposal.tsx | 4 ++-- packages/react-hooks/src/index.ts | 2 +- packages/react-hooks/src/{useApiContext.tsx => useApi.tsx} | 2 +- packages/react-hooks/src/useCacheKey.ts | 4 ++-- packages/react-hooks/src/useSessionRewards.tsx | 4 ++-- packages/react-query/src/BlockAuthors.tsx | 6 +++--- packages/react-query/src/Chain.tsx | 4 ++-- packages/react-query/src/Events.tsx | 6 +++--- packages/react-query/src/NodeName.tsx | 4 ++-- packages/react-query/src/NodeVersion.tsx | 4 ++-- packages/react-signer/src/Checks/index.tsx | 4 ++-- 48 files changed, 96 insertions(+), 96 deletions(-) rename packages/react-hooks/src/{useApiContext.tsx => useApi.tsx} (87%) diff --git a/packages/app-123code/src/SummaryBar.tsx b/packages/app-123code/src/SummaryBar.tsx index 1dcd41fe80e8..e9cee4c56478 100644 --- a/packages/app-123code/src/SummaryBar.tsx +++ b/packages/app-123code/src/SummaryBar.tsx @@ -10,7 +10,7 @@ import BN from 'bn.js'; import React from 'react'; import { withCalls } from '@polkadot/react-api'; import { Bubble, IdentityIcon } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { formatBalance, formatNumber } from '@polkadot/util'; import translate from './translate'; @@ -23,7 +23,7 @@ interface Props extends BareProps, I18nProps { } function SummaryBar ({ balances_totalIssuance, chain_bestNumber, chain_bestNumberLag, staking_validators }: Props): React.ReactElement { - const { api, systemChain, systemName, systemVersion } = useApiContext(); + const { api, systemChain, systemName, systemVersion } = useApi(); return ( diff --git a/packages/app-accounts/src/modals/Create.tsx b/packages/app-accounts/src/modals/Create.tsx index 8838b0fbded9..5aeeb23bb9eb 100644 --- a/packages/app-accounts/src/modals/Create.tsx +++ b/packages/app-accounts/src/modals/Create.tsx @@ -13,7 +13,7 @@ import React, { useState } from 'react'; import styled from 'styled-components'; import { DEV_PHRASE } from '@polkadot/keyring/defaults'; import { AddressRow, Button, Dropdown, Input, InputAddress, Modal, Password } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; import uiSettings from '@polkadot/ui-settings'; import { isHex, u8aToHex } from '@polkadot/util'; @@ -151,7 +151,7 @@ function createAccount (suri: string, pairType: KeypairType, name: string, passw } function Create ({ className, onClose, onStatusChange, seed: propsSeed, t, type: propsType }: Props): React.ReactElement { - const { isDevelopment } = useApiContext(); + const { isDevelopment } = useApi(); const [{ address, deriveError, derivePath, isSeedValid, pairType, seed, seedType }, setAddress] = useState(generateSeed(propsSeed, '', propsSeed ? 'raw' : 'bip', propsType)); const [isConfirmationOpen, setIsConfirmationOpen] = useState(false); const [{ isNameValid, name }, setName] = useState({ isNameValid: false, name: '' }); diff --git a/packages/app-accounts/src/modals/Transfer.tsx b/packages/app-accounts/src/modals/Transfer.tsx index 6b9b05d95333..ebbeb0d78397 100644 --- a/packages/app-accounts/src/modals/Transfer.tsx +++ b/packages/app-accounts/src/modals/Transfer.tsx @@ -11,7 +11,7 @@ import BN from 'bn.js'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; import { Button, InputAddress, InputBalance, Modal, TxButton } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { Available } from '@polkadot/react-query'; import Checks from '@polkadot/react-signer/Checks'; @@ -65,7 +65,7 @@ const ZERO = new BN(0); // } function Transfer ({ className, onClose, recipientId: propRecipientId, senderId: propSenderId, t }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const [amount, setAmount] = useState(new BN(0)); const [extrinsic, setExtrinsic] = useState(null); const [hasAvailable, setHasAvailable] = useState(true); diff --git a/packages/app-claims/src/Claim.tsx b/packages/app-claims/src/Claim.tsx index d5d9e7b71aa9..e1ff7418d6fa 100644 --- a/packages/app-claims/src/Claim.tsx +++ b/packages/app-claims/src/Claim.tsx @@ -9,7 +9,7 @@ import { I18nProps } from '@polkadot/react-components/types'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; import { Button, Card } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { FormatBalance } from '@polkadot/react-query'; import translate from './translate'; @@ -21,7 +21,7 @@ interface Props extends I18nProps { } function Claim ({ button, className, ethereumAddress, t }: Props): React.ReactElement | null { - const { api } = useApiContext(); + const { api } = useApi(); const [claimValue, setClaimValue] = useState(null); const [claimAddress, setClaimAddress] = useState(null); const [isBusy, setIsBusy] = useState(false); diff --git a/packages/app-explorer/src/Forks.tsx b/packages/app-explorer/src/Forks.tsx index cc1cf77a63bb..f730908794d6 100644 --- a/packages/app-explorer/src/Forks.tsx +++ b/packages/app-explorer/src/Forks.tsx @@ -10,7 +10,7 @@ import { Header } from '@polkadot/types/interfaces'; import React, { useEffect, useRef, useState } from 'react'; import styled from 'styled-components'; import { CardSummary, IdentityIcon, SummaryBox } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { formatNumber } from '@polkadot/util'; import translate from './translate'; @@ -204,7 +204,7 @@ function renderRows (rows: Row[]): React.ReactNode[] { } function Forks ({ className, t }: Props): React.ReactElement | null { - const { api } = useApiContext(); + const { api } = useApi(); const [tree, setTree] = useState(null); const childrenRef = useRef>(new Map([['root', []]])); const countRef = useRef({ numBlocks: 0, numForks: 0 }); diff --git a/packages/app-explorer/src/NodeInfo/index.tsx b/packages/app-explorer/src/NodeInfo/index.tsx index 4e9d3ac2562a..ef0e450b5887 100644 --- a/packages/app-explorer/src/NodeInfo/index.tsx +++ b/packages/app-explorer/src/NodeInfo/index.tsx @@ -7,7 +7,7 @@ import { Info } from './types'; import React, { useEffect, useState } from 'react'; import { ApiPromise } from '@polkadot/api'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import Extrinsics from '../BlockInfo/Extrinsics'; import Peers from './Peers'; @@ -32,7 +32,7 @@ async function retrieveInfo (api: ApiPromise): Promise> { } function NodeInfo ({ t }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const [info, setInfo] = useState>({}); const [nextRefresh, setNextRefresh] = useState(Date.now()); diff --git a/packages/app-explorer/src/index.tsx b/packages/app-explorer/src/index.tsx index 8bf6028456c0..fc174b82a0da 100644 --- a/packages/app-explorer/src/index.tsx +++ b/packages/app-explorer/src/index.tsx @@ -9,7 +9,7 @@ import React, { useContext } from 'react'; import { Route, Switch } from 'react-router'; import styled from 'styled-components'; import Tabs from '@polkadot/react-components/Tabs'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { BlockAuthorsContext, EventsContext } from '@polkadot/react-query'; import uiSettings from '@polkadot/ui-settings'; @@ -24,7 +24,7 @@ interface Props extends AppProps, BareProps, I18nProps { } function ExplorerApp ({ basePath, className, t }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const { lastHeaders } = useContext(BlockAuthorsContext); const events = useContext(EventsContext); diff --git a/packages/app-generic-asset/src/Transfer.tsx b/packages/app-generic-asset/src/Transfer.tsx index 0ee6abd332cf..ce36b76bacfb 100644 --- a/packages/app-generic-asset/src/Transfer.tsx +++ b/packages/app-generic-asset/src/Transfer.tsx @@ -9,7 +9,7 @@ import BN from 'bn.js'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; import { Button, InputAddress, InputBalance, TxButton, Dropdown } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { Available } from '@polkadot/react-query'; import Checks from '@polkadot/react-signer/Checks'; import { withMulti, withObservable } from '@polkadot/react-api'; @@ -31,7 +31,7 @@ interface Option { } function Transfer ({ assets, className, onClose, recipientId: propRecipientId, senderId: propSenderId, t }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const [assetId, setAssetId] = useState('0'); const [amount, setAmount] = useState(new BN(0)); const [extrinsic, setExtrinsic] = useState(null); diff --git a/packages/app-js/src/Playground.tsx b/packages/app-js/src/Playground.tsx index 46d839ff919f..4ad995e0d43a 100644 --- a/packages/app-js/src/Playground.tsx +++ b/packages/app-js/src/Playground.tsx @@ -13,7 +13,7 @@ import { Transition } from 'semantic-ui-react'; import snappy from 'snappyjs'; import styled from 'styled-components'; import { Button, Dropdown, Editor } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import uiKeyring from '@polkadot/ui-keyring'; import * as types from '@polkadot/types'; import * as util from '@polkadot/util'; @@ -80,7 +80,7 @@ function decodeBase64 (base64: string): Snippet { // FIXME This... ladies & gentlemen, is a mess that should be untangled function Playground ({ className, t }: Props): React.ReactElement { - const { api, isDevelopment } = useApiContext(); + const { api, isDevelopment } = useApi(); const history = useHistory(); const { base64 } = useParams(); const injectedRef = useRef(null); diff --git a/packages/app-staking/src/Actions/Account/SetSessionKey.tsx b/packages/app-staking/src/Actions/Account/SetSessionKey.tsx index 39673f1c23fc..772b5df9ec6f 100644 --- a/packages/app-staking/src/Actions/Account/SetSessionKey.tsx +++ b/packages/app-staking/src/Actions/Account/SetSessionKey.tsx @@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/react-components/types'; import React, { useState } from 'react'; import { Button, InputAddress, Input, Modal, TxButton } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import ValidationSessionKey from './InputValidationSessionKey'; import translate from '../../translate'; @@ -22,7 +22,7 @@ interface Props extends I18nProps { const EMPTY_PROOF = new Uint8Array(); function SetSessionKey ({ controllerId, isOpen, onClose, sessionIds, stashId, t }: Props): React.ReactElement | null { - const { isSubstrateV2 } = useApiContext(); + const { isSubstrateV2 } = useApi(); const [keysError, setKeysError] = useState(null); const [keys, setKeys] = useState( isSubstrateV2 diff --git a/packages/app-staking/src/Actions/Accounts.tsx b/packages/app-staking/src/Actions/Accounts.tsx index 39fdbbb50bf8..c69919e64f6e 100644 --- a/packages/app-staking/src/Actions/Accounts.tsx +++ b/packages/app-staking/src/Actions/Accounts.tsx @@ -10,7 +10,7 @@ import { ComponentProps } from '../types'; import React, { useState } from 'react'; import styled from 'styled-components'; import { Button, CardGrid } from '@polkadot/react-components'; -import { trackStream, useApiContext } from '@polkadot/react-hooks'; +import { trackStream, useApi } from '@polkadot/react-hooks'; import { AccountName } from '@polkadot/react-query'; import { Option } from '@polkadot/types'; import createOption from '@polkadot/ui-keyring/options/item'; @@ -45,7 +45,7 @@ function getMyStashes (allAccounts: string[], queryBonded?: Option[], } function Accounts ({ allAccounts, allStashes, className, recentlyOnline, t }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const queryBonded = trackStream[]>(api.query.staking.bonded.multi as any, [allAccounts]); const queryLedger = trackStream[]>(api.query.staking.ledger.multi as any, [allAccounts]); const [isNewStakeOpen, setIsNewStateOpen] = useState(false); diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx index 31405ed2f949..1952fd75c9f8 100644 --- a/packages/app-staking/src/Overview/Address.tsx +++ b/packages/app-staking/src/Overview/Address.tsx @@ -12,7 +12,7 @@ import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; import { AddressCard, AddressMini, Badge, Expander, Icon } from '@polkadot/react-components'; import { classes } from '@polkadot/react-components/util'; -import { trackStream, useApiContext } from '@polkadot/react-hooks'; +import { trackStream, useApi } from '@polkadot/react-hooks'; import { formatNumber } from '@polkadot/util'; import translate from '../translate'; @@ -47,7 +47,7 @@ interface StakingState { const WITH_VALIDATOR_PREFS = { validatorPayment: true }; function Address ({ address, authorsMap, className, defaultName, filter, hasQueries, isElected, isFavorite, lastAuthors, myAccounts, points, recentlyOnline, t, toggleFavorite, withNominations = true }: Props): React.ReactElement | null { - const { api, isSubstrateV2 } = useApiContext(); + const { api, isSubstrateV2 } = useApi(); // FIXME Any horrors, caused by derive type mismatches const stakingInfo = trackStream(api.derive.staking.info as any, [address]); const [extraInfo, setExtraInfo] = useState<[React.ReactNode, React.ReactNode][] | undefined>(); diff --git a/packages/app-staking/src/Overview/CurrentList.tsx b/packages/app-staking/src/Overview/CurrentList.tsx index 6f3fccd9e9fc..33bb33ed0f9a 100644 --- a/packages/app-staking/src/Overview/CurrentList.tsx +++ b/packages/app-staking/src/Overview/CurrentList.tsx @@ -9,7 +9,7 @@ import { ValidatorFilter } from '../types'; import React, { useEffect, useState } from 'react'; import { Columar, Column, Dropdown, FilterOverlay } from '@polkadot/react-components'; -import { useApiContext, useFavorites } from '@polkadot/react-hooks'; +import { useApi, useFavorites } from '@polkadot/react-hooks'; import keyring from '@polkadot/ui-keyring'; import { STORE_FAVS_BASE } from '../constants'; @@ -57,7 +57,7 @@ function accountsToString (accounts: AccountId[]): string[] { } function CurrentList ({ authorsMap, hasQueries, lastAuthors, next, recentlyOnline, stakingOverview, t }: Props): React.ReactElement { - const { isSubstrateV2 } = useApiContext(); + const { isSubstrateV2 } = useApi(); const [favorites, toggleFavorite] = useFavorites(STORE_FAVS_BASE); const [filter, setFilter] = useState('all'); const [myAccounts] = useState(keyring.getAccounts().map(({ address }): string => address)); diff --git a/packages/app-staking/src/Overview/index.tsx b/packages/app-staking/src/Overview/index.tsx index be59b4eafec5..6964d43a3e43 100644 --- a/packages/app-staking/src/Overview/index.tsx +++ b/packages/app-staking/src/Overview/index.tsx @@ -6,7 +6,7 @@ import { BareProps } from '@polkadot/react-components/types'; import { ComponentProps } from '../types'; import React, { useContext, useEffect, useState } from 'react'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { BlockAuthorsContext } from '@polkadot/react-query'; import CurrentList from './CurrentList'; @@ -15,7 +15,7 @@ import Summary from './Summary'; interface Props extends BareProps, ComponentProps {} export default function Overview ({ allControllers, hasQueries, allStashes, className, recentlyOnline, stakingOverview }: Props): React.ReactElement { - const { isSubstrateV2 } = useApiContext(); + const { isSubstrateV2 } = useApi(); const { byAuthor, lastBlockAuthors, lastBlockNumber } = useContext(BlockAuthorsContext); const [next, setNext] = useState([]); const validators = stakingOverview && stakingOverview.validators; diff --git a/packages/app-staking/src/Query/Validator.tsx b/packages/app-staking/src/Query/Validator.tsx index 835bdbe345bf..1d6674f5edee 100644 --- a/packages/app-staking/src/Query/Validator.tsx +++ b/packages/app-staking/src/Query/Validator.tsx @@ -11,7 +11,7 @@ import React, { useEffect, useState } from 'react'; import { Chart, Columar, Column } from '@polkadot/react-components'; import { toShortAddress } from '@polkadot/react-components/util'; import { getHistoric } from '@polkadot/react-api/util'; -import { trackStream, useApiContext } from '@polkadot/react-hooks'; +import { trackStream, useApi } from '@polkadot/react-hooks'; import { u32 } from '@polkadot/types'; import { formatBalance, formatNumber } from '@polkadot/util'; @@ -91,7 +91,7 @@ function extractEraSlash (validatorId: string, slashes: Slash[]): BN { } function Validator ({ className, sessionRewards, t, validatorId }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); // FIXME There is something seriously wrong in these two with "any" horrors const blockCounts = trackStream(api.query.imOnline?.authoredBlocks?.multi as any, [sessionRewards, validatorId], { paramMap: ([sessionRewards, validatorId]: [SessionRewards[], string]): any => diff --git a/packages/app-staking/src/index.tsx b/packages/app-staking/src/index.tsx index 2d453b0f1833..0cb9da803d53 100644 --- a/packages/app-staking/src/index.tsx +++ b/packages/app-staking/src/index.tsx @@ -14,7 +14,7 @@ import styled from 'styled-components'; import { Option } from '@polkadot/types'; import { HelpOverlay } from '@polkadot/react-components'; import Tabs from '@polkadot/react-components/Tabs'; -import { trackStream, useAccounts, useApiContext, useSessionRewards } from '@polkadot/react-hooks'; +import { trackStream, useAccounts, useApi, useSessionRewards } from '@polkadot/react-hooks'; import Accounts from './Actions/Accounts'; import basicMd from './md/basic.md'; @@ -39,7 +39,7 @@ function transformStakingControllers ([stashes, controllers]: [AccountId[], Opti } function App ({ basePath, className, t }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const { allAccounts, hasAccounts } = useAccounts(); const stakingControllers = trackStream<[string[], string[]]>(api.derive.staking.controllers, [], { transform: transformStakingControllers }); const bestNumber = trackStream(api.derive.chain.bestNumber, []); diff --git a/packages/app-storage/src/Selection/Consts.tsx b/packages/app-storage/src/Selection/Consts.tsx index 883f60721fcd..580277c48498 100644 --- a/packages/app-storage/src/Selection/Consts.tsx +++ b/packages/app-storage/src/Selection/Consts.tsx @@ -9,14 +9,14 @@ import { ComponentProps } from '../types'; import React, { useState } from 'react'; import { Button, InputConsts } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import translate from '../translate'; interface Props extends ComponentProps, I18nProps {} function Consts ({ onAdd, t }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const [defaultValue] = useState((): ConstValue => { const section = Object.keys(api.consts)[0]; const method = Object.keys(api.consts[section])[0]; diff --git a/packages/app-storage/src/Selection/Modules.tsx b/packages/app-storage/src/Selection/Modules.tsx index ca2c20dc519d..5b17845da5e2 100644 --- a/packages/app-storage/src/Selection/Modules.tsx +++ b/packages/app-storage/src/Selection/Modules.tsx @@ -11,7 +11,7 @@ import React, { useState } from 'react'; import { getTypeDef } from '@polkadot/types'; import { Button, InputStorage } from '@polkadot/react-components'; import Params from '@polkadot/react-params'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { isNull, isUndefined } from '@polkadot/util'; import translate from '../translate'; @@ -32,7 +32,7 @@ function areParamsValid (values: RawParams): boolean { } function Modules ({ onAdd, t }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const [{ defaultValues, isLinked, key, params }, setKey] = useState<{ defaultValues: RawParams | undefined | null; isLinked: boolean; key: StorageEntryPromise; params: ParamsType }>({ defaultValues: undefined, isLinked: false, key: api.query.timestamp.now, params: [] }); const [{ isValid, values }, setValues] = useState<{ isValid: boolean; values: RawParams }>({ isValid: true, values: [] }); diff --git a/packages/app-storage/src/Selection/index.tsx b/packages/app-storage/src/Selection/index.tsx index 9b7eaaa637cb..20659899c90c 100644 --- a/packages/app-storage/src/Selection/index.tsx +++ b/packages/app-storage/src/Selection/index.tsx @@ -8,7 +8,7 @@ import { ComponentProps, QueryTypes, ParitalQueryTypes } from '../types'; import React from 'react'; import { Route, Switch } from 'react-router'; import { Tabs } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import Consts from './Consts'; import Modules from './Modules'; @@ -23,7 +23,7 @@ interface Props extends I18nProps { let id = -1; function Selection ({ basePath, onAdd, t }: Props): React.ReactElement { - const { isSubstrateV2 } = useApiContext(); + const { isSubstrateV2 } = useApi(); const _onAdd = (query: ParitalQueryTypes): void => onAdd({ ...query, id: ++id }); const _renderComponent = (Component: React.ComponentType): () => React.ReactNode => // eslint-disable-next-line react/display-name diff --git a/packages/app-sudo/src/index.tsx b/packages/app-sudo/src/index.tsx index 011adab330ed..abe2f8172d17 100644 --- a/packages/app-sudo/src/index.tsx +++ b/packages/app-sudo/src/index.tsx @@ -9,7 +9,7 @@ import { ComponentProps } from './types'; import React, { useEffect, useState } from 'react'; import { Route, Switch } from 'react-router'; import { Icon, Tabs } from '@polkadot/react-components'; -import { trackStream, useAccounts, useApiContext } from '@polkadot/react-hooks'; +import { trackStream, useAccounts, useApi } from '@polkadot/react-hooks'; import SetKey from './SetKey'; import Sudo from './Sudo'; @@ -20,7 +20,7 @@ interface Props extends AppProps, I18nProps { } function App ({ basePath, t }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const sudoKey = trackStream(api.query.sudo.key, [], { transform: (k): string => k.toString() }); const { allAccounts } = useAccounts(); const [isMine, setIsMine] = useState(false); diff --git a/packages/apps/src/Content/index.tsx b/packages/apps/src/Content/index.tsx index 6fa7a3b33693..1fa7ab2e11ff 100644 --- a/packages/apps/src/Content/index.tsx +++ b/packages/apps/src/Content/index.tsx @@ -9,7 +9,7 @@ import { useLocation } from 'react-router-dom'; import styled from 'styled-components'; import routing from '@polkadot/apps-routing'; import { StatusContext } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import Status from './Status'; import translate from '../translate'; @@ -25,7 +25,7 @@ const unknown = { function Content ({ className, t }: Props): React.ReactElement { const location = useLocation(); - const { isApiConnected, isApiReady } = useApiContext(); + const { isApiConnected, isApiReady } = useApi(); const { queueAction, stqueue, txqueue } = useContext(StatusContext); const app = location.pathname.slice(1) || ''; const { Component, display: { needsApi }, name } = routing.routes.find((route): boolean => diff --git a/packages/apps/src/SideBar/Item.tsx b/packages/apps/src/SideBar/Item.tsx index 122dde1d9e95..ad9de5ba907c 100644 --- a/packages/apps/src/SideBar/Item.tsx +++ b/packages/apps/src/SideBar/Item.tsx @@ -12,7 +12,7 @@ import { NavLink } from 'react-router-dom'; import { ApiPromise } from '@polkadot/api'; import { Icon, Menu, Tooltip } from '@polkadot/react-components'; import { withCalls, withMulti } from '@polkadot/react-api'; -import { useAccounts, useApiContext } from '@polkadot/react-hooks'; +import { useAccounts, useApi } from '@polkadot/react-hooks'; import { isFunction } from '@polkadot/util'; import translate from '../translate'; @@ -76,7 +76,7 @@ function checkVisible (name: string, { api, isApiReady, isApiConnected }: ApiPro function Item ({ route: { Modal, display, i18n, icon, name }, t, isCollapsed, onClick, sudoKey }: Props): React.ReactElement | null { const { allAccounts, hasAccounts } = useAccounts(); - const apiProps = useApiContext(); + const apiProps = useApi(); const [hasSudo, setHasSudo] = useState(false); const [isVisible, setIsVisible] = useState(false); diff --git a/packages/apps/src/SideBar/NodeInfo.tsx b/packages/apps/src/SideBar/NodeInfo.tsx index a4295da4f22a..898036b7db05 100644 --- a/packages/apps/src/SideBar/NodeInfo.tsx +++ b/packages/apps/src/SideBar/NodeInfo.tsx @@ -6,7 +6,7 @@ import { BareProps as Props } from '@polkadot/react-components/types'; import React from 'react'; import styled from 'styled-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { NodeName, NodeVersion } from '@polkadot/react-query'; // eslint-disable-next-line @typescript-eslint/no-var-requires @@ -15,7 +15,7 @@ const pkgJson = require('../../package.json'); const uiInfo = `apps v${pkgJson.version}`; function NodeInfo ({ className }: Props): React.ReactElement { - const { api, isApiReady } = useApiContext(); + const { api, isApiReady } = useApi(); return (
diff --git a/packages/apps/src/SideBar/index.tsx b/packages/apps/src/SideBar/index.tsx index e5fb457e98e7..3c38ee1d0e9f 100644 --- a/packages/apps/src/SideBar/index.tsx +++ b/packages/apps/src/SideBar/index.tsx @@ -12,7 +12,7 @@ import styled from 'styled-components'; import { Responsive } from 'semantic-ui-react'; import routing from '@polkadot/apps-routing'; import { Button, ChainImg, Icon, Menu, media } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { classes } from '@polkadot/react-components/util'; import { BestNumber, Chain } from '@polkadot/react-query'; @@ -31,7 +31,7 @@ interface Props extends I18nProps { } function SideBar ({ className, collapse, handleResize, isCollapsed, toggleMenu, menuOpen }: Props): React.ReactElement { - const { api, isApiReady } = useApiContext(); + const { api, isApiReady } = useApi(); const [modals, setModals] = useState>( routing.routes.reduce((result: Record, route): Record => { if (route && route.Modal) { diff --git a/packages/apps/src/overlays/Accounts.tsx b/packages/apps/src/overlays/Accounts.tsx index 54a4d8bba8ee..4502e9d30805 100644 --- a/packages/apps/src/overlays/Accounts.tsx +++ b/packages/apps/src/overlays/Accounts.tsx @@ -7,14 +7,14 @@ import { I18nProps as Props } from '@polkadot/react-components/types'; import React, { useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { useAccounts, useApiContext } from '@polkadot/react-hooks'; +import { useAccounts, useApi } from '@polkadot/react-hooks'; import translate from '../translate'; import BaseOverlay from './Base'; function Accounts ({ className, t }: Props): React.ReactElement | null { const { hasAccounts } = useAccounts(); - const { isApiReady } = useApiContext(); + const { isApiReady } = useApi(); const [isHidden, setIsHidden] = useState(false); if (!isApiReady || hasAccounts || isHidden) { diff --git a/packages/apps/src/overlays/Connecting.tsx b/packages/apps/src/overlays/Connecting.tsx index cee9564fd8c9..e4f4b00a39ec 100644 --- a/packages/apps/src/overlays/Connecting.tsx +++ b/packages/apps/src/overlays/Connecting.tsx @@ -7,7 +7,7 @@ import { I18nProps as Props } from '@polkadot/react-components/types'; import React from 'react'; import styled from 'styled-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import settings from '@polkadot/ui-settings'; import translate from '../translate'; @@ -60,7 +60,7 @@ function ConnectOverlay ({ className, isApiConnected, t }: ApiProps & Props): Re } function Connecting (props: Props): React.ReactElement | null { - const api = useApiContext(); + const api = useApi(); return ExtensionOverlay({ ...props, ...api }) || ConnectOverlay({ ...props, ...api }); } diff --git a/packages/react-components/src/ChainImg.tsx b/packages/react-components/src/ChainImg.tsx index b9fd24689a96..89d7cff085c9 100644 --- a/packages/react-components/src/ChainImg.tsx +++ b/packages/react-components/src/ChainImg.tsx @@ -4,7 +4,7 @@ import React from 'react'; import styled from 'styled-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; // the imports here as a bit all-over, non-aphabetical - since we expect this to grow, // rather organise based on type, grouping chains and nodes as opposed to location @@ -54,7 +54,7 @@ interface Props { } function ChainImg ({ className, logo = '', onClick }: Props): React.ReactElement { - const { systemChain, systemName } = useApiContext(); + const { systemChain, systemName } = useApi(); const img = LOGOS[logo] || CHAINS[systemChain] || NODES[systemName] || EMPTY; return ( diff --git a/packages/react-components/src/ChainLock.tsx b/packages/react-components/src/ChainLock.tsx index a0c3301f68fd..1060330a3372 100644 --- a/packages/react-components/src/ChainLock.tsx +++ b/packages/react-components/src/ChainLock.tsx @@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/react-components/types'; import React from 'react'; import styled from 'styled-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import translate from './translate'; import Toggle from './Toggle'; @@ -20,7 +20,7 @@ interface Props extends I18nProps { } function ChainLock ({ className, genesisHash, isDisabled, onChange, preventDefault, t }: Props): React.ReactElement | null { - const { isDevelopment, api } = useApiContext(); + const { isDevelopment, api } = useApi(); if (isDevelopment) { return null; diff --git a/packages/react-components/src/IdentityIcon.tsx b/packages/react-components/src/IdentityIcon.tsx index 0b3dd0f79e6d..0986206c8b3a 100644 --- a/packages/react-components/src/IdentityIcon.tsx +++ b/packages/react-components/src/IdentityIcon.tsx @@ -8,7 +8,7 @@ import { I18nProps } from './types'; import React, { useContext, useEffect, useState } from 'react'; import { withCalls, withMulti } from '@polkadot/react-api'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import BaseIdentityIcon from '@polkadot/react-identicon'; import uiSettings from '@polkadot/ui-settings'; @@ -34,7 +34,7 @@ export function getIdentityTheme (systemName: string): 'empty' { } function IdentityIcon ({ className, onCopy, prefix, size, style, t, theme, validators, value }: Props): React.ReactElement { - const { systemName } = useApiContext(); + const { systemName } = useApi(); const { queueAction } = useContext(StatusContext); const [address, setAddress] = useState(); const [isValidator, setIsValidator] = useState(false); diff --git a/packages/react-components/src/InputConsts/index.tsx b/packages/react-components/src/InputConsts/index.tsx index 8b6bc8ff0f43..72d3b56aa2e5 100644 --- a/packages/react-components/src/InputConsts/index.tsx +++ b/packages/react-components/src/InputConsts/index.tsx @@ -11,7 +11,7 @@ import '../InputExtrinsic/InputExtrinsic.css'; import React, { useState } from 'react'; import { ApiPromise } from '@polkadot/api'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import Labelled from '../Labelled'; import translate from '../translate'; @@ -43,7 +43,7 @@ function getValue (api: ApiPromise, { method, section }: ConstValueBase): ConstV } function InputConsts ({ className, defaultValue, help, label, onChange, style, withLabel }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const [optionsMethod, setOptionsMethod] = useState(keyOptions(api, defaultValue.section)); const [optionsSection] = useState(sectionOptions(api)); const [value, setValue] = useState(getValue(api, defaultValue)); diff --git a/packages/react-components/src/InputExtrinsic/index.tsx b/packages/react-components/src/InputExtrinsic/index.tsx index 5da3de4d7c39..7bdc60e66154 100644 --- a/packages/react-components/src/InputExtrinsic/index.tsx +++ b/packages/react-components/src/InputExtrinsic/index.tsx @@ -9,7 +9,7 @@ import { DropdownOptions } from '../util/types'; import './InputExtrinsic.css'; import React, { useState } from 'react'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import Labelled from '../Labelled'; import translate from '../translate'; @@ -30,7 +30,7 @@ interface Props extends I18nProps { } function InputExtrinsic ({ className, defaultValue, help, label, onChange, style, withLabel }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const [optionsMethod, setOptionsMethod] = useState(methodOptions(api, defaultValue.section)); const [optionsSection] = useState(sectionOptions(api)); const [value, setValue] = useState((): CallFunction => defaultValue); diff --git a/packages/react-components/src/InputRpc/index.tsx b/packages/react-components/src/InputRpc/index.tsx index 1f1325748ab8..3c0592f77057 100644 --- a/packages/react-components/src/InputRpc/index.tsx +++ b/packages/react-components/src/InputRpc/index.tsx @@ -12,7 +12,7 @@ import '../InputExtrinsic/InputExtrinsic.css'; import React, { useState } from 'react'; import map from '@polkadot/jsonrpc'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import Labelled from '../Labelled'; import translate from '../translate'; @@ -31,7 +31,7 @@ interface Props extends I18nProps { } function InputRpc ({ className, defaultValue, help, label, onChange, style, withLabel }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const [optionsMethod, setOptionsMethod] = useState(methodOptions(api, defaultValue.section)); const [optionsSection] = useState(sectionOptions(api)); const [value, setValue] = useState((): RpcMethod => defaultValue); diff --git a/packages/react-components/src/InputStorage/SelectKey.tsx b/packages/react-components/src/InputStorage/SelectKey.tsx index 95130499cbac..c59e39e16738 100644 --- a/packages/react-components/src/InputStorage/SelectKey.tsx +++ b/packages/react-components/src/InputStorage/SelectKey.tsx @@ -8,7 +8,7 @@ import { StorageEntryPromise } from './types'; import React from 'react'; import { ApiPromise } from '@polkadot/api'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import Dropdown from '../Dropdown'; import { classes } from '../util'; @@ -29,7 +29,7 @@ function transform (api: ApiPromise, { value }: Props): (method: string) => Stor } export default function SelectKey (props: Props): React.ReactElement | null { - const { api } = useApiContext(); + const { api } = useApi(); const { className, isError, onChange, options, style, value } = props; if (!options.length) { diff --git a/packages/react-components/src/InputStorage/index.tsx b/packages/react-components/src/InputStorage/index.tsx index fde76b6a30ed..d7b6eca14f9e 100644 --- a/packages/react-components/src/InputStorage/index.tsx +++ b/packages/react-components/src/InputStorage/index.tsx @@ -11,7 +11,7 @@ import { StorageEntryPromise } from './types'; import '../InputExtrinsic/InputExtrinsic.css'; import React, { useState } from 'react'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import Labelled from '../Labelled'; import translate from '../translate'; @@ -30,7 +30,7 @@ interface Props extends I18nProps { } function InputStorage ({ className, defaultValue, help, label, onChange, style, withLabel }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const [optionsMethod, setOptionsMethod] = useState(keyOptions(api, defaultValue.creator.section)); const [optionsSection] = useState(sectionOptions(api)); const [value, setValue] = useState((): StorageEntryPromise => defaultValue); diff --git a/packages/react-components/src/LinkPolkascan.tsx b/packages/react-components/src/LinkPolkascan.tsx index 4cb8c655d9e2..6582ff772592 100644 --- a/packages/react-components/src/LinkPolkascan.tsx +++ b/packages/react-components/src/LinkPolkascan.tsx @@ -6,7 +6,7 @@ import { I18nProps } from './types'; import React from 'react'; import styled from 'styled-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import translate from './translate'; @@ -34,7 +34,7 @@ const TYPES: Record = { }; function LinkPolkascan ({ className, data, t, type }: Props): React.ReactElement | null { - const { systemChain } = useApiContext(); + const { systemChain } = useApi(); const extChain = CHAINS[systemChain]; const extType = TYPES[type]; diff --git a/packages/react-components/src/Params/Call.tsx b/packages/react-components/src/Params/Call.tsx index a3d8b412d95f..4d775ac3c4dc 100644 --- a/packages/react-components/src/Params/Call.tsx +++ b/packages/react-components/src/Params/Call.tsx @@ -6,12 +6,12 @@ import { SubmittableExtrinsicFunction } from '@polkadot/api/types'; import { Props } from '@polkadot/react-params/types'; import React from 'react'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import Extrinsic from './Extrinsic'; export default function Call ({ className, isDisabled, isError, label, onChange, onEnter, style, withLabel }: Props): React.ReactElement { - const { api, apiDefaultTx } = useApiContext(); + const { api, apiDefaultTx } = useApi(); const defaultValue = ((): SubmittableExtrinsicFunction<'promise'> => { try { diff --git a/packages/react-components/src/Params/Proposal.tsx b/packages/react-components/src/Params/Proposal.tsx index 5054d944e34d..a5b0015f91e5 100644 --- a/packages/react-components/src/Params/Proposal.tsx +++ b/packages/react-components/src/Params/Proposal.tsx @@ -6,7 +6,7 @@ import { Props, RawParam } from '@polkadot/react-params/types'; import React from 'react'; import { createType } from '@polkadot/types'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import ExtrinsicDisplay from './Extrinsic'; @@ -26,7 +26,7 @@ function onChange ({ onChange }: Props): (_: RawParam) => void { } export default function ProposalDisplay (props: Props): React.ReactElement { - const { apiDefaultTxSudo } = useApiContext(); + const { apiDefaultTxSudo } = useApi(); const { className, isDisabled, isError, label, onEnter, style, withLabel } = props; return ( diff --git a/packages/react-components/src/TreasuryProposal.tsx b/packages/react-components/src/TreasuryProposal.tsx index 0a36807d5b63..862c87c6db8a 100644 --- a/packages/react-components/src/TreasuryProposal.tsx +++ b/packages/react-components/src/TreasuryProposal.tsx @@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/react-components/types'; import React, { useEffect, useState } from 'react'; import { InputAddress, Labelled, Static } from '@polkadot/react-components'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { Option } from '@polkadot/types'; import { FormatBalance } from '@polkadot/react-query'; @@ -26,7 +26,7 @@ interface Props extends I18nProps { function TreasuryProposal ({ className, asInset, insetProps, onClick, proposal, proposalId, t }: Props): React.ReactElement | null { const [stateProposal, setProposal] = useState(null); - const { api } = useApiContext(); + const { api } = useApi(); useEffect((): void => { if (!proposal && proposalId) { diff --git a/packages/react-hooks/src/index.ts b/packages/react-hooks/src/index.ts index 00cb074109c6..f0ea2bed7e23 100644 --- a/packages/react-hooks/src/index.ts +++ b/packages/react-hooks/src/index.ts @@ -6,7 +6,7 @@ export { default as trackPromise } from './track/trackPromise'; export { default as trackStream } from './track/trackStream'; export { default as useAccounts } from './useAccounts'; export { default as useAddresses } from './useAddresses'; -export { default as useApiContext } from './useApiContext'; +export { default as useApi } from './useApi'; export { default as useDebounce } from './useDebounce'; export { default as useFavorites } from './useFavorites'; export { default as useSessionRewards } from './useSessionRewards'; diff --git a/packages/react-hooks/src/useApiContext.tsx b/packages/react-hooks/src/useApi.tsx similarity index 87% rename from packages/react-hooks/src/useApiContext.tsx rename to packages/react-hooks/src/useApi.tsx index 7f131b9bab0f..d8b39e97aaac 100644 --- a/packages/react-hooks/src/useApiContext.tsx +++ b/packages/react-hooks/src/useApi.tsx @@ -7,6 +7,6 @@ import { ApiProps } from '@polkadot/react-api/types'; import { useContext } from 'react'; import { ApiContext } from '@polkadot/react-api'; -export default function useApiContext (): ApiProps { +export default function useApi (): ApiProps { return useContext(ApiContext); } diff --git a/packages/react-hooks/src/useCacheKey.ts b/packages/react-hooks/src/useCacheKey.ts index ff3622272852..14a261b87e8f 100644 --- a/packages/react-hooks/src/useCacheKey.ts +++ b/packages/react-hooks/src/useCacheKey.ts @@ -3,11 +3,11 @@ // of the Apache-2.0 license. See the LICENSE file for details. import store from 'store'; -import useApiContext from './useApiContext'; +import useApi from './useApi'; // create a chain-specific key for the local cache export default function useCacheKey (storageKeyBase: string): [(defaultValue?: T) => T | undefined, (value: T) => T] { - const { api, isDevelopment } = useApiContext(); + const { api, isDevelopment } = useApi(); const STORAGE_KEY = `${storageKeyBase}:${isDevelopment ? 'development' : api.genesisHash}`; return [ diff --git a/packages/react-hooks/src/useSessionRewards.tsx b/packages/react-hooks/src/useSessionRewards.tsx index 3f8ec08f3f01..44a411aab42c 100644 --- a/packages/react-hooks/src/useSessionRewards.tsx +++ b/packages/react-hooks/src/useSessionRewards.tsx @@ -11,7 +11,7 @@ import { ApiPromise } from '@polkadot/api'; import { createType } from '@polkadot/types'; import { bnMax, u8aToU8a } from '@polkadot/util'; -import useApiContext from './useApiContext'; +import useApi from './useApi'; import useCacheKey from './useCacheKey'; interface SerializedSlash { @@ -111,7 +111,7 @@ async function loadSome (api: ApiPromise, fromHash: Hash, toHash: Hash): Promise } export default function useSessionRewards (maxSessions: number): SessionRewards[] { - const { api } = useApiContext(); + const { api } = useApi(); const [getCache, setCache] = useCacheKey('hooks:sessionSlashes'); const [filtered, setFiltered] = useState([]); diff --git a/packages/react-query/src/BlockAuthors.tsx b/packages/react-query/src/BlockAuthors.tsx index 02acec95b051..9fab38425a91 100644 --- a/packages/react-query/src/BlockAuthors.tsx +++ b/packages/react-query/src/BlockAuthors.tsx @@ -4,7 +4,7 @@ import React, { useEffect, useState } from 'react'; import { HeaderExtended } from '@polkadot/api-derive'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; import { formatNumber } from '@polkadot/util'; interface Authors { @@ -19,13 +19,13 @@ interface Props { children: React.ReactNode; } -const MAX_HEADERS = 20; +const MAX_HEADERS = 25; const byAuthor: Record = {}; const BlockAuthorsContext: React.Context = React.createContext({ byAuthor, lastHeaders: [] }); function BlockAuthors ({ children }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const [state, setState] = useState({ byAuthor, lastHeaders: [] }); useEffect((): void => { diff --git a/packages/react-query/src/Chain.tsx b/packages/react-query/src/Chain.tsx index 495e189da783..0dea4c680999 100644 --- a/packages/react-query/src/Chain.tsx +++ b/packages/react-query/src/Chain.tsx @@ -6,7 +6,7 @@ import { BareProps } from '@polkadot/react-api/types'; import React from 'react'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; interface Props extends BareProps { children?: React.ReactNode; @@ -14,7 +14,7 @@ interface Props extends BareProps { } export default function Chain ({ children, className, label = '', style }: Props): React.ReactElement { - const { systemChain } = useApiContext(); + const { systemChain } = useApi(); return (
= React.createContext([]); function Events ({ children }: Props): React.ReactElement { - const { api } = useApiContext(); + const { api } = useApi(); const [state, setState] = useState([]); useEffect((): void => { diff --git a/packages/react-query/src/NodeName.tsx b/packages/react-query/src/NodeName.tsx index a44e3b942afe..3689ee8ee25f 100644 --- a/packages/react-query/src/NodeName.tsx +++ b/packages/react-query/src/NodeName.tsx @@ -6,7 +6,7 @@ import { BareProps } from '@polkadot/react-api/types'; import React from 'react'; -import { useApiContext } from '@polkadot/react-hooks'; +import { useApi } from '@polkadot/react-hooks'; interface Props extends BareProps { children?: React.ReactNode; @@ -14,7 +14,7 @@ interface Props extends BareProps { } export default function NodeName ({ children, className, label = '', style }: Props): React.ReactElement { - const { systemName } = useApiContext(); + const { systemName } = useApi(); return (
{ - const { systemVersion } = useApiContext(); + const { systemVersion } = useApi(); return (
| null { - const { api } = useApiContext(); + const { api } = useApi(); const [state, setState] = useState({ allFees: ZERO, allTotal: ZERO, From f71c9fd5cd99fef19079f4a166669d714fd59733 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Sat, 16 Nov 2019 19:27:00 +0000 Subject: [PATCH 062/154] [CI Skip] 0.37.0-beta.96 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index b56f4531266c..141522963769 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.95" + "version": "0.37.0-beta.96" } diff --git a/package.json b/package.json index 95fb9206e319..0e1eb536fb34 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index ff20fb3dbc2f..391db4140e3d 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index f8d2208345b6..be52fa98792f 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-components": "^0.37.0-beta.96", "@polkadot/react-qr": "^0.47.0-beta.6", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 85f3c6b4b94b..12ae870a9ff7 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index c68e02319327..8fe09684e07a 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 614913dbc8df..66a1693ecb06 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.9", - "@polkadot/react-components": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index fc35addce5fe..46ea214969e1 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", - "@polkadot/react-query": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96", + "@polkadot/react-query": "^0.37.0-beta.96" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index bcab3a52e20a..aa0edb7ee6c4 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.95", - "@polkadot/react-components": "^0.37.0-beta.95" + "@polkadot/apps-routing": "^0.37.0-beta.96", + "@polkadot/react-components": "^0.37.0-beta.96" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index dd1358c04dae..4a0ead914518 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", - "@polkadot/react-query": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96", + "@polkadot/react-query": "^0.37.0-beta.96" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 4c80fa79f26f..2c38c8c98dd3 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index aa20982fe30c..adf57ab2fba6 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", - "@polkadot/react-params": "^0.37.0-beta.95", - "@polkadot/react-signer": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96", + "@polkadot/react-params": "^0.37.0-beta.96", + "@polkadot/react-signer": "^0.37.0-beta.96" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 977c0cf2dc89..a0d6bd735f77 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 4134795e1a1f..96d902e5dff1 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-components": "^0.37.0-beta.96", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index a00df4c8ace4..6e14f7276dc3 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", - "@polkadot/react-query": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96", + "@polkadot/react-query": "^0.37.0-beta.96" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 629a4d229f15..d4e361917729 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", - "@polkadot/react-query": "^0.37.0-beta.95", + "@polkadot/react-components": "^0.37.0-beta.96", + "@polkadot/react-query": "^0.37.0-beta.96", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 756f7f9f2f41..3b8e4e74e508 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.95", - "@polkadot/react-components": "^0.37.0-beta.95", - "@polkadot/react-query": "^0.37.0-beta.95" + "@polkadot/app-explorer": "^0.37.0-beta.96", + "@polkadot/react-components": "^0.37.0-beta.96", + "@polkadot/react-query": "^0.37.0-beta.96" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 0b65a27ef6f4..f162fbe4c3be 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", - "@polkadot/react-params": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96", + "@polkadot/react-params": "^0.37.0-beta.96" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 87b42cc5db6f..db46240694bd 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index e8814e8781c2..090f6be13c5d 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index af9f4210b766..790613db3151 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", - "@polkadot/react-query": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96", + "@polkadot/react-query": "^0.37.0-beta.96" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 57327947d5ce..ef9904637694 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", - "@polkadot/react-query": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96", + "@polkadot/react-query": "^0.37.0-beta.96" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 8d38fd7d71cf..de16eeee1a80 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 7d44fa3edeae..c6cbe473c9df 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", - "@polkadot/react-signer": "^0.37.0-beta.95", + "@polkadot/react-components": "^0.37.0-beta.96", + "@polkadot/react-signer": "^0.37.0-beta.96", "@polkadot/ui-assets": "^0.47.0-beta.6", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 18ebabbbe854..1c407fa47e6c 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index b85f887b6e4d..7e13366a6c96 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.95", + "@polkadot/react-api": "^0.37.0-beta.96", "@polkadot/react-identicon": "^0.47.0-beta.6", - "@polkadot/react-query": "^0.37.0-beta.95", + "@polkadot/react-query": "^0.37.0-beta.96", "@polkadot/ui-keyring": "^0.47.0-beta.6", "@polkadot/ui-settings": "^0.47.0-beta.6", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index d352cd2d8e38..84b3e8eb45a9 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index ee81506c8e2f..f55686454616 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95" + "@polkadot/react-components": "^0.37.0-beta.96" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index e1cdffa96377..d8bc30530451 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 3996dfd745b2..2b62bf3a4bf2 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.95", + "version": "0.37.0-beta.96", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.95", + "@polkadot/react-components": "^0.37.0-beta.96", "@polkadot/react-qr": "^0.47.0-beta.6" } } From ae6b453f0da73be07c196982f34ed66e4329c5ed Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sun, 17 Nov 2019 11:45:23 +0100 Subject: [PATCH 063/154] Disable stash operations (when not own) (#1901) --- .../app-staking/src/Actions/Account/index.tsx | 15 +++++++++++---- packages/app-staking/src/Actions/Accounts.tsx | 13 +++++++------ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/app-staking/src/Actions/Account/index.tsx b/packages/app-staking/src/Actions/Account/index.tsx index bb0fdda45658..45442f4b05cb 100644 --- a/packages/app-staking/src/Actions/Account/index.tsx +++ b/packages/app-staking/src/Actions/Account/index.tsx @@ -30,6 +30,7 @@ interface Props extends ApiProps, I18nProps { allStashes?: string[]; balances_all?: DerivedBalances; className?: string; + ownStash: boolean; recentlyOnline?: DerivedHeartbeats; staking_info?: DerivedStaking; stashOptions: KeyringSectionOption[]; @@ -345,7 +346,7 @@ class Account extends React.PureComponent { key='settings' onClose={this.toggleSettingPopup} open={isSettingPopupOpen} - position='bottom left' + position='bottom right' trigger={
@@ -287,7 +290,7 @@ class Account extends React.PureComponent { private renderButtons (): React.ReactNode { const { isSubstrateV2, t } = this.props; - const { controllerId, hexSessionId, isSettingPopupOpen, isStashNominating, isStashValidating, sessionIds } = this.state; + const { controllerId, hexSessionIdNext, isSettingPopupOpen, isStashNominating, isStashValidating, sessionIds } = this.state; const buttons = []; // if we are validating/nominating show stop @@ -307,7 +310,7 @@ class Account extends React.PureComponent { /> ); } else { - if (!sessionIds.length || (isSubstrateV2 && hexSessionId === '0x')) { + if (!sessionIds.length || (isSubstrateV2 && hexSessionIdNext === '0x')) { buttons.push(
@@ -92,7 +89,7 @@ function General ({ className, isModalContent, onClose, t }: Props): React.React defaultValue={ledgerConn} help={t('Manage your connection to Ledger S')} label={t('manage hardware connections')} - onChange={_onChangeLedgerConn} + onChange={_handleChange('ledgerConn')} options={ledgerConnOptions} />
@@ -101,7 +98,7 @@ function General ({ className, isModalContent, onClose, t }: Props): React.React
diff --git a/packages/react-components/package.json b/packages/react-components/package.json index af92f49d106d..c645e1ee9594 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -16,7 +16,7 @@ "@polkadot/react-identicon": "^0.47.0-beta.7", "@polkadot/react-query": "^0.37.0-beta.112", "@polkadot/ui-keyring": "^0.47.0-beta.7", - "@polkadot/ui-settings": "^0.47.0-beta.7", + "@polkadot/ui-settings": "0.47.0-beta.9", "@types/chart.js": "^2.8.10", "@types/i18next": "^13.0.0", "@types/react-copy-to-clipboard": "^4.3.0", diff --git a/yarn.lock b/yarn.lock index 23ff757611ae..5d3b14d8560b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2280,6 +2280,15 @@ optionalDependencies: "@ledgerhq/hw-transport-node-hid" "^4.73.7" +"@polkadot/ui-settings@0.47.0-beta.9": + version "0.47.0-beta.9" + resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.47.0-beta.9.tgz#59fd7f0a831ef932f5e877a27065a00da0e69ac7" + integrity sha512-57RK1oS3A23oHnHmMQLIo10pBKCOYINFsiv9fECuER+L4elFF/2/KuLD7uZJy0nOoN2Nk8OO/MiPVKxRD8yw+w== + dependencies: + "@babel/runtime" "^7.7.2" + "@types/store" "^2.0.2" + store "^2.0.12" + "@polkadot/ui-settings@^0.47.0-beta.7": version "0.47.0-beta.7" resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.47.0-beta.7.tgz#a7e341980827acdba1c5580c2a2f2b2f5c146ea1" From 3a7d11a3eb1e96eae86cc4a5c92d2d8521167fa1 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 23 Nov 2019 13:18:02 +0100 Subject: [PATCH 096/154] Bump API, latest substrate types (#1928) * Bump API, latest substrate types * ^ for package, not pinned --- package.json | 6 +- packages/app-accounts/package.json | 2 +- packages/app-contracts/package.json | 2 +- packages/apps/package.json | 2 +- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +- .../react-params/src/Param/findComponent.ts | 8 +- packages/react-signer/package.json | 2 +- yarn.lock | 145 ++++++++---------- 9 files changed, 86 insertions(+), 89 deletions(-) diff --git a/package.json b/package.json index d15485eb701b..78b600d0fda6 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.20", - "@polkadot/api-contract": "^0.97.0-beta.20", + "@polkadot/api": "^0.97.0-beta.27", + "@polkadot/api-contract": "^0.97.0-beta.27", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/types": "^0.97.0-beta.20", + "@polkadot/types": "^0.97.0-beta.27", "@polkadot/util": "^1.7.0-beta.7", "@polkadot/util-crypto": "^1.7.0-beta.7", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 09b2c3f7cfd2..13de12a910c0 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -12,7 +12,7 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-qr": "^0.47.0-beta.7", + "@polkadot/react-qr": "^0.47.0-beta.9", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", "babel-plugin-module-resolver": "^3.1.1", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 89467986cf88..88462a719504 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api-contract": "^0.97.0-beta.20", + "@polkadot/api-contract": "^0.97.0-beta.27", "@polkadot/react-components": "^0.37.0-beta.112" } } diff --git a/packages/apps/package.json b/packages/apps/package.json index b70efd67f219..d2f22418f879 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -16,7 +16,7 @@ "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.112", "@polkadot/react-signer": "^0.37.0-beta.112", - "@polkadot/ui-assets": "^0.47.0-beta.7", + "@polkadot/ui-assets": "^0.47.0-beta.9", "query-string": "^6.8.3" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 823512c1e7a0..64c2b3f98c23 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api": "^0.97.0-beta.20", + "@polkadot/api": "^0.97.0-beta.27", "@polkadot/extension-dapp": "^0.14.0-beta.5", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/packages/react-components/package.json b/packages/react-components/package.json index c645e1ee9594..0cfdf4438fcc 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -13,10 +13,10 @@ "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", "@polkadot/react-api": "^0.37.0-beta.112", - "@polkadot/react-identicon": "^0.47.0-beta.7", + "@polkadot/react-identicon": "^0.47.0-beta.9", "@polkadot/react-query": "^0.37.0-beta.112", - "@polkadot/ui-keyring": "^0.47.0-beta.7", - "@polkadot/ui-settings": "0.47.0-beta.9", + "@polkadot/ui-keyring": "^0.47.0-beta.9", + "@polkadot/ui-settings": "^0.47.0-beta.9", "@types/chart.js": "^2.8.10", "@types/i18next": "^13.0.0", "@types/react-copy-to-clipboard": "^4.3.0", diff --git a/packages/react-params/src/Param/findComponent.ts b/packages/react-params/src/Param/findComponent.ts index 9035d24e4f0e..156e015ba4e4 100644 --- a/packages/react-params/src/Param/findComponent.ts +++ b/packages/react-params/src/Param/findComponent.ts @@ -70,6 +70,8 @@ const components: ComponentMap = ([ return components; }, {} as unknown as ComponentMap); +const warnList: string[] = []; + export default function findComponent (def: TypeDef, overrides: ComponentMap = {}): React.ComponentType { const findOne = (type: string): React.ComponentType | null => overrides[type] || components[type]; @@ -127,7 +129,11 @@ export default function findComponent (def: TypeDef, overrides: ComponentMap = { // console.error(error.message); } - console.warn(`Cannot find Component for ${type}, defaulting to Unknown`); + // we only want to want once, not spam + if (!warnList.includes(type)) { + warnList.push(type); + console.warn(`Cannot find component for ${type}, defaulting to Unknown`); + } } return Component || Unknown; diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 63fa0522c84e..319fcf057467 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-qr": "^0.47.0-beta.7" + "@polkadot/react-qr": "^0.47.0-beta.9" } } diff --git a/yarn.lock b/yarn.lock index 5d3b14d8560b..1cf8ca8ab723 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,35 +2029,35 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^0.97.0-beta.20": - version "0.97.0-beta.20" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.20.tgz#107033420b48a7a54befd4d808a7f64f5e0d97d2" - integrity sha512-Y3HxaAnnTOxkbdcPnqByYdNZ8nJGIO8yB0nFrwIUFgTq9Z8iZI54dI4QdQM+bURI0IMO7GWkBYt8qoSJ+f3oMg== +"@polkadot/api-contract@^0.97.0-beta.27": + version "0.97.0-beta.27" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.27.tgz#26f9c6902af19efa8e4a9daf9b15021d7d112760" + integrity sha512-IbGEvLauX9xHMhuxJjVG6DWIiACCK6w3eoc+Zu9i3BXPNyrgjYLzn/kOh1yOOa+OxvW7ZzJ2nHBq+Kdkep+5pw== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/types" "^0.97.0-beta.20" + "@polkadot/types" "^0.97.0-beta.27" -"@polkadot/api-derive@^0.97.0-beta.20": - version "0.97.0-beta.20" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.20.tgz#5289b0ac7dd0f66eb1125ab232274b7114296ba1" - integrity sha512-eWARQZ+rgLsPto4L35qTzHajqWW3zVhEdmiRMGT5o7On+YdDXiPP8Dp/+mPqVZNvdYd1jpU0n06H53gsZMSYuA== +"@polkadot/api-derive@^0.97.0-beta.27": + version "0.97.0-beta.27" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.27.tgz#be73252edb28954d15f346cfa7e8cda9a938d51f" + integrity sha512-z7wtFLmAOPhOX6HJpDrEhV5hoPrhMliM4Xv0COzk89xyNt73XmMyGhLd3QfOPcet5Nzgq6iC5jYOjhxyYaOn1Q== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/api" "^0.97.0-beta.20" - "@polkadot/types" "^0.97.0-beta.20" + "@polkadot/api" "^0.97.0-beta.27" + "@polkadot/types" "^0.97.0-beta.27" -"@polkadot/api@^0.97.0-beta.20": - version "0.97.0-beta.20" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.20.tgz#1c21b7f46e86d40b59f6312ed6fb06059dab559c" - integrity sha512-tGLo/ye0Dgbcg5FaUb+QssueLnMr7fHE8A20lTG1Yki34fzYnWRSoO7Yk6xHKFAwW1nuBX6rmbkphdHZISCpcw== +"@polkadot/api@^0.97.0-beta.27": + version "0.97.0-beta.27" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.27.tgz#ec625c8bcee5371950e4c1cb54ff66227948d92c" + integrity sha512-Rx2HoUuYGtFeN7CFeZZlfk66acLzK8+gwJg9sR7z3e/xj6Ece1/L8cZwcnaZrAATm2vwQX7xaFSMFAbX0yMR3A== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/api-derive" "^0.97.0-beta.20" + "@polkadot/api-derive" "^0.97.0-beta.27" "@polkadot/keyring" "^1.7.0-beta.7" - "@polkadot/metadata" "^0.97.0-beta.20" - "@polkadot/rpc-core" "^0.97.0-beta.20" - "@polkadot/rpc-provider" "^0.97.0-beta.20" - "@polkadot/types" "^0.97.0-beta.20" + "@polkadot/metadata" "^0.97.0-beta.27" + "@polkadot/rpc-core" "^0.97.0-beta.27" + "@polkadot/rpc-provider" "^0.97.0-beta.27" + "@polkadot/types" "^0.97.0-beta.27" "@polkadot/util-crypto" "^1.7.0-beta.7" "@polkadot/dev-react@^0.32.0-beta.14": @@ -2160,10 +2160,10 @@ dependencies: "@babel/runtime" "^7.7.2" -"@polkadot/jsonrpc@^0.97.0-beta.20": - version "0.97.0-beta.20" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.20.tgz#eb41d5a58770af020d70e30dcee24b212c745abc" - integrity sha512-u+gkO4NGqM4csT+zJ/QL7K4XgiFW5RUt8kg0SGggnHI1xXT2Tj+Cb+Fb2KzTuU8yWqzFmVFHfYaZLttL/mZPpg== +"@polkadot/jsonrpc@^0.97.0-beta.27": + version "0.97.0-beta.27" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.27.tgz#1b456c3ab9bcea3eeb8dbb7bf0c56a355083c672" + integrity sha512-ufBpC7yzV9a8jNsz2SYNYAYPxbcMotn6gJUpu5yEQFgrYWK6VpCLpk6ydHIkmFjYJf45mWuvwc1Dd6XCcWBnMQ== dependencies: "@babel/runtime" "^7.7.2" @@ -2176,24 +2176,24 @@ "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" -"@polkadot/metadata@^0.97.0-beta.20": - version "0.97.0-beta.20" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.20.tgz#9a9249f5874aebdf4e91b1aa51a562dc06e101d9" - integrity sha512-kNSxGPnF7rFw71txt1//xofF89x/ohcqJ0hs0GPzdddZIB1lJUjDx5gxvmQ9+DWUO9DS7lf2CdM1fzyNexFh1A== +"@polkadot/metadata@^0.97.0-beta.27": + version "0.97.0-beta.27" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.27.tgz#8c22ab31e859b12b55738bb93c52370695318a47" + integrity sha512-Ba+HNnUDo1Tb9fdPb4PrdJ3uN3xTOsREu77JMZG0uDSlsl+Tv6+V0PvCbSptfVuVaDXPIuAJeyoKZntJh2WF8A== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/types" "^0.97.0-beta.20" + "@polkadot/types" "^0.97.0-beta.27" "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" -"@polkadot/react-identicon@^0.47.0-beta.7": - version "0.47.0-beta.7" - resolved "https://registry.yarnpkg.com/@polkadot/react-identicon/-/react-identicon-0.47.0-beta.7.tgz#d203f4e785c15eae6585cf398d1edb2c05917f67" - integrity sha512-ZabcxseswfcanwELMMohw3ZMfYfwT201OCNurjixft3FOCiXi8enOQtj5w3wg6vQt54to2Oqo5JdgY/MUjNQig== +"@polkadot/react-identicon@^0.47.0-beta.9": + version "0.47.0-beta.9" + resolved "https://registry.yarnpkg.com/@polkadot/react-identicon/-/react-identicon-0.47.0-beta.9.tgz#c7340f2de5e48220ce3a05b6bba87b318cb8c72c" + integrity sha512-PKM6NYV4zcoc4RakfoBgvHu4tJTh+ea8bC90imSm5cNnCrr2v53ZeRhAYffWQfCPfwpHyozkCAI7gfbroaXTsg== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/ui-settings" "^0.47.0-beta.7" - "@polkadot/ui-shared" "^0.47.0-beta.7" + "@polkadot/ui-settings" "^0.47.0-beta.9" + "@polkadot/ui-shared" "^0.47.0-beta.9" "@types/color" "^3.0.0" "@types/react-copy-to-clipboard" "^4.3.0" color "^3.1.2" @@ -2201,35 +2201,35 @@ react-copy-to-clipboard "^5.0.2" styled-components "^4.4.1" -"@polkadot/react-qr@^0.47.0-beta.7": - version "0.47.0-beta.7" - resolved "https://registry.yarnpkg.com/@polkadot/react-qr/-/react-qr-0.47.0-beta.7.tgz#fbceab697b0df292f7157b23cabdda3a91eef367" - integrity sha512-GEPXtANOGm4xXlay1WIBOE6zXtBL6Rt9S6AAR7FyLA5Cg3swnkLcxYSOL1UGOXfGNqdLqAeLnWz7DXHL5RjZAg== +"@polkadot/react-qr@^0.47.0-beta.9": + version "0.47.0-beta.9" + resolved "https://registry.yarnpkg.com/@polkadot/react-qr/-/react-qr-0.47.0-beta.9.tgz#4d310fad92fbc122bf963a4c431fc15af28dfb7e" + integrity sha512-koO5b8sknzqiMGijHaUJ0L7bwiHPv92QSraH43U+KcT+/WVD64JeBYwjiOGRJwLAYNynFLuPBRbHvgthxbTeOA== dependencies: "@babel/runtime" "^7.7.2" "@types/react-qr-reader" "^2.1.1" qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.0-beta.20": - version "0.97.0-beta.20" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.20.tgz#9212a4af630cbd38529d6ebb02585b28eaf72c18" - integrity sha512-NUYjM2uxbyZo4Yo877KYrXo4z4AWJ+DBCTH0BWwnqG4R42bOAndkj4X5a5sJBrBrDFvLoZw9ydrs4K4e2nnL2Q== +"@polkadot/rpc-core@^0.97.0-beta.27": + version "0.97.0-beta.27" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.27.tgz#3028d51c4b23fc97daf6ceae307cde50952956c3" + integrity sha512-F6RgMRXOpXfaDM/DqNYiHkB98ZVMzBg7lsTJ/7xt4EW1Ihv3p1yIEPUj0HC1dGcaUQ4l0PqPa5ZJdD54iBihYA== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/jsonrpc" "^0.97.0-beta.20" - "@polkadot/rpc-provider" "^0.97.0-beta.20" - "@polkadot/types" "^0.97.0-beta.20" + "@polkadot/jsonrpc" "^0.97.0-beta.27" + "@polkadot/rpc-provider" "^0.97.0-beta.27" + "@polkadot/types" "^0.97.0-beta.27" "@polkadot/util" "^1.7.0-beta.7" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.0-beta.20": - version "0.97.0-beta.20" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.20.tgz#e94b3dfd11994f6dcaf39ced3b56ae842bc9d8d1" - integrity sha512-/JpXwaDg2Mh/odYPN2Di4U911LVFUSx791WN1dku+Tx+yDHDK2ySyGAPYwLosSl7Y18AX/kJRkPAVoYC7oADJA== +"@polkadot/rpc-provider@^0.97.0-beta.27": + version "0.97.0-beta.27" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.27.tgz#0e0be036958a696a495af82f0f361de6df6866a1" + integrity sha512-VAbfmVRd1yqmzPIBDu+/rI5XSEBxG776Sc9lJVhvYWzSRge9QjJLSlH8FaV3b3yrvkUm7ylyiquCe/0Io2jf/Q== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/metadata" "^0.97.0-beta.20" + "@polkadot/metadata" "^0.97.0-beta.27" "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" eventemitter3 "^4.0.0" @@ -2243,10 +2243,10 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.0-beta.20": - version "0.97.0-beta.20" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.20.tgz#df79f3e17d45d43400a0fce88f179b778821d760" - integrity sha512-0+exHmnu5Zf+Qj9xMvesTPq/zz0m60GBjhogInPtcEXSv8OFoB3IgvT1RcK44HMhz077u0KfNzcH2CFbUzaGRg== +"@polkadot/types@^0.97.0-beta.27": + version "0.97.0-beta.27" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.27.tgz#0ee167f74bcd70d13c1d81524201222536ea0e23" + integrity sha512-Asv673S66XjfWmP8WiDATDPv+qwe23+A0yletGLj0i5LfkPPsB2f52kPBXQASeGjhI3HQ9xiTLqzbAmkyB1rAQ== dependencies: "@babel/runtime" "^7.7.2" "@polkadot/util" "^1.7.0-beta.7" @@ -2254,17 +2254,17 @@ "@types/memoizee" "^0.4.3" memoizee "^0.4.14" -"@polkadot/ui-assets@^0.47.0-beta.7": - version "0.47.0-beta.7" - resolved "https://registry.yarnpkg.com/@polkadot/ui-assets/-/ui-assets-0.47.0-beta.7.tgz#92d15b10c58ea9689566bbd59f177ea5c6cd95a4" - integrity sha512-FOQcKHuo98/21z/zvLLxKN3Np7QBIFoBTXwm0sUyBIC8UxpTFiJPOVWehiNp5usCIyAXg8mrJy/6FtPS7B6f1Q== +"@polkadot/ui-assets@^0.47.0-beta.9": + version "0.47.0-beta.9" + resolved "https://registry.yarnpkg.com/@polkadot/ui-assets/-/ui-assets-0.47.0-beta.9.tgz#7abc99afc336010fc5a69349d183215810c3925e" + integrity sha512-hwyXX7qXIwmNlN0KJMJUZorks9IR4oOEbG/uvzWpyU4bgkbirB5hS24w7E8hq9rz0bONrHT1osXbYO/Z27+aKw== dependencies: "@babel/runtime" "^7.7.2" -"@polkadot/ui-keyring@^0.47.0-beta.7": - version "0.47.0-beta.7" - resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.47.0-beta.7.tgz#59fd57808556737b544d1825a906b17b7200e0df" - integrity sha512-c9uaRArOKyhYCkyNTv3gy8ZRTUCXMf69jX+JDvJt760IDPl55ChVIOIrrbuKduUNnnBsrtp7vYMiOon8xLNxFg== +"@polkadot/ui-keyring@^0.47.0-beta.9": + version "0.47.0-beta.9" + resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.47.0-beta.9.tgz#3dbe1ca745b7667a7865b94ebef80e2409d4fea8" + integrity sha512-JGBGgfPjvRGDo1lMojKEapN2wZG23a7o6f7taN8xdJhYpZ3wWvQsrz35U6sUn1Ez5jfQ38IzvdDozixfpUZrhA== dependencies: "@babel/runtime" "^7.7.2" "@ledgerhq/hw-transport-u2f" "^4.73.7" @@ -2280,7 +2280,7 @@ optionalDependencies: "@ledgerhq/hw-transport-node-hid" "^4.73.7" -"@polkadot/ui-settings@0.47.0-beta.9": +"@polkadot/ui-settings@0.47.0-beta.9", "@polkadot/ui-settings@^0.47.0-beta.9": version "0.47.0-beta.9" resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.47.0-beta.9.tgz#59fd7f0a831ef932f5e877a27065a00da0e69ac7" integrity sha512-57RK1oS3A23oHnHmMQLIo10pBKCOYINFsiv9fECuER+L4elFF/2/KuLD7uZJy0nOoN2Nk8OO/MiPVKxRD8yw+w== @@ -2289,19 +2289,10 @@ "@types/store" "^2.0.2" store "^2.0.12" -"@polkadot/ui-settings@^0.47.0-beta.7": - version "0.47.0-beta.7" - resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.47.0-beta.7.tgz#a7e341980827acdba1c5580c2a2f2b2f5c146ea1" - integrity sha512-tKGuYrru5N0SY/uq/Q1vgAEyDVgOpRbVrjX03CBUAmXf/A5cHAjXH+5pi9FsXdcRKKKqZTJ4IWjELdSBAVaPuA== - dependencies: - "@babel/runtime" "^7.7.2" - "@types/store" "^2.0.2" - store "^2.0.12" - -"@polkadot/ui-shared@^0.47.0-beta.7": - version "0.47.0-beta.7" - resolved "https://registry.yarnpkg.com/@polkadot/ui-shared/-/ui-shared-0.47.0-beta.7.tgz#2b40d810952b57e5edeae51c17cfac2583729b0b" - integrity sha512-6Mc6FKVZGaOKPSq4ji20hkSRF/0t+vFHU4CJU8vijZD5E7d7nmigKvqqDPDiPRCsBINyJ60nIT5l6f0vBZAFew== +"@polkadot/ui-shared@^0.47.0-beta.9": + version "0.47.0-beta.9" + resolved "https://registry.yarnpkg.com/@polkadot/ui-shared/-/ui-shared-0.47.0-beta.9.tgz#8c6e21993ba219da782c58b7cd95384a6bdd2971" + integrity sha512-0TbcDgXEZrRUc4XMd570sj3Xg1PstldJGIzh2nOxYPoQbqW78tKi54B+SlpkjUbBbIY6VtU/Wim4NbQC87gUKQ== dependencies: "@babel/runtime" "^7.7.2" "@types/color" "^3.0.0" From 40e4aeac6ccf93b82b8f6f0c13691148e5cdb08b Mon Sep 17 00:00:00 2001 From: Github Actions Date: Sat, 23 Nov 2019 12:23:03 +0000 Subject: [PATCH 097/154] [CI Skip] 0.37.0-beta.113 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 2f294b8f99cf..5cf061369499 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.112" + "version": "0.37.0-beta.113" } diff --git a/package.json b/package.json index 78b600d0fda6..e10ea1b40d4c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 93e0fbac82b9..a1de50c3891b 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 13de12a910c0..16d9913d7dea 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", + "@polkadot/react-components": "^0.37.0-beta.113", "@polkadot/react-qr": "^0.47.0-beta.9", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index b2ebc410a38f..413e49eb101f 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 1b3e448df683..ccea078d6c86 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 88462a719504..2014737bdd26 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.27", - "@polkadot/react-components": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index cbab8eb2f614..5c65ea195744 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-query": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-query": "^0.37.0-beta.113" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 98913ccb4f5d..2a8cd9996682 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.112", - "@polkadot/react-components": "^0.37.0-beta.112" + "@polkadot/apps-routing": "^0.37.0-beta.113", + "@polkadot/react-components": "^0.37.0-beta.113" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 399e48bcc063..f529c0841664 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-query": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-query": "^0.37.0-beta.113" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 339f6a177b8b..744d1b4867b0 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index fcfaf73a4fb6..93b2d6f77579 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-params": "^0.37.0-beta.112", - "@polkadot/react-signer": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-params": "^0.37.0-beta.113", + "@polkadot/react-signer": "^0.37.0-beta.113" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 5bd36b127134..74738d46d1a2 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index aa7045f69a99..056b30a701de 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", + "@polkadot/react-components": "^0.37.0-beta.113", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index a174cf9ce855..199b7ac2e9b1 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-query": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-query": "^0.37.0-beta.113" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index efaf401d7640..d9a438dafcd0 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-query": "^0.37.0-beta.112", + "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-query": "^0.37.0-beta.113", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 2804e6bf54ce..7ac231b97fe2 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.112", - "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-query": "^0.37.0-beta.112" + "@polkadot/app-explorer": "^0.37.0-beta.113", + "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-query": "^0.37.0-beta.113" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 94873a122d2d..0106c5bf92a5 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-params": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-params": "^0.37.0-beta.113" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 18f3b7cc7a4b..ff3c68b309f9 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 12a98d418ea2..2fa37b2ce68e 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 6f4956dde9b9..6e5dc1b5972d 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-query": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-query": "^0.37.0-beta.113" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 09417205d4d9..9ec627536af9 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-query": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-query": "^0.37.0-beta.113" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index df183a445e64..a343defeea0a 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index d2f22418f879..79f92e155776 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", - "@polkadot/react-signer": "^0.37.0-beta.112", + "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-signer": "^0.37.0-beta.113", "@polkadot/ui-assets": "^0.47.0-beta.9", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 64c2b3f98c23..bbd813b9ffe5 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 0cfdf4438fcc..e4507b180c0a 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.112", + "@polkadot/react-api": "^0.37.0-beta.113", "@polkadot/react-identicon": "^0.47.0-beta.9", - "@polkadot/react-query": "^0.37.0-beta.112", + "@polkadot/react-query": "^0.37.0-beta.113", "@polkadot/ui-keyring": "^0.47.0-beta.9", "@polkadot/ui-settings": "^0.47.0-beta.9", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 64fce9cc27d6..1ca5fd82e360 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 5f1a8e7589de..cccb7a33094a 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112" + "@polkadot/react-components": "^0.37.0-beta.113" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 88d0fcf64486..3c598f8c4879 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 319fcf057467..d31ce8882505 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.112", + "version": "0.37.0-beta.113", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.112", + "@polkadot/react-components": "^0.37.0-beta.113", "@polkadot/react-qr": "^0.47.0-beta.9" } } From 8d40ca21cb2341f25a60ce4ddaa7a56700be1724 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Sat, 23 Nov 2019 12:33:15 +0000 Subject: [PATCH 098/154] [CI Skip] 0.37.0-beta.114 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 5cf061369499..876f0b7364ad 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.113" + "version": "0.37.0-beta.114" } diff --git a/package.json b/package.json index e10ea1b40d4c..0acfca67dbcd 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index a1de50c3891b..c91884f1507c 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 16d9913d7dea..829ca75a8bf3 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-components": "^0.37.0-beta.114", "@polkadot/react-qr": "^0.47.0-beta.9", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 413e49eb101f..ffb071108779 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index ccea078d6c86..44dac765964c 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 2014737bdd26..be7a6327ecfa 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.27", - "@polkadot/react-components": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 5c65ea195744..8e3577982349 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", - "@polkadot/react-query": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-query": "^0.37.0-beta.114" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 2a8cd9996682..42dc1a4f06aa 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.113", - "@polkadot/react-components": "^0.37.0-beta.113" + "@polkadot/apps-routing": "^0.37.0-beta.114", + "@polkadot/react-components": "^0.37.0-beta.114" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index f529c0841664..971dd51e68f7 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", - "@polkadot/react-query": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-query": "^0.37.0-beta.114" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 744d1b4867b0..296332770b80 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 93b2d6f77579..8c9346acb28a 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", - "@polkadot/react-params": "^0.37.0-beta.113", - "@polkadot/react-signer": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-params": "^0.37.0-beta.114", + "@polkadot/react-signer": "^0.37.0-beta.114" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 74738d46d1a2..6d6fc76ad5f1 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 056b30a701de..4a75b6a74a15 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-components": "^0.37.0-beta.114", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 199b7ac2e9b1..b06fddade3c3 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", - "@polkadot/react-query": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-query": "^0.37.0-beta.114" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index d9a438dafcd0..e9fe4d5800d6 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", - "@polkadot/react-query": "^0.37.0-beta.113", + "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-query": "^0.37.0-beta.114", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 7ac231b97fe2..90792d02fd3d 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.113", - "@polkadot/react-components": "^0.37.0-beta.113", - "@polkadot/react-query": "^0.37.0-beta.113" + "@polkadot/app-explorer": "^0.37.0-beta.114", + "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-query": "^0.37.0-beta.114" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 0106c5bf92a5..9f7def105804 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", - "@polkadot/react-params": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-params": "^0.37.0-beta.114" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index ff3c68b309f9..b3fcbac320e2 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 2fa37b2ce68e..e46e08680033 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 6e5dc1b5972d..aa7893dff398 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", - "@polkadot/react-query": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-query": "^0.37.0-beta.114" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 9ec627536af9..4a3074d4d7ec 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", - "@polkadot/react-query": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-query": "^0.37.0-beta.114" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index a343defeea0a..70ef51bff725 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 79f92e155776..6696db06778c 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", - "@polkadot/react-signer": "^0.37.0-beta.113", + "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-signer": "^0.37.0-beta.114", "@polkadot/ui-assets": "^0.47.0-beta.9", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index bbd813b9ffe5..af965dd6e896 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index e4507b180c0a..9b0410c9eb63 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.113", + "@polkadot/react-api": "^0.37.0-beta.114", "@polkadot/react-identicon": "^0.47.0-beta.9", - "@polkadot/react-query": "^0.37.0-beta.113", + "@polkadot/react-query": "^0.37.0-beta.114", "@polkadot/ui-keyring": "^0.47.0-beta.9", "@polkadot/ui-settings": "^0.47.0-beta.9", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 1ca5fd82e360..6a44023f25ba 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index cccb7a33094a..8b0adb9c882d 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113" + "@polkadot/react-components": "^0.37.0-beta.114" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 3c598f8c4879..02348bc2baa3 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index d31ce8882505..6e5d4c758fc6 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.113", + "version": "0.37.0-beta.114", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.113", + "@polkadot/react-components": "^0.37.0-beta.114", "@polkadot/react-qr": "^0.47.0-beta.9" } } From 14af62c1701f954daf2bff47cdff7652e03a17c9 Mon Sep 17 00:00:00 2001 From: Luke Sugiura Date: Sat, 23 Nov 2019 16:01:35 +0100 Subject: [PATCH 099/154] add language options inside app-settings (#1929) --- packages/app-settings/src/General.tsx | 27 ++++++++++++++++--- packages/app-settings/src/types.ts | 2 +- packages/app-settings/src/util.tsx | 4 +-- .../apps/public/locales/en/app-settings.json | 3 ++- .../apps/public/locales/ja/app-settings.json | 3 ++- 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/packages/app-settings/src/General.tsx b/packages/app-settings/src/General.tsx index 7d4e6a1fdec8..ea671a9de832 100644 --- a/packages/app-settings/src/General.tsx +++ b/packages/app-settings/src/General.tsx @@ -3,9 +3,9 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { I18nProps } from '@polkadot/react-components/types'; -import { Option } from './types'; +import { Option, SetOption } from './types'; -import React, { useEffect, useState } from 'react'; +import React, { useEffect, useState, useMemo } from 'react'; import { isLedgerCapable } from '@polkadot/react-api'; import { Button, Dropdown } from '@polkadot/react-components'; import uiSettings, { SettingsStruct } from '@polkadot/ui-settings'; @@ -22,6 +22,20 @@ interface Props extends I18nProps{ const prefixOptions = uiSettings.availablePrefixes.map((o): Option => createOption(o, ['default'])); const iconOptions = uiSettings.availableIcons.map((o): Option => createIdenticon(o, ['default'])); const ledgerConnOptions = uiSettings.availableLedgerConn; +const availableLanguages: SetOption[] = [ + { + text: 'Default browser language (auto-detect)', + value: 'default' + }, + { + text: 'English', + value: 'en' + }, + { + text: '日本語', + value: 'ja' + } +]; function General ({ className, isModalContent, onClose, t }: Props): React.ReactElement { // tri-state: null = nothing changed, false = no reload, true = reload required @@ -49,6 +63,13 @@ function General ({ className, isModalContent, onClose, t }: Props): React.React setChanged(null); }; + const translatedAvailableLanguages = useMemo(() => + availableLanguages.map(option => ({ + ...option, + text: t(option.text) + })) + , [t]); + const { icon, i18nLang, ledgerConn, prefix, uiMode } = settings; return ( @@ -99,7 +120,7 @@ function General ({ className, isModalContent, onClose, t }: Props): React.React defaultValue={i18nLang} label={t('default interface language')} onChange={_handleChange('i18nLang')} - options={uiSettings.availableLanguages} + options={translatedAvailableLanguages} />
diff --git a/packages/app-settings/src/types.ts b/packages/app-settings/src/types.ts index 897cf11ffb63..41702bc5f4b9 100644 --- a/packages/app-settings/src/types.ts +++ b/packages/app-settings/src/types.ts @@ -8,7 +8,7 @@ export interface Option { } export interface SetOption { - info: string; + info?: string; text: string; value: string | number; } diff --git a/packages/app-settings/src/util.tsx b/packages/app-settings/src/util.tsx index 32372a9cbb59..cb4147d82d86 100644 --- a/packages/app-settings/src/util.tsx +++ b/packages/app-settings/src/util.tsx @@ -19,7 +19,7 @@ export function createOption ({ info, text, value }: SetOption, overrides: strin Date: Sat, 23 Nov 2019 15:06:33 +0000 Subject: [PATCH 100/154] [CI Skip] 0.37.0-beta.115 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 876f0b7364ad..8f574b2fad31 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.114" + "version": "0.37.0-beta.115" } diff --git a/package.json b/package.json index 0acfca67dbcd..b0a52b7aad80 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index c91884f1507c..d4a28135ac32 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 829ca75a8bf3..ab05390d8b20 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-components": "^0.37.0-beta.115", "@polkadot/react-qr": "^0.47.0-beta.9", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index ffb071108779..84b32f938edc 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 44dac765964c..81aac2861f1b 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index be7a6327ecfa..e8449aa9f120 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.27", - "@polkadot/react-components": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 8e3577982349..ef3e16e9ef54 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", - "@polkadot/react-query": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-query": "^0.37.0-beta.115" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 42dc1a4f06aa..7f483132fb7a 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.114", - "@polkadot/react-components": "^0.37.0-beta.114" + "@polkadot/apps-routing": "^0.37.0-beta.115", + "@polkadot/react-components": "^0.37.0-beta.115" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 971dd51e68f7..1e61dfca101b 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", - "@polkadot/react-query": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-query": "^0.37.0-beta.115" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 296332770b80..aa98fe735d96 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 8c9346acb28a..5667f81d47d8 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", - "@polkadot/react-params": "^0.37.0-beta.114", - "@polkadot/react-signer": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-params": "^0.37.0-beta.115", + "@polkadot/react-signer": "^0.37.0-beta.115" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 6d6fc76ad5f1..5895624dda4c 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 4a75b6a74a15..97c9b2f0318b 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-components": "^0.37.0-beta.115", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index b06fddade3c3..6a99183a2d77 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", - "@polkadot/react-query": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-query": "^0.37.0-beta.115" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index e9fe4d5800d6..cc75b341d16c 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", - "@polkadot/react-query": "^0.37.0-beta.114", + "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-query": "^0.37.0-beta.115", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 90792d02fd3d..2ace8565d8f3 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.114", - "@polkadot/react-components": "^0.37.0-beta.114", - "@polkadot/react-query": "^0.37.0-beta.114" + "@polkadot/app-explorer": "^0.37.0-beta.115", + "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-query": "^0.37.0-beta.115" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 9f7def105804..16a27812fabb 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", - "@polkadot/react-params": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-params": "^0.37.0-beta.115" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index b3fcbac320e2..be088564449c 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index e46e08680033..18bed99f056a 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index aa7893dff398..d87bde562c2f 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", - "@polkadot/react-query": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-query": "^0.37.0-beta.115" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 4a3074d4d7ec..d4081dce27fe 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", - "@polkadot/react-query": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-query": "^0.37.0-beta.115" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 70ef51bff725..fc7a933e0b97 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 6696db06778c..ef021612ed1a 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", - "@polkadot/react-signer": "^0.37.0-beta.114", + "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-signer": "^0.37.0-beta.115", "@polkadot/ui-assets": "^0.47.0-beta.9", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index af965dd6e896..effe82accf84 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 9b0410c9eb63..0732d09b0367 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.114", + "@polkadot/react-api": "^0.37.0-beta.115", "@polkadot/react-identicon": "^0.47.0-beta.9", - "@polkadot/react-query": "^0.37.0-beta.114", + "@polkadot/react-query": "^0.37.0-beta.115", "@polkadot/ui-keyring": "^0.47.0-beta.9", "@polkadot/ui-settings": "^0.47.0-beta.9", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 6a44023f25ba..ec04be6bdb1d 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 8b0adb9c882d..537e50d6571d 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114" + "@polkadot/react-components": "^0.37.0-beta.115" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 02348bc2baa3..3fedba130558 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 6e5d4c758fc6..edfb2053599e 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.114", + "version": "0.37.0-beta.115", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.114", + "@polkadot/react-components": "^0.37.0-beta.115", "@polkadot/react-qr": "^0.47.0-beta.9" } } From bebe9576123f10f701ed8df692cb14411c2e79d3 Mon Sep 17 00:00:00 2001 From: Keith Ingram Date: Sat, 23 Nov 2019 07:18:24 -0800 Subject: [PATCH 101/154] Fix Vec issue (#1924) * fix vec * api version * console * lint * fix struct display * registry * arg order --- packages/react-params/src/Param/Struct.tsx | 9 +- .../react-params/src/Param/findComponent.ts | 8 +- packages/react-params/src/Param/index.tsx | 5 +- yarn.lock | 423 +++++++++--------- 4 files changed, 239 insertions(+), 206 deletions(-) diff --git a/packages/react-params/src/Param/Struct.tsx b/packages/react-params/src/Param/Struct.tsx index a4da4bd1e699..a7c3713f9d5d 100644 --- a/packages/react-params/src/Param/Struct.tsx +++ b/packages/react-params/src/Param/Struct.tsx @@ -18,8 +18,13 @@ export default function StructParam (props: Props): React.ReactElement { const [params, setParams] = useState([]); useEffect((): void => { - const rawType = createType(registry, type.type as any).toRawType(); - const typeDef = getTypeDef(rawType); + let typeDef; + try { + const rawType = createType(registry, type.type as any).toRawType(); + typeDef = getTypeDef(rawType); + } catch (e) { + typeDef = type; + } setParams((typeDef.sub as TypeDef[]).map((type): ParamDef => ({ name: type.name, type }))); }, [type]); diff --git a/packages/react-params/src/Param/findComponent.ts b/packages/react-params/src/Param/findComponent.ts index 156e015ba4e4..581c2468704c 100644 --- a/packages/react-params/src/Param/findComponent.ts +++ b/packages/react-params/src/Param/findComponent.ts @@ -7,7 +7,7 @@ import { Props, ComponentMap } from '../types'; import BN from 'bn.js'; import { registry } from '@polkadot/react-api'; -import { createType, getTypeDef } from '@polkadot/types'; +import { createType, getTypeDef, SPECIAL_TYPES } from '@polkadot/types'; import Account from './Account'; import Amount from './Amount'; @@ -76,7 +76,7 @@ export default function findComponent (def: TypeDef, overrides: ComponentMap = { const findOne = (type: string): React.ComponentType | null => overrides[type] || components[type]; const type = (({ displayName, info, sub, type }: TypeDef): string => { - if (displayName) { + if (displayName && SPECIAL_TYPES.includes(displayName)) { return displayName; } @@ -100,6 +100,10 @@ export default function findComponent (def: TypeDef, overrides: ComponentMap = { return 'Tuple'; case TypeDefInfo.Vec: + if (type === 'Vec') { + return 'Bytes'; + } + return ['Vec'].includes(type) ? 'Vec' : 'Vec'; diff --git a/packages/react-params/src/Param/index.tsx b/packages/react-params/src/Param/index.tsx index 8114e6f7b33b..634cd4f7d4e4 100644 --- a/packages/react-params/src/Param/index.tsx +++ b/packages/react-params/src/Param/index.tsx @@ -7,6 +7,7 @@ import { BaseProps, Props as CProps, ComponentMap } from '../types'; import React, { useRef } from 'react'; import { classes } from '@polkadot/react-components/util'; +import { displayType } from '@polkadot/types'; import { isUndefined } from '@polkadot/util'; import translate from '../translate'; @@ -27,8 +28,8 @@ function Param ({ className, defaultValue, isDisabled, isOptional, name, onChang } const label = isUndefined(name) - ? (type.displayName || type.type) - : `${name}: ${type.displayName || type.type}`; + ? displayType(type) + : `${name}: ${displayType(type)}`; return isOptional ? ( diff --git a/yarn.lock b/yarn.lock index 1cf8ca8ab723..73d0f254bd60 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1017,9 +1017,9 @@ which "^1.3.1" "@hapi/address@2.x.x": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz#1c794cd6dbf2354d1eb1ef10e0303f573e1c7222" - integrity sha512-O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q== + version "2.1.4" + resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" + integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ== "@hapi/bourne@1.x.x": version "1.3.2" @@ -1196,72 +1196,72 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^13.0.0" -"@ledgerhq/devices@^4.73.7": - version "4.73.7" - resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-4.73.7.tgz#848756207082107531f76bf22acbc224dca20f2e" - integrity sha512-6jUv+Jw/unpZdz8I6nZdaYCP838cfiXLsh95S02XnCRE2xxfq3h3QfhEMnaDbxtJqUmJClRqayGZNIm2Go8IvA== +"@ledgerhq/devices@^4.74.2": + version "4.74.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-4.74.2.tgz#f7042c31b491ba3d9fad506ec6519674fd9c7474" + integrity sha512-EUA2S28DWWKvUs9XOIpdNZMU5HGyXIZU2nVr6Rr0yYvYTEuItuBSvtfot17rSoyYLwClOoNPHMqXAvrCmr/6hg== dependencies: - "@ledgerhq/errors" "^4.73.7" + "@ledgerhq/errors" "^4.74.2" "@ledgerhq/logs" "^4.72.0" rxjs "^6.5.3" -"@ledgerhq/errors@^4.73.7": - version "4.73.7" - resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-4.73.7.tgz#1c86918798669d5555076c576bfa3a317834935a" - integrity sha512-ybRJlRB3AjF6H19rQi5IuavvuGsBazzHL5ldw3DekvKlbjb+Mmf4ft21f2FKPynl9PlWhHVeVlhyVXXk+tuXOA== +"@ledgerhq/errors@^4.74.2": + version "4.74.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-4.74.2.tgz#586cfaed135354e94afda4e7ab2334abcdce187a" + integrity sha512-Y42pWQlxP0cD5av/UKXM0PXCL4knylP4lZ0BFMPDDqU8VTOWKhj92sWJJgb4beqU19i7uuEqqAeYbMMt1ubwpg== -"@ledgerhq/hw-transport-node-hid-noevents@^4.73.7": - version "4.73.7" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-4.73.7.tgz#ea457c8eb3cc2c2d53c0e9f5b97c545dcb7d46ec" - integrity sha512-5AL0ahsXAvjQJMcEtnXJsI847y8BHhO9eAJxsXYNZYYFXoKTfXBaMP8zCkUTBEi564GStQawM7aAmTzP+p70tw== +"@ledgerhq/hw-transport-node-hid-noevents@^4.74.2": + version "4.74.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-4.74.2.tgz#a1b49562bdb781b07ec85072e1eb80b648078fa3" + integrity sha512-ed2dApJWGEZFdLX4Z3wRAWKXiPloNpqE22KkehiBgDCMtiJBTCtI7cH97OgsjqAac9fEelUXplQIPLbYjiWlJQ== dependencies: - "@ledgerhq/devices" "^4.73.7" - "@ledgerhq/errors" "^4.73.7" - "@ledgerhq/hw-transport" "^4.73.7" + "@ledgerhq/devices" "^4.74.2" + "@ledgerhq/errors" "^4.74.2" + "@ledgerhq/hw-transport" "^4.74.2" "@ledgerhq/logs" "^4.72.0" node-hid "^0.7.9" "@ledgerhq/hw-transport-node-hid@^4.73.7": - version "4.73.7" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.73.7.tgz#078c2021cdb32b2b20abefea0a1922dfd53ea012" - integrity sha512-vN8UD2CeiKM50VQud24triJtkUiuwuIw04XXV663QQ2GOvMu/ssSdXjodbzXKaIzkBAH2DCZhLOOCMELZGfTJQ== - dependencies: - "@ledgerhq/devices" "^4.73.7" - "@ledgerhq/errors" "^4.73.7" - "@ledgerhq/hw-transport" "^4.73.7" - "@ledgerhq/hw-transport-node-hid-noevents" "^4.73.7" + version "4.74.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.74.2.tgz#4880f5dada00b6af507275234086d198540d290a" + integrity sha512-wdNdr7oojIEj7EZjoJ5L+R7rdm1wTEMB7Sy+/cR2CwgEIn2L+qKhgUrBcpMeiU+SN3tKrTAzUZ2+ZcTSpY4GZA== + dependencies: + "@ledgerhq/devices" "^4.74.2" + "@ledgerhq/errors" "^4.74.2" + "@ledgerhq/hw-transport" "^4.74.2" + "@ledgerhq/hw-transport-node-hid-noevents" "^4.74.2" "@ledgerhq/logs" "^4.72.0" lodash "^4.17.15" node-hid "^0.7.9" usb "^1.6.0" "@ledgerhq/hw-transport-u2f@^4.73.7": - version "4.73.7" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-4.73.7.tgz#fb6f0cb9e3f31890a97142df1d7c8835bc4a5f9a" - integrity sha512-ww6E4jNYsW7NyKqrevHAPF6r8gMvxurp+CajPRBiVfVbZv4l2Qil3SL5F8j2/q749Uc/ZgqDqTbxoOhohYmPyg== + version "4.74.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-4.74.2.tgz#20946865204113eb4a586b2ac8d721730ee35bad" + integrity sha512-islCIL1HTnmSEj6V9U/f9TT9HHe9sviDuN3Ra0zK65cGaWqQa3Ni6wQil2wl7vNrEN7inwqAq5QOf3LzEFTOtg== dependencies: - "@ledgerhq/errors" "^4.73.7" - "@ledgerhq/hw-transport" "^4.73.7" + "@ledgerhq/errors" "^4.74.2" + "@ledgerhq/hw-transport" "^4.74.2" "@ledgerhq/logs" "^4.72.0" u2f-api "0.2.7" "@ledgerhq/hw-transport-webusb@^4.73.7": - version "4.73.7" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-4.73.7.tgz#3189342a85e0aceb99d7a6c1f04aed144709d927" - integrity sha512-OpoMA85qgT+xeUdxJ1ERzVfKii3T2vJjgBUl8FUVfRaMc8fW0wJBvec9FYKne3wywRDsVZETIToYDWJ5EsjOEw== + version "4.74.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-4.74.2.tgz#1aafa38a02d69d65ec5a481cae01d875f3de4e92" + integrity sha512-UAdkUx0kDy4mVE+tDq/m5W1j4r5r9+wrCFkLedLpkpJoRPQaVJF5zmYwPaPv8RHk/jzWcOVxAEB4xAE7xSJWlg== dependencies: - "@ledgerhq/devices" "^4.73.7" - "@ledgerhq/errors" "^4.73.7" - "@ledgerhq/hw-transport" "^4.73.7" + "@ledgerhq/devices" "^4.74.2" + "@ledgerhq/errors" "^4.74.2" + "@ledgerhq/hw-transport" "^4.74.2" "@ledgerhq/logs" "^4.72.0" -"@ledgerhq/hw-transport@^4.35.0", "@ledgerhq/hw-transport@^4.73.7": - version "4.73.7" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-4.73.7.tgz#7a7fe6d8e0445d5723b9bd62c50b11f129894a68" - integrity sha512-X7pwX9kk+BuQMf6W1HrB0a6Qb+zoJtVbvyuOqrCqCGx4vh8pogaKAOHriM8eVKJ5UmDUfTayYpLHG3MbOQLZzg== +"@ledgerhq/hw-transport@^4.35.0", "@ledgerhq/hw-transport@^4.74.2": + version "4.74.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-4.74.2.tgz#dc4874b77616b63419cee5eed746dc23183ab6ce" + integrity sha512-83SiHd7wuif/epq58n9kPFhqr/1zv9a13nDYFLinaUGvRrx5jGFvCq9HiS/WIPOeIHsnuStpqKQbpUDvlRlHKg== dependencies: - "@ledgerhq/devices" "^4.73.7" - "@ledgerhq/errors" "^4.73.7" + "@ledgerhq/devices" "^4.74.2" + "@ledgerhq/errors" "^4.74.2" events "^3.0.0" "@ledgerhq/logs@^4.72.0": @@ -2396,13 +2396,6 @@ dependencies: "@babel/types" "^7.3.0" -"@types/base-x@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/base-x/-/base-x-3.0.0.tgz#a1365259d1d3fa3ff973ab543192a6bdd4cb2f90" - integrity sha512-vnqSlpsv9uFX5/z8GyKWAfWHhLGJDBkrgRRsnxlsX23DHOlNyqP/eHQiv4TwnYcZULzQIxaWA/xRWU9Dyy4qzw== - dependencies: - "@types/node" "*" - "@types/bip39@^2.4.2": version "2.4.2" resolved "https://registry.yarnpkg.com/@types/bip39/-/bip39-2.4.2.tgz#f5d6617212be496bb998d3969f657f77a10c5287" @@ -2418,16 +2411,16 @@ "@types/node" "*" "@types/bs58@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/bs58/-/bs58-4.0.0.tgz#baec75cb007b419ede3ec6b3410d2c8f14c92fc5" - integrity sha512-gYX+MHD4G/R+YGYwdhG5gbJj4LsEQGr3Vg6gVDAbe7xC5Bn8dNNG2Lpo6uDX/rT5dE7VBj0rGEFuV8L0AEx4Rg== + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/bs58/-/bs58-4.0.1.tgz#3d51222aab067786d3bc3740a84a7f5a0effaa37" + integrity sha512-yfAgiWgVLjFCmRv8zAcOIHywYATEwiTVccTLnRp6UxTNavT55M9d/uhK3T03St/+8/z/wW+CRjGKUNmEqoHHCA== dependencies: - "@types/base-x" "*" + base-x "^3.0.6" "@types/chart.js@^2.8.10": - version "2.8.11" - resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.8.11.tgz#acf52ec2a29b8fcb71e77d6fae54b89b77be9b22" - integrity sha512-ALmOqIBl6re4dFZbvd4OTCrZpCN1l3s6/Ool84JLowlychK0kJmNmcHGeVw4ol3KNme579tHCFEaNfTT/S3xmQ== + version "2.9.2" + resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.2.tgz#0629c49d791df1347a163aa412d665218f7be667" + integrity sha512-jgSW2LSsrgLLzfxDhJfDLst4ifH3IhHqbE1qXrqigHyhDz1zGHL3PSvIxwcoQvCAcq8kMeVcTkpiODChAy/QaA== "@types/chrome@^0.0.91": version "0.0.91" @@ -2584,9 +2577,9 @@ "@types/node" "*" "@types/node@*", "@types/node@>= 8", "@types/node@^12.12.7": - version "12.12.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.7.tgz#01e4ea724d9e3bd50d90c11fd5980ba317d8fa11" - integrity sha512-E6Zn0rffhgd130zbCbAr/JdXfXkoOUFAKNs/rF8qnafSJ8KYaA/j3oz7dcwal+lYjLA7xvdd5J4wdYpCTlP8+w== + version "12.12.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.11.tgz#bec2961975888d964196bf0016a2f984d793d3ce" + integrity sha512-O+x6uIpa6oMNTkPuHDa9MhMMehlxLAd5QcOvKRjAFsBVpeFWTOPnXbDvILvFgFFZfQ1xh1EZi1FbXxUix+zpsQ== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -2654,9 +2647,9 @@ "@types/react-router" "*" "@types/react-router@*": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.2.tgz#41e5e6aa333a7b9a2bfdac753c04e1ca4b3e0d21" - integrity sha512-euC3SiwDg3NcjFdNmFL8uVuAFTpZJm0WMFUw+4eXMUnxa7M9RGFEG0szt0z+/Zgk4G2k9JBFhaEnY64RBiFmuw== + version "5.1.3" + resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.3.tgz#7c7ca717399af64d8733d8cb338dd43641b96f2d" + integrity sha512-0gGhmerBqN8CzlnDmSgGNun3tuZFXerUclWkqEhozdLaJtfcJRUTGkKaEKk+/MpHd1KDS1+o2zb/3PkBUiv2qQ== dependencies: "@types/history" "*" "@types/react" "*" @@ -3386,11 +3379,11 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== ansi-escapes@^4.1.0, ansi-escapes@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.2.1.tgz#4dccdb846c3eee10f6d64dea66273eab90c37228" - integrity sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q== + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d" + integrity sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg== dependencies: - type-fest "^0.5.2" + type-fest "^0.8.1" ansi-html@0.0.7: version "0.0.7" @@ -3685,12 +3678,10 @@ atob@^2.1.1: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -attr-accept@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-1.1.3.tgz#48230c79f93790ef2775fcec4f0db0f5db41ca52" - integrity sha512-iT40nudw8zmCweivz6j58g+RT33I4KbaIvRUhjNmDwO2WmsQUxFEZZYZ5w3vXe5x5MX9D7mfvA/XaLOZYFR9EQ== - dependencies: - core-js "^2.5.0" +attr-accept@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.0.0.tgz#8422fef5ee4a511c207796c888227ab5de03306f" + integrity sha512-I9SDP4Wvh2ItYYoafEg8hFpsBe96pfQ+eabceShXt3sw2fbIP96+Aoj9zZE0vkZNAkXXzHJATVRuWz+h9FxJxQ== autocomplete.js@0.36.0: version "0.36.0" @@ -3700,16 +3691,16 @@ autocomplete.js@0.36.0: immediate "^3.2.3" autoprefixer@^9.5.1, autoprefixer@^9.6.1, autoprefixer@^9.7.1: - version "9.7.1" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.1.tgz#9ffc44c55f5ca89253d9bb7186cefb01ef57747f" - integrity sha512-w3b5y1PXWlhYulevrTJ0lizkQ5CyqfeU6BIRDbuhsMupstHQOeb1Ur80tcB1zxSu7AwyY/qCQ7Vvqklh31ZBFw== + version "9.7.2" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.2.tgz#26cf729fbb709323b40171a874304884dcceffed" + integrity sha512-LCAfcdej1182uVvPOZnytbq61AhnOZ/4JelDaJGDeNwewyU1AMaNthcHsyz1NRjTmd2FkurMckLWfkHg3Z//KA== dependencies: - browserslist "^4.7.2" - caniuse-lite "^1.0.30001006" + browserslist "^4.7.3" + caniuse-lite "^1.0.30001010" chalk "^2.4.2" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^7.0.21" + postcss "^7.0.23" postcss-value-parser "^4.0.2" aws-sign2@~0.7.0: @@ -3840,7 +3831,7 @@ base-x@3.0.5: dependencies: safe-buffer "^5.0.1" -base-x@^3.0.2: +base-x@^3.0.2, base-x@^3.0.6: version "3.0.7" resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.7.tgz#1c5a7fafe8f66b4114063e8da102799d4e7c408f" integrity sha512-zAKJGuQPihXW22fkrfOclUUZXM2g92z5GzlSMHxhO6r6Qj+Nm0ccaGNBzDZojzwOMkpjAv4J0fOv1U4go+a4iw== @@ -4103,14 +4094,14 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.2.tgz#1bb984531a476b5d389cedecb195b2cd69fb1348" - integrity sha512-uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw== +browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.7.2, browserslist@^4.7.3: + version "4.7.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.3.tgz#02341f162b6bcc1e1028e30624815d4924442dc3" + integrity sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ== dependencies: - caniuse-lite "^1.0.30001004" - electron-to-chromium "^1.3.295" - node-releases "^1.1.38" + caniuse-lite "^1.0.30001010" + electron-to-chromium "^1.3.306" + node-releases "^1.1.40" bs58@^4.0.1: version "4.0.1" @@ -4345,10 +4336,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001004, caniuse-lite@^1.0.30001006: - version "1.0.30001009" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001009.tgz#69b77997b882a7aee6af24c8d7d2fa27ee41f348" - integrity sha512-M3rEqHN6SaVjgo4bIik7HsGcWXsi+lI9WA0p51RPMFx5gXfduyOXWJrc0R4xBkSK1pgNf4CNgy5M+6H+WiEP8g== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001010: + version "1.0.30001010" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001010.tgz#397a14034d384260453cc81994f494626d34b938" + integrity sha512-RA5GH9YjFNea4ZQszdWgh2SC+dpLiRAg4VDQS2b5JRI45OxmbGrYocYHTa9x0bKMQUE7uvHkNPNffUr+pCxSGw== canvas-renderer@~2.1.1: version "2.1.1" @@ -4416,9 +4407,9 @@ chardet@^0.7.0: integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== chart.js@^2.9.2: - version "2.9.2" - resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.2.tgz#5f7397f2fc33ca406836dbaed3cc39943bbb9f80" - integrity sha512-AagP9h27gU7hhx8F64BOFpNZGV0R1Pz1nhsi0M1+KLhtniX6ElqLl0z0obKSiuGMl9tcRe6ZhruCGCJWmH6snQ== + version "2.9.3" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.3.tgz#ae3884114dafd381bc600f5b35a189138aac1ef7" + integrity sha512-+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw== dependencies: chartjs-color "^2.1.0" moment "^2.10.2" @@ -4909,9 +4900,9 @@ conventional-changelog-preset-loader@^2.1.1: integrity sha512-/rHb32J2EJnEXeK4NpDgMaAVTFZS3o1ExmjKMtYVgIC4MQn0vkNSbYpdGRotkfGGRWiqk3Ri3FBkiZGbAfIfOQ== conventional-changelog-writer@^4.0.6: - version "4.0.10" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.10.tgz#39f6458cca62a8151b3ce582a57ff71fd2b0ff7a" - integrity sha512-vtO9vBAVh7XnSpGLTB1BOGgsGTz1MdvFjzbSXLrtapWCHWwuVOZFgwdLhlS0MaXwlF1dksWdEb6tnr42Ie2INw== + version "4.0.11" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz#9f56d2122d20c96eb48baae0bf1deffaed1edba4" + integrity sha512-g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw== dependencies: compare-func "^1.3.1" conventional-commits-filter "^2.0.2" @@ -4919,7 +4910,7 @@ conventional-changelog-writer@^4.0.6: handlebars "^4.4.0" json-stringify-safe "^5.0.1" lodash "^4.17.15" - meow "^4.0.0" + meow "^5.0.0" semver "^6.0.0" split "^1.0.0" through2 "^3.0.0" @@ -4933,14 +4924,14 @@ conventional-commits-filter@^2.0.2: modify-values "^1.0.0" conventional-commits-parser@^3.0.3: - version "3.0.7" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.7.tgz#55b6cde6a2d0b4a7ab399392777d527134a8d05c" - integrity sha512-4mx/FRC92z0yIiXGyRVYQFhn0jWDwvxnj2UuLaUi3hJSG4Thall6GXA8YOPHQK2qvotciJandJIVmuSvLgDLbQ== + version "3.0.8" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz#23310a9bda6c93c874224375e72b09fb275fe710" + integrity sha512-YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ== dependencies: JSONStream "^1.0.4" is-text-path "^1.0.1" lodash "^4.17.15" - meow "^4.0.0" + meow "^5.0.0" split2 "^2.0.0" through2 "^3.0.0" trim-off-newlines "^1.0.0" @@ -4959,7 +4950,7 @@ conventional-recommended-bump@^5.0.0: meow "^4.0.0" q "^1.5.1" -convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== @@ -5034,7 +5025,7 @@ core-js-compat@^3.1.1: browserslist "^4.7.2" semver "^6.3.0" -core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5: +core-js@^2.4.0, core-js@^2.6.5: version "2.6.10" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f" integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA== @@ -5982,12 +5973,12 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -ejs@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.1.tgz#5b5ab57f718b79d4aca9254457afecd36fa80228" - integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ== +ejs@^2.7.2: + version "2.7.4" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" + integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== -electron-to-chromium@^1.3.295: +electron-to-chromium@^1.3.306: version "1.3.306" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.306.tgz#e8265301d053d5f74e36cb876486830261fbe946" integrity sha512-frDqXvrIROoYvikSKTIKbHbzO6M3/qC6kCIt/1FOa9kALe++c4VAJnwjSFvf1tYLEUsP2n9XZ4XSCyqc3l7A/A== @@ -6183,9 +6174,9 @@ err-code@^1.0.0: integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= errlop@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/errlop/-/errlop-1.2.0.tgz#15d02f8232e788da39b6472fb76809fff423a7d8" - integrity sha512-xlbC/1TA2kMaPYy0DtlL0sLyu6T5ZYpLNnOY5EtvDbHRnzUAipUqW1eKObQgwWbRDiudE2IJaxJAgw4fF39Lcw== + version "1.3.0" + resolved "https://registry.yarnpkg.com/errlop/-/errlop-1.3.0.tgz#ae6624cf8ba838ca0d34770606c230878586ee44" + integrity sha512-qbb3CRis7c/XouHw41umhSIt4e0KFcESXDrWvgFwIuD/neT1WBO9lKFj7sriqPgF8xEY0Vz6Ws5hMbjN4q/hsQ== dependencies: editions "^2.2.0" @@ -6380,9 +6371,9 @@ eslint-plugin-promise@^4.2.1: integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== eslint-plugin-react-hooks@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.2.0.tgz#078264e9e388da6929ace09d6abe92c85963aff4" - integrity sha512-jSlnBjV2cmyIeL555H/FbvuSbQ1AtpHjLMHuPrQnt1eVA6lX8yufdygh7AArI2m8ct7ChHGx2uOaCuxq2MUn6g== + version "2.3.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.3.0.tgz#53e073961f1f5ccf8dd19558036c1fac8c29d99a" + integrity sha512-gLKCa52G4ee7uXzdLiorca7JIQZPPXRAQDXV83J4bUEeUuc5pIEyZYAZ45Xnxe5IuupxEqHS+hUhSLIimK1EMw== eslint-plugin-react@^7.16.0: version "7.16.0" @@ -6891,7 +6882,7 @@ file-saver@^2.0.0: resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.2.tgz#06d6e728a9ea2df2cce2f8d9e84dfcdc338ec17a" integrity sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw== -file-selector@^0.1.11: +file-selector@^0.1.12: version "0.1.12" resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.1.12.tgz#fe726547be219a787a9dcc640575a04a032b1fd0" integrity sha512-Kx7RTzxyQipHuiqyZGf+Nz4vY9R1XGxuQl/hLoJwq+J4avk/9wxxgZyHKtbyIPJmbD4A66DWGYfyykWNpcYutQ== @@ -7439,7 +7430,7 @@ glob@^5.0.15: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -7608,9 +7599,9 @@ handle-thing@^2.0.0: integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ== handlebars@^4.1.2, handlebars@^4.4.0, handlebars@^4.5.1: - version "4.5.1" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.1.tgz#8a01c382c180272260d07f2d1aa3ae745715c7ba" - integrity sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA== + version "4.5.3" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" + integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA== dependencies: neo-async "^2.6.0" optimist "^0.6.1" @@ -7654,9 +7645,9 @@ has-flag@^4.0.0: integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== has-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" - integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== has-unicode@^2.0.0, has-unicode@^2.0.1: version "2.0.1" @@ -7772,9 +7763,9 @@ hogan.js@^3.0.2: nopt "1.0.10" hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b" - integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA== + version "3.3.1" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#101685d3aff3b23ea213163f6e8e12f4f111e19f" + integrity sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw== dependencies: react-is "^16.7.0" @@ -8075,9 +8066,9 @@ i18next-xhr-backend@^3.2.2: "@babel/runtime" "^7.5.5" i18next@*, i18next@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.0.0.tgz#5418207d7286128e6cfe558e659fa8c60d89794b" - integrity sha512-xxNKNOqLdGP/M+/fzzBOhcc9hCAqv6gDhHq0xbYz/Vlz5PlMfr9P1LbBvmk7RkZjYoh/kyM1tnfSl+sJ2VaD0Q== + version "19.0.1" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.0.1.tgz#11347b9d5f2ceb4a03750a06010cc249fe065d31" + integrity sha512-xZjzCcInvkgx3ZzymkySZ/ULOZyAMXTmQP22Hvnf5CMRqrxe3BXhg6CBtpGSVPMiANnHOmPiNVWHLSncnffnxw== dependencies: "@babel/runtime" "^7.3.1" @@ -8153,9 +8144,9 @@ import-fresh@^2.0.0: resolve-from "^3.0.0" import-fresh@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.0.tgz#fed4d772a13949de7d9894b647e77297db14dedf" - integrity sha512-w1waegcRoBrRQ6kfX2+KWc3lIaVUvHiib7F1ZpggbL5+GyZZrpbOnOVNNuylJonNHO6aCJubjfDUzH6J8HmwSA== + version "3.2.1" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" + integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -8793,6 +8784,11 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= +is-wsl@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d" + integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog== + isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -9940,9 +9936,9 @@ make-dir@^2.0.0, make-dir@^2.1.0: semver "^5.6.0" make-fetch-happen@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.1.tgz#fac65400ab5f7a9c001862a3e9b0f417f0840175" - integrity sha512-b4dfaMvUDR67zxUq1+GN7Ke9rH5WvGRmoHuMH7l+gmUCR2tCXFP6mpeJ9Dp+jB6z8mShRopSf1vLRBhRs8Cu5w== + version "5.0.2" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd" + integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag== dependencies: agentkeepalive "^3.4.1" cacache "^12.0.0" @@ -10164,6 +10160,21 @@ meow@^4.0.0: redent "^2.0.0" trim-newlines "^2.0.0" +meow@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4" + integrity sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig== + dependencies: + camelcase-keys "^4.0.0" + decamelize-keys "^1.0.0" + loud-rejection "^1.0.0" + minimist-options "^3.0.1" + normalize-package-data "^2.3.4" + read-pkg-up "^3.0.0" + redent "^2.0.0" + trim-newlines "^2.0.0" + yargs-parser "^10.0.0" + merge-anything@^2.2.4: version "2.4.1" resolved "https://registry.yarnpkg.com/merge-anything/-/merge-anything-2.4.1.tgz#e9bccaec1e49ec6cb5f77ca78c5770d1a35315e6" @@ -10540,9 +10551,9 @@ nan@^2.12.1, nan@^2.13.2, nan@^2.14.0: integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== nanoid@^2.0.0: - version "2.1.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.6.tgz#0665418f692e54cf44f34d4010761f3240a03314" - integrity sha512-2NDzpiuEy3+H0AVtdt8LoFi7PnqkOnIzYmJQp7xsEU6VexLluHQwKREuiz57XaQC5006seIadPrIZJhyS2n7aw== + version "2.1.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.7.tgz#d775e3e7c6470bbaaae3da9a647a80e228e0abf7" + integrity sha512-fmS3qwDldm4bE01HCIRqNk+f255CNjnAoeV3Zzzv0KemObHKqYgirVaZA9DtKcjogicWjYcHkJs4D5A8CjnuVQ== nanomatch@^1.2.9: version "1.2.13" @@ -10744,7 +10755,7 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.38: +node-releases@^1.1.40: version "1.1.40" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.40.tgz#a94facfa8e2d612302601ca1361741d529c4515a" integrity sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ== @@ -11095,12 +11106,12 @@ only@~0.0.2: resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4" integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q= -open@^6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9" - integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg== +open@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/open/-/open-7.0.0.tgz#7e52999b14eb73f90f0f0807fe93897c4ae73ec9" + integrity sha512-K6EKzYqnwQzk+/dzJAQSBORub3xlBTxMz+ntpZpH/LyCa1o6KjXhuN+2npAaI9jaSmU3R1Q8NWf4KUWcyytGsQ== dependencies: - is-wsl "^1.1.0" + is-wsl "^2.1.0" opencollective-postinstall@^2.0.2: version "2.0.2" @@ -12414,10 +12425,10 @@ postcss@^6.0.21, postcss@^6.0.22, postcss@^6.0.6, postcss@^6.x: source-map "^0.6.1" supports-color "^5.4.0" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.21" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17" - integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ== +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.23" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.23.tgz#9f9759fad661b15964f3cfc3140f66f1e05eadc1" + integrity sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ== dependencies: chalk "^2.4.2" source-map "^0.6.1" @@ -12827,28 +12838,28 @@ react-copy-to-clipboard@^5.0.1, react-copy-to-clipboard@^5.0.2: prop-types "^15.5.8" react-dom@^16.11.0: - version "16.11.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.11.0.tgz#7e7c4a5a85a569d565c2462f5d345da2dd849af5" - integrity sha512-nrRyIUE1e7j8PaXSPtyRKtz+2y9ubW/ghNgqKFHHAHaeP0fpF5uXR+sq8IMRHC+ZUxw7W9NyCDTBtwWxvkb0iA== + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11" + integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.17.0" + scheduler "^0.18.0" react-dropzone@^10.1.10: - version "10.1.10" - resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-10.1.10.tgz#f340290dfc26ac09ad68abc020ab6232c23d6cf3" - integrity sha512-vcLBdkYo7wgZpw1o4cz7uk8/Mmm+sYHeiTfFSshA/EGthz/TjjrTOrKwvFHm3o1p1LPk+x+KbDDlw5OeIo6eYA== + version "10.2.0" + resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-10.2.0.tgz#6b3df4866045e7c078ddabe795fb8789dbbc4598" + integrity sha512-VvJtg6GKtM1Xu+SsMcBNBcB2XcOi27xbNLBMDkrpqsk3cSILFiBVoCuW96FSOWkCK1IFeNg67FjKu/c/KuUhkg== dependencies: - attr-accept "^1.1.3" - file-selector "^0.1.11" + attr-accept "^2.0.0" + file-selector "^0.1.12" prop-types "^15.7.2" react-hot-loader@^4.12.17: - version "4.12.17" - resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.12.17.tgz#e48815848865342edd829861634637b8c0d22bed" - integrity sha512-nee5q4Xip6+wD8DrCWxVUH0zT488K1zRG1KezJTb8oEbRO1JZvnEizbOG7BwnRfxxjk5QSyx6fPXeBf2fToBhw== + version "4.12.18" + resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.12.18.tgz#a9029e34af2690d76208f9a35189d73c2dfea6a7" + integrity sha512-qYD0Qi9lIbg9jLyfmodfqvAQqCBsoPKxAhca8Nxvy2/2pO5Q9r2kM28jN0bbbSnhwK8dJ7FjsfVtXKOxMW+bqw== dependencies: fast-levenshtein "^2.0.6" global "^4.3.0" @@ -12860,17 +12871,17 @@ react-hot-loader@^4.12.17: source-map "^0.7.3" react-i18next@^11.0.1: - version "11.2.0" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.2.0.tgz#ef49dc2205408b192e51cc449a6b572ae2af0670" - integrity sha512-V+TmORi4ImmhdEiJslXDF0XO1wETI/eKfVi3J3tFpcAW0M6BFJYKYBSV/dkGNjiZb1CgRrTImJnApSaeXFyHag== + version "11.2.2" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.2.2.tgz#e5e55ae4187521b01b4eafe483dd96b280106670" + integrity sha512-g0Nqa9HBVbS1UMWaUD+tgrlnpDT+wiID1hHj51uYcz6aPS1YFSkH5U4XhEQrJf4Ms5c+vbma12abyT2Mq7e65w== dependencies: "@babel/runtime" "^7.3.1" html-parse-stringify2 "2.0.1" react-is@^16.10.2, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0: - version "16.11.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.11.0.tgz#b85dfecd48ad1ce469ff558a882ca8e8313928fa" - integrity sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw== + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" + integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== react-lifecycles-compat@^3.0.4: version "3.0.4" @@ -12942,14 +12953,14 @@ react-router@5.1.2, react-router@^5.1.2: tiny-warning "^1.0.0" react-test-renderer@^16.0.0-0: - version "16.11.0" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.11.0.tgz#72574566496462c808ac449b0287a4c0a1a7d8f8" - integrity sha512-nh9gDl8R4ut+ZNNb2EeKO5VMvTKxwzurbSMuGBoKtjpjbg8JK/u3eVPVNi1h1Ue+eYK9oSzJjb+K3lzLxyA4ag== + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz#11417ffda579306d4e841a794d32140f3da1b43f" + integrity sha512-Vj/teSqt2oayaWxkbhQ6gKis+t5JrknXfPVo+aIJ8QwYAqMPH77uptOdrlphyxl8eQI/rtkOYg86i/UWkpFu0w== dependencies: object-assign "^4.1.1" prop-types "^15.6.2" react-is "^16.8.6" - scheduler "^0.17.0" + scheduler "^0.18.0" react-tooltip@^3.11.1: version "3.11.1" @@ -12960,9 +12971,9 @@ react-tooltip@^3.11.1: prop-types "^15.6.0" react@^16.11.0: - version "16.11.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.11.0.tgz#d294545fe62299ccee83363599bf904e4a07fdbb" - integrity sha512-M5Y8yITaLmU0ynd0r1Yvfq98Rmll6q8AxaEe88c8e7LxO8fZ2cNgmFt0aGAS9wzf1Ao32NKXtCl+/tVVtkxq6g== + version "16.12.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83" + integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -13663,10 +13674,10 @@ sax@^1.2.4, sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -scheduler@^0.17.0: - version "0.17.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.17.0.tgz#7c9c673e4ec781fac853927916d1c426b6f3ddfe" - integrity sha512-7rro8Io3tnCPuY4la/NuI5F2yfESpnfZyT6TtkXnSWVkcu0BCDJ+8gk5ozUaFaxpIyNuWAPXrH0yFcSi28fnDA== +scheduler@^0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4" + integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -14092,21 +14103,21 @@ source-list-map@^2.0.0: integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== source-map-explorer@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.1.0.tgz#d80e2a7fef0f15b3c9c1f57bc22bd1aabfaf2309" - integrity sha512-VlOYrBo7gKT72E3IGMzK33ddEWIHGIdyraz8nmpxC7n0ZrzGWq08pWkB8FBxlJJCm9xmP3imlZ9ElUsGbKPpvQ== + version "2.1.1" + resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.1.1.tgz#7e7f833cbb7a807dc3a76608c0d581909353852c" + integrity sha512-GSHrlyGFhcXhjdWgM+ysY7d11eZMN2gvLsW56qFOdV3ZCsZCM/tl8tt3PXu5BUvllNKPRCGyv2mbWjbZrvEdmA== dependencies: btoa "^1.2.1" - chalk "^2.4.2" - convert-source-map "^1.6.0" - ejs "^2.7.1" + chalk "^3.0.0" + convert-source-map "^1.7.0" + ejs "^2.7.2" escape-html "^1.0.3" - glob "^7.1.4" + glob "^7.1.6" lodash "^4.17.15" - open "^6.4.0" + open "^7.0.0" source-map "^0.7.3" - temp "^0.9.0" - yargs "^14.0.0" + temp "^0.9.1" + yargs "^14.2.0" source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.2" @@ -14749,7 +14760,7 @@ temp-write@^3.4.0: temp-dir "^1.0.0" uuid "^3.0.1" -temp@^0.9.0: +temp@^0.9.1: version "0.9.1" resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.1.tgz#2d666114fafa26966cd4065996d7ceedd4dd4697" integrity sha512-WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA== @@ -15101,7 +15112,7 @@ type-fest@^0.3.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ== -type-fest@^0.5.0, type-fest@^0.5.2: +type-fest@^0.5.0: version "0.5.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2" integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw== @@ -15111,6 +15122,11 @@ type-fest@^0.6.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + type-is@^1.6.16, type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -15169,9 +15185,9 @@ typedoc-plugin-no-inherit@^1.1.10: integrity sha512-BhSFAWlBTh9Bf6PSfruIqdQBM8gd/Gj8hVuRk5pVWkHu4I/SB24LzFr5gAo52ZlaQSeN72+VOkkRD6tNYl8Enw== typedoc@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.15.1.tgz#9e2acfe9a36fb9891a30bb3382dd97a382a31a12" - integrity sha512-zm/rWq2seVqaop9isXc5jMK5vqOjPHni3/t9OVWmuZYKNbYdlxbtM10CbpuaLdHn7ry2HLtMx7IP236B/F6Xwg== + version "0.15.2" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.15.2.tgz#f0f79abd12e8b9785f96ce205e2dadf282c32cf4" + integrity sha512-K2nFEtyDQTVdXOzYtECw3TwuT3lM91Zc0dzGSLuor5R8qzZbwqBoCw7xYGVBow6+mEZAvKGznLFsl7FzG+wAgQ== dependencies: "@types/minimatch" "3.0.3" fs-extra "^8.1.0" @@ -16077,9 +16093,9 @@ which@1, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1: isexe "^2.0.0" which@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.1.tgz#f1cf94d07a8e571b6ff006aeb91d0300c47ef0a4" - integrity sha512-N7GBZOTswtB9lkQBZA4+zAXrjEIWAUOB93AvzUiudRzRxhUdLURQ7D/gAIMY1gatT/LTbmbcv8SiYazy3eYB7w== + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" @@ -16271,6 +16287,13 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== +yargs-parser@^10.0.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" + integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ== + dependencies: + camelcase "^4.1.0" + yargs-parser@^11.1.1: version "11.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" @@ -16354,10 +16377,10 @@ yargs@^13.3.0: y18n "^4.0.0" yargs-parser "^13.1.1" -yargs@^14.0.0, yargs@^14.2.0: - version "14.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.0.tgz#f116a9242c4ed8668790b40759b4906c276e76c3" - integrity sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg== +yargs@^14.2.0: + version "14.2.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.2.tgz#2769564379009ff8597cdd38fba09da9b493c4b5" + integrity sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA== dependencies: cliui "^5.0.0" decamelize "^1.2.0" From da337701a4e29a2792c6dfb63d951491321161ab Mon Sep 17 00:00:00 2001 From: Github Actions Date: Sat, 23 Nov 2019 15:23:09 +0000 Subject: [PATCH 102/154] [CI Skip] 0.37.0-beta.116 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 8f574b2fad31..7cbbb25f7392 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.115" + "version": "0.37.0-beta.116" } diff --git a/package.json b/package.json index b0a52b7aad80..add23380bb3d 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index d4a28135ac32..8c6a95ff2e94 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index ab05390d8b20..29440352d62e 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-components": "^0.37.0-beta.116", "@polkadot/react-qr": "^0.47.0-beta.9", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 84b32f938edc..ac1e5366f1c8 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 81aac2861f1b..2a48a1e81bc5 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index e8449aa9f120..09d0135d136e 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.27", - "@polkadot/react-components": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index ef3e16e9ef54..c6eb77525c71 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", - "@polkadot/react-query": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-query": "^0.37.0-beta.116" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 7f483132fb7a..73c10c0e5531 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.115", - "@polkadot/react-components": "^0.37.0-beta.115" + "@polkadot/apps-routing": "^0.37.0-beta.116", + "@polkadot/react-components": "^0.37.0-beta.116" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 1e61dfca101b..b871780660be 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", - "@polkadot/react-query": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-query": "^0.37.0-beta.116" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index aa98fe735d96..184f3a72261f 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 5667f81d47d8..649eb62d4b21 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", - "@polkadot/react-params": "^0.37.0-beta.115", - "@polkadot/react-signer": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-params": "^0.37.0-beta.116", + "@polkadot/react-signer": "^0.37.0-beta.116" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 5895624dda4c..0361d3b598c0 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 97c9b2f0318b..07db5f93cb74 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-components": "^0.37.0-beta.116", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 6a99183a2d77..7fb2b521911e 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", - "@polkadot/react-query": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-query": "^0.37.0-beta.116" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index cc75b341d16c..286f784a3396 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", - "@polkadot/react-query": "^0.37.0-beta.115", + "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-query": "^0.37.0-beta.116", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 2ace8565d8f3..91da42028175 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.115", - "@polkadot/react-components": "^0.37.0-beta.115", - "@polkadot/react-query": "^0.37.0-beta.115" + "@polkadot/app-explorer": "^0.37.0-beta.116", + "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-query": "^0.37.0-beta.116" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 16a27812fabb..8868bbe4d9d7 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", - "@polkadot/react-params": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-params": "^0.37.0-beta.116" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index be088564449c..9cabefda15de 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 18bed99f056a..a89f0d6c763c 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index d87bde562c2f..306f643bd022 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", - "@polkadot/react-query": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-query": "^0.37.0-beta.116" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index d4081dce27fe..4142025d0f75 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", - "@polkadot/react-query": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-query": "^0.37.0-beta.116" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index fc7a933e0b97..bdc2659a96be 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index ef021612ed1a..c790187a35ca 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", - "@polkadot/react-signer": "^0.37.0-beta.115", + "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-signer": "^0.37.0-beta.116", "@polkadot/ui-assets": "^0.47.0-beta.9", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index effe82accf84..b25cd0606fbf 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 0732d09b0367..1b47003e422b 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.115", + "@polkadot/react-api": "^0.37.0-beta.116", "@polkadot/react-identicon": "^0.47.0-beta.9", - "@polkadot/react-query": "^0.37.0-beta.115", + "@polkadot/react-query": "^0.37.0-beta.116", "@polkadot/ui-keyring": "^0.47.0-beta.9", "@polkadot/ui-settings": "^0.47.0-beta.9", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index ec04be6bdb1d..b9b8943bdc44 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 537e50d6571d..1e717c37098e 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115" + "@polkadot/react-components": "^0.37.0-beta.116" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 3fedba130558..100501624526 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index edfb2053599e..fe1bcf722c29 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.115", + "version": "0.37.0-beta.116", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.115", + "@polkadot/react-components": "^0.37.0-beta.116", "@polkadot/react-qr": "^0.47.0-beta.9" } } From 533c8a72d839a6d3eab0594fcfe85d607f4366f7 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 23 Nov 2019 23:03:48 +0100 Subject: [PATCH 103/154] Bump API, fixup storage types (#1933) --- package.json | 6 +- packages/app-accounts/package.json | 2 +- packages/app-contracts/package.json | 2 +- packages/app-storage/src/Query.tsx | 13 +- packages/apps/package.json | 2 +- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +- .../src/InputStorage/options/key.tsx | 4 +- .../react-params/src/Param/findComponent.ts | 2 +- packages/react-params/src/initValue.ts | 3 +- packages/react-signer/package.json | 2 +- yarn.lock | 142 +++++++++--------- 12 files changed, 92 insertions(+), 94 deletions(-) diff --git a/package.json b/package.json index add23380bb3d..ddfda2344b6c 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.27", - "@polkadot/api-contract": "^0.97.0-beta.27", + "@polkadot/api": "^0.97.0-beta.28", + "@polkadot/api-contract": "^0.97.0-beta.28", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/types": "^0.97.0-beta.27", + "@polkadot/types": "^0.97.0-beta.28", "@polkadot/util": "^1.7.0-beta.7", "@polkadot/util-crypto": "^1.7.0-beta.7", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 29440352d62e..4164ba76dad4 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -12,7 +12,7 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-qr": "^0.47.0-beta.9", + "@polkadot/react-qr": "^0.47.0-beta.10", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", "babel-plugin-module-resolver": "^3.1.1", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 09d0135d136e..d4ce50f3c797 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api-contract": "^0.97.0-beta.27", + "@polkadot/api-contract": "^0.97.0-beta.28", "@polkadot/react-components": "^0.37.0-beta.116" } } diff --git a/packages/app-storage/src/Query.tsx b/packages/app-storage/src/Query.tsx index 3a3ab53078ed..b77da9ec769b 100644 --- a/packages/app-storage/src/Query.tsx +++ b/packages/app-storage/src/Query.tsx @@ -9,6 +9,7 @@ import { QueryTypes, StorageEntryPromise, StorageModuleQuery } from './types'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; +import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey'; import { Button, Labelled } from '@polkadot/react-components'; import { withCallDiv } from '@polkadot/react-api'; import valueToText from '@polkadot/react-params/valueToText'; @@ -51,14 +52,12 @@ function keyToName (isConst: boolean, _key: Uint8Array | StorageEntryPromise | C return `${key.creator.section}.${key.creator.method}`; } -function typeToString (key: StorageEntryPromise): string { - const type = key.creator.meta.type.isDoubleMap - ? key.creator.meta.type.asDoubleMap.value.toString() - : key.creator.meta.type.toString(); +function typeToString ({ creator: { meta: { modifier, type } } }: StorageEntryPromise): string { + const _type = unwrapStorageType(type); - return key.creator.meta.modifier.isOptional - ? `Option<${type}>` - : type; + return modifier.isOptional + ? `Option<${_type}>` + : _type; } function createComponent (type: string, Component: React.ComponentType, defaultProps: DefaultProps, renderHelper: ComponentRenderer): { Component: React.ComponentType; render: (createComponent: RenderFn) => React.ComponentType; refresh: (swallowErrors: boolean, contentShorten: boolean) => React.ComponentType } { diff --git a/packages/apps/package.json b/packages/apps/package.json index c790187a35ca..f1ed302b60cd 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -16,7 +16,7 @@ "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.116", "@polkadot/react-signer": "^0.37.0-beta.116", - "@polkadot/ui-assets": "^0.47.0-beta.9", + "@polkadot/ui-assets": "^0.47.0-beta.10", "query-string": "^6.8.3" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index b25cd0606fbf..9adadea98d02 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api": "^0.97.0-beta.27", + "@polkadot/api": "^0.97.0-beta.28", "@polkadot/extension-dapp": "^0.14.0-beta.5", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 1b47003e422b..07cbe43c6438 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -13,10 +13,10 @@ "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", "@polkadot/react-api": "^0.37.0-beta.116", - "@polkadot/react-identicon": "^0.47.0-beta.9", + "@polkadot/react-identicon": "^0.47.0-beta.10", "@polkadot/react-query": "^0.37.0-beta.116", - "@polkadot/ui-keyring": "^0.47.0-beta.9", - "@polkadot/ui-settings": "^0.47.0-beta.9", + "@polkadot/ui-keyring": "^0.47.0-beta.10", + "@polkadot/ui-settings": "^0.47.0-beta.10", "@types/chart.js": "^2.8.10", "@types/i18next": "^13.0.0", "@types/react-copy-to-clipboard": "^4.3.0", diff --git a/packages/react-components/src/InputStorage/options/key.tsx b/packages/react-components/src/InputStorage/options/key.tsx index 07ad690ca840..8cc9043465f9 100644 --- a/packages/react-components/src/InputStorage/options/key.tsx +++ b/packages/react-components/src/InputStorage/options/key.tsx @@ -2,11 +2,11 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { StorageEntry } from '@polkadot/types/primitive/StorageKey'; import { DropdownOptions, DropdownOption } from '../../util/types'; import React from 'react'; import ApiPromise from '@polkadot/api/promise'; +import { StorageEntry, unwrapStorageType } from '@polkadot/types/primitive/StorageKey'; export default function createOptions (api: ApiPromise, sectionName: string): DropdownOptions { const section = api.query[sectionName]; @@ -29,7 +29,7 @@ export default function createOptions (api: ApiPromise, sectionName: string): Dr input = type.asDoubleMap.key1.toString() + ', ' + type.asDoubleMap.key2.toString(); } - let output = type.toString(); + let output = unwrapStorageType(type); if (type.isDoubleMap) { output = type.asDoubleMap.value.toString(); diff --git a/packages/react-params/src/Param/findComponent.ts b/packages/react-params/src/Param/findComponent.ts index 581c2468704c..f49f8194c297 100644 --- a/packages/react-params/src/Param/findComponent.ts +++ b/packages/react-params/src/Param/findComponent.ts @@ -47,7 +47,7 @@ const components: ComponentMap = ([ { c: Code, t: ['Code'] }, { c: Data, t: ['Data', 'Keys'] }, { c: Enum, t: ['Enum'] }, - { c: Hash256, t: ['CodeHash', 'Hash', 'H256', 'SeedOf'] }, + { c: Hash256, t: ['BlockHash', 'CodeHash', 'Hash', 'H256', 'SeedOf'] }, { c: Hash512, t: ['H512', 'Signature'] }, { c: KeyValue, t: ['KeyValue'] }, { c: KeyValueArray, t: ['Vec'] }, diff --git a/packages/react-params/src/initValue.ts b/packages/react-params/src/initValue.ts index 2e23a120f265..699fed90352b 100644 --- a/packages/react-params/src/initValue.ts +++ b/packages/react-params/src/initValue.ts @@ -79,10 +79,9 @@ export default function getInitValue (def: TypeDef): RawParamValue | RawParamVal case 'Bytes': return new Bytes(registry); + case 'BlockHash': case 'CodeHash': case 'Hash': - return createType(registry, 'Hash'); - case 'H256': return createType(registry, 'H256'); diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index fe1bcf722c29..2c4907636b20 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-qr": "^0.47.0-beta.9" + "@polkadot/react-qr": "^0.47.0-beta.10" } } diff --git a/yarn.lock b/yarn.lock index 73d0f254bd60..5ae23d7a5213 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,35 +2029,35 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^0.97.0-beta.27": - version "0.97.0-beta.27" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.27.tgz#26f9c6902af19efa8e4a9daf9b15021d7d112760" - integrity sha512-IbGEvLauX9xHMhuxJjVG6DWIiACCK6w3eoc+Zu9i3BXPNyrgjYLzn/kOh1yOOa+OxvW7ZzJ2nHBq+Kdkep+5pw== +"@polkadot/api-contract@^0.97.0-beta.28": + version "0.97.0-beta.28" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.28.tgz#113aef1cc993c57815ac7cff88c002fc6281641d" + integrity sha512-B62jw2/1tZoVMa8OXj6ULPJ6dmEfF3UnGeS2L9ifaZ5wrVdCU9TTH6wVbTEe0ANzCcLY9op+r9Jm1/MQ5N8OSw== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/types" "^0.97.0-beta.27" + "@polkadot/types" "^0.97.0-beta.28" -"@polkadot/api-derive@^0.97.0-beta.27": - version "0.97.0-beta.27" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.27.tgz#be73252edb28954d15f346cfa7e8cda9a938d51f" - integrity sha512-z7wtFLmAOPhOX6HJpDrEhV5hoPrhMliM4Xv0COzk89xyNt73XmMyGhLd3QfOPcet5Nzgq6iC5jYOjhxyYaOn1Q== +"@polkadot/api-derive@^0.97.0-beta.28": + version "0.97.0-beta.28" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.28.tgz#a6086071a0220789f4ae5b5ab73c7efe218546a1" + integrity sha512-Rh+lUmCArzmQmtGzKvwVCP8t7xckLDgBNhZOB6AFJfb3oPTHAziXyuE0WQJeQIfgVgHzRDdZXF70X3NnV0Faww== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/api" "^0.97.0-beta.27" - "@polkadot/types" "^0.97.0-beta.27" + "@polkadot/api" "^0.97.0-beta.28" + "@polkadot/types" "^0.97.0-beta.28" -"@polkadot/api@^0.97.0-beta.27": - version "0.97.0-beta.27" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.27.tgz#ec625c8bcee5371950e4c1cb54ff66227948d92c" - integrity sha512-Rx2HoUuYGtFeN7CFeZZlfk66acLzK8+gwJg9sR7z3e/xj6Ece1/L8cZwcnaZrAATm2vwQX7xaFSMFAbX0yMR3A== +"@polkadot/api@^0.97.0-beta.28": + version "0.97.0-beta.28" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.28.tgz#b8c473eee6ff90b00e459a5937f4cf3c2cf86cd3" + integrity sha512-6RFxXuRelrToKxf5ljbuZHP7NNOSJSUIJH3jPuJBqy+Bqrn2aOnYH1iZXZ2+mkcfwwRX2aLyJm9k4XI53LkPxg== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/api-derive" "^0.97.0-beta.27" + "@polkadot/api-derive" "^0.97.0-beta.28" "@polkadot/keyring" "^1.7.0-beta.7" - "@polkadot/metadata" "^0.97.0-beta.27" - "@polkadot/rpc-core" "^0.97.0-beta.27" - "@polkadot/rpc-provider" "^0.97.0-beta.27" - "@polkadot/types" "^0.97.0-beta.27" + "@polkadot/metadata" "^0.97.0-beta.28" + "@polkadot/rpc-core" "^0.97.0-beta.28" + "@polkadot/rpc-provider" "^0.97.0-beta.28" + "@polkadot/types" "^0.97.0-beta.28" "@polkadot/util-crypto" "^1.7.0-beta.7" "@polkadot/dev-react@^0.32.0-beta.14": @@ -2160,10 +2160,10 @@ dependencies: "@babel/runtime" "^7.7.2" -"@polkadot/jsonrpc@^0.97.0-beta.27": - version "0.97.0-beta.27" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.27.tgz#1b456c3ab9bcea3eeb8dbb7bf0c56a355083c672" - integrity sha512-ufBpC7yzV9a8jNsz2SYNYAYPxbcMotn6gJUpu5yEQFgrYWK6VpCLpk6ydHIkmFjYJf45mWuvwc1Dd6XCcWBnMQ== +"@polkadot/jsonrpc@^0.97.0-beta.28": + version "0.97.0-beta.28" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.28.tgz#9335ac1c5ba92cb3e400c647465db8add6ce2028" + integrity sha512-oiV8AcFeI6hiafVM/Lp/eogfRbo9p++d+bPmRCk+dTchlc+/NhhrPy7w4/w4wfUoPIAQHHRuO2O/8lss/zciUA== dependencies: "@babel/runtime" "^7.7.2" @@ -2176,24 +2176,24 @@ "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" -"@polkadot/metadata@^0.97.0-beta.27": - version "0.97.0-beta.27" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.27.tgz#8c22ab31e859b12b55738bb93c52370695318a47" - integrity sha512-Ba+HNnUDo1Tb9fdPb4PrdJ3uN3xTOsREu77JMZG0uDSlsl+Tv6+V0PvCbSptfVuVaDXPIuAJeyoKZntJh2WF8A== +"@polkadot/metadata@^0.97.0-beta.28": + version "0.97.0-beta.28" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.28.tgz#f6250d124a48b8922863b5c187a27ed7e979556d" + integrity sha512-ejZjZP2VzYTgaMarUMExG1euXskmRn+t6yvLgJlObUVG3R2MFpH0Z3ZmITWYWg8lyLXp+A4ia7zJvvjfcW+hbg== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/types" "^0.97.0-beta.27" + "@polkadot/types" "^0.97.0-beta.28" "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" -"@polkadot/react-identicon@^0.47.0-beta.9": - version "0.47.0-beta.9" - resolved "https://registry.yarnpkg.com/@polkadot/react-identicon/-/react-identicon-0.47.0-beta.9.tgz#c7340f2de5e48220ce3a05b6bba87b318cb8c72c" - integrity sha512-PKM6NYV4zcoc4RakfoBgvHu4tJTh+ea8bC90imSm5cNnCrr2v53ZeRhAYffWQfCPfwpHyozkCAI7gfbroaXTsg== +"@polkadot/react-identicon@^0.47.0-beta.10": + version "0.47.0-beta.10" + resolved "https://registry.yarnpkg.com/@polkadot/react-identicon/-/react-identicon-0.47.0-beta.10.tgz#2933a931e0db7bbfefd4ec0f09d86240021020b5" + integrity sha512-Ml2/o+HWasvPHQ+POOmn27XddK1BYKnGzPEsse+MpTGbemOjFlVDQHYW//yBXivhzctk8CslOaeDpaMs34tPjg== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/ui-settings" "^0.47.0-beta.9" - "@polkadot/ui-shared" "^0.47.0-beta.9" + "@polkadot/ui-settings" "^0.47.0-beta.10" + "@polkadot/ui-shared" "^0.47.0-beta.10" "@types/color" "^3.0.0" "@types/react-copy-to-clipboard" "^4.3.0" color "^3.1.2" @@ -2201,35 +2201,35 @@ react-copy-to-clipboard "^5.0.2" styled-components "^4.4.1" -"@polkadot/react-qr@^0.47.0-beta.9": - version "0.47.0-beta.9" - resolved "https://registry.yarnpkg.com/@polkadot/react-qr/-/react-qr-0.47.0-beta.9.tgz#4d310fad92fbc122bf963a4c431fc15af28dfb7e" - integrity sha512-koO5b8sknzqiMGijHaUJ0L7bwiHPv92QSraH43U+KcT+/WVD64JeBYwjiOGRJwLAYNynFLuPBRbHvgthxbTeOA== +"@polkadot/react-qr@^0.47.0-beta.10": + version "0.47.0-beta.10" + resolved "https://registry.yarnpkg.com/@polkadot/react-qr/-/react-qr-0.47.0-beta.10.tgz#bb3d37ad542712268edf580a51ec960222c45ff1" + integrity sha512-B3ZOav8p38lobqRNJDVFvyFp3EqF4873bsK8qcGzNfdJ4hp0wY8qTT+ThjiniIIPynNXdUcxPLNfADHVWThXQw== dependencies: "@babel/runtime" "^7.7.2" "@types/react-qr-reader" "^2.1.1" qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.0-beta.27": - version "0.97.0-beta.27" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.27.tgz#3028d51c4b23fc97daf6ceae307cde50952956c3" - integrity sha512-F6RgMRXOpXfaDM/DqNYiHkB98ZVMzBg7lsTJ/7xt4EW1Ihv3p1yIEPUj0HC1dGcaUQ4l0PqPa5ZJdD54iBihYA== +"@polkadot/rpc-core@^0.97.0-beta.28": + version "0.97.0-beta.28" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.28.tgz#2f000db698a7e8f574ec1cbbcf4207fddfe10d75" + integrity sha512-67npaY5KtN4HlDw8O//wB4g7p3llXiyHw0tYQN9498n5q0ywgN1KnHl3DB1t+lddWoWdY8QJ+02+ue0IXsk9Zg== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/jsonrpc" "^0.97.0-beta.27" - "@polkadot/rpc-provider" "^0.97.0-beta.27" - "@polkadot/types" "^0.97.0-beta.27" + "@polkadot/jsonrpc" "^0.97.0-beta.28" + "@polkadot/rpc-provider" "^0.97.0-beta.28" + "@polkadot/types" "^0.97.0-beta.28" "@polkadot/util" "^1.7.0-beta.7" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.0-beta.27": - version "0.97.0-beta.27" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.27.tgz#0e0be036958a696a495af82f0f361de6df6866a1" - integrity sha512-VAbfmVRd1yqmzPIBDu+/rI5XSEBxG776Sc9lJVhvYWzSRge9QjJLSlH8FaV3b3yrvkUm7ylyiquCe/0Io2jf/Q== +"@polkadot/rpc-provider@^0.97.0-beta.28": + version "0.97.0-beta.28" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.28.tgz#e12499a4bcaf8f0b512b97ddf0d2661422d29a0c" + integrity sha512-OAeaQu2HdY4NGqDockkO2i7Of/KZk+Z/IVWKGdUnfKAy7xSMzt6ldwvclSuOA2V8WRIwV98FNR+0SqZS0ivY4w== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/metadata" "^0.97.0-beta.27" + "@polkadot/metadata" "^0.97.0-beta.28" "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" eventemitter3 "^4.0.0" @@ -2243,10 +2243,10 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.0-beta.27": - version "0.97.0-beta.27" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.27.tgz#0ee167f74bcd70d13c1d81524201222536ea0e23" - integrity sha512-Asv673S66XjfWmP8WiDATDPv+qwe23+A0yletGLj0i5LfkPPsB2f52kPBXQASeGjhI3HQ9xiTLqzbAmkyB1rAQ== +"@polkadot/types@^0.97.0-beta.28": + version "0.97.0-beta.28" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.28.tgz#b932e745eb066b74287284cbc95a29fb088334bf" + integrity sha512-HaxY2daVCggmnPbjl6spuSzJomW30/kGQu0pQDoFVcXzcD07h4zazT0ZqxXkvY1pPllCIKWTG8Q4K+sGOFPsow== dependencies: "@babel/runtime" "^7.7.2" "@polkadot/util" "^1.7.0-beta.7" @@ -2254,17 +2254,17 @@ "@types/memoizee" "^0.4.3" memoizee "^0.4.14" -"@polkadot/ui-assets@^0.47.0-beta.9": - version "0.47.0-beta.9" - resolved "https://registry.yarnpkg.com/@polkadot/ui-assets/-/ui-assets-0.47.0-beta.9.tgz#7abc99afc336010fc5a69349d183215810c3925e" - integrity sha512-hwyXX7qXIwmNlN0KJMJUZorks9IR4oOEbG/uvzWpyU4bgkbirB5hS24w7E8hq9rz0bONrHT1osXbYO/Z27+aKw== +"@polkadot/ui-assets@^0.47.0-beta.10": + version "0.47.0-beta.10" + resolved "https://registry.yarnpkg.com/@polkadot/ui-assets/-/ui-assets-0.47.0-beta.10.tgz#c1a8d5edc9c6439207ad23b4d30171440a80b2b1" + integrity sha512-TuAVkG4O6X/++HroN4Vm6TxpRdJ3UX6Oc74DdXkgzfEu3RVNgs/9MCKlB4oMEAezkAUyNBDPk2XKcrWMhZp56g== dependencies: "@babel/runtime" "^7.7.2" -"@polkadot/ui-keyring@^0.47.0-beta.9": - version "0.47.0-beta.9" - resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.47.0-beta.9.tgz#3dbe1ca745b7667a7865b94ebef80e2409d4fea8" - integrity sha512-JGBGgfPjvRGDo1lMojKEapN2wZG23a7o6f7taN8xdJhYpZ3wWvQsrz35U6sUn1Ez5jfQ38IzvdDozixfpUZrhA== +"@polkadot/ui-keyring@^0.47.0-beta.10": + version "0.47.0-beta.10" + resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.47.0-beta.10.tgz#61208a90a2d14a4e62225abe082e05c0a7647bcc" + integrity sha512-/GwvDHMUONBEekkc+bQ/ha+p3E/fNNNcwFV/khsI7qAgxi5vzYXuvAYe3Lf5SH2/l7TLFc/elQSkpcvH1BIjmQ== dependencies: "@babel/runtime" "^7.7.2" "@ledgerhq/hw-transport-u2f" "^4.73.7" @@ -2280,19 +2280,19 @@ optionalDependencies: "@ledgerhq/hw-transport-node-hid" "^4.73.7" -"@polkadot/ui-settings@0.47.0-beta.9", "@polkadot/ui-settings@^0.47.0-beta.9": - version "0.47.0-beta.9" - resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.47.0-beta.9.tgz#59fd7f0a831ef932f5e877a27065a00da0e69ac7" - integrity sha512-57RK1oS3A23oHnHmMQLIo10pBKCOYINFsiv9fECuER+L4elFF/2/KuLD7uZJy0nOoN2Nk8OO/MiPVKxRD8yw+w== +"@polkadot/ui-settings@^0.47.0-beta.10": + version "0.47.0-beta.10" + resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.47.0-beta.10.tgz#a838bfceb380a28b84b4566d779a6cb86abe666f" + integrity sha512-2WSoeUaeSDpW1+t1vRtmP0dmEMlQlB/+RxEzJQpmkxsGY7I/EhDjh1BqI36bwYzaXRAjZz9IXNGrCLlO4OdJqA== dependencies: "@babel/runtime" "^7.7.2" "@types/store" "^2.0.2" store "^2.0.12" -"@polkadot/ui-shared@^0.47.0-beta.9": - version "0.47.0-beta.9" - resolved "https://registry.yarnpkg.com/@polkadot/ui-shared/-/ui-shared-0.47.0-beta.9.tgz#8c6e21993ba219da782c58b7cd95384a6bdd2971" - integrity sha512-0TbcDgXEZrRUc4XMd570sj3Xg1PstldJGIzh2nOxYPoQbqW78tKi54B+SlpkjUbBbIY6VtU/Wim4NbQC87gUKQ== +"@polkadot/ui-shared@^0.47.0-beta.10": + version "0.47.0-beta.10" + resolved "https://registry.yarnpkg.com/@polkadot/ui-shared/-/ui-shared-0.47.0-beta.10.tgz#f77a843f4345645526406cf5968e1778490a6c57" + integrity sha512-q8xtMNtFThx+YtLvWhU//VMWcPZMb+a2hIrPVnMUwWUwvSyQ4tYZC4tHgqfhK3prXnKMUejQ2Kr/5o+s/M9mPw== dependencies: "@babel/runtime" "^7.7.2" "@types/color" "^3.0.0" From 7615ed3c80cba80658e4b570c58d3a60fd8cad0a Mon Sep 17 00:00:00 2001 From: Github Actions Date: Sat, 23 Nov 2019 22:08:43 +0000 Subject: [PATCH 104/154] [CI Skip] 0.37.0-beta.117 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 7cbbb25f7392..7de69f0cdd1d 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.116" + "version": "0.37.0-beta.117" } diff --git a/package.json b/package.json index ddfda2344b6c..5ceb0f23bc79 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 8c6a95ff2e94..d07e3f7a742b 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 4164ba76dad4..0e40cb21d372 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-components": "^0.37.0-beta.117", "@polkadot/react-qr": "^0.47.0-beta.10", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index ac1e5366f1c8..3a18f229ce74 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 2a48a1e81bc5..9fbdc4aae9d7 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index d4ce50f3c797..c37a2a286a15 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.28", - "@polkadot/react-components": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index c6eb77525c71..1ea8a38a5503 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-query": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-query": "^0.37.0-beta.117" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 73c10c0e5531..3793ede73db1 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.116", - "@polkadot/react-components": "^0.37.0-beta.116" + "@polkadot/apps-routing": "^0.37.0-beta.117", + "@polkadot/react-components": "^0.37.0-beta.117" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index b871780660be..e994fb955ed6 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-query": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-query": "^0.37.0-beta.117" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 184f3a72261f..a8107f6134e9 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 649eb62d4b21..b0db0b84bc19 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-params": "^0.37.0-beta.116", - "@polkadot/react-signer": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-params": "^0.37.0-beta.117", + "@polkadot/react-signer": "^0.37.0-beta.117" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 0361d3b598c0..7343f7f4a264 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 07db5f93cb74..b5ae085331d6 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-components": "^0.37.0-beta.117", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 7fb2b521911e..aeee9a3fb940 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-query": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-query": "^0.37.0-beta.117" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 286f784a3396..9415735f1e0f 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-query": "^0.37.0-beta.116", + "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-query": "^0.37.0-beta.117", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 91da42028175..0f1f700dcae5 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.116", - "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-query": "^0.37.0-beta.116" + "@polkadot/app-explorer": "^0.37.0-beta.117", + "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-query": "^0.37.0-beta.117" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 8868bbe4d9d7..3a330d371fd2 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-params": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-params": "^0.37.0-beta.117" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 9cabefda15de..84755080d53c 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index a89f0d6c763c..08055202b173 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 306f643bd022..24f0b55119e7 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-query": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-query": "^0.37.0-beta.117" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 4142025d0f75..fc82f2a5144b 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-query": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-query": "^0.37.0-beta.117" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index bdc2659a96be..dc4a8cdefa5a 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index f1ed302b60cd..5e88383b1bb9 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", - "@polkadot/react-signer": "^0.37.0-beta.116", + "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-signer": "^0.37.0-beta.117", "@polkadot/ui-assets": "^0.47.0-beta.10", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 9adadea98d02..5ee2960e8173 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 07cbe43c6438..18eb8f36af85 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.116", + "@polkadot/react-api": "^0.37.0-beta.117", "@polkadot/react-identicon": "^0.47.0-beta.10", - "@polkadot/react-query": "^0.37.0-beta.116", + "@polkadot/react-query": "^0.37.0-beta.117", "@polkadot/ui-keyring": "^0.47.0-beta.10", "@polkadot/ui-settings": "^0.47.0-beta.10", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index b9b8943bdc44..f892376fae49 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 1e717c37098e..61d7ed7a416a 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116" + "@polkadot/react-components": "^0.37.0-beta.117" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 100501624526..9d415418dc95 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 2c4907636b20..371ad78b4842 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.116", + "version": "0.37.0-beta.117", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.116", + "@polkadot/react-components": "^0.37.0-beta.117", "@polkadot/react-qr": "^0.47.0-beta.10" } } From 682d6281098d110949e724b0f2567c5f0c0cb14c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sun, 24 Nov 2019 12:45:58 +0100 Subject: [PATCH 105/154] Remove empty rewards from cache (#1935) * Remove empty rewards from cache * Update MAX_BLOCKS * Revert count change --- .../app-staking/src/useSessionRewards.tsx | 56 ++++++++++++------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/packages/app-staking/src/useSessionRewards.tsx b/packages/app-staking/src/useSessionRewards.tsx index 3cc928fea602..9f715871307d 100644 --- a/packages/app-staking/src/useSessionRewards.tsx +++ b/packages/app-staking/src/useSessionRewards.tsx @@ -27,18 +27,35 @@ interface Serialized { slashes: SerializedSlash[]; } +const MAX_BLOCKS = 2500; + function fromJSON (sessions: Serialized[]): SessionRewards[] { - return sessions.map(({ blockHash, blockNumber, isEventsEmpty, reward, sessionIndex, slashes }): SessionRewards => ({ - blockHash: createType(registry, 'Hash', blockHash), - blockNumber: createType(registry, 'BlockNumber', blockNumber), - isEventsEmpty, - reward: createType(registry, 'Balance', reward), - sessionIndex: createType(registry, 'SessionIndex', sessionIndex), - slashes: slashes.map(({ accountId, amount }): Slash => ({ - accountId: createType(registry, 'AccountId', accountId), - amount: createType(registry, 'Balance', amount) + let hasSome = false; + let keepAll = true; + + return sessions + .map(({ blockHash, blockNumber, isEventsEmpty, reward, sessionIndex, slashes }): SessionRewards => ({ + blockHash: createType(registry, 'Hash', blockHash), + blockNumber: createType(registry, 'BlockNumber', blockNumber), + isEventsEmpty, + reward: createType(registry, 'Balance', reward), + sessionIndex: createType(registry, 'SessionIndex', sessionIndex), + slashes: slashes.map(({ accountId, amount }): Slash => ({ + accountId: createType(registry, 'AccountId', accountId), + amount: createType(registry, 'Balance', amount) + })) })) - })); + .filter(({ isEventsEmpty }): boolean => { + if (!isEventsEmpty) { + // we first see if we have some data up to this point (we may not, i.e. non-archive) + hasSome = true; + } else if (hasSome) { + // if data is followed by empty, drop everything from here on + keepAll = false; + } + + return keepAll; + }); } function toJSON (sessions: SessionRewards[], maxSessions: number): Serialized[] { @@ -120,38 +137,35 @@ export default function useSessionRewards (maxSessions: number): SessionRewards[ useEffect((): void => { let workQueue = fromJSON(getCache() || []); + const savedNumber = workQueue[workQueue.length - 1] + ? workQueue[workQueue.length - 1].blockNumber + : undefined; setImmediate((): void => { api.isReady.then(async (): Promise => { const maxSessionsStore = maxSessions + 1; // assuming first is a bust - const sessionLength = api.consts.babe?.epochDuration || new BN(500); - const eraLength = api.consts.staking.sessionsPerEra.toNumber(); - const count = Math.min(sessionLength.muln(maxSessionsStore).divn(10).toNumber(), 7500); const bestHeader = await api.rpc.chain.getHeader(); - let retrieved = 0; let toHash = bestHeader.hash; let toNumber = bestHeader.number.unwrap().toBn(); - let fromHash = api.genesisHash; - let fromNumber = bnMax(toNumber.subn(count), new BN(1)); + let fromNumber = bnMax(toNumber.subn(MAX_BLOCKS), new BN(1)); while (true) { - fromHash = await api.rpc.chain.getBlockHash(fromNumber as any); + // console.log(`Updating rewards cache, #${fromNumber} -> #${toNumber}`); + const fromHash = await api.rpc.chain.getBlockHash(fromNumber as any); const newQueue = await loadSome(api, fromHash, toHash); - retrieved += newQueue.length; workQueue = mergeResults(workQueue, newQueue); toHash = fromHash; toNumber = fromNumber; - fromNumber = bnMax(toNumber.subn(count), new BN(1)); + fromNumber = bnMax(toNumber.subn(MAX_BLOCKS), new BN(1)); setCache(toJSON(workQueue, maxSessionsStore)); setFiltered(workQueue.slice(-maxSessions)); const lastNumber = workQueue[workQueue.length - 1]?.blockNumber; - // we always want to retrieve at least 1 era worth of information, or we are at the start - if (!lastNumber || fromNumber.eqn(1) || (retrieved > eraLength && (workQueue.length >= maxSessionsStore) && fromNumber.lt(lastNumber))) { + if (!lastNumber || fromNumber.eqn(1) || ((workQueue.length >= maxSessionsStore) && fromNumber.lt(savedNumber || lastNumber))) { break; } } From e49f77dbd02c2bdc312bc87f3f4c4ee6e2d7e2f0 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Sun, 24 Nov 2019 11:51:25 +0000 Subject: [PATCH 106/154] [CI Skip] 0.37.0-beta.118 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 7de69f0cdd1d..da7e15620626 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.117" + "version": "0.37.0-beta.118" } diff --git a/package.json b/package.json index 5ceb0f23bc79..947af75c7b92 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index d07e3f7a742b..2c9f70143ef4 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 0e40cb21d372..5a246ea76821 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-components": "^0.37.0-beta.118", "@polkadot/react-qr": "^0.47.0-beta.10", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 3a18f229ce74..4cb774e0a1c1 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 9fbdc4aae9d7..f7e32eb511b1 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index c37a2a286a15..479f6b7f4caa 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.28", - "@polkadot/react-components": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 1ea8a38a5503..1a6fbf9bfaa0 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", - "@polkadot/react-query": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-query": "^0.37.0-beta.118" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 3793ede73db1..9b4bff63e719 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.117", - "@polkadot/react-components": "^0.37.0-beta.117" + "@polkadot/apps-routing": "^0.37.0-beta.118", + "@polkadot/react-components": "^0.37.0-beta.118" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index e994fb955ed6..bf782a411198 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", - "@polkadot/react-query": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-query": "^0.37.0-beta.118" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index a8107f6134e9..a3147864bf3c 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index b0db0b84bc19..169a2ef6de19 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", - "@polkadot/react-params": "^0.37.0-beta.117", - "@polkadot/react-signer": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-params": "^0.37.0-beta.118", + "@polkadot/react-signer": "^0.37.0-beta.118" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 7343f7f4a264..58c85595b698 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index b5ae085331d6..f9680365450d 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-components": "^0.37.0-beta.118", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index aeee9a3fb940..5968604a6a52 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", - "@polkadot/react-query": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-query": "^0.37.0-beta.118" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 9415735f1e0f..2df0878dd849 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", - "@polkadot/react-query": "^0.37.0-beta.117", + "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-query": "^0.37.0-beta.118", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 0f1f700dcae5..0adb54b35408 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.117", - "@polkadot/react-components": "^0.37.0-beta.117", - "@polkadot/react-query": "^0.37.0-beta.117" + "@polkadot/app-explorer": "^0.37.0-beta.118", + "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-query": "^0.37.0-beta.118" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 3a330d371fd2..e20b82c34e10 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", - "@polkadot/react-params": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-params": "^0.37.0-beta.118" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 84755080d53c..85b4073ba1a9 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 08055202b173..dc6e4c0c3400 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 24f0b55119e7..c869445e2bec 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", - "@polkadot/react-query": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-query": "^0.37.0-beta.118" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index fc82f2a5144b..d269963926c0 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", - "@polkadot/react-query": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-query": "^0.37.0-beta.118" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index dc4a8cdefa5a..3a03a8f8767f 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 5e88383b1bb9..fe3110caf4ff 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", - "@polkadot/react-signer": "^0.37.0-beta.117", + "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-signer": "^0.37.0-beta.118", "@polkadot/ui-assets": "^0.47.0-beta.10", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 5ee2960e8173..32cd74c3de71 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 18eb8f36af85..8e8d7f24293a 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.117", + "@polkadot/react-api": "^0.37.0-beta.118", "@polkadot/react-identicon": "^0.47.0-beta.10", - "@polkadot/react-query": "^0.37.0-beta.117", + "@polkadot/react-query": "^0.37.0-beta.118", "@polkadot/ui-keyring": "^0.47.0-beta.10", "@polkadot/ui-settings": "^0.47.0-beta.10", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index f892376fae49..06cf1c243e2a 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 61d7ed7a416a..087f7d3f157f 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117" + "@polkadot/react-components": "^0.37.0-beta.118" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 9d415418dc95..b3f138fce427 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 371ad78b4842..0e6f396343a7 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.117", + "version": "0.37.0-beta.118", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.117", + "@polkadot/react-components": "^0.37.0-beta.118", "@polkadot/react-qr": "^0.47.0-beta.10" } } From 082f4147a94cdb817ce005dcc461e52e45ac7fa0 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 25 Nov 2019 10:33:05 +0100 Subject: [PATCH 107/154] Allow signRaw usable from extension (#1936) * Allow signRaw usable from extension * Add sign button * Allow signing via extension * Cleanup states, this was really messy... * null check... ok, just need to test through * Minor ocd * Cleanup sign unlock * Cleanup display flashing * Message for extension --- packages/app-toolbox/src/Sign.tsx | 149 +++++++++++++++++----------- packages/app-toolbox/src/Unlock.tsx | 5 +- 2 files changed, 95 insertions(+), 59 deletions(-) diff --git a/packages/app-toolbox/src/Sign.tsx b/packages/app-toolbox/src/Sign.tsx index 22d83aa5d03c..08969e6e516c 100644 --- a/packages/app-toolbox/src/Sign.tsx +++ b/packages/app-toolbox/src/Sign.tsx @@ -2,15 +2,16 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +import { Signer } from '@polkadot/api/types'; import { I18nProps } from '@polkadot/react-components/types'; import { KeyringPair } from '@polkadot/keyring/types'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { withMulti } from '@polkadot/react-api'; +import { web3FromSource } from '@polkadot/extension-dapp'; import { Button, Input, InputAddress, Output, Static } from '@polkadot/react-components'; import keyring from '@polkadot/ui-keyring'; -import { hexToU8a, isHex, stringToU8a, u8aToHex } from '@polkadot/util'; +import { hexToU8a, isFunction, isHex, stringToU8a, u8aToHex } from '@polkadot/util'; import translate from './translate'; import Unlock from './Unlock'; @@ -19,73 +20,85 @@ interface Props extends I18nProps { className?: string; } -interface State { - currentPair: KeyringPair | null; - data: string; - isHexData: boolean; - isLocked: boolean; - isUnlockVisible: boolean; - signature: string; +interface AccountState { + isExternal: boolean; + isHardware: boolean; + isInjected: boolean; } function Sign ({ className, t }: Props): React.ReactElement { - const [state, setState] = useState({ - currentPair: null, - data: '', - isHexData: false, - isLocked: false, - isUnlockVisible: false, - signature: '' + const [currentPair, setCurrentPair] = useState(keyring.getPairs()[0] || null); + const [{ data, isHexData }, setData] = useState<{ data: string; isHexData: boolean }>({ data: '', isHexData: false }); + const [{ isInjected }, setAccountState] = useState({ + isExternal: false, + isHardware: false, + isInjected: false }); + const [isLocked, setIsLocked] = useState(false); + const [{ isUsable, signer }, setSigner] = useState<{ isUsable: boolean; signer: Signer | null }>({ isUsable: true, signer: null }); + const [signature, setSignature] = useState(''); + const [isUnlockVisible, setIsUnlockVisible] = useState(false); useEffect((): void => { - const pairs = keyring.getPairs(); - const currentPair = pairs[0] || null; - - setState({ - currentPair, - data: '', - isHexData: false, - isLocked: currentPair - ? currentPair.isLocked - : false, - isUnlockVisible: false, - signature: '' + const isExternal = currentPair?.meta.isExternal || false; + const isHardware = currentPair?.meta.isHardware || false; + const isInjected = currentPair?.meta.isInjected || false; + const isUsable = !(isExternal || isHardware || isInjected); + + setAccountState({ + isExternal, + isHardware, + isInjected }); - }, []); + setIsLocked( + isInjected + ? false + : currentPair?.isLocked || false + ); + setSignature(''); + setSigner({ isUsable, signer: null }); + + // for injected, retrieve the signer + if (currentPair && isInjected) { + const { meta: { source } } = currentPair; + + web3FromSource(source) + .catch((): null => null) + .then((injected): void => setSigner({ + isUsable: isFunction(injected?.signer?.signRaw), + signer: injected?.signer || null + })); + } + }, [currentPair]); + + const _toggleUnlock = (): void => setIsUnlockVisible(!isUnlockVisible); + const _onChangeAccount = (accountId: string | null): void => setCurrentPair(keyring.getPair(accountId || '')); + const _onChangeData = (data: string): void => setData({ data, isHexData: isHex(data) }); + const _onSign = (): void => { + if (isLocked || !isUsable || !currentPair) { + return; + } - const _nextState = ({ currentPair = state.currentPair, data = state.data, isHexData = state.isHexData, isUnlockVisible = state.isUnlockVisible }: Partial): void => { - const isLocked = !currentPair || currentPair.isLocked; - let signature = ''; + if (signer?.signRaw) { + setSignature(''); - if (!isLocked && currentPair) { - signature = u8aToHex( + signer + .signRaw({ address: currentPair.address, data, type: 'bytes' }) + .then(({ signature }): void => setSignature(signature)); + } else { + setSignature(u8aToHex( currentPair.sign( isHexData ? hexToU8a(data) : stringToU8a(data) ) - ); + )); } - - setState({ - currentPair, - data, - isHexData, - isLocked, - isUnlockVisible, - signature - }); }; - - const _toggleUnlock = (): void => - _nextState({ isUnlockVisible: !state.isUnlockVisible }); - const _onChangeAccount = (accountId: string | null): void => - _nextState({ currentPair: keyring.getPair(accountId || '') }); - const _onChangeData = (data: string): void => - _nextState({ data, isHexData: isHex(data) }); - - const { currentPair, data, isHexData, isLocked, isUnlockVisible, signature } = state; + const _onUnlock = (): void => { + setIsLocked(false); + _toggleUnlock(); + }; return (
@@ -135,7 +148,7 @@ function Sign ({ className, t }: Props): React.ReactElement {
+ {isUnlockVisible && ( )}
+ +
); } -export default withMulti( +export default translate( styled(Sign)` .toolbox--Sign-input { position: relative; @@ -189,6 +224,7 @@ export default withMulti( .unlock-overlay-content { color:#fff; + padding: 0 2.5rem; text-align:center; .ui--Button-Group { @@ -196,6 +232,5 @@ export default withMulti( } } } - `, - translate + ` ); diff --git a/packages/app-toolbox/src/Unlock.tsx b/packages/app-toolbox/src/Unlock.tsx index 60b798d41b28..4561d8880981 100644 --- a/packages/app-toolbox/src/Unlock.tsx +++ b/packages/app-toolbox/src/Unlock.tsx @@ -12,6 +12,7 @@ import translate from './translate'; interface Props extends I18nProps { onClose: () => void; + onUnlock: () => void; pair: KeyringPair | null; } @@ -138,7 +139,7 @@ class Unlock extends TxComponent { } private onUnlock = (): void => { - const { onClose } = this.props; + const { onUnlock } = this.props; const { password } = this.state; const unlockError = this.unlockAccount(password); @@ -147,7 +148,7 @@ class Unlock extends TxComponent { return; } - onClose(); + onUnlock(); } } From 5e83cca2aaf81e48fb448ebde2a2bdb1ae57e8f3 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Mon, 25 Nov 2019 09:38:18 +0000 Subject: [PATCH 108/154] [CI Skip] 0.37.0-beta.119 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-toolbox.json | 4 +++- packages/apps/public/locales/en/ui.json | 4 +++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 32 files changed, 74 insertions(+), 70 deletions(-) diff --git a/lerna.json b/lerna.json index da7e15620626..a7e2874883a1 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.118" + "version": "0.37.0-beta.119" } diff --git a/package.json b/package.json index 947af75c7b92..325af38fef2e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 2c9f70143ef4..757e0758bf3c 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 5a246ea76821..5d1703ff0f87 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-components": "^0.37.0-beta.119", "@polkadot/react-qr": "^0.47.0-beta.10", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 4cb774e0a1c1..6f410c945bc2 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index f7e32eb511b1..85cfb480587a 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 479f6b7f4caa..810548cf7d24 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.28", - "@polkadot/react-components": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 1a6fbf9bfaa0..3c270a97448a 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", - "@polkadot/react-query": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-query": "^0.37.0-beta.119" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 9b4bff63e719..aecfb2e22142 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.118", - "@polkadot/react-components": "^0.37.0-beta.118" + "@polkadot/apps-routing": "^0.37.0-beta.119", + "@polkadot/react-components": "^0.37.0-beta.119" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index bf782a411198..c8dcbb3f509e 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", - "@polkadot/react-query": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-query": "^0.37.0-beta.119" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index a3147864bf3c..5f29616a0894 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 169a2ef6de19..fd4d5b34bd4f 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", - "@polkadot/react-params": "^0.37.0-beta.118", - "@polkadot/react-signer": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-params": "^0.37.0-beta.119", + "@polkadot/react-signer": "^0.37.0-beta.119" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 58c85595b698..6f831bb6e1c8 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index f9680365450d..0ef59e0f3670 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-components": "^0.37.0-beta.119", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 5968604a6a52..0ea2843a5509 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", - "@polkadot/react-query": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-query": "^0.37.0-beta.119" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 2df0878dd849..0f68b1a92246 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", - "@polkadot/react-query": "^0.37.0-beta.118", + "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-query": "^0.37.0-beta.119", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 0adb54b35408..60193cd49e8b 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.118", - "@polkadot/react-components": "^0.37.0-beta.118", - "@polkadot/react-query": "^0.37.0-beta.118" + "@polkadot/app-explorer": "^0.37.0-beta.119", + "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-query": "^0.37.0-beta.119" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index e20b82c34e10..e7d633a485fe 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", - "@polkadot/react-params": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-params": "^0.37.0-beta.119" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 85b4073ba1a9..12450d38b1dd 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index dc6e4c0c3400..e8072319dcae 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index c869445e2bec..61ddaddd2df0 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", - "@polkadot/react-query": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-query": "^0.37.0-beta.119" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index d269963926c0..02b0898d566a 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", - "@polkadot/react-query": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-query": "^0.37.0-beta.119" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 3a03a8f8767f..7214e9f7c3ed 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index fe3110caf4ff..7856329d3023 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", - "@polkadot/react-signer": "^0.37.0-beta.118", + "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-signer": "^0.37.0-beta.119", "@polkadot/ui-assets": "^0.47.0-beta.10", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-toolbox.json b/packages/apps/public/locales/en/app-toolbox.json index 80e733853058..c5afd803df01 100644 --- a/packages/apps/public/locales/en/app-toolbox.json +++ b/packages/apps/public/locales/en/app-toolbox.json @@ -37,5 +37,7 @@ "The signature as by the account being checked, supplied as a hex-formatted string.": "The signature as by the account being checked, supplied as a hex-formatted string.", "the supplied signature": "the supplied signature", "Cryptography used to create this signature. It is auto-detected on valid signatures.": "Cryptography used to create this signature. It is auto-detected on valid signatures.", - "signature crypto type": "signature crypto type" + "signature crypto type": "signature crypto type", + "This injected account cannot be used to sign data since the extension does not support raw signing.": "This injected account cannot be used to sign data since the extension does not support raw signing.", + "This external account cannot be used to sign data. Only Limited support is currently available for signing from any non-internal accounts.": "This external account cannot be used to sign data. Only Limited support is currently available for signing from any non-internal accounts." } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index 0486e9f98961..39e36b9ffce9 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -642,5 +642,7 @@ "{{currency}} own": "", "{{currency}} other": "", "session rotate": "", - "session next": "" + "session next": "", + "This injected account cannot be used to sign data since the extension does not support raw signing.": "", + "This external account cannot be used to sign data. Only Limited support is currently available for signing from any non-internal accounts.": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 32cd74c3de71..749ded1f9478 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 8e8d7f24293a..e736bc48073b 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.118", + "@polkadot/react-api": "^0.37.0-beta.119", "@polkadot/react-identicon": "^0.47.0-beta.10", - "@polkadot/react-query": "^0.37.0-beta.118", + "@polkadot/react-query": "^0.37.0-beta.119", "@polkadot/ui-keyring": "^0.47.0-beta.10", "@polkadot/ui-settings": "^0.47.0-beta.10", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 06cf1c243e2a..afd7f67eff99 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 087f7d3f157f..89a9ccb365a2 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118" + "@polkadot/react-components": "^0.37.0-beta.119" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index b3f138fce427..f2e94711e8f1 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 0e6f396343a7..0a70e2d32276 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.118", + "version": "0.37.0-beta.119", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.118", + "@polkadot/react-components": "^0.37.0-beta.119", "@polkadot/react-qr": "^0.47.0-beta.10" } } From 358d8ed4b38229a87da8de547a18823eb4276fa7 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 25 Nov 2019 11:04:49 +0100 Subject: [PATCH 109/154] Remove disabled state (#1939) --- packages/app-staking/src/Overview/Address.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx index 1952fd75c9f8..d642aca326b3 100644 --- a/packages/app-staking/src/Overview/Address.tsx +++ b/packages/app-staking/src/Overview/Address.tsx @@ -187,7 +187,6 @@ function Address ({ address, authorsMap, className, defaultName, filter, hasQuer )} } - isDisabled={isSubstrateV2 && !hasActivity} overlay={ hasQueries && api.query.imOnline?.authoredBlocks && ( Date: Mon, 25 Nov 2019 10:09:40 +0000 Subject: [PATCH 110/154] [CI Skip] 0.37.0-beta.120 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index a7e2874883a1..7f8bc35bab86 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.119" + "version": "0.37.0-beta.120" } diff --git a/package.json b/package.json index 325af38fef2e..550b536a5756 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 757e0758bf3c..184a17bd12b4 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 5d1703ff0f87..41e4872ecfb4 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-components": "^0.37.0-beta.120", "@polkadot/react-qr": "^0.47.0-beta.10", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 6f410c945bc2..46e7d669223a 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 85cfb480587a..b672afad9656 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 810548cf7d24..5ede7e02f78d 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.28", - "@polkadot/react-components": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 3c270a97448a..8d9dd1833aa8 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", - "@polkadot/react-query": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-query": "^0.37.0-beta.120" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index aecfb2e22142..62398111fc5e 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.119", - "@polkadot/react-components": "^0.37.0-beta.119" + "@polkadot/apps-routing": "^0.37.0-beta.120", + "@polkadot/react-components": "^0.37.0-beta.120" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index c8dcbb3f509e..4527e93ca46c 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", - "@polkadot/react-query": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-query": "^0.37.0-beta.120" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 5f29616a0894..e3071151194c 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index fd4d5b34bd4f..55dc4f3d2c93 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", - "@polkadot/react-params": "^0.37.0-beta.119", - "@polkadot/react-signer": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-params": "^0.37.0-beta.120", + "@polkadot/react-signer": "^0.37.0-beta.120" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 6f831bb6e1c8..4a1415f6509f 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 0ef59e0f3670..b704aba22c1c 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-components": "^0.37.0-beta.120", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 0ea2843a5509..051661d80d5c 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", - "@polkadot/react-query": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-query": "^0.37.0-beta.120" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 0f68b1a92246..f2e04a8b211e 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", - "@polkadot/react-query": "^0.37.0-beta.119", + "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-query": "^0.37.0-beta.120", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 60193cd49e8b..5648e732e074 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.119", - "@polkadot/react-components": "^0.37.0-beta.119", - "@polkadot/react-query": "^0.37.0-beta.119" + "@polkadot/app-explorer": "^0.37.0-beta.120", + "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-query": "^0.37.0-beta.120" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index e7d633a485fe..a4e36bb6a653 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", - "@polkadot/react-params": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-params": "^0.37.0-beta.120" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 12450d38b1dd..8970c5717517 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index e8072319dcae..68279f25a1b6 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 61ddaddd2df0..9236fa1158fb 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", - "@polkadot/react-query": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-query": "^0.37.0-beta.120" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 02b0898d566a..34db4719ff54 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", - "@polkadot/react-query": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-query": "^0.37.0-beta.120" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 7214e9f7c3ed..b1c2fcf4cfc0 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 7856329d3023..fc3c01b5c804 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", - "@polkadot/react-signer": "^0.37.0-beta.119", + "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-signer": "^0.37.0-beta.120", "@polkadot/ui-assets": "^0.47.0-beta.10", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 749ded1f9478..4b835de6bf4f 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index e736bc48073b..d1544593d276 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.119", + "@polkadot/react-api": "^0.37.0-beta.120", "@polkadot/react-identicon": "^0.47.0-beta.10", - "@polkadot/react-query": "^0.37.0-beta.119", + "@polkadot/react-query": "^0.37.0-beta.120", "@polkadot/ui-keyring": "^0.47.0-beta.10", "@polkadot/ui-settings": "^0.47.0-beta.10", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index afd7f67eff99..26e348d33d9b 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 89a9ccb365a2..3d8427d07150 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119" + "@polkadot/react-components": "^0.37.0-beta.120" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index f2e94711e8f1..b5c0f4273198 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 0a70e2d32276..23c25f1feaf1 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.119", + "version": "0.37.0-beta.120", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.119", + "@polkadot/react-components": "^0.37.0-beta.120", "@polkadot/react-qr": "^0.47.0-beta.10" } } From c958bfba143b000ffb8808e39ba4a8d31d3f5ab9 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 25 Nov 2019 12:55:18 +0100 Subject: [PATCH 111/154] Bump API deps (#1942) --- package.json | 6 +- packages/app-contracts/package.json | 2 +- packages/react-api/package.json | 2 +- yarn.lock | 90 ++++++++++++++--------------- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/package.json b/package.json index 550b536a5756..8b0baefa81c1 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.28", - "@polkadot/api-contract": "^0.97.0-beta.28", + "@polkadot/api": "^0.97.0-beta.30", + "@polkadot/api-contract": "^0.97.0-beta.30", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/types": "^0.97.0-beta.28", + "@polkadot/types": "^0.97.0-beta.30", "@polkadot/util": "^1.7.0-beta.7", "@polkadot/util-crypto": "^1.7.0-beta.7", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 5ede7e02f78d..3f24c7575660 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api-contract": "^0.97.0-beta.28", + "@polkadot/api-contract": "^0.97.0-beta.30", "@polkadot/react-components": "^0.37.0-beta.120" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 4b835de6bf4f..46a57c402679 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api": "^0.97.0-beta.28", + "@polkadot/api": "^0.97.0-beta.30", "@polkadot/extension-dapp": "^0.14.0-beta.5", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/yarn.lock b/yarn.lock index 5ae23d7a5213..c587efba2cb6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,35 +2029,35 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^0.97.0-beta.28": - version "0.97.0-beta.28" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.28.tgz#113aef1cc993c57815ac7cff88c002fc6281641d" - integrity sha512-B62jw2/1tZoVMa8OXj6ULPJ6dmEfF3UnGeS2L9ifaZ5wrVdCU9TTH6wVbTEe0ANzCcLY9op+r9Jm1/MQ5N8OSw== +"@polkadot/api-contract@^0.97.0-beta.30": + version "0.97.0-beta.30" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.30.tgz#dc411bb29c19c580a773d6979d1bc4440950febe" + integrity sha512-v8CDH+u18rN3/yMNfhj//hZvb8LjTTU+31jt3K98UqhmkruQtIrYXraRwqkh1FnglqooRFGG8K5Xp+y+8mhH5g== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/types" "^0.97.0-beta.28" + "@polkadot/types" "^0.97.0-beta.30" -"@polkadot/api-derive@^0.97.0-beta.28": - version "0.97.0-beta.28" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.28.tgz#a6086071a0220789f4ae5b5ab73c7efe218546a1" - integrity sha512-Rh+lUmCArzmQmtGzKvwVCP8t7xckLDgBNhZOB6AFJfb3oPTHAziXyuE0WQJeQIfgVgHzRDdZXF70X3NnV0Faww== +"@polkadot/api-derive@^0.97.0-beta.30": + version "0.97.0-beta.30" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.30.tgz#1d157e11eb63ab1bcdd1edeacaff537514d73dc7" + integrity sha512-Mn2vuVyNCM2vkGGsvRTKAB4Lj0J2mKlewWDDMf4+YnvJCmY1jHaKV7GMO3sedW4Ri6V5eAzQDhyJg6rZ2ty8gg== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/api" "^0.97.0-beta.28" - "@polkadot/types" "^0.97.0-beta.28" + "@polkadot/api" "^0.97.0-beta.30" + "@polkadot/types" "^0.97.0-beta.30" -"@polkadot/api@^0.97.0-beta.28": - version "0.97.0-beta.28" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.28.tgz#b8c473eee6ff90b00e459a5937f4cf3c2cf86cd3" - integrity sha512-6RFxXuRelrToKxf5ljbuZHP7NNOSJSUIJH3jPuJBqy+Bqrn2aOnYH1iZXZ2+mkcfwwRX2aLyJm9k4XI53LkPxg== +"@polkadot/api@^0.97.0-beta.30": + version "0.97.0-beta.30" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.30.tgz#2731ca9edaf416fb6ffdb12796bd22f758e89ecf" + integrity sha512-54l8PYtvYzcrIikOSfDpS82stk4wa+dyNMKUC9LG1WyeEe5MS1xqb6tDfPTAjQMsHlYAnjirVlWpjzK9fiG8CQ== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/api-derive" "^0.97.0-beta.28" + "@polkadot/api-derive" "^0.97.0-beta.30" "@polkadot/keyring" "^1.7.0-beta.7" - "@polkadot/metadata" "^0.97.0-beta.28" - "@polkadot/rpc-core" "^0.97.0-beta.28" - "@polkadot/rpc-provider" "^0.97.0-beta.28" - "@polkadot/types" "^0.97.0-beta.28" + "@polkadot/metadata" "^0.97.0-beta.30" + "@polkadot/rpc-core" "^0.97.0-beta.30" + "@polkadot/rpc-provider" "^0.97.0-beta.30" + "@polkadot/types" "^0.97.0-beta.30" "@polkadot/util-crypto" "^1.7.0-beta.7" "@polkadot/dev-react@^0.32.0-beta.14": @@ -2160,10 +2160,10 @@ dependencies: "@babel/runtime" "^7.7.2" -"@polkadot/jsonrpc@^0.97.0-beta.28": - version "0.97.0-beta.28" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.28.tgz#9335ac1c5ba92cb3e400c647465db8add6ce2028" - integrity sha512-oiV8AcFeI6hiafVM/Lp/eogfRbo9p++d+bPmRCk+dTchlc+/NhhrPy7w4/w4wfUoPIAQHHRuO2O/8lss/zciUA== +"@polkadot/jsonrpc@^0.97.0-beta.30": + version "0.97.0-beta.30" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.30.tgz#89cf8c9648f71f5594a37893f9750601db2d1503" + integrity sha512-mRa878mJ4hhlKct4dnKiPc2QAHWrry/yWkuHtqmbQDSiJnBD3n1413jZmJRzKCnSNr/ViAfw2NTUFok9kn1x1g== dependencies: "@babel/runtime" "^7.7.2" @@ -2176,13 +2176,13 @@ "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" -"@polkadot/metadata@^0.97.0-beta.28": - version "0.97.0-beta.28" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.28.tgz#f6250d124a48b8922863b5c187a27ed7e979556d" - integrity sha512-ejZjZP2VzYTgaMarUMExG1euXskmRn+t6yvLgJlObUVG3R2MFpH0Z3ZmITWYWg8lyLXp+A4ia7zJvvjfcW+hbg== +"@polkadot/metadata@^0.97.0-beta.30": + version "0.97.0-beta.30" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.30.tgz#9577d93881124ff2bb8501d996dc3205c1660be7" + integrity sha512-8qEPrZeXj2wIWtRVGWoygWiZ1fikngLfW0N1lyrlUo2eAs3oo/+8ZtYxJNYlX1h+ZqfXPL4ALdcJ+C4CIOjrmA== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/types" "^0.97.0-beta.28" + "@polkadot/types" "^0.97.0-beta.30" "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" @@ -2211,25 +2211,25 @@ qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.0-beta.28": - version "0.97.0-beta.28" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.28.tgz#2f000db698a7e8f574ec1cbbcf4207fddfe10d75" - integrity sha512-67npaY5KtN4HlDw8O//wB4g7p3llXiyHw0tYQN9498n5q0ywgN1KnHl3DB1t+lddWoWdY8QJ+02+ue0IXsk9Zg== +"@polkadot/rpc-core@^0.97.0-beta.30": + version "0.97.0-beta.30" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.30.tgz#2d00294cce386c0e9567d54788570afd620b02a8" + integrity sha512-R2VBke4MXL9okVkJxxGr/maPqpOfA9Qe/78kvZAa6pqx/wOh0G6ooA+4RPCfneREB9jTvFm1fEvxH9TuS/8n5g== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/jsonrpc" "^0.97.0-beta.28" - "@polkadot/rpc-provider" "^0.97.0-beta.28" - "@polkadot/types" "^0.97.0-beta.28" + "@polkadot/jsonrpc" "^0.97.0-beta.30" + "@polkadot/rpc-provider" "^0.97.0-beta.30" + "@polkadot/types" "^0.97.0-beta.30" "@polkadot/util" "^1.7.0-beta.7" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.0-beta.28": - version "0.97.0-beta.28" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.28.tgz#e12499a4bcaf8f0b512b97ddf0d2661422d29a0c" - integrity sha512-OAeaQu2HdY4NGqDockkO2i7Of/KZk+Z/IVWKGdUnfKAy7xSMzt6ldwvclSuOA2V8WRIwV98FNR+0SqZS0ivY4w== +"@polkadot/rpc-provider@^0.97.0-beta.30": + version "0.97.0-beta.30" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.30.tgz#200664bcedac7004b5fdc828ed476a37a81bbea1" + integrity sha512-TdHD/liLmwxXomjKtWA2M6wSB1eY6IPR4CgFpdjHYeUrMU9P0YJMjM0tLcBuiJhbFMR+bpI65KfYjCMlaXrPvw== dependencies: "@babel/runtime" "^7.7.2" - "@polkadot/metadata" "^0.97.0-beta.28" + "@polkadot/metadata" "^0.97.0-beta.30" "@polkadot/util" "^1.7.0-beta.7" "@polkadot/util-crypto" "^1.7.0-beta.7" eventemitter3 "^4.0.0" @@ -2243,10 +2243,10 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.0-beta.28": - version "0.97.0-beta.28" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.28.tgz#b932e745eb066b74287284cbc95a29fb088334bf" - integrity sha512-HaxY2daVCggmnPbjl6spuSzJomW30/kGQu0pQDoFVcXzcD07h4zazT0ZqxXkvY1pPllCIKWTG8Q4K+sGOFPsow== +"@polkadot/types@^0.97.0-beta.30": + version "0.97.0-beta.30" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.30.tgz#38ab3d16352ba42108332beb49ebb38f9d5ef188" + integrity sha512-qHnXZWGs305/u3BoRqqXr/SFgVAvWaFRMBLJEEoJ/5H5YAID4IVqHJ5iI0QpdKLMhodIWH+TccN/QgxUx+HXBw== dependencies: "@babel/runtime" "^7.7.2" "@polkadot/util" "^1.7.0-beta.7" From fbb7408d09c4e2021e9fddd2a0d0fa9d28f04959 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Mon, 25 Nov 2019 12:00:05 +0000 Subject: [PATCH 112/154] [CI Skip] 0.37.0-beta.121 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 7f8bc35bab86..139491bf93db 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.120" + "version": "0.37.0-beta.121" } diff --git a/package.json b/package.json index 8b0baefa81c1..030d954c7973 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 184a17bd12b4..9e4a51a688a5 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 41e4872ecfb4..e75f3ebefc57 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-components": "^0.37.0-beta.121", "@polkadot/react-qr": "^0.47.0-beta.10", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 46e7d669223a..e1bd46f7d97f 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index b672afad9656..8b17379279ff 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 3f24c7575660..9674c366c019 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/api-contract": "^0.97.0-beta.30", - "@polkadot/react-components": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 8d9dd1833aa8..224fef2d9ff6 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", - "@polkadot/react-query": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121", + "@polkadot/react-query": "^0.37.0-beta.121" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 62398111fc5e..e8d59c026690 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/apps-routing": "^0.37.0-beta.120", - "@polkadot/react-components": "^0.37.0-beta.120" + "@polkadot/apps-routing": "^0.37.0-beta.121", + "@polkadot/react-components": "^0.37.0-beta.121" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 4527e93ca46c..4f2c982935f2 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", - "@polkadot/react-query": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121", + "@polkadot/react-query": "^0.37.0-beta.121" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index e3071151194c..154d32f1cf75 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 55dc4f3d2c93..69369257807c 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", - "@polkadot/react-params": "^0.37.0-beta.120", - "@polkadot/react-signer": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121", + "@polkadot/react-params": "^0.37.0-beta.121", + "@polkadot/react-signer": "^0.37.0-beta.121" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 4a1415f6509f..0cdf0c4cb7c3 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index b704aba22c1c..9c3bda91154a 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-components": "^0.37.0-beta.121", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 051661d80d5c..56ba5f27d52e 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", - "@polkadot/react-query": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121", + "@polkadot/react-query": "^0.37.0-beta.121" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index f2e04a8b211e..012788baebd8 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", - "@polkadot/react-query": "^0.37.0-beta.120", + "@polkadot/react-components": "^0.37.0-beta.121", + "@polkadot/react-query": "^0.37.0-beta.121", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 5648e732e074..809c9c24dd7f 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/app-explorer": "^0.37.0-beta.120", - "@polkadot/react-components": "^0.37.0-beta.120", - "@polkadot/react-query": "^0.37.0-beta.120" + "@polkadot/app-explorer": "^0.37.0-beta.121", + "@polkadot/react-components": "^0.37.0-beta.121", + "@polkadot/react-query": "^0.37.0-beta.121" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index a4e36bb6a653..cbdfa58164a8 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", - "@polkadot/react-params": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121", + "@polkadot/react-params": "^0.37.0-beta.121" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 8970c5717517..7e74bfe1d603 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 68279f25a1b6..3a6825b31fa2 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 9236fa1158fb..69ee28e8bc15 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", - "@polkadot/react-query": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121", + "@polkadot/react-query": "^0.37.0-beta.121" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 34db4719ff54..29ca11b4e228 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", - "@polkadot/react-query": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121", + "@polkadot/react-query": "^0.37.0-beta.121" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index b1c2fcf4cfc0..104cc8bcbb47 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index fc3c01b5c804..90f089deb77f 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", - "@polkadot/react-signer": "^0.37.0-beta.120", + "@polkadot/react-components": "^0.37.0-beta.121", + "@polkadot/react-signer": "^0.37.0-beta.121", "@polkadot/ui-assets": "^0.47.0-beta.10", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 46a57c402679..ed7da437ba9d 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index d1544593d276..8e8714355568 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/react-api": "^0.37.0-beta.120", + "@polkadot/react-api": "^0.37.0-beta.121", "@polkadot/react-identicon": "^0.47.0-beta.10", - "@polkadot/react-query": "^0.37.0-beta.120", + "@polkadot/react-query": "^0.37.0-beta.121", "@polkadot/ui-keyring": "^0.47.0-beta.10", "@polkadot/ui-settings": "^0.47.0-beta.10", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 26e348d33d9b..4e0b851061a5 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 3d8427d07150..16b5f8881606 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120" + "@polkadot/react-components": "^0.37.0-beta.121" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index b5c0f4273198..e2dc939081ee 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 23c25f1feaf1..3aa05ded3eee 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.120", + "version": "0.37.0-beta.121", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/react-components": "^0.37.0-beta.120", + "@polkadot/react-components": "^0.37.0-beta.121", "@polkadot/react-qr": "^0.47.0-beta.10" } } From 7a14adeee2ed2005b1a0ba69dfa4f5af0473adfe Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 25 Nov 2019 13:13:26 +0100 Subject: [PATCH 113/154] Check for controller availability (unlock) (#1940) --- packages/react-components/src/AddressInfo.tsx | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/react-components/src/AddressInfo.tsx b/packages/react-components/src/AddressInfo.tsx index 43ef88ffd74b..3879607df81c 100644 --- a/packages/react-components/src/AddressInfo.tsx +++ b/packages/react-components/src/AddressInfo.tsx @@ -12,6 +12,7 @@ import styled from 'styled-components'; import { formatBalance, formatNumber, isObject } from '@polkadot/util'; import { Icon, Tooltip, TxButton } from '@polkadot/react-components'; import { withCalls, withMulti } from '@polkadot/react-api'; +import { useAccounts } from '@polkadot/react-hooks'; import { FormatBalance } from '@polkadot/react-query'; import CryptoType from './CryptoType'; @@ -224,7 +225,7 @@ function renderValidatorPrefs ({ stakingInfo, t, withValidatorPrefs = false }: P ); } -function renderBalances (props: Props): React.ReactNode { +function renderBalances (props: Props, allAccounts: string[]): React.ReactNode { const { balancesAll, stakingInfo, t, withBalance = true } = props; const balanceDisplay = withBalance === true ? DEFAULT_BALANCES @@ -235,6 +236,7 @@ function renderBalances (props: Props): React.ReactNode { } const [ownBonded, otherBonded] = calcBonded(stakingInfo, balanceDisplay.bonded); + const controllerId = stakingInfo?.controllerId?.toString(); return ( <> @@ -256,7 +258,7 @@ function renderBalances (props: Props): React.ReactNode { /> )} - {balancesAll && balanceDisplay.vested && balancesAll.isVesting && ( + {balanceDisplay.vested && balancesAll?.isVesting && ( <>
); } - -export default withCalls( - ['derive.accounts.info', { paramName: 'params', propName: 'info' }] -)(AccountName); From fb88bd7b3bbbb1b5b70e8b8703b763a2affbe7d9 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Tue, 26 Nov 2019 14:21:54 +0000 Subject: [PATCH 126/154] [CI Skip] 0.37.0-beta.128 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index cdbe71aa8f10..420a99a8c63e 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.127" + "version": "0.37.0-beta.128" } diff --git a/package.json b/package.json index da85f49c9ed7..761c3dfe024e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index f079fb09cdf6..a29609f9bd2d 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 4bd52748b7ef..0e5076d98ba1 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", + "@polkadot/react-components": "^0.37.0-beta.128", "@polkadot/react-qr": "^0.47.0-beta.11", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 6d760138678c..150b4c23c40b 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 2e5c57c87377..b7093e08023e 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 4ea74ecfa0e4..b1828567daf7 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/api-contract": "^0.97.0-beta.33", - "@polkadot/react-components": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 27d09120b469..7d6f973f747f 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", - "@polkadot/react-query": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-query": "^0.37.0-beta.128" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 5503c1e3d26e..b97aadec4bc5 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/apps-routing": "^0.37.0-beta.127", - "@polkadot/react-components": "^0.37.0-beta.127" + "@polkadot/apps-routing": "^0.37.0-beta.128", + "@polkadot/react-components": "^0.37.0-beta.128" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 70734e42d718..2fd09a8e9646 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", - "@polkadot/react-query": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-query": "^0.37.0-beta.128" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 12ae2a06f87a..d052ce90a34b 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index ad822a78cce3..7c18a3f9c5d6 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", - "@polkadot/react-params": "^0.37.0-beta.127", - "@polkadot/react-signer": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-params": "^0.37.0-beta.128", + "@polkadot/react-signer": "^0.37.0-beta.128" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index de20b03fc76c..6c95c32dd068 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index e662b3728710..24918ca2ce94 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", + "@polkadot/react-components": "^0.37.0-beta.128", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 5a4b8712663a..d0580ec1dfb8 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", - "@polkadot/react-query": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-query": "^0.37.0-beta.128" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 2017696b192e..8c14c45692f9 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", - "@polkadot/react-query": "^0.37.0-beta.127", + "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-query": "^0.37.0-beta.128", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index e88a12b734bd..c37946f139c4 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/app-explorer": "^0.37.0-beta.127", - "@polkadot/react-components": "^0.37.0-beta.127", - "@polkadot/react-query": "^0.37.0-beta.127" + "@polkadot/app-explorer": "^0.37.0-beta.128", + "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-query": "^0.37.0-beta.128" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 5d6eb2d63a6a..816f6a08c773 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", - "@polkadot/react-params": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-params": "^0.37.0-beta.128" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 8c47efb8f70c..3ef265d68569 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 1bb860de2696..e1f977db375e 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 85075285edb8..5901473bff0a 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", - "@polkadot/react-query": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-query": "^0.37.0-beta.128" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 42530545815d..6d15e59b38b4 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", - "@polkadot/react-query": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-query": "^0.37.0-beta.128" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 4dd1486c7b0c..adae57416f9b 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index eb72bf047f4e..217178114b68 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", - "@polkadot/react-signer": "^0.37.0-beta.127", + "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-signer": "^0.37.0-beta.128", "@polkadot/ui-assets": "^0.47.0-beta.11", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index a3fda8659164..abb6debed778 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index e2646efbcbde..e579ba42cf97 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/keyring": "^1.7.0-beta.8", - "@polkadot/react-api": "^0.37.0-beta.127", + "@polkadot/react-api": "^0.37.0-beta.128", "@polkadot/react-identicon": "^0.47.0-beta.11", - "@polkadot/react-query": "^0.37.0-beta.127", + "@polkadot/react-query": "^0.37.0-beta.128", "@polkadot/ui-keyring": "^0.47.0-beta.11", "@polkadot/ui-settings": "^0.47.0-beta.11", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index fc0d77be89fd..826959a1264e 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index f42ee5b88c89..2d7422c89374 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127" + "@polkadot/react-components": "^0.37.0-beta.128" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 690f858ced09..1c17974e9390 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 051aa1523602..9f6eeda84ffc 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.127", + "version": "0.37.0-beta.128", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.127", + "@polkadot/react-components": "^0.37.0-beta.128", "@polkadot/react-qr": "^0.47.0-beta.11" } } From fba7778c74b69095a57cd1f1a7bfb712c4cd2bcf Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 27 Nov 2019 15:11:00 +0100 Subject: [PATCH 127/154] Nomination target dashboard (#1953) * Nomination target dashboard * Bump API --- package.json | 6 +- packages/app-contracts/package.json | 2 +- packages/app-staking/src/Targets/Summary.tsx | 79 ++++++ .../app-staking/src/Targets/Validator.tsx | 54 +++++ packages/app-staking/src/Targets/index.tsx | 224 ++++++++++++++++++ packages/app-staking/src/Targets/types.ts | 25 ++ packages/app-staking/src/index.tsx | 8 +- packages/react-api/package.json | 2 +- yarn.lock | 90 +++---- 9 files changed, 439 insertions(+), 51 deletions(-) create mode 100644 packages/app-staking/src/Targets/Summary.tsx create mode 100644 packages/app-staking/src/Targets/Validator.tsx create mode 100644 packages/app-staking/src/Targets/index.tsx create mode 100644 packages/app-staking/src/Targets/types.ts diff --git a/package.json b/package.json index 761c3dfe024e..474bdb9909f6 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.33", - "@polkadot/api-contract": "^0.97.0-beta.33", + "@polkadot/api": "^0.97.0-beta.34", + "@polkadot/api-contract": "^0.97.0-beta.34", "@polkadot/keyring": "^1.7.0-beta.8", - "@polkadot/types": "^0.97.0-beta.33", + "@polkadot/types": "^0.97.0-beta.34", "@polkadot/util": "^1.7.0-beta.8", "@polkadot/util-crypto": "^1.7.0-beta.8", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index b1828567daf7..040daaa3c170 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api-contract": "^0.97.0-beta.33", + "@polkadot/api-contract": "^0.97.0-beta.34", "@polkadot/react-components": "^0.37.0-beta.128" } } diff --git a/packages/app-staking/src/Targets/Summary.tsx b/packages/app-staking/src/Targets/Summary.tsx new file mode 100644 index 000000000000..fc1dcd1205b2 --- /dev/null +++ b/packages/app-staking/src/Targets/Summary.tsx @@ -0,0 +1,79 @@ +// Copyright 2017-2019 @polkadot/app-staking authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { Balance } from '@polkadot/types/interfaces'; +import { I18nProps } from '@polkadot/react-components/types'; + +import BN from 'bn.js'; +import React, { useEffect, useState } from 'react'; +import { SummaryBox, CardSummary } from '@polkadot/react-components'; +import { useApi, trackStream } from '@polkadot/react-hooks'; +import { formatBalance } from '@polkadot/util'; + +import translate from '../translate'; + +interface Props extends I18nProps { + totalStaked: BN; +} + +interface StakeInfo { + percentage: string; + staked: string | null; + total: string | null; +} + +function Summary ({ t, totalStaked }: Props): React.ReactElement { + const { api } = useApi(); + const totalInsurance = trackStream(api.query.balances.totalIssuance, []); + const [{ percentage, staked, total }, setStakeInfo] = useState({ percentage: '-', staked: null, total: null }); + + useEffect((): void => { + if (totalInsurance && totalStaked?.gtn(0)) { + setStakeInfo({ + percentage: `${(totalStaked.muln(10000).div(totalInsurance).toNumber() / 100).toFixed(2)}%`, + staked: totalStaked.toString(), + total: totalInsurance.toString() + }); + } + }, [totalInsurance, totalStaked]); + + return ( + +
+ + { + staked + ? `${formatBalance(staked, false)}${formatBalance.calcSi(staked).value}` + : '-' + } + + / + + { + total + ? `${formatBalance(total, false)}${formatBalance.calcSi(total).value}` + : '-' + } + +
+ + {percentage} + +
+ ); +} + +export default translate(Summary); diff --git a/packages/app-staking/src/Targets/Validator.tsx b/packages/app-staking/src/Targets/Validator.tsx new file mode 100644 index 000000000000..472cfcfba2e7 --- /dev/null +++ b/packages/app-staking/src/Targets/Validator.tsx @@ -0,0 +1,54 @@ +// Copyright 2017-2019 @polkadot/app-staking authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details.v + +import { I18nProps } from '@polkadot/react-components/types'; +import { ValidatorInfo } from './types'; + +import React from 'react'; +import { AddressMini, Icon } from '@polkadot/react-components'; +import { FormatBalance } from '@polkadot/react-query'; +import { formatNumber } from '@polkadot/util'; + +import translate from '../translate'; + +interface Props extends I18nProps { + info: ValidatorInfo; + toggleFavorite: (accountId: string) => void; +} + +function Validator ({ info: { accountId, bondOther, bondOwn, bondTotal, commission, isFavorite, key, numNominators, rankOverall, rewardPayout }, toggleFavorite }: Props): React.ReactElement { + const _onFavorite = (): void => toggleFavorite(key); + const _onQueryStats = (): void => { + window.location.hash = `/staking/query/${key}`; + }; + + return ( + + + + + {formatNumber(rankOverall)} + + + {formatNumber(numNominators)} + + + + + + + + + ); +} + +export default translate(Validator); diff --git a/packages/app-staking/src/Targets/index.tsx b/packages/app-staking/src/Targets/index.tsx new file mode 100644 index 000000000000..677c7827a0c7 --- /dev/null +++ b/packages/app-staking/src/Targets/index.tsx @@ -0,0 +1,224 @@ +// Copyright 2017-2019 @polkadot/app-staking authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { DerivedStakingElected } from '@polkadot/api-derive/types'; +import { I18nProps } from '@polkadot/react-components/types'; +import { ComponentProps } from '../types'; +import { ValidatorInfo } from './types'; + +import BN from 'bn.js'; +import React, { useEffect, useState } from 'react'; +import styled from 'styled-components'; +import { InputBalance, Icon, Tooltip } from '@polkadot/react-components'; +import { useApi, useFavorites, trackStream } from '@polkadot/react-hooks'; + +import { STORE_FAVS_BASE } from '../constants'; +import translate from '../translate'; +import Summary from './Summary'; +import Validator from './Validator'; + +interface Props extends I18nProps, ComponentProps { +} + +interface AllInfo { + totalStaked: BN; + validators: ValidatorInfo[]; +} + +function sortValidators (list: ValidatorInfo[]): ValidatorInfo[] { + return list + .sort((a, b): number => b.bondTotal.cmp(a.bondTotal)) + .map((info, index): ValidatorInfo => { + info.rankBonded = index + 1; + + return info; + }) + .sort((a, b): number => b.commission.cmp(a.commission)) + .map((info, index): ValidatorInfo => { + info.rankCommission = index + 1; + + return info; + }) + .sort((a, b): number => a.rewardSplit.cmp(b.rewardSplit)) + .map((info, index): ValidatorInfo => { + info.rankReward = index + 1; + + return info; + }) + .sort((a, b): number => + a.rankReward === b.rankReward + ? a.rankCommission === b.rankCommission + ? a.rankBonded === b.rankBonded + ? 0 + : a.rankBonded < b.rankBonded + ? 1 + : -1 + : a.rankCommission < b.rankCommission + ? 1 + : -1 + : a.rankReward < b.rankReward + ? 1 + : -1 + ) + .map((info, index): ValidatorInfo => { + info.rankOverall = index + 1; + + return info; + }) + .sort((a, b): number => + a.isFavorite === b.isFavorite + ? 0 + : a.isFavorite + ? -1 + : 1 + ); +} + +function Targets ({ className, sessionRewards, t }: Props): React.ReactElement { + const { api } = useApi(); + const [amount, setAmount] = useState(new BN(1000)); + const electedInfo = trackStream(api.derive.staking.electedInfo, []); + const [favorites, toggleFavorite] = useFavorites(STORE_FAVS_BASE); + const [{ validators, totalStaked }, setWorkable] = useState({ totalStaked: new BN(0), validators: [] }); + + useEffect((): void => { + if (electedInfo) { + let totalStaked = new BN(0); + const numValidators = electedInfo.info.length; + const lastReward = sessionRewards[sessionRewards.length - 1] + ? sessionRewards[sessionRewards.length - 1].reward.divn(numValidators) + : new BN(0); + const validators = sortValidators( + electedInfo.info.map(({ accountId, stakers, validatorPrefs }): ValidatorInfo => { + const exposure = stakers || { + total: api.createType('Compact'), + own: api.createType('Compact'), + others: api.createType('Vec') + }; + const prefs = validatorPrefs || { + validatorPayment: api.createType('Compact') + }; + const bondOwn = exposure.own.unwrap(); + const bondTotal = exposure.total.unwrap(); + const commission = prefs.validatorPayment.unwrap(); + const key = accountId.toString(); + const rewardSplit = lastReward.sub(commission); + const calcAmount = amount || new BN(0); + const rewardPayout = rewardSplit.gtn(0) + ? calcAmount.mul(rewardSplit).div(calcAmount.add(bondTotal)) + : new BN(0); + + totalStaked = totalStaked.add(bondTotal); + + return { + accountId, + bondOther: bondTotal.sub(bondOwn), + bondOwn, + bondShare: 0, + bondTotal, + isFavorite: favorites.includes(key), + key, + commission, + numNominators: exposure.others.length, + rankBonded: 0, + rankCommission: 0, + rankOverall: 0, + rankReward: 0, + rewardPayout, + rewardSplit + }; + }) + ); + + setWorkable({ totalStaked, validators }); + } + }, [amount, electedInfo, favorites, sessionRewards]); + + return ( +
+ + + + + + + + + + + + + + + + + + + {validators.map((info): React.ReactNode => + + )} + +
  + + + validatorcommissionnominatorstotal stakeown stakeother stakepayout (est.) 
+
+ ); +} + +export default translate( + styled(Targets)` + text-align: center; + + table { + margin: 1.5rem auto; + + tr { + &:nth-child(even), &.header { + background: #f2f2f2; + } + + td, th { + padding: 0.25rem 0.5rem; + text-align: left; + + &.number { + text-align: right; + } + } + + th { + color: rgba(0,0,0,.6); + font-family: sans-serif; + font-weight: 100; + font-size: 1.25rem; + } + } + } + + i.icon { + cursor: pointer; + } + + .favorite.isSelected { + color: darkorange; + } + ` +); diff --git a/packages/app-staking/src/Targets/types.ts b/packages/app-staking/src/Targets/types.ts new file mode 100644 index 000000000000..5805d1cdc539 --- /dev/null +++ b/packages/app-staking/src/Targets/types.ts @@ -0,0 +1,25 @@ +// Copyright 2017-2019 @polkadot/app-staking authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { AccountId, Balance } from '@polkadot/types/interfaces'; + +import BN from 'bn.js'; + +export interface ValidatorInfo { + accountId: AccountId; + bondOther: BN; + bondOwn: Balance; + bondShare: number; + bondTotal: Balance; + commission: Balance; + isFavorite: boolean; + key: string; + numNominators: number; + rankBonded: number; + rankCommission: number; + rankOverall: number; + rankReward: number; + rewardPayout: BN; + rewardSplit: BN; +} diff --git a/packages/app-staking/src/index.tsx b/packages/app-staking/src/index.tsx index dd421d0157ed..7b38851fcc74 100644 --- a/packages/app-staking/src/index.tsx +++ b/packages/app-staking/src/index.tsx @@ -16,10 +16,11 @@ import { HelpOverlay } from '@polkadot/react-components'; import Tabs from '@polkadot/react-components/Tabs'; import { trackStream, useAccounts, useApi } from '@polkadot/react-hooks'; -import Actions from './Actions'; import basicMd from './md/basic.md'; +import Actions from './Actions'; import Overview from './Overview'; import Query from './Query'; +import Targets from './Targets'; import { MAX_SESSIONS } from './constants'; import translate from './translate'; import useSessionRewards from './useSessionRewards'; @@ -89,6 +90,10 @@ function App ({ basePath, className, t }: Props): React.ReactElement { name: 'actions', text: t('Account actions') }, + { + name: 'returns', + text: t('Returns') + }, { hasParams: true, name: 'query', @@ -101,6 +106,7 @@ function App ({ basePath, className, t }: Props): React.ReactElement { {_renderComponent(Actions)} {_renderComponent(Query)} {_renderComponent(Query)} + {_renderComponent(Targets)} {_renderComponent(Overview, routeMatch?.isExact ? '' : 'staking--hidden')} diff --git a/packages/react-api/package.json b/packages/react-api/package.json index abb6debed778..d564cfd45f6f 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api": "^0.97.0-beta.33", + "@polkadot/api": "^0.97.0-beta.34", "@polkadot/extension-dapp": "^0.14.0-beta.6", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/yarn.lock b/yarn.lock index 2abbc972010d..fdeee532f47e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,35 +2029,35 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^0.97.0-beta.33": - version "0.97.0-beta.33" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.33.tgz#5a1952ddfdb0690aba19cda6b2730d4e26a17d57" - integrity sha512-Q5XDZnHYu+ABXyBPjKgc7I9IXGSMBZQWdvyAF3OVr0kJimQUYJwUQP5j9DQi2cWFi7Pg9P1aNXfEPp89aABN7g== +"@polkadot/api-contract@^0.97.0-beta.34": + version "0.97.0-beta.34" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.34.tgz#4d4a38c8447468c50d7731b9c644e8582f3cbb7c" + integrity sha512-S33bKfLNZ8LGXQmhu9/cQLa630HhnsqZaht++Blg4FgwSGPzY6CN4OYPFlazM7z58tLDOFXrWtSSHzypREDmww== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.0-beta.33" + "@polkadot/types" "^0.97.0-beta.34" -"@polkadot/api-derive@^0.97.0-beta.33": - version "0.97.0-beta.33" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.33.tgz#19f6b94adb677c09e27f3a066517189059f88254" - integrity sha512-jVzBrdp8o3My3yhU7+ip7KI06SL0uYAY7VlvbYmIy3iPkttm0cbp1HD9sZhqbntQo15w8TT6KkgE16tm8xHr+w== +"@polkadot/api-derive@^0.97.0-beta.34": + version "0.97.0-beta.34" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.34.tgz#5cac3de8d6670e76483987e8cd66e985a0c69a17" + integrity sha512-NMrEI2aj6jtK5J83rZ8eO65J4L1O8S2cUgYWOI7Cio1rCK3hm05S+2Yi376fO0LfKt5nDgnCLUBl9ADHhHT4Pg== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api" "^0.97.0-beta.33" - "@polkadot/types" "^0.97.0-beta.33" + "@polkadot/api" "^0.97.0-beta.34" + "@polkadot/types" "^0.97.0-beta.34" -"@polkadot/api@^0.97.0-beta.33": - version "0.97.0-beta.33" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.33.tgz#0edc5cf5047fcfa018f3c1b75b73a5cacb515f65" - integrity sha512-FMOprhm7sNUiX1hepFZftoBm+8DgBg4IByqhKfNLOhAXPpYvU7owwGxQIyZ9EXCUsT8LxMxhCArh4TcE/pKQGQ== +"@polkadot/api@^0.97.0-beta.34": + version "0.97.0-beta.34" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.34.tgz#846d34726450d6796ce44c1a56bfc1ff267657c0" + integrity sha512-B4vT8/bjV046LHOdeJFLrCDmEagfhyUF4/JvOk18mTM9wYg9fUEfkVcFVTMgrDj0QpXBsNSEv+W1goizbXtxog== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api-derive" "^0.97.0-beta.33" + "@polkadot/api-derive" "^0.97.0-beta.34" "@polkadot/keyring" "^1.7.0-beta.8" - "@polkadot/metadata" "^0.97.0-beta.33" - "@polkadot/rpc-core" "^0.97.0-beta.33" - "@polkadot/rpc-provider" "^0.97.0-beta.33" - "@polkadot/types" "^0.97.0-beta.33" + "@polkadot/metadata" "^0.97.0-beta.34" + "@polkadot/rpc-core" "^0.97.0-beta.34" + "@polkadot/rpc-provider" "^0.97.0-beta.34" + "@polkadot/types" "^0.97.0-beta.34" "@polkadot/util-crypto" "^1.7.0-beta.8" "@polkadot/dev-react@^0.32.0-beta.15": @@ -2161,10 +2161,10 @@ dependencies: "@babel/runtime" "^7.7.4" -"@polkadot/jsonrpc@^0.97.0-beta.33": - version "0.97.0-beta.33" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.33.tgz#0ad64eeb395767dc0a0c226e68d5bf92771011fe" - integrity sha512-1kd+1YOqqaHhIMbGCCtYrAkEUblHERlZPQ7+eJy5qZIxYQPuCknMzG6McnUAtEqjhiEpfnlfxDRTVyOWlIEvFg== +"@polkadot/jsonrpc@^0.97.0-beta.34": + version "0.97.0-beta.34" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.34.tgz#b4e58b2c689d1dd115e62e95423850204f0814db" + integrity sha512-kF/R+XeGfY4iI+EE2HRjm6exj35r8l/Zf7q5Y7sUuh54cNKJ6ILVUtIT5Io2LjimvJ3Csf8d5GOUSraNOHnO4A== dependencies: "@babel/runtime" "^7.7.4" @@ -2177,13 +2177,13 @@ "@polkadot/util" "^1.7.0-beta.8" "@polkadot/util-crypto" "^1.7.0-beta.8" -"@polkadot/metadata@^0.97.0-beta.33": - version "0.97.0-beta.33" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.33.tgz#53fd7f447aead53f226013c8cce6e4f3a6823b75" - integrity sha512-JRqbcsMEDso6vUa/mHS1Ri7kocbeKcyjHIBwW/QO1nr7aLLmTCv5RVq2xnFtbzGsvEg0sN0QVbbaNzp1MJ7INQ== +"@polkadot/metadata@^0.97.0-beta.34": + version "0.97.0-beta.34" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.34.tgz#db74e4547fd88bd1ebebd487b43d245f37b5fd96" + integrity sha512-B9go5UcIMEANsKlcHYSXYDZsgFLLQ82izqdS+njqc6V2F4bCMQsUmGa8T7miCa4W6EkOb+HqtPLooXpa3+pA/w== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.0-beta.33" + "@polkadot/types" "^0.97.0-beta.34" "@polkadot/util" "^1.7.0-beta.8" "@polkadot/util-crypto" "^1.7.0-beta.8" @@ -2212,25 +2212,25 @@ qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.0-beta.33": - version "0.97.0-beta.33" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.33.tgz#fa7bbf4cc65ca49ab8fc1f7eb1c360b935825b9f" - integrity sha512-HuU4yqKLUjiPFSxzx8TrMoX0OTbfch3sLfw9cFJ9Yqbei2shf7j8ndLjwAH5oUPEdN/qHqdsLjQ3m54lt5Qcfg== +"@polkadot/rpc-core@^0.97.0-beta.34": + version "0.97.0-beta.34" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.34.tgz#acb73b711f7a6286e2b610908cc6df2d162e08bd" + integrity sha512-qm9R83DuTktT1jDsNfY/yD6AFIrbpOPV3mdF7ZltDxY89OD1fmkM//8xY3gUV4lwrKu9oManVYtKTBlHwHVDTQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/jsonrpc" "^0.97.0-beta.33" - "@polkadot/rpc-provider" "^0.97.0-beta.33" - "@polkadot/types" "^0.97.0-beta.33" + "@polkadot/jsonrpc" "^0.97.0-beta.34" + "@polkadot/rpc-provider" "^0.97.0-beta.34" + "@polkadot/types" "^0.97.0-beta.34" "@polkadot/util" "^1.7.0-beta.8" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.0-beta.33": - version "0.97.0-beta.33" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.33.tgz#af4055e0734e9349e2d33aa3b94a293eea553166" - integrity sha512-dbDa0rhWXEbi+/on8u/fl94tZxyt79wnNevxF+T8sAKrD5avZmKbcXOizsBml1Ax8y/EJjl34xPJpBMDx1uB/g== +"@polkadot/rpc-provider@^0.97.0-beta.34": + version "0.97.0-beta.34" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.34.tgz#28d612d0086cba553522d97b3a632630a3f5bf42" + integrity sha512-QEtqcGMf70DeFq6wKOB529NIV2+3fnJej97LfShHj5Us/LpQ/WXscCIuYxMnA2T3GaltFtzxYxYWLWg/anf7yA== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/metadata" "^0.97.0-beta.33" + "@polkadot/metadata" "^0.97.0-beta.34" "@polkadot/util" "^1.7.0-beta.8" "@polkadot/util-crypto" "^1.7.0-beta.8" eventemitter3 "^4.0.0" @@ -2244,10 +2244,10 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.0-beta.33": - version "0.97.0-beta.33" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.33.tgz#d83d46eabc7b6d5c496f21792bff42dc736eefc9" - integrity sha512-MWHxn9pdh7BCR7tZOPp90jnRdhh1T4GP6sctYYDpskTldneMB+URP38rUoCJuH0c/zJ5zl0z1RUiFksU8Qy7Gg== +"@polkadot/types@^0.97.0-beta.34": + version "0.97.0-beta.34" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.34.tgz#6cae02b4170a1712eb3e7ad7be7e3326b675b947" + integrity sha512-ET/nFYfbXmYkNbVW1++3dEg+Ci56gfT2a+LZbiMgrjDF/08BEztBagD6F1A2UceY2+NfITtSeJjK6HhOrWF12Q== dependencies: "@babel/runtime" "^7.7.4" "@polkadot/util" "^1.7.0-beta.8" From da520d8e8a20f19b1377988305718a5f49cabcac Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 27 Nov 2019 14:16:14 +0000 Subject: [PATCH 128/154] [CI Skip] 0.37.0-beta.129 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-staking.json | 9 ++++++++- packages/apps/public/locales/en/ui.json | 8 +++++++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 32 files changed, 83 insertions(+), 70 deletions(-) diff --git a/lerna.json b/lerna.json index 420a99a8c63e..938dcc7720b2 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.128" + "version": "0.37.0-beta.129" } diff --git a/package.json b/package.json index 474bdb9909f6..785fc83f2530 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index a29609f9bd2d..4c67f7a4f470 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 0e5076d98ba1..803ec291b743 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-components": "^0.37.0-beta.129", "@polkadot/react-qr": "^0.47.0-beta.11", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 150b4c23c40b..a640e208e0b4 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index b7093e08023e..628d300f715d 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 040daaa3c170..ea5a2df7313c 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/api-contract": "^0.97.0-beta.34", - "@polkadot/react-components": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 7d6f973f747f..d823240321a2 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", - "@polkadot/react-query": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-query": "^0.37.0-beta.129" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index b97aadec4bc5..7163d9145c97 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/apps-routing": "^0.37.0-beta.128", - "@polkadot/react-components": "^0.37.0-beta.128" + "@polkadot/apps-routing": "^0.37.0-beta.129", + "@polkadot/react-components": "^0.37.0-beta.129" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 2fd09a8e9646..5fd7d1c7756f 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", - "@polkadot/react-query": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-query": "^0.37.0-beta.129" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index d052ce90a34b..d3e1825a15f0 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 7c18a3f9c5d6..6495beb1980c 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", - "@polkadot/react-params": "^0.37.0-beta.128", - "@polkadot/react-signer": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-params": "^0.37.0-beta.129", + "@polkadot/react-signer": "^0.37.0-beta.129" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 6c95c32dd068..5572bee41549 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 24918ca2ce94..7c3006007b5f 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-components": "^0.37.0-beta.129", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index d0580ec1dfb8..cec224a8a330 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", - "@polkadot/react-query": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-query": "^0.37.0-beta.129" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 8c14c45692f9..383e06da0b64 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", - "@polkadot/react-query": "^0.37.0-beta.128", + "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-query": "^0.37.0-beta.129", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index c37946f139c4..d3fef7b39cee 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/app-explorer": "^0.37.0-beta.128", - "@polkadot/react-components": "^0.37.0-beta.128", - "@polkadot/react-query": "^0.37.0-beta.128" + "@polkadot/app-explorer": "^0.37.0-beta.129", + "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-query": "^0.37.0-beta.129" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 816f6a08c773..6deb8b78652a 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", - "@polkadot/react-params": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-params": "^0.37.0-beta.129" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 3ef265d68569..2dbf6c18915f 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index e1f977db375e..81a66b111aa6 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 5901473bff0a..bb08528cb31c 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", - "@polkadot/react-query": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-query": "^0.37.0-beta.129" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 6d15e59b38b4..eb01d76d41a8 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", - "@polkadot/react-query": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-query": "^0.37.0-beta.129" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index adae57416f9b..e574b8557de7 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 217178114b68..c4fc96f91d5b 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", - "@polkadot/react-signer": "^0.37.0-beta.128", + "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-signer": "^0.37.0-beta.129", "@polkadot/ui-assets": "^0.47.0-beta.11", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-staking.json b/packages/apps/public/locales/en/app-staking.json index 6000415c3588..78489039c994 100644 --- a/packages/apps/public/locales/en/app-staking.json +++ b/packages/apps/public/locales/en/app-staking.json @@ -124,5 +124,12 @@ "{{currency}} average": "{{currency}} average", "{{currency}} total": "{{currency}} total", "{{currency}} own": "{{currency}} own", - "{{currency}} other": "{{currency}} other" + "{{currency}} other": "{{currency}} other", + "Returns": "Returns", + "The amount that will be used on a per-validator basis to calculate rewards for that validator.": "The amount that will be used on a per-validator basis to calculate rewards for that validator.", + "amount to use for estimation": "amount to use for estimation", + "Ranking is done of the estimated best return, taking the commission and total bonded amount into account. It does not incorporate validator liveliness according to length of operation nor number of blocks produced.": "Ranking is done of the estimated best return, taking the commission and total bonded amount into account. It does not incorporate validator liveliness according to length of operation nor number of blocks produced.", + "total staked": "total staked", + "total issuance": "total issuance", + "staked": "staked" } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index 39e36b9ffce9..5d9ba558176b 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -644,5 +644,11 @@ "session rotate": "", "session next": "", "This injected account cannot be used to sign data since the extension does not support raw signing.": "", - "This external account cannot be used to sign data. Only Limited support is currently available for signing from any non-internal accounts.": "" + "This external account cannot be used to sign data. Only Limited support is currently available for signing from any non-internal accounts.": "", + "Returns": "", + "The amount that will be used on a per-validator basis to calculate rewards for that validator.": "", + "amount to use for estimation": "", + "Ranking is done of the estimated best return, taking the commission and total bonded amount into account. It does not incorporate validator liveliness according to length of operation nor number of blocks produced.": "", + "total staked": "", + "staked": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index d564cfd45f6f..c86262da14ee 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index e579ba42cf97..3a9940fdc3a3 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/keyring": "^1.7.0-beta.8", - "@polkadot/react-api": "^0.37.0-beta.128", + "@polkadot/react-api": "^0.37.0-beta.129", "@polkadot/react-identicon": "^0.47.0-beta.11", - "@polkadot/react-query": "^0.37.0-beta.128", + "@polkadot/react-query": "^0.37.0-beta.129", "@polkadot/ui-keyring": "^0.47.0-beta.11", "@polkadot/ui-settings": "^0.47.0-beta.11", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 826959a1264e..97235269d947 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 2d7422c89374..583a930aff79 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128" + "@polkadot/react-components": "^0.37.0-beta.129" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 1c17974e9390..40c4d283db90 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 9f6eeda84ffc..3088d0afd99c 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.128", + "version": "0.37.0-beta.129", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.128", + "@polkadot/react-components": "^0.37.0-beta.129", "@polkadot/react-qr": "^0.47.0-beta.11" } } From 9d6ab823129d85db90f18c14e05b4fe1602209c4 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 27 Nov 2019 15:44:44 +0100 Subject: [PATCH 129/154] Small table styling tweaks --- packages/app-staking/src/Targets/index.tsx | 104 +++++++++++---------- 1 file changed, 57 insertions(+), 47 deletions(-) diff --git a/packages/app-staking/src/Targets/index.tsx b/packages/app-staking/src/Targets/index.tsx index 677c7827a0c7..d91272a27815 100644 --- a/packages/app-staking/src/Targets/index.tsx +++ b/packages/app-staking/src/Targets/index.tsx @@ -138,47 +138,51 @@ function Targets ({ className, sessionRewards, t }: Props): React.ReactElement

- - - - - - - - - - - - - - - - - - {validators.map((info): React.ReactNode => - - )} - -
  - - - validatorcommissionnominatorstotal stakeown stakeother stakepayout (est.) 
+ {validators.length !== 0 && ( + <> + + + + + + + + + + + + + + + + + + {validators.map((info): React.ReactNode => + + )} + +
  + + + validatorcommissionnominatorstotal stakeown stakeother stakepayout (est.) 
+ + )}
); } @@ -188,27 +192,33 @@ export default translate( text-align: center; table { + border-collapse: collapse; margin: 1.5rem auto; tr { - &:nth-child(even), &.header { + &:nth-child(even) { background: #f2f2f2; } td, th { - padding: 0.25rem 0.5rem; text-align: left; + } + + td { + padding: 0.5rem 0.75rem; - &.number { + &.number{ text-align: right; } } th { - color: rgba(0,0,0,.6); + background: #666; + color: #eee; font-family: sans-serif; - font-weight: 100; - font-size: 1.25rem; + font-weight: normal; + padding: 0.75rem; + text-align: right; } } } From 9be3eb7342e91481b7d1f19f1b57f33aec6ff08e Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 27 Nov 2019 14:49:57 +0000 Subject: [PATCH 130/154] [CI Skip] 0.37.0-beta.130 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 938dcc7720b2..5c40933af042 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.129" + "version": "0.37.0-beta.130" } diff --git a/package.json b/package.json index 785fc83f2530..22dea779e4e5 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 4c67f7a4f470..5026536cb65e 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 803ec291b743..e56775a864ba 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-components": "^0.37.0-beta.130", "@polkadot/react-qr": "^0.47.0-beta.11", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index a640e208e0b4..87af79439c89 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 628d300f715d..a12eec791a0f 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index ea5a2df7313c..098fbab22810 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/api-contract": "^0.97.0-beta.34", - "@polkadot/react-components": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index d823240321a2..23069f99e176 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", - "@polkadot/react-query": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-query": "^0.37.0-beta.130" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 7163d9145c97..9d937b54c83d 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/apps-routing": "^0.37.0-beta.129", - "@polkadot/react-components": "^0.37.0-beta.129" + "@polkadot/apps-routing": "^0.37.0-beta.130", + "@polkadot/react-components": "^0.37.0-beta.130" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 5fd7d1c7756f..4fb7faa1808b 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", - "@polkadot/react-query": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-query": "^0.37.0-beta.130" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index d3e1825a15f0..3b51f1fd6737 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 6495beb1980c..7a4986033f83 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", - "@polkadot/react-params": "^0.37.0-beta.129", - "@polkadot/react-signer": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-params": "^0.37.0-beta.130", + "@polkadot/react-signer": "^0.37.0-beta.130" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 5572bee41549..eadbd98a11ec 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 7c3006007b5f..dfa3553a2550 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-components": "^0.37.0-beta.130", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index cec224a8a330..f7e24f89757a 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", - "@polkadot/react-query": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-query": "^0.37.0-beta.130" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 383e06da0b64..5f41e6c4f65e 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", - "@polkadot/react-query": "^0.37.0-beta.129", + "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-query": "^0.37.0-beta.130", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index d3fef7b39cee..182fc3605728 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/app-explorer": "^0.37.0-beta.129", - "@polkadot/react-components": "^0.37.0-beta.129", - "@polkadot/react-query": "^0.37.0-beta.129" + "@polkadot/app-explorer": "^0.37.0-beta.130", + "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-query": "^0.37.0-beta.130" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 6deb8b78652a..d1d1a0d3567c 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", - "@polkadot/react-params": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-params": "^0.37.0-beta.130" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 2dbf6c18915f..b7dfadc766ed 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 81a66b111aa6..46163a6688bc 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index bb08528cb31c..3710702cecfe 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", - "@polkadot/react-query": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-query": "^0.37.0-beta.130" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index eb01d76d41a8..65762dd633bc 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", - "@polkadot/react-query": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-query": "^0.37.0-beta.130" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index e574b8557de7..6a5f69189f19 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index c4fc96f91d5b..107cd4edffc4 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", - "@polkadot/react-signer": "^0.37.0-beta.129", + "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-signer": "^0.37.0-beta.130", "@polkadot/ui-assets": "^0.47.0-beta.11", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index c86262da14ee..c641c71e2752 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 3a9940fdc3a3..178e20e55197 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/keyring": "^1.7.0-beta.8", - "@polkadot/react-api": "^0.37.0-beta.129", + "@polkadot/react-api": "^0.37.0-beta.130", "@polkadot/react-identicon": "^0.47.0-beta.11", - "@polkadot/react-query": "^0.37.0-beta.129", + "@polkadot/react-query": "^0.37.0-beta.130", "@polkadot/ui-keyring": "^0.47.0-beta.11", "@polkadot/ui-settings": "^0.47.0-beta.11", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 97235269d947..51f1679a40a1 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 583a930aff79..09ad400e1003 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129" + "@polkadot/react-components": "^0.37.0-beta.130" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 40c4d283db90..d067c5feebc7 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 3088d0afd99c..410b19df3f36 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.129", + "version": "0.37.0-beta.130", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.129", + "@polkadot/react-components": "^0.37.0-beta.130", "@polkadot/react-qr": "^0.47.0-beta.11" } } From d8421131511199db839b29742f5d1035d66cf143 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 27 Nov 2019 20:10:01 +0100 Subject: [PATCH 131/154] Support v9 metadata (#1934) * Support v9 metadata * Cleanup key expansion * Add isIterable * Bump API (with V9) * Bump common --- package.json | 12 +- packages/app-contracts/package.json | 2 +- packages/app-staking/src/Targets/index.tsx | 8 ++ .../app-storage/src/Selection/Modules.tsx | 18 +-- packages/react-api/package.json | 2 +- packages/react-api/src/with/call.tsx | 2 +- packages/react-components/package.json | 2 +- .../src/InputStorage/options/key.tsx | 25 ++-- yarn.lock | 120 +++++++++--------- 9 files changed, 95 insertions(+), 96 deletions(-) diff --git a/package.json b/package.json index 22dea779e4e5..77f2f60598c5 100644 --- a/package.json +++ b/package.json @@ -10,12 +10,12 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.34", - "@polkadot/api-contract": "^0.97.0-beta.34", - "@polkadot/keyring": "^1.7.0-beta.8", - "@polkadot/types": "^0.97.0-beta.34", - "@polkadot/util": "^1.7.0-beta.8", - "@polkadot/util-crypto": "^1.7.0-beta.8", + "@polkadot/api": "^0.97.0-beta.35", + "@polkadot/api-contract": "^0.97.0-beta.35", + "@polkadot/keyring": "^1.7.1", + "@polkadot/types": "^0.97.0-beta.35", + "@polkadot/util": "^1.7.1", + "@polkadot/util-crypto": "^1.7.1", "babel-core": "^7.0.0-bridge.0", "typescript": "^3.7.2" }, diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 098fbab22810..b8237b0bf4e6 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api-contract": "^0.97.0-beta.34", + "@polkadot/api-contract": "^0.97.0-beta.35", "@polkadot/react-components": "^0.37.0-beta.130" } } diff --git a/packages/app-staking/src/Targets/index.tsx b/packages/app-staking/src/Targets/index.tsx index d91272a27815..04a280e6a15b 100644 --- a/packages/app-staking/src/Targets/index.tsx +++ b/packages/app-staking/src/Targets/index.tsx @@ -219,6 +219,14 @@ export default translate( font-weight: normal; padding: 0.75rem; text-align: right; + + &:first-child { + border-top-left-radius: 0.25rem; + } + + &:last-child { + border-top-right-radius: 0.25rem; + } } } } diff --git a/packages/app-storage/src/Selection/Modules.tsx b/packages/app-storage/src/Selection/Modules.tsx index 5b17845da5e2..f8b15c46df7e 100644 --- a/packages/app-storage/src/Selection/Modules.tsx +++ b/packages/app-storage/src/Selection/Modules.tsx @@ -33,14 +33,14 @@ function areParamsValid (values: RawParams): boolean { function Modules ({ onAdd, t }: Props): React.ReactElement { const { api } = useApi(); - const [{ defaultValues, isLinked, key, params }, setKey] = useState<{ defaultValues: RawParams | undefined | null; isLinked: boolean; key: StorageEntryPromise; params: ParamsType }>({ defaultValues: undefined, isLinked: false, key: api.query.timestamp.now, params: [] }); + const [{ defaultValues, isIterable, key, params }, setKey] = useState<{ defaultValues: RawParams | undefined | null; isIterable: boolean; key: StorageEntryPromise; params: ParamsType }>({ defaultValues: undefined, isIterable: false, key: api.query.timestamp.now, params: [] }); const [{ isValid, values }, setValues] = useState<{ isValid: boolean; values: RawParams }>({ isValid: true, values: [] }); const _onAdd = (): void => { isValid && onAdd({ isConst: false, key, - params: values.filter(({ value }): boolean => !isLinked || !isNull(value)) + params: values.filter(({ value }): boolean => !isIterable || !isNull(value)) }); }; const _onChangeValues = (values: RawParams): void => { @@ -54,26 +54,26 @@ function Modules ({ onAdd, t }: Props): React.ReactElement { }); }; const _onChangeKey = (key: StorageEntryPromise): void => { - const isMap = key.creator.meta.type.isMap; - const isLinked = isMap && key.creator.meta.type.asMap.linked.isTrue; + const asMap = key.creator.meta.type.isMap && key.creator.meta.type.asMap; + const isIterable = !!asMap && (asMap.kind.isLinkedMap || asMap.kind.isPrefixedMap); setKey({ defaultValues: key.creator.section === 'session' && key.creator.meta.type.isDoubleMap ? [{ isValid: true, value: api.consts.session.dedupKeyPrefix.toHex() }] : null, - isLinked, + isIterable, key, params: key.creator.meta.type.isDoubleMap ? [ { type: getTypeDef(key.creator.meta.type.asDoubleMap.key1.toString()) }, { type: getTypeDef(key.creator.meta.type.asDoubleMap.key2.toString()) } ] - : isMap + : asMap ? [{ type: getTypeDef( - isLinked - ? `Option<${key.creator.meta.type.asMap.key.toString()}>` - : key.creator.meta.type.asMap.key.toString() + isIterable + ? `Option<${asMap.key.toString()}>` + : asMap.key.toString() ) }] : [] diff --git a/packages/react-api/package.json b/packages/react-api/package.json index c641c71e2752..0d9f05f96008 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api": "^0.97.0-beta.34", + "@polkadot/api": "^0.97.0-beta.35", "@polkadot/extension-dapp": "^0.14.0-beta.6", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/packages/react-api/src/with/call.tsx b/packages/react-api/src/with/call.tsx index cc7ecba90e24..eb42ed29771a 100644 --- a/packages/react-api/src/with/call.tsx +++ b/packages/react-api/src/with/call.tsx @@ -193,7 +193,7 @@ export default function withCall

(endpoint: string, { if (area === 'query' && meta && meta.type.isMap) { const arg = newParams[0]; - assert((!isUndefined(arg) && !isNull(arg)) || meta.type.asMap.linked.isTrue, `${meta.name} expects one argument`); + assert((!isUndefined(arg) && !isNull(arg)) || meta.type.asMap.kind.isLinkedMap, `${meta.name} expects one argument`); } return [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 178e20e55197..55dac45a5062 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/keyring": "^1.7.0-beta.8", + "@polkadot/keyring": "^1.7.1", "@polkadot/react-api": "^0.37.0-beta.130", "@polkadot/react-identicon": "^0.47.0-beta.11", "@polkadot/react-query": "^0.37.0-beta.130", diff --git a/packages/react-components/src/InputStorage/options/key.tsx b/packages/react-components/src/InputStorage/options/key.tsx index 8cc9043465f9..f4f769c6c89f 100644 --- a/packages/react-components/src/InputStorage/options/key.tsx +++ b/packages/react-components/src/InputStorage/options/key.tsx @@ -21,23 +21,14 @@ export default function createOptions (api: ApiPromise, sectionName: string): Dr .map((value): DropdownOption => { const method = section[value] as unknown as StorageEntry; const type = method.meta.type; - let input = ''; - - if (type.isMap) { - input = type.asMap.key.toString(); - } else if (type.isDoubleMap) { - input = type.asDoubleMap.key1.toString() + ', ' + type.asDoubleMap.key2.toString(); - } - - let output = unwrapStorageType(type); - - if (type.isDoubleMap) { - output = type.asDoubleMap.value.toString(); - } - - if (method.meta.modifier.isOptional) { - output = `Option<${output}>`; - } + const input = type.isMap + ? type.asMap.key.toString() + : type.isDoubleMap + ? `${type.asDoubleMap.key1}, ${type.asDoubleMap.key2}` + : ''; + const output = method.meta.modifier.isOptional + ? `Option<${unwrapStorageType(type)}>` + : unwrapStorageType(type); return { className: 'ui--DropdownLinked-Item', diff --git a/yarn.lock b/yarn.lock index fdeee532f47e..19e8bab938ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,35 +2029,35 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^0.97.0-beta.34": - version "0.97.0-beta.34" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.34.tgz#4d4a38c8447468c50d7731b9c644e8582f3cbb7c" - integrity sha512-S33bKfLNZ8LGXQmhu9/cQLa630HhnsqZaht++Blg4FgwSGPzY6CN4OYPFlazM7z58tLDOFXrWtSSHzypREDmww== +"@polkadot/api-contract@^0.97.0-beta.35": + version "0.97.0-beta.35" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.35.tgz#ece83c5aad5482c1ec4f29ee2d57218e7f29e435" + integrity sha512-WKWKtLmxZtJYoMg3hf+4i+Rf9OK6nQsis9/sXeLfD8v2RQ6gHxbxdtpcuy9+BUlJpe6YoH342JE3xgdqAp8sKQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.0-beta.34" + "@polkadot/types" "^0.97.0-beta.35" -"@polkadot/api-derive@^0.97.0-beta.34": - version "0.97.0-beta.34" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.34.tgz#5cac3de8d6670e76483987e8cd66e985a0c69a17" - integrity sha512-NMrEI2aj6jtK5J83rZ8eO65J4L1O8S2cUgYWOI7Cio1rCK3hm05S+2Yi376fO0LfKt5nDgnCLUBl9ADHhHT4Pg== +"@polkadot/api-derive@^0.97.0-beta.35": + version "0.97.0-beta.35" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.35.tgz#453421688d36ff2be104699909f050c648583f50" + integrity sha512-QkLZc8m0xD9Yje8H+jY4uHoDP4r/w8P07SVvptQZ5ktBsaJ+uA+kmGjaKjOHDKsBvlXGnEQ+B5VSo7Mj9hlBNA== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api" "^0.97.0-beta.34" - "@polkadot/types" "^0.97.0-beta.34" + "@polkadot/api" "^0.97.0-beta.35" + "@polkadot/types" "^0.97.0-beta.35" -"@polkadot/api@^0.97.0-beta.34": - version "0.97.0-beta.34" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.34.tgz#846d34726450d6796ce44c1a56bfc1ff267657c0" - integrity sha512-B4vT8/bjV046LHOdeJFLrCDmEagfhyUF4/JvOk18mTM9wYg9fUEfkVcFVTMgrDj0QpXBsNSEv+W1goizbXtxog== +"@polkadot/api@^0.97.0-beta.35": + version "0.97.0-beta.35" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.35.tgz#8772c4addb2a00ebb07d5700928b1e3094928c59" + integrity sha512-+Ct2MOhxTA9yPQJhgP360jeqFi1Cd/MSQcsppsDPCVigcYJzQ/NscY8hElE/FW6mnse9nVGhigewKp1VZgeAuA== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api-derive" "^0.97.0-beta.34" + "@polkadot/api-derive" "^0.97.0-beta.35" "@polkadot/keyring" "^1.7.0-beta.8" - "@polkadot/metadata" "^0.97.0-beta.34" - "@polkadot/rpc-core" "^0.97.0-beta.34" - "@polkadot/rpc-provider" "^0.97.0-beta.34" - "@polkadot/types" "^0.97.0-beta.34" + "@polkadot/metadata" "^0.97.0-beta.35" + "@polkadot/rpc-core" "^0.97.0-beta.35" + "@polkadot/rpc-provider" "^0.97.0-beta.35" + "@polkadot/types" "^0.97.0-beta.35" "@polkadot/util-crypto" "^1.7.0-beta.8" "@polkadot/dev-react@^0.32.0-beta.15": @@ -2161,29 +2161,29 @@ dependencies: "@babel/runtime" "^7.7.4" -"@polkadot/jsonrpc@^0.97.0-beta.34": - version "0.97.0-beta.34" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.34.tgz#b4e58b2c689d1dd115e62e95423850204f0814db" - integrity sha512-kF/R+XeGfY4iI+EE2HRjm6exj35r8l/Zf7q5Y7sUuh54cNKJ6ILVUtIT5Io2LjimvJ3Csf8d5GOUSraNOHnO4A== +"@polkadot/jsonrpc@^0.97.0-beta.35": + version "0.97.0-beta.35" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.35.tgz#21bc1016751e5690337e16e3324142eca139cfdc" + integrity sha512-9YTkYqLsLlE2dOF67SDH4AWaWqfTDF1k8gbA4T1EoMUzmjuEDd1OGolIhd2IgMSWrkFvulTcWO3ndRREGy9V2A== dependencies: "@babel/runtime" "^7.7.4" -"@polkadot/keyring@^1.7.0-beta.8": - version "1.7.0-beta.8" - resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-1.7.0-beta.8.tgz#dc6f15ea629df9dcc0b3e220171148647721701f" - integrity sha512-uv+XIcTeihApUs75gDnaQDaxiJ1LmJDfayRREn+1LKlJMgYhCOdNhISSTn/3hLp+hJLHvIVZ8QEg818Tz+G7WA== +"@polkadot/keyring@^1.7.0-beta.8", "@polkadot/keyring@^1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-1.7.1.tgz#53a3dd87e547aaee0a877e4fc5fdfc4757e60a0d" + integrity sha512-CWCnU0zsaot0QvEiasKfhCiVlZCIVKOQGPzXiVE9JSjoqTQQJ0BEdaEfM4x0/bFFvvsn/8RcjLPpxBPSfe2eOg== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/util" "^1.7.0-beta.8" - "@polkadot/util-crypto" "^1.7.0-beta.8" + "@polkadot/util" "^1.7.1" + "@polkadot/util-crypto" "^1.7.1" -"@polkadot/metadata@^0.97.0-beta.34": - version "0.97.0-beta.34" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.34.tgz#db74e4547fd88bd1ebebd487b43d245f37b5fd96" - integrity sha512-B9go5UcIMEANsKlcHYSXYDZsgFLLQ82izqdS+njqc6V2F4bCMQsUmGa8T7miCa4W6EkOb+HqtPLooXpa3+pA/w== +"@polkadot/metadata@^0.97.0-beta.35": + version "0.97.0-beta.35" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.35.tgz#ce73220c974a14040072e40c493975b592dcba8c" + integrity sha512-yzdeog4Pjs3ba2cEe0tgvh53jGtB71OyuSgLZiKIV/VXaBXJKJ112u2voe//cfps1oU4vpnbPN9n956d04sebg== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.0-beta.34" + "@polkadot/types" "^0.97.0-beta.35" "@polkadot/util" "^1.7.0-beta.8" "@polkadot/util-crypto" "^1.7.0-beta.8" @@ -2212,25 +2212,25 @@ qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.0-beta.34": - version "0.97.0-beta.34" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.34.tgz#acb73b711f7a6286e2b610908cc6df2d162e08bd" - integrity sha512-qm9R83DuTktT1jDsNfY/yD6AFIrbpOPV3mdF7ZltDxY89OD1fmkM//8xY3gUV4lwrKu9oManVYtKTBlHwHVDTQ== +"@polkadot/rpc-core@^0.97.0-beta.35": + version "0.97.0-beta.35" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.35.tgz#9c2af17af054b0146ed6873f0a43ef0e6d1883b1" + integrity sha512-ByKhRL8wMR7m90qaAZ6kz1hIHuagBn+xfM0vge9vrq9lIpvESIv+ZOWLIlShw3sZXFUkjiI5mGb+OGZym1/hFA== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/jsonrpc" "^0.97.0-beta.34" - "@polkadot/rpc-provider" "^0.97.0-beta.34" - "@polkadot/types" "^0.97.0-beta.34" + "@polkadot/jsonrpc" "^0.97.0-beta.35" + "@polkadot/rpc-provider" "^0.97.0-beta.35" + "@polkadot/types" "^0.97.0-beta.35" "@polkadot/util" "^1.7.0-beta.8" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.0-beta.34": - version "0.97.0-beta.34" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.34.tgz#28d612d0086cba553522d97b3a632630a3f5bf42" - integrity sha512-QEtqcGMf70DeFq6wKOB529NIV2+3fnJej97LfShHj5Us/LpQ/WXscCIuYxMnA2T3GaltFtzxYxYWLWg/anf7yA== +"@polkadot/rpc-provider@^0.97.0-beta.35": + version "0.97.0-beta.35" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.35.tgz#420a00d08bb7944b410b03b78d517ac0a1cc4d12" + integrity sha512-BXEeo93ElXkBuNQLwXU+lmpV/FLfkgHjcy/kVd6E5Xaz/LsqxJOU7VbY4LdVlTbE8XJgRPZi+5RDY0YS+yBGfw== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/metadata" "^0.97.0-beta.34" + "@polkadot/metadata" "^0.97.0-beta.35" "@polkadot/util" "^1.7.0-beta.8" "@polkadot/util-crypto" "^1.7.0-beta.8" eventemitter3 "^4.0.0" @@ -2244,10 +2244,10 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.0-beta.34": - version "0.97.0-beta.34" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.34.tgz#6cae02b4170a1712eb3e7ad7be7e3326b675b947" - integrity sha512-ET/nFYfbXmYkNbVW1++3dEg+Ci56gfT2a+LZbiMgrjDF/08BEztBagD6F1A2UceY2+NfITtSeJjK6HhOrWF12Q== +"@polkadot/types@^0.97.0-beta.35": + version "0.97.0-beta.35" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.35.tgz#66d1da5cc81a1d1ed5e5b0f8740398029b5a0377" + integrity sha512-x5imP6jM0N1eTsx9uHtYNEmjCX3md9dXcZgj65EdJpRphMfukE8vSJar/ZmwDu53Fm+oS8lTxSkcwQtptmTE6Q== dependencies: "@babel/runtime" "^7.7.4" "@polkadot/util" "^1.7.0-beta.8" @@ -2299,13 +2299,13 @@ "@types/color" "^3.0.0" color "^3.1.2" -"@polkadot/util-crypto@^1.7.0-beta.8": - version "1.7.0-beta.8" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-1.7.0-beta.8.tgz#900eb500a8fd02172590988872407bfb4dc612c6" - integrity sha512-bIhPp/l2e5zMVsDzb2FqXWlYFChkgZci2nF2skP5X/eD+XDOla5+iuGCvajpY3VIYm0SDu6OK5qmfXZ/gqs8OA== +"@polkadot/util-crypto@^1.7.0-beta.8", "@polkadot/util-crypto@^1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-1.7.1.tgz#6cb1ed1f7ecbea3b41100231830817e7fd116dc6" + integrity sha512-g0JCciJLJXbkc/Q+2QuJgCgS0Xfl7tO97ALdsI00bgSDA7zlh2zhjpx03Ve47hMndmn7K8ClIGrj4nxHx/95Tw== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/util" "^1.7.0-beta.8" + "@polkadot/util" "^1.7.1" "@polkadot/wasm-crypto" "^0.14.1" "@types/bip39" "^2.4.2" "@types/bs58" "^4.0.0" @@ -2321,10 +2321,10 @@ tweetnacl "^1.0.1" xxhashjs "^0.2.2" -"@polkadot/util@^1.7.0-beta.8": - version "1.7.0-beta.8" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-1.7.0-beta.8.tgz#cf7c42f37b141fb647030fd91a805207f691794b" - integrity sha512-Wk+/9ORJJE12pb0D4OadHQM77mUHaTl4Czf1dnWfge0J3pizV3tXojxunFnQwZbCqyJGnYOkbqu+TDPytVVipw== +"@polkadot/util@^1.7.0-beta.8", "@polkadot/util@^1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-1.7.1.tgz#cb262fa5a441097c0c093532f70d0b7e0503fbb1" + integrity sha512-tWvh+vYDIiXDIWgAGd9zyJWlDKxQ5KYTKZ9uTlLxfuy1qXEdVOjlX9Qz5+FACU2742e8tTvtvM9KfK05VK5X/A== dependencies: "@babel/runtime" "^7.7.4" "@types/bn.js" "^4.11.5" From 3b7685ecee5da59dc8e8b04390a58789876f6849 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 27 Nov 2019 19:15:01 +0000 Subject: [PATCH 132/154] [CI Skip] 0.37.0-beta.131 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 5c40933af042..c6cfe23077c9 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.130" + "version": "0.37.0-beta.131" } diff --git a/package.json b/package.json index 77f2f60598c5..6ad0ad252174 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 5026536cb65e..6a8d5089d656 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index e56775a864ba..198c3a660bf3 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-components": "^0.37.0-beta.131", "@polkadot/react-qr": "^0.47.0-beta.11", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 87af79439c89..cec2d4aaffc9 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index a12eec791a0f..d1b2555eb29f 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index b8237b0bf4e6..ab933f8c235a 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/api-contract": "^0.97.0-beta.35", - "@polkadot/react-components": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 23069f99e176..18d0bea552fd 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", - "@polkadot/react-query": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-query": "^0.37.0-beta.131" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 9d937b54c83d..10f2bd6babf7 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/apps-routing": "^0.37.0-beta.130", - "@polkadot/react-components": "^0.37.0-beta.130" + "@polkadot/apps-routing": "^0.37.0-beta.131", + "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 4fb7faa1808b..9b3a32edb49c 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", - "@polkadot/react-query": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-query": "^0.37.0-beta.131" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 3b51f1fd6737..ee98c6abae42 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 7a4986033f83..55f07b5c379f 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", - "@polkadot/react-params": "^0.37.0-beta.130", - "@polkadot/react-signer": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-params": "^0.37.0-beta.131", + "@polkadot/react-signer": "^0.37.0-beta.131" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index eadbd98a11ec..0ad8a14c3201 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index dfa3553a2550..55396cdeeb1b 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-components": "^0.37.0-beta.131", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index f7e24f89757a..c180f33a7782 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", - "@polkadot/react-query": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-query": "^0.37.0-beta.131" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 5f41e6c4f65e..97f6f5a0936f 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", - "@polkadot/react-query": "^0.37.0-beta.130", + "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-query": "^0.37.0-beta.131", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 182fc3605728..da3115c1a7d0 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/app-explorer": "^0.37.0-beta.130", - "@polkadot/react-components": "^0.37.0-beta.130", - "@polkadot/react-query": "^0.37.0-beta.130" + "@polkadot/app-explorer": "^0.37.0-beta.131", + "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-query": "^0.37.0-beta.131" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index d1d1a0d3567c..e70e3467c461 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", - "@polkadot/react-params": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-params": "^0.37.0-beta.131" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index b7dfadc766ed..af60271a5dfe 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 46163a6688bc..ee5f08cd66db 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 3710702cecfe..6baa4c1a593f 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", - "@polkadot/react-query": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-query": "^0.37.0-beta.131" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 65762dd633bc..dde2e5daf5aa 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", - "@polkadot/react-query": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-query": "^0.37.0-beta.131" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 6a5f69189f19..d1af706a77fa 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 107cd4edffc4..a96011960fc1 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", - "@polkadot/react-signer": "^0.37.0-beta.130", + "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-signer": "^0.37.0-beta.131", "@polkadot/ui-assets": "^0.47.0-beta.11", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 0d9f05f96008..e2de5c327430 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 55dac45a5062..9acfe122e51f 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/keyring": "^1.7.1", - "@polkadot/react-api": "^0.37.0-beta.130", + "@polkadot/react-api": "^0.37.0-beta.131", "@polkadot/react-identicon": "^0.47.0-beta.11", - "@polkadot/react-query": "^0.37.0-beta.130", + "@polkadot/react-query": "^0.37.0-beta.131", "@polkadot/ui-keyring": "^0.47.0-beta.11", "@polkadot/ui-settings": "^0.47.0-beta.11", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 51f1679a40a1..7e21d8144399 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 09ad400e1003..081d6261ffa1 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130" + "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index d067c5feebc7..7923d6aa6c0e 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 410b19df3f36..cb721296c88f 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.130", + "version": "0.37.0-beta.131", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.130", + "@polkadot/react-components": "^0.37.0-beta.131", "@polkadot/react-qr": "^0.47.0-beta.11" } } From d36301810a446287c7f50e9ae1d7f7de5826dc66 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 27 Nov 2019 22:27:22 +0100 Subject: [PATCH 133/154] CC3 (#1955) * CC3 * Bump API with type injection --- package.json | 6 +- packages/app-contracts/package.json | 2 +- packages/app-staking/src/Targets/index.tsx | 8 ++ packages/app-staking/src/unsafeChains.ts | 2 +- packages/react-api/package.json | 2 +- .../react-api/src/overrides/spec/edgeware.ts | 3 +- packages/react-components/src/ChainImg.tsx | 3 +- .../react-components/src/LinkPolkascan.tsx | 3 +- yarn.lock | 114 +++++++++--------- 9 files changed, 77 insertions(+), 66 deletions(-) diff --git a/package.json b/package.json index 6ad0ad252174..f46d51080d49 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.35", - "@polkadot/api-contract": "^0.97.0-beta.35", + "@polkadot/api": "^0.97.0-beta.38", + "@polkadot/api-contract": "^0.97.0-beta.38", "@polkadot/keyring": "^1.7.1", - "@polkadot/types": "^0.97.0-beta.35", + "@polkadot/types": "^0.97.0-beta.38", "@polkadot/util": "^1.7.1", "@polkadot/util-crypto": "^1.7.1", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index ab933f8c235a..843d924a83d2 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api-contract": "^0.97.0-beta.35", + "@polkadot/api-contract": "^0.97.0-beta.38", "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/app-staking/src/Targets/index.tsx b/packages/app-staking/src/Targets/index.tsx index 04a280e6a15b..b3c3309cdd66 100644 --- a/packages/app-staking/src/Targets/index.tsx +++ b/packages/app-staking/src/Targets/index.tsx @@ -196,10 +196,18 @@ export default translate( margin: 1.5rem auto; tr { + border: 0px solid #f2f2f2; + border-left-width: 1px; + border-right-width: 1px; + &:nth-child(even) { background: #f2f2f2; } + &:nth-child(odd) { + background: white; + } + td, th { text-align: left; } diff --git a/packages/app-staking/src/unsafeChains.ts b/packages/app-staking/src/unsafeChains.ts index 05b7c38f399c..d45389e691be 100644 --- a/packages/app-staking/src/unsafeChains.ts +++ b/packages/app-staking/src/unsafeChains.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -export const UNSAFE_CHAINS = ['Development', 'Kusama CC1', 'Kusama CC2', 'Kusama']; +export const UNSAFE_CHAINS = ['Development', 'Kusama CC1', 'Kusama CC2', 'Kusama CC3', 'Kusama']; export default function detectUnsafe (chain: Text | string): boolean { return UNSAFE_CHAINS.includes(chain.toString()); diff --git a/packages/react-api/package.json b/packages/react-api/package.json index e2de5c327430..1cd23c1ba2a0 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api": "^0.97.0-beta.35", + "@polkadot/api": "^0.97.0-beta.38", "@polkadot/extension-dapp": "^0.14.0-beta.6", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/packages/react-api/src/overrides/spec/edgeware.ts b/packages/react-api/src/overrides/spec/edgeware.ts index 2801c602d0cc..d87131362b67 100644 --- a/packages/react-api/src/overrides/spec/edgeware.ts +++ b/packages/react-api/src/overrides/spec/edgeware.ts @@ -11,5 +11,6 @@ export default { ...IdentityTypes, ...SignalingTypes, ...TreasuryRewardTypes, - ...VotingTypes + ...VotingTypes, + Keys: 'SessionKeys3' }; diff --git a/packages/react-components/src/ChainImg.tsx b/packages/react-components/src/ChainImg.tsx index 89d7cff085c9..d5910d767914 100644 --- a/packages/react-components/src/ChainImg.tsx +++ b/packages/react-components/src/ChainImg.tsx @@ -25,7 +25,8 @@ import substrate from '@polkadot/ui-assets/substrate-hexagon.svg'; const CHAINS: Record = { Kusama: chainKusama, // old name, the W3F nodes still has these 'Kusama CC1': chainKusama, - 'Kusama CC2': chainKusama + 'Kusama CC2': chainKusama, + 'Kusama CC3': chainKusama }; // overrides based on the actual software node type diff --git a/packages/react-components/src/LinkPolkascan.tsx b/packages/react-components/src/LinkPolkascan.tsx index 6582ff772592..3188a36d2937 100644 --- a/packages/react-components/src/LinkPolkascan.tsx +++ b/packages/react-components/src/LinkPolkascan.tsx @@ -24,7 +24,8 @@ const CHAINS: Record = { Alexander: 'alexander', Kusama: 'kusama-cc1', // old name via W3F nodes 'Kusama CC1': 'kusama-cc1', - 'Kusama CC2': 'kusama-cc2' + 'Kusama CC2': 'kusama-cc2', + 'Kusama CC3': 'kusama-cc3' }; const TYPES: Record = { diff --git a/yarn.lock b/yarn.lock index 19e8bab938ca..6ef10644b11b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,36 +2029,36 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.35.tgz#ece83c5aad5482c1ec4f29ee2d57218e7f29e435" - integrity sha512-WKWKtLmxZtJYoMg3hf+4i+Rf9OK6nQsis9/sXeLfD8v2RQ6gHxbxdtpcuy9+BUlJpe6YoH342JE3xgdqAp8sKQ== +"@polkadot/api-contract@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.38.tgz#3637dcbeb07f10ee85873a1a3571a75f8a034834" + integrity sha512-+QbzyQHa3AV0Lzf2YDFSNAa+p1rBOO+yihuh7ENVfwUj5WEc9JiJjS5evhtUg7E22sXbyA0K1cAJw2+H/goVxQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.0-beta.35" + "@polkadot/types" "^0.97.0-beta.38" -"@polkadot/api-derive@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.35.tgz#453421688d36ff2be104699909f050c648583f50" - integrity sha512-QkLZc8m0xD9Yje8H+jY4uHoDP4r/w8P07SVvptQZ5ktBsaJ+uA+kmGjaKjOHDKsBvlXGnEQ+B5VSo7Mj9hlBNA== +"@polkadot/api-derive@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.38.tgz#2d603586b1cebaf1d8c36cb58f65b16c2fda504d" + integrity sha512-+ugr8P24YQrLfcjqbbRXQY5ZVlL/XcoWV1DvQ0QBv02h8UBIcjS2YXzgXUhOI6kdkXIWfcJBfasujMwEXyfiVg== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api" "^0.97.0-beta.35" - "@polkadot/types" "^0.97.0-beta.35" + "@polkadot/api" "^0.97.0-beta.38" + "@polkadot/types" "^0.97.0-beta.38" -"@polkadot/api@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.35.tgz#8772c4addb2a00ebb07d5700928b1e3094928c59" - integrity sha512-+Ct2MOhxTA9yPQJhgP360jeqFi1Cd/MSQcsppsDPCVigcYJzQ/NscY8hElE/FW6mnse9nVGhigewKp1VZgeAuA== +"@polkadot/api@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.38.tgz#fb33c75ee1f46b5f3e7597e403c41b953e273aa5" + integrity sha512-3yd0b1pPznHU65XE1TyNFtfwoR4vSnVzbv3h8X2hiCxWX+4cfw+yDEPGAC+wvfy5DIE7W0X3aqM2RHffQdmt3w== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api-derive" "^0.97.0-beta.35" - "@polkadot/keyring" "^1.7.0-beta.8" - "@polkadot/metadata" "^0.97.0-beta.35" - "@polkadot/rpc-core" "^0.97.0-beta.35" - "@polkadot/rpc-provider" "^0.97.0-beta.35" - "@polkadot/types" "^0.97.0-beta.35" - "@polkadot/util-crypto" "^1.7.0-beta.8" + "@polkadot/api-derive" "^0.97.0-beta.38" + "@polkadot/keyring" "^1.7.1" + "@polkadot/metadata" "^0.97.0-beta.38" + "@polkadot/rpc-core" "^0.97.0-beta.38" + "@polkadot/rpc-provider" "^0.97.0-beta.38" + "@polkadot/types" "^0.97.0-beta.38" + "@polkadot/util-crypto" "^1.7.1" "@polkadot/dev-react@^0.32.0-beta.15": version "0.32.0-beta.15" @@ -2161,14 +2161,14 @@ dependencies: "@babel/runtime" "^7.7.4" -"@polkadot/jsonrpc@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.35.tgz#21bc1016751e5690337e16e3324142eca139cfdc" - integrity sha512-9YTkYqLsLlE2dOF67SDH4AWaWqfTDF1k8gbA4T1EoMUzmjuEDd1OGolIhd2IgMSWrkFvulTcWO3ndRREGy9V2A== +"@polkadot/jsonrpc@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.38.tgz#ecee28fbc096586a5cdfdcb896c87a97381b95ba" + integrity sha512-NeF7wEUjKY3Tfyic7Sm0zdMQHwVQAlFS+sCKFr3max73Xctr5SxsjbHkZtQSwVaHkuMBcV9Ub+4u6KEL8J0Tzw== dependencies: "@babel/runtime" "^7.7.4" -"@polkadot/keyring@^1.7.0-beta.8", "@polkadot/keyring@^1.7.1": +"@polkadot/keyring@^1.7.1": version "1.7.1" resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-1.7.1.tgz#53a3dd87e547aaee0a877e4fc5fdfc4757e60a0d" integrity sha512-CWCnU0zsaot0QvEiasKfhCiVlZCIVKOQGPzXiVE9JSjoqTQQJ0BEdaEfM4x0/bFFvvsn/8RcjLPpxBPSfe2eOg== @@ -2177,15 +2177,15 @@ "@polkadot/util" "^1.7.1" "@polkadot/util-crypto" "^1.7.1" -"@polkadot/metadata@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.35.tgz#ce73220c974a14040072e40c493975b592dcba8c" - integrity sha512-yzdeog4Pjs3ba2cEe0tgvh53jGtB71OyuSgLZiKIV/VXaBXJKJ112u2voe//cfps1oU4vpnbPN9n956d04sebg== +"@polkadot/metadata@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.38.tgz#ad41b8c7b3b354e6dd656763625c5138699a7c54" + integrity sha512-IfT7gzZjdLgYyojvi0U9mSGGM/IKBDNEOmYU09tYibsspfIHdRKT4qxwedZivD52EcuyW5cME0FNALQoFYcBbQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.0-beta.35" - "@polkadot/util" "^1.7.0-beta.8" - "@polkadot/util-crypto" "^1.7.0-beta.8" + "@polkadot/types" "^0.97.0-beta.38" + "@polkadot/util" "^1.7.1" + "@polkadot/util-crypto" "^1.7.1" "@polkadot/react-identicon@^0.47.0-beta.11": version "0.47.0-beta.11" @@ -2212,27 +2212,27 @@ qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.35.tgz#9c2af17af054b0146ed6873f0a43ef0e6d1883b1" - integrity sha512-ByKhRL8wMR7m90qaAZ6kz1hIHuagBn+xfM0vge9vrq9lIpvESIv+ZOWLIlShw3sZXFUkjiI5mGb+OGZym1/hFA== +"@polkadot/rpc-core@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.38.tgz#ac2e87e38ff59141ef3707fae7c0ca0ac7c4adf5" + integrity sha512-11+3olWF+z6jftjY0fu7OhZNh1ZSf8gHk93vpTggykJoJWGJ+/o9QR5/B6wcEpjzYtCJBfBtAoVCHoyHiL/c2A== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/jsonrpc" "^0.97.0-beta.35" - "@polkadot/rpc-provider" "^0.97.0-beta.35" - "@polkadot/types" "^0.97.0-beta.35" - "@polkadot/util" "^1.7.0-beta.8" + "@polkadot/jsonrpc" "^0.97.0-beta.38" + "@polkadot/rpc-provider" "^0.97.0-beta.38" + "@polkadot/types" "^0.97.0-beta.38" + "@polkadot/util" "^1.7.1" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.35.tgz#420a00d08bb7944b410b03b78d517ac0a1cc4d12" - integrity sha512-BXEeo93ElXkBuNQLwXU+lmpV/FLfkgHjcy/kVd6E5Xaz/LsqxJOU7VbY4LdVlTbE8XJgRPZi+5RDY0YS+yBGfw== +"@polkadot/rpc-provider@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.38.tgz#d58d0dd179b4e8cb698a62bfd301d92e05ff2113" + integrity sha512-WL4bW4rBL6YZl3cc9jh4H5wIpiYloE1ISMgc/DrJWQdHVs/QJJtgTC2yrBdgigeYjUUP9+/zTTbmpX1/n4omSQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/metadata" "^0.97.0-beta.35" - "@polkadot/util" "^1.7.0-beta.8" - "@polkadot/util-crypto" "^1.7.0-beta.8" + "@polkadot/metadata" "^0.97.0-beta.38" + "@polkadot/util" "^1.7.1" + "@polkadot/util-crypto" "^1.7.1" eventemitter3 "^4.0.0" isomorphic-fetch "^2.2.1" websocket "^1.0.30" @@ -2244,14 +2244,14 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.35.tgz#66d1da5cc81a1d1ed5e5b0f8740398029b5a0377" - integrity sha512-x5imP6jM0N1eTsx9uHtYNEmjCX3md9dXcZgj65EdJpRphMfukE8vSJar/ZmwDu53Fm+oS8lTxSkcwQtptmTE6Q== +"@polkadot/types@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.38.tgz#ce361b11a73d5e1a448430f45e99f21370d367ce" + integrity sha512-ZERKcVot+ZueKAxLwtbXHHEDSEQ8NHww2kNEJ9AN0k/2gBx9+QUFEeaWBrohyHzlhiSPPZzlNKZC3MYrwhg8KQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/util" "^1.7.0-beta.8" - "@polkadot/util-crypto" "^1.7.0-beta.8" + "@polkadot/util" "^1.7.1" + "@polkadot/util-crypto" "^1.7.1" "@types/memoizee" "^0.4.3" memoizee "^0.4.14" @@ -2299,7 +2299,7 @@ "@types/color" "^3.0.0" color "^3.1.2" -"@polkadot/util-crypto@^1.7.0-beta.8", "@polkadot/util-crypto@^1.7.1": +"@polkadot/util-crypto@^1.7.1": version "1.7.1" resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-1.7.1.tgz#6cb1ed1f7ecbea3b41100231830817e7fd116dc6" integrity sha512-g0JCciJLJXbkc/Q+2QuJgCgS0Xfl7tO97ALdsI00bgSDA7zlh2zhjpx03Ve47hMndmn7K8ClIGrj4nxHx/95Tw== @@ -2321,7 +2321,7 @@ tweetnacl "^1.0.1" xxhashjs "^0.2.2" -"@polkadot/util@^1.7.0-beta.8", "@polkadot/util@^1.7.1": +"@polkadot/util@^1.7.1": version "1.7.1" resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-1.7.1.tgz#cb262fa5a441097c0c093532f70d0b7e0503fbb1" integrity sha512-tWvh+vYDIiXDIWgAGd9zyJWlDKxQ5KYTKZ9uTlLxfuy1qXEdVOjlX9Qz5+FACU2742e8tTvtvM9KfK05VK5X/A== From 6df583975f614242d38fe70c374ddff048e906ed Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 27 Nov 2019 21:32:30 +0000 Subject: [PATCH 134/154] [CI Skip] 0.37.0-beta.132 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index c6cfe23077c9..691dbf363be2 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.131" + "version": "0.37.0-beta.132" } diff --git a/package.json b/package.json index f46d51080d49..240fa2f1fef7 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 6a8d5089d656..63852e286869 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 198c3a660bf3..16893fa124f2 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-components": "^0.37.0-beta.132", "@polkadot/react-qr": "^0.47.0-beta.11", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index cec2d4aaffc9..ddd4e61413cc 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index d1b2555eb29f..41b394c45c21 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 843d924a83d2..94cd7cb374b6 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/api-contract": "^0.97.0-beta.38", - "@polkadot/react-components": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 18d0bea552fd..9650cb06297c 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", - "@polkadot/react-query": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-query": "^0.37.0-beta.132" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 10f2bd6babf7..4500ddc63c70 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/apps-routing": "^0.37.0-beta.131", - "@polkadot/react-components": "^0.37.0-beta.131" + "@polkadot/apps-routing": "^0.37.0-beta.132", + "@polkadot/react-components": "^0.37.0-beta.132" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 9b3a32edb49c..b3bd5a3dbae2 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", - "@polkadot/react-query": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-query": "^0.37.0-beta.132" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index ee98c6abae42..94861462dbf7 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 55f07b5c379f..e88c66ac6bb5 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", - "@polkadot/react-params": "^0.37.0-beta.131", - "@polkadot/react-signer": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-params": "^0.37.0-beta.132", + "@polkadot/react-signer": "^0.37.0-beta.132" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 0ad8a14c3201..2769577a9b36 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 55396cdeeb1b..fd45153dc1d2 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-components": "^0.37.0-beta.132", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index c180f33a7782..5be94bef4219 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", - "@polkadot/react-query": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-query": "^0.37.0-beta.132" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 97f6f5a0936f..1a7c1e8d05f1 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", - "@polkadot/react-query": "^0.37.0-beta.131", + "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-query": "^0.37.0-beta.132", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index da3115c1a7d0..6e64aad21f06 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/app-explorer": "^0.37.0-beta.131", - "@polkadot/react-components": "^0.37.0-beta.131", - "@polkadot/react-query": "^0.37.0-beta.131" + "@polkadot/app-explorer": "^0.37.0-beta.132", + "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-query": "^0.37.0-beta.132" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index e70e3467c461..33fc9b102057 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", - "@polkadot/react-params": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-params": "^0.37.0-beta.132" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index af60271a5dfe..aa40438b7e48 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index ee5f08cd66db..52f173bab0b8 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 6baa4c1a593f..63c9a85f8fd9 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", - "@polkadot/react-query": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-query": "^0.37.0-beta.132" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index dde2e5daf5aa..39474eac067b 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", - "@polkadot/react-query": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-query": "^0.37.0-beta.132" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index d1af706a77fa..ccc9c8520e70 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index a96011960fc1..3235833ffe81 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", - "@polkadot/react-signer": "^0.37.0-beta.131", + "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-signer": "^0.37.0-beta.132", "@polkadot/ui-assets": "^0.47.0-beta.11", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 1cd23c1ba2a0..4473f72d48de 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 9acfe122e51f..07b1fbf3015c 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/keyring": "^1.7.1", - "@polkadot/react-api": "^0.37.0-beta.131", + "@polkadot/react-api": "^0.37.0-beta.132", "@polkadot/react-identicon": "^0.47.0-beta.11", - "@polkadot/react-query": "^0.37.0-beta.131", + "@polkadot/react-query": "^0.37.0-beta.132", "@polkadot/ui-keyring": "^0.47.0-beta.11", "@polkadot/ui-settings": "^0.47.0-beta.11", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 7e21d8144399..a994af91f6e7 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 081d6261ffa1..2109206d7207 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131" + "@polkadot/react-components": "^0.37.0-beta.132" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 7923d6aa6c0e..12c78b3d03d0 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index cb721296c88f..0773375f46e6 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.131", + "version": "0.37.0-beta.132", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.131", + "@polkadot/react-components": "^0.37.0-beta.132", "@polkadot/react-qr": "^0.47.0-beta.11" } } From 03f19e92ae48b730561025387bb278e5b8f3c70d Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 28 Nov 2019 12:22:57 +0100 Subject: [PATCH 135/154] Highlight validator participation (#1956) * Highlight validator participation * Linting --- packages/app-staking/src/Targets/Summary.tsx | 32 ++++++++--------- .../app-staking/src/Targets/Validator.tsx | 4 +-- packages/app-staking/src/Targets/index.tsx | 35 +++++++++++++------ packages/app-staking/src/Targets/types.ts | 1 + 4 files changed, 42 insertions(+), 30 deletions(-) diff --git a/packages/app-staking/src/Targets/Summary.tsx b/packages/app-staking/src/Targets/Summary.tsx index fc1dcd1205b2..9bcdc199275b 100644 --- a/packages/app-staking/src/Targets/Summary.tsx +++ b/packages/app-staking/src/Targets/Summary.tsx @@ -14,6 +14,7 @@ import { formatBalance } from '@polkadot/util'; import translate from '../translate'; interface Props extends I18nProps { + lastReward: BN; totalStaked: BN; } @@ -23,7 +24,7 @@ interface StakeInfo { total: string | null; } -function Summary ({ t, totalStaked }: Props): React.ReactElement { +function Summary ({ lastReward, t, totalStaked }: Props): React.ReactElement { const { api } = useApi(); const totalInsurance = trackStream(api.query.balances.totalIssuance, []); const [{ percentage, staked, total }, setStakeInfo] = useState({ percentage: '-', staked: null, total: null }); @@ -40,25 +41,16 @@ function Summary ({ t, totalStaked }: Props): React.ReactElement { return ( -

- +
+ { staked ? `${formatBalance(staked, false)}${formatBalance.calcSi(staked).value}` : '-' } - / - + / + { total ? `${formatBalance(total, false)}${formatBalance.calcSi(total).value}` @@ -66,12 +58,16 @@ function Summary ({ t, totalStaked }: Props): React.ReactElement { }
- + {percentage} + + { + lastReward.gtn(0) + ? `${formatBalance(lastReward, false)}` + : '-' + } + ); } diff --git a/packages/app-staking/src/Targets/Validator.tsx b/packages/app-staking/src/Targets/Validator.tsx index 472cfcfba2e7..70c143463fef 100644 --- a/packages/app-staking/src/Targets/Validator.tsx +++ b/packages/app-staking/src/Targets/Validator.tsx @@ -17,14 +17,14 @@ interface Props extends I18nProps { toggleFavorite: (accountId: string) => void; } -function Validator ({ info: { accountId, bondOther, bondOwn, bondTotal, commission, isFavorite, key, numNominators, rankOverall, rewardPayout }, toggleFavorite }: Props): React.ReactElement { +function Validator ({ info: { accountId, bondOther, bondOwn, bondTotal, commission, isFavorite, isNominating, key, numNominators, rankOverall, rewardPayout }, toggleFavorite }: Props): React.ReactElement { const _onFavorite = (): void => toggleFavorite(key); const _onQueryStats = (): void => { window.location.hash = `/staking/query/${key}`; }; return ( - + { const { api } = useApi(); + const { allAccounts } = useAccounts(); const [amount, setAmount] = useState(new BN(1000)); const electedInfo = trackStream(api.derive.staking.electedInfo, []); const [favorites, toggleFavorite] = useFavorites(STORE_FAVS_BASE); + const [lastReward, setLastReward] = useState(new BN(0)); const [{ validators, totalStaked }, setWorkable] = useState({ totalStaked: new BN(0), validators: [] }); + useEffect((): void => { + if (sessionRewards && sessionRewards.length) { + setLastReward(sessionRewards[sessionRewards.length - 1].reward); + } + }, [sessionRewards]); + useEffect((): void => { if (electedInfo) { let totalStaked = new BN(0); const numValidators = electedInfo.info.length; - const lastReward = sessionRewards[sessionRewards.length - 1] - ? sessionRewards[sessionRewards.length - 1].reward.divn(numValidators) - : new BN(0); const validators = sortValidators( electedInfo.info.map(({ accountId, stakers, validatorPrefs }): ValidatorInfo => { const exposure = stakers || { @@ -103,11 +108,14 @@ function Targets ({ className, sessionRewards, t }: Props): React.ReactElement

{ + return isNominating || allAccounts.includes(indv.who.toString()); + }, allAccounts.includes(key)); totalStaked = totalStaked.add(bondTotal); @@ -118,6 +126,7 @@ function Targets ({ className, sessionRewards, t }: Props): React.ReactElement

-

+ {validators.length !== 0 && ( <> Date: Thu, 28 Nov 2019 11:28:23 +0000 Subject: [PATCH 136/154] [CI Skip] 0.37.0-beta.133 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-staking.json | 3 ++- packages/apps/public/locales/en/ui.json | 3 ++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 32 files changed, 72 insertions(+), 70 deletions(-) diff --git a/lerna.json b/lerna.json index 691dbf363be2..92fbce5b134d 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.132" + "version": "0.37.0-beta.133" } diff --git a/package.json b/package.json index 240fa2f1fef7..350036350676 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 63852e286869..f5a76a33801e 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 16893fa124f2..16a70cccc231 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-components": "^0.37.0-beta.133", "@polkadot/react-qr": "^0.47.0-beta.11", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index ddd4e61413cc..855e1b114617 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 41b394c45c21..93b974c3fb2d 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 94cd7cb374b6..1795311e6086 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/api-contract": "^0.97.0-beta.38", - "@polkadot/react-components": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index 9650cb06297c..ad2435e00515 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", - "@polkadot/react-query": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-query": "^0.37.0-beta.133" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 4500ddc63c70..423d2fc1c43f 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/apps-routing": "^0.37.0-beta.132", - "@polkadot/react-components": "^0.37.0-beta.132" + "@polkadot/apps-routing": "^0.37.0-beta.133", + "@polkadot/react-components": "^0.37.0-beta.133" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index b3bd5a3dbae2..7e8ca566bd0c 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", - "@polkadot/react-query": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-query": "^0.37.0-beta.133" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 94861462dbf7..f9d61fb7a9b0 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index e88c66ac6bb5..fbf41744556f 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", - "@polkadot/react-params": "^0.37.0-beta.132", - "@polkadot/react-signer": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-params": "^0.37.0-beta.133", + "@polkadot/react-signer": "^0.37.0-beta.133" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index 2769577a9b36..d6bdb32bfd3c 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index fd45153dc1d2..5da4bcff10de 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-components": "^0.37.0-beta.133", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 5be94bef4219..f130c7d41c40 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", - "@polkadot/react-query": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-query": "^0.37.0-beta.133" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 1a7c1e8d05f1..0ac6cc4808a3 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", - "@polkadot/react-query": "^0.37.0-beta.132", + "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-query": "^0.37.0-beta.133", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 6e64aad21f06..d2d9f2b5f87e 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/app-explorer": "^0.37.0-beta.132", - "@polkadot/react-components": "^0.37.0-beta.132", - "@polkadot/react-query": "^0.37.0-beta.132" + "@polkadot/app-explorer": "^0.37.0-beta.133", + "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-query": "^0.37.0-beta.133" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 33fc9b102057..a4972789c3a0 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", - "@polkadot/react-params": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-params": "^0.37.0-beta.133" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index aa40438b7e48..f6b82f3bdf9f 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 52f173bab0b8..95cea5706a01 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 63c9a85f8fd9..78030e283999 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", - "@polkadot/react-query": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-query": "^0.37.0-beta.133" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 39474eac067b..71e0dff5e506 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", - "@polkadot/react-query": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-query": "^0.37.0-beta.133" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index ccc9c8520e70..69b69846645c 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 3235833ffe81..613e50b90404 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", - "@polkadot/react-signer": "^0.37.0-beta.132", + "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-signer": "^0.37.0-beta.133", "@polkadot/ui-assets": "^0.47.0-beta.11", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-staking.json b/packages/apps/public/locales/en/app-staking.json index 78489039c994..433eb120195c 100644 --- a/packages/apps/public/locales/en/app-staking.json +++ b/packages/apps/public/locales/en/app-staking.json @@ -131,5 +131,6 @@ "Ranking is done of the estimated best return, taking the commission and total bonded amount into account. It does not incorporate validator liveliness according to length of operation nor number of blocks produced.": "Ranking is done of the estimated best return, taking the commission and total bonded amount into account. It does not incorporate validator liveliness according to length of operation nor number of blocks produced.", "total staked": "total staked", "total issuance": "total issuance", - "staked": "staked" + "staked": "staked", + "last reward": "last reward" } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index 5d9ba558176b..94634befce51 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -650,5 +650,6 @@ "amount to use for estimation": "", "Ranking is done of the estimated best return, taking the commission and total bonded amount into account. It does not incorporate validator liveliness according to length of operation nor number of blocks produced.": "", "total staked": "", - "staked": "" + "staked": "", + "last reward": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 4473f72d48de..957c7c540881 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 07b1fbf3015c..00bf2554fe82 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/keyring": "^1.7.1", - "@polkadot/react-api": "^0.37.0-beta.132", + "@polkadot/react-api": "^0.37.0-beta.133", "@polkadot/react-identicon": "^0.47.0-beta.11", - "@polkadot/react-query": "^0.37.0-beta.132", + "@polkadot/react-query": "^0.37.0-beta.133", "@polkadot/ui-keyring": "^0.47.0-beta.11", "@polkadot/ui-settings": "^0.47.0-beta.11", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index a994af91f6e7..1af58e0c5014 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 2109206d7207..84a4943c1632 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132" + "@polkadot/react-components": "^0.37.0-beta.133" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 12c78b3d03d0..ef6002ae5e7e 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 0773375f46e6..94d4ac39ba95 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.132", + "version": "0.37.0-beta.133", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.132", + "@polkadot/react-components": "^0.37.0-beta.133", "@polkadot/react-qr": "^0.47.0-beta.11" } } From 12caaec47d955f81304ce54f3bc7065a294a02d3 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 28 Nov 2019 13:36:57 +0100 Subject: [PATCH 137/154] Bump API (#1957) --- package.json | 6 +- packages/app-contracts/package.json | 2 +- packages/app-staking/src/Targets/index.tsx | 83 +++++++++++--------- packages/react-api/package.json | 2 +- yarn.lock | 90 +++++++++++----------- 5 files changed, 97 insertions(+), 86 deletions(-) diff --git a/package.json b/package.json index 350036350676..9aa17a46d396 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.38", - "@polkadot/api-contract": "^0.97.0-beta.38", + "@polkadot/api": "^0.97.0-beta.39", + "@polkadot/api-contract": "^0.97.0-beta.39", "@polkadot/keyring": "^1.7.1", - "@polkadot/types": "^0.97.0-beta.38", + "@polkadot/types": "^0.97.0-beta.39", "@polkadot/util": "^1.7.1", "@polkadot/util-crypto": "^1.7.1", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 1795311e6086..d940e0a24355 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api-contract": "^0.97.0-beta.38", + "@polkadot/api-contract": "^0.97.0-beta.39", "@polkadot/react-components": "^0.37.0-beta.133" } } diff --git a/packages/app-staking/src/Targets/index.tsx b/packages/app-staking/src/Targets/index.tsx index 5b29ee0ce593..003db8219cb0 100644 --- a/packages/app-staking/src/Targets/index.tsx +++ b/packages/app-staking/src/Targets/index.tsx @@ -153,46 +153,49 @@ function Targets ({ className, sessionRewards, t }: Props): React.ReactElement

- - - - -
  - + + + + + + + + + + + + + + + + + {validators.map((info): React.ReactNode => + - - - - - - - - - - - - - - {validators.map((info): React.ReactNode => - - )} - -
  + + + validatorcommissionnominatorstotal stakeown stakeother stakepayout (est.) 
validatorcommissionnominatorstotal stakeown stakeother stakepayout (est.) 
+ )} + +
+

)}
@@ -203,9 +206,17 @@ export default translate( styled(Targets)` text-align: center; + .balanceInput { + padding-right: 2rem; + } + + .tableContainer { + padding: 1.5rem 0; + } + table { border-collapse: collapse; - margin: 1.5rem auto; + width: 100%; tr { border: 1px solid #f2f2f2; @@ -224,7 +235,7 @@ export default translate( } td, th { - text-align: left; + text-align: right; } td { diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 957c7c540881..403d67f9392b 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api": "^0.97.0-beta.38", + "@polkadot/api": "^0.97.0-beta.39", "@polkadot/extension-dapp": "^0.14.0-beta.6", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/yarn.lock b/yarn.lock index 6ef10644b11b..53108889c4f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,35 +2029,35 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^0.97.0-beta.38": - version "0.97.0-beta.38" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.38.tgz#3637dcbeb07f10ee85873a1a3571a75f8a034834" - integrity sha512-+QbzyQHa3AV0Lzf2YDFSNAa+p1rBOO+yihuh7ENVfwUj5WEc9JiJjS5evhtUg7E22sXbyA0K1cAJw2+H/goVxQ== +"@polkadot/api-contract@^0.97.0-beta.39": + version "0.97.0-beta.39" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.39.tgz#3ac80bb39f3592e65fc5cd305b92db8d4ce71b28" + integrity sha512-O3p29g5M8Z3eGgdyPlPoAu57SVRocW1VeUUSfgLySS6q9+N1fttaVEzEwbAdktsQFUdxt06sFyYgiCWdZ0ZVew== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.0-beta.38" + "@polkadot/types" "^0.97.0-beta.39" -"@polkadot/api-derive@^0.97.0-beta.38": - version "0.97.0-beta.38" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.38.tgz#2d603586b1cebaf1d8c36cb58f65b16c2fda504d" - integrity sha512-+ugr8P24YQrLfcjqbbRXQY5ZVlL/XcoWV1DvQ0QBv02h8UBIcjS2YXzgXUhOI6kdkXIWfcJBfasujMwEXyfiVg== +"@polkadot/api-derive@^0.97.0-beta.39": + version "0.97.0-beta.39" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.39.tgz#c835a4f4037cbb6946ff9aeb20c70996c85d1cbf" + integrity sha512-bh9uuFk/Nanr5Km0BTfzMtw+FUZrGXvipQHLP5IvHKvPogYEQdIfiOU61q1NjKER2lgpPXRLikXIEFudEXzRmQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api" "^0.97.0-beta.38" - "@polkadot/types" "^0.97.0-beta.38" + "@polkadot/api" "^0.97.0-beta.39" + "@polkadot/types" "^0.97.0-beta.39" -"@polkadot/api@^0.97.0-beta.38": - version "0.97.0-beta.38" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.38.tgz#fb33c75ee1f46b5f3e7597e403c41b953e273aa5" - integrity sha512-3yd0b1pPznHU65XE1TyNFtfwoR4vSnVzbv3h8X2hiCxWX+4cfw+yDEPGAC+wvfy5DIE7W0X3aqM2RHffQdmt3w== +"@polkadot/api@^0.97.0-beta.39": + version "0.97.0-beta.39" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.39.tgz#1ba48af404920142445f6d01826f0e93943d07e6" + integrity sha512-3rZZFjs0PiwJK2RUgC/WLaTq3F6v8ArfTObSiKjL0yq250JIPVdXzh7PDeR7tUH3e/Nuq6Q5Ov+GR6HNkb0ZRw== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api-derive" "^0.97.0-beta.38" + "@polkadot/api-derive" "^0.97.0-beta.39" "@polkadot/keyring" "^1.7.1" - "@polkadot/metadata" "^0.97.0-beta.38" - "@polkadot/rpc-core" "^0.97.0-beta.38" - "@polkadot/rpc-provider" "^0.97.0-beta.38" - "@polkadot/types" "^0.97.0-beta.38" + "@polkadot/metadata" "^0.97.0-beta.39" + "@polkadot/rpc-core" "^0.97.0-beta.39" + "@polkadot/rpc-provider" "^0.97.0-beta.39" + "@polkadot/types" "^0.97.0-beta.39" "@polkadot/util-crypto" "^1.7.1" "@polkadot/dev-react@^0.32.0-beta.15": @@ -2161,10 +2161,10 @@ dependencies: "@babel/runtime" "^7.7.4" -"@polkadot/jsonrpc@^0.97.0-beta.38": - version "0.97.0-beta.38" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.38.tgz#ecee28fbc096586a5cdfdcb896c87a97381b95ba" - integrity sha512-NeF7wEUjKY3Tfyic7Sm0zdMQHwVQAlFS+sCKFr3max73Xctr5SxsjbHkZtQSwVaHkuMBcV9Ub+4u6KEL8J0Tzw== +"@polkadot/jsonrpc@^0.97.0-beta.39": + version "0.97.0-beta.39" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.39.tgz#c57452378bac86f9f53d42444bb98b16cb3b0675" + integrity sha512-yB0AIfcYtUYs9MyCs3HCw5jnLSy/GtPuWSXS0eeUT6A5QJFYRstgReYHmcGWfT3OzPsa0ONM+o1gEtgF6Torsw== dependencies: "@babel/runtime" "^7.7.4" @@ -2177,13 +2177,13 @@ "@polkadot/util" "^1.7.1" "@polkadot/util-crypto" "^1.7.1" -"@polkadot/metadata@^0.97.0-beta.38": - version "0.97.0-beta.38" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.38.tgz#ad41b8c7b3b354e6dd656763625c5138699a7c54" - integrity sha512-IfT7gzZjdLgYyojvi0U9mSGGM/IKBDNEOmYU09tYibsspfIHdRKT4qxwedZivD52EcuyW5cME0FNALQoFYcBbQ== +"@polkadot/metadata@^0.97.0-beta.39": + version "0.97.0-beta.39" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.39.tgz#f2853bff00d6925325932bfe0e9ea09c52a92487" + integrity sha512-qShxMdcO3+2WhYglI41k5pGB9U7VMeCXTkdUJ4Wk9UY7HU2Epgc7xrPHq3MLEFFFzFJ0T2Um7q1iYb7dj1y3GQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.0-beta.38" + "@polkadot/types" "^0.97.0-beta.39" "@polkadot/util" "^1.7.1" "@polkadot/util-crypto" "^1.7.1" @@ -2212,25 +2212,25 @@ qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.0-beta.38": - version "0.97.0-beta.38" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.38.tgz#ac2e87e38ff59141ef3707fae7c0ca0ac7c4adf5" - integrity sha512-11+3olWF+z6jftjY0fu7OhZNh1ZSf8gHk93vpTggykJoJWGJ+/o9QR5/B6wcEpjzYtCJBfBtAoVCHoyHiL/c2A== +"@polkadot/rpc-core@^0.97.0-beta.39": + version "0.97.0-beta.39" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.39.tgz#1ee02f3f65ceaba1228830b7ff8c034dc6019a45" + integrity sha512-LgPN6uVs61uPWoK4/RkJfcJWLZVVmiF0iefkIxMjb7pHe3E3j4PqIl9xjrk6fY5PyiRdJXp8IDprP8ogmz33kQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/jsonrpc" "^0.97.0-beta.38" - "@polkadot/rpc-provider" "^0.97.0-beta.38" - "@polkadot/types" "^0.97.0-beta.38" + "@polkadot/jsonrpc" "^0.97.0-beta.39" + "@polkadot/rpc-provider" "^0.97.0-beta.39" + "@polkadot/types" "^0.97.0-beta.39" "@polkadot/util" "^1.7.1" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.0-beta.38": - version "0.97.0-beta.38" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.38.tgz#d58d0dd179b4e8cb698a62bfd301d92e05ff2113" - integrity sha512-WL4bW4rBL6YZl3cc9jh4H5wIpiYloE1ISMgc/DrJWQdHVs/QJJtgTC2yrBdgigeYjUUP9+/zTTbmpX1/n4omSQ== +"@polkadot/rpc-provider@^0.97.0-beta.39": + version "0.97.0-beta.39" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.39.tgz#b75f7cc486e5460be9f7942ba5a3b80f99bce9ef" + integrity sha512-PacASxjPndVJixFG4V1Z7hXvKtROO4o5MHm7CYozfwsH7IA7uenno5TsjzGXoWVv+F9vKMCez51gkZlXZLbddQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/metadata" "^0.97.0-beta.38" + "@polkadot/metadata" "^0.97.0-beta.39" "@polkadot/util" "^1.7.1" "@polkadot/util-crypto" "^1.7.1" eventemitter3 "^4.0.0" @@ -2244,10 +2244,10 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.0-beta.38": - version "0.97.0-beta.38" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.38.tgz#ce361b11a73d5e1a448430f45e99f21370d367ce" - integrity sha512-ZERKcVot+ZueKAxLwtbXHHEDSEQ8NHww2kNEJ9AN0k/2gBx9+QUFEeaWBrohyHzlhiSPPZzlNKZC3MYrwhg8KQ== +"@polkadot/types@^0.97.0-beta.39": + version "0.97.0-beta.39" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.39.tgz#7fe786afb9e987ffb06048ea011838cabdbb918e" + integrity sha512-/gkArYctnsJCUn5RQ0YgiWgI4b7OrJaYlYCfVRC8k2N7Fl1UMc6Wyn7zxPLHxHQj4Cm8FlyfHkf9aeNzwgA+Jg== dependencies: "@babel/runtime" "^7.7.4" "@polkadot/util" "^1.7.1" From 3ed017fd9799bda38a7c9676998e41951af3ac85 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 28 Nov 2019 12:42:20 +0000 Subject: [PATCH 138/154] [CI Skip] 0.37.0-beta.134 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 92fbce5b134d..6eba9fac7274 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0-beta.133" + "version": "0.37.0-beta.134" } diff --git a/package.json b/package.json index 9aa17a46d396..9ace489bcb3f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index f5a76a33801e..31b1c23d8965 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 16a70cccc231..c55b1842a1c8 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-components": "^0.37.0-beta.134", "@polkadot/react-qr": "^0.47.0-beta.11", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 855e1b114617..3727ba49cdca 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index 93b974c3fb2d..c18250132342 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index d940e0a24355..412dda00363d 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/api-contract": "^0.97.0-beta.39", - "@polkadot/react-components": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index ad2435e00515..27763f9f98c5 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", - "@polkadot/react-query": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134", + "@polkadot/react-query": "^0.37.0-beta.134" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 423d2fc1c43f..d4a9138a0dd6 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/apps-routing": "^0.37.0-beta.133", - "@polkadot/react-components": "^0.37.0-beta.133" + "@polkadot/apps-routing": "^0.37.0-beta.134", + "@polkadot/react-components": "^0.37.0-beta.134" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 7e8ca566bd0c..0222024590c2 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", - "@polkadot/react-query": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134", + "@polkadot/react-query": "^0.37.0-beta.134" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index f9d61fb7a9b0..00b9016a4565 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index fbf41744556f..e2be4d2a1f70 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", - "@polkadot/react-params": "^0.37.0-beta.133", - "@polkadot/react-signer": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134", + "@polkadot/react-params": "^0.37.0-beta.134", + "@polkadot/react-signer": "^0.37.0-beta.134" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index d6bdb32bfd3c..19c43dc53ee7 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 5da4bcff10de..bc56d28f8d91 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-components": "^0.37.0-beta.134", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index f130c7d41c40..9404ba1d6d96 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", - "@polkadot/react-query": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134", + "@polkadot/react-query": "^0.37.0-beta.134" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 0ac6cc4808a3..dac880da3aa3 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", - "@polkadot/react-query": "^0.37.0-beta.133", + "@polkadot/react-components": "^0.37.0-beta.134", + "@polkadot/react-query": "^0.37.0-beta.134", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index d2d9f2b5f87e..1e328d505cae 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/app-explorer": "^0.37.0-beta.133", - "@polkadot/react-components": "^0.37.0-beta.133", - "@polkadot/react-query": "^0.37.0-beta.133" + "@polkadot/app-explorer": "^0.37.0-beta.134", + "@polkadot/react-components": "^0.37.0-beta.134", + "@polkadot/react-query": "^0.37.0-beta.134" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index a4972789c3a0..a925a8fd7142 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", - "@polkadot/react-params": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134", + "@polkadot/react-params": "^0.37.0-beta.134" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index f6b82f3bdf9f..66091d437817 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 95cea5706a01..40b3910a3a77 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 78030e283999..3ac5919c8115 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", - "@polkadot/react-query": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134", + "@polkadot/react-query": "^0.37.0-beta.134" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 71e0dff5e506..a0ee60cdf206 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", - "@polkadot/react-query": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134", + "@polkadot/react-query": "^0.37.0-beta.134" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 69b69846645c..43c8e12cbb1c 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 613e50b90404..b7e23c0c4473 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", - "@polkadot/react-signer": "^0.37.0-beta.133", + "@polkadot/react-components": "^0.37.0-beta.134", + "@polkadot/react-signer": "^0.37.0-beta.134", "@polkadot/ui-assets": "^0.47.0-beta.11", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 403d67f9392b..b3efb27d0b3b 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 00bf2554fe82..de5539ea37f7 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/keyring": "^1.7.1", - "@polkadot/react-api": "^0.37.0-beta.133", + "@polkadot/react-api": "^0.37.0-beta.134", "@polkadot/react-identicon": "^0.47.0-beta.11", - "@polkadot/react-query": "^0.37.0-beta.133", + "@polkadot/react-query": "^0.37.0-beta.134", "@polkadot/ui-keyring": "^0.47.0-beta.11", "@polkadot/ui-settings": "^0.47.0-beta.11", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 1af58e0c5014..6113fb5e6e58 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 84a4943c1632..7c02561f7ca4 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133" + "@polkadot/react-components": "^0.37.0-beta.134" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index ef6002ae5e7e..dcb8689e51de 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 94d4ac39ba95..02dbb743f7e2 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.133", + "version": "0.37.0-beta.134", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.133", + "@polkadot/react-components": "^0.37.0-beta.134", "@polkadot/react-qr": "^0.47.0-beta.11" } } From f6976e1e496cc9802e722b99aa4ef8af66917d99 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 28 Nov 2019 17:44:50 +0100 Subject: [PATCH 139/154] Update ValidatorPrefs with commission (#1959) * Update ValidatorPrefs with commission * Bump API --- package.json | 6 +- packages/app-contracts/package.json | 2 +- .../src/Actions/Account/Validate.tsx | 70 ++++++++++----- .../app-staking/src/Targets/Validator.tsx | 10 ++- packages/app-staking/src/Targets/index.tsx | 32 ++++--- packages/app-staking/src/Targets/types.ts | 6 +- packages/react-api/package.json | 2 +- packages/react-components/src/AddressInfo.tsx | 33 ++++--- yarn.lock | 90 +++++++++---------- 9 files changed, 151 insertions(+), 100 deletions(-) diff --git a/package.json b/package.json index 9ace489bcb3f..4b2b5c0525d8 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.39", - "@polkadot/api-contract": "^0.97.0-beta.39", + "@polkadot/api": "^0.97.0-beta.40", + "@polkadot/api-contract": "^0.97.0-beta.40", "@polkadot/keyring": "^1.7.1", - "@polkadot/types": "^0.97.0-beta.39", + "@polkadot/types": "^0.97.0-beta.40", "@polkadot/util": "^1.7.1", "@polkadot/util-crypto": "^1.7.1", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 412dda00363d..54b7076b4cfa 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api-contract": "^0.97.0-beta.39", + "@polkadot/api-contract": "^0.97.0-beta.40", "@polkadot/react-components": "^0.37.0-beta.134" } } diff --git a/packages/app-staking/src/Actions/Account/Validate.tsx b/packages/app-staking/src/Actions/Account/Validate.tsx index a5ab177d8d8e..bb802f132135 100644 --- a/packages/app-staking/src/Actions/Account/Validate.tsx +++ b/packages/app-staking/src/Actions/Account/Validate.tsx @@ -2,14 +2,15 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { ValidatorPrefs, ValidatorPrefs0to145 } from '@polkadot/types/interfaces'; +import { ValidatorPrefs, ValidatorPrefsTo145, ValidatorPrefsTo196 } from '@polkadot/types/interfaces'; import { ApiProps } from '@polkadot/react-api/types'; import { I18nProps } from '@polkadot/react-components/types'; import BN from 'bn.js'; import React from 'react'; -import { withApi, withMulti } from '@polkadot/react-api'; +import { registry, withApi, withMulti } from '@polkadot/react-api'; import { Button, InputAddress, InputBalance, InputNumber, Modal, TxButton, TxComponent } from '@polkadot/react-components'; +import { createType } from '@polkadot/types'; import InputValidationUnstakeThreshold from './InputValidationUnstakeThreshold'; import translate from '../../translate'; @@ -19,17 +20,24 @@ interface Props extends ApiProps, I18nProps { isOpen: boolean; onClose: () => void; stashId: string; - validatorPrefs?: ValidatorPrefs | ValidatorPrefs0to145; + validatorPrefs?: ValidatorPrefs | ValidatorPrefsTo145 | ValidatorPrefsTo196; } interface State { - unstakeThreshold?: BN; + hasCommission: boolean; + commission: BN; + unstakeThreshold: BN; unstakeThresholdError: string | null; - validatorPayment?: BN; + validatorPayment: BN; } +const COMM_MUL = new BN(10000000); +const MAX_COMM = new BN(100); + class Validate extends TxComponent { public state: State = { + hasCommission: !!(createType(registry, 'ValidatorPrefs').commission), + commission: new BN(0), unstakeThreshold: new BN(3), unstakeThresholdError: null, validatorPayment: new BN(0) @@ -87,7 +95,7 @@ class Validate extends TxComponent { private renderButtons (): React.ReactNode { const { controllerId, isSubstrateV2, onClose, t } = this.props; - const { unstakeThreshold, unstakeThresholdError, validatorPayment } = this.state; + const { commission, hasCommission, unstakeThreshold, unstakeThresholdError, validatorPayment } = this.state; return ( @@ -108,7 +116,9 @@ class Validate extends TxComponent { onClick={onClose} params={[ isSubstrateV2 - ? { validatorPayment } + ? hasCommission + ? { commission } + : { validatorPayment } : { unstakeThreshold, validatorPayment } ]} tx='staking.validate' @@ -121,8 +131,8 @@ class Validate extends TxComponent { private renderContent (): React.ReactNode { const { controllerId, isSubstrateV2, stashId, t, validatorPrefs } = this.props; - const { unstakeThreshold, unstakeThresholdError } = this.state; - const defaultThreshold = validatorPrefs && (validatorPrefs as ValidatorPrefs0to145).unstakeThreshold && (validatorPrefs as ValidatorPrefs0to145).unstakeThreshold.toBn(); + const { hasCommission, unstakeThreshold, unstakeThresholdError } = this.state; + const defaultThreshold = validatorPrefs && (validatorPrefs as ValidatorPrefsTo145).unstakeThreshold && (validatorPrefs as ValidatorPrefsTo145).unstakeThreshold.toBn(); return ( <> @@ -161,30 +171,42 @@ class Validate extends TxComponent { /> )} - + { + hasCommission + ? + : + } ); } + private onChangeCommission = (commission?: BN): void => { + commission && this.setState({ commission: commission.mul(COMM_MUL) }); + } + private onChangePayment = (validatorPayment?: BN): void => { - if (validatorPayment) { - this.setState({ validatorPayment }); - } + validatorPayment && this.setState({ validatorPayment }); } private onChangeThreshold = (unstakeThreshold?: BN): void => { - if (unstakeThreshold) { - this.setState({ unstakeThreshold }); - } + unstakeThreshold && this.setState({ unstakeThreshold }); } private onUnstakeThresholdError = (unstakeThresholdError: string | null): void => { diff --git a/packages/app-staking/src/Targets/Validator.tsx b/packages/app-staking/src/Targets/Validator.tsx index 70c143463fef..e2a5025a95ac 100644 --- a/packages/app-staking/src/Targets/Validator.tsx +++ b/packages/app-staking/src/Targets/Validator.tsx @@ -17,7 +17,7 @@ interface Props extends I18nProps { toggleFavorite: (accountId: string) => void; } -function Validator ({ info: { accountId, bondOther, bondOwn, bondTotal, commission, isFavorite, isNominating, key, numNominators, rankOverall, rewardPayout }, toggleFavorite }: Props): React.ReactElement { +function Validator ({ info: { accountId, bondOther, bondOwn, bondTotal, commissionPer, isCommission, isFavorite, isNominating, key, numNominators, rankOverall, rewardPayout, validatorPayment }, toggleFavorite }: Props): React.ReactElement { const _onFavorite = (): void => toggleFavorite(key); const _onQueryStats = (): void => { window.location.hash = `/staking/query/${key}`; @@ -34,7 +34,13 @@ function Validator ({ info: { accountId, bondOther, bondOwn, bondTotal, commissi {formatNumber(rankOverall)} - + + { + isCommission + ? `${commissionPer.toFixed(2)}%` + : + } + {formatNumber(numNominators)} diff --git a/packages/app-staking/src/Targets/index.tsx b/packages/app-staking/src/Targets/index.tsx index 003db8219cb0..b3ebd3b5eee1 100644 --- a/packages/app-staking/src/Targets/index.tsx +++ b/packages/app-staking/src/Targets/index.tsx @@ -4,6 +4,7 @@ import { DerivedStakingElected } from '@polkadot/api-derive/types'; import { I18nProps } from '@polkadot/react-components/types'; +import { ValidatorPrefs, ValidatorPrefsTo196 } from '@polkadot/types/interfaces'; import { ComponentProps } from '../types'; import { ValidatorInfo } from './types'; @@ -18,6 +19,8 @@ import translate from '../translate'; import Summary from './Summary'; import Validator from './Validator'; +const PERBILL = new BN(1000000000); + interface Props extends I18nProps, ComponentProps { } @@ -34,9 +37,9 @@ function sortValidators (list: ValidatorInfo[]): ValidatorInfo[] { return info; }) - .sort((a, b): number => b.commission.cmp(a.commission)) + .sort((a, b): number => b.validatorPayment.cmp(a.validatorPayment)) .map((info, index): ValidatorInfo => { - info.rankCommission = index + 1; + info.rankPayment = index + 1; return info; }) @@ -48,13 +51,13 @@ function sortValidators (list: ValidatorInfo[]): ValidatorInfo[] { }) .sort((a, b): number => a.rankReward === b.rankReward - ? a.rankCommission === b.rankCommission + ? a.rankPayment === b.rankPayment ? a.rankBonded === b.rankBonded ? 0 : a.rankBonded < b.rankBonded ? 1 : -1 - : a.rankCommission < b.rankCommission + : a.rankPayment < b.rankPayment ? 1 : -1 : a.rankReward < b.rankReward @@ -96,19 +99,24 @@ function Targets ({ className, sessionRewards, t }: Props): React.ReactElement

{ + console.error((validatorPrefs as ValidatorPrefs).commission.toString()); + const exposure = stakers || { total: api.createType('Compact'), own: api.createType('Compact'), others: api.createType('Vec') }; - const prefs = validatorPrefs || { - validatorPayment: api.createType('Compact') + const prefs = (validatorPrefs as (ValidatorPrefs | ValidatorPrefsTo196)) || { + commission: api.createType('Compact') }; const bondOwn = exposure.own.unwrap(); const bondTotal = exposure.total.unwrap(); - const commission = prefs.validatorPayment.unwrap(); + const perValidatorReward = lastReward.divn(numValidators); + const validatorPayment = (prefs as ValidatorPrefsTo196).validatorPayment + ? (prefs as ValidatorPrefsTo196).validatorPayment.unwrap() as BN + : (prefs as ValidatorPrefs).commission.unwrap().mul(perValidatorReward).div(PERBILL); const key = accountId.toString(); - const rewardSplit = lastReward.divn(numValidators).sub(commission); + const rewardSplit = perValidatorReward.sub(validatorPayment); const calcAmount = amount || new BN(0); const rewardPayout = rewardSplit.gtn(0) ? calcAmount.mul(rewardSplit).div(calcAmount.add(bondTotal)) @@ -125,17 +133,19 @@ function Targets ({ className, sessionRewards, t }: Props): React.ReactElement

- {validatorPrefsDisplay.unstakeThreshold && (stakingInfo.validatorPrefs as ValidatorPrefs0to145).unstakeThreshold && ( + {validatorPrefsDisplay.unstakeThreshold && (stakingInfo.validatorPrefs as any as ValidatorPrefsTo145).unstakeThreshold && ( <>
); } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 300f537927a0..6698603ce524 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0-beta.139", + "version": "0.37.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.139", - "@polkadot/react-params": "^0.37.0-beta.139" + "@polkadot/react-components": "^0.37.0", + "@polkadot/react-params": "^0.37.0" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index a5d4ae2c82c5..c57c5e09dee0 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0-beta.139", + "version": "0.37.0", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.139" + "@polkadot/react-components": "^0.37.0" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index b97f2840d6a3..3b22bfd6b889 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0-beta.139", + "version": "0.37.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.139" + "@polkadot/react-components": "^0.37.0" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index a335acc6f303..7701b3c452bf 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0-beta.139", + "version": "0.37.0", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.139", - "@polkadot/react-query": "^0.37.0-beta.139" + "@polkadot/react-components": "^0.37.0", + "@polkadot/react-query": "^0.37.0" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index d00b3ff4dca8..9e71c0a38814 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0-beta.139", + "version": "0.37.0", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.139", - "@polkadot/react-query": "^0.37.0-beta.139" + "@polkadot/react-components": "^0.37.0", + "@polkadot/react-query": "^0.37.0" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 39cf956a0fad..01ae56dbee94 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0-beta.139", + "version": "0.37.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index f8ceefd3906c..ef22e4fe604e 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0-beta.139", + "version": "0.37.0", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,9 +14,9 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.139", - "@polkadot/react-signer": "^0.37.0-beta.139", - "@polkadot/ui-assets": "^0.47.0-beta.12", + "@polkadot/react-components": "^0.37.0", + "@polkadot/react-signer": "^0.37.0", + "@polkadot/ui-assets": "^0.47.1", "query-string": "^6.8.3" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index d4f11fd27ac9..84a91ccaa951 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0-beta.139", + "version": "0.37.0", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api": "^0.97.1", + "@polkadot/api": "^0.98.0-beta.0", "@polkadot/extension-dapp": "^0.14.0-beta.6", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/packages/react-components/package.json b/packages/react-components/package.json index be36d6c5fd85..f73a7018b31e 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0-beta.139", + "version": "0.37.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,11 +12,11 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/keyring": "^1.7.1", - "@polkadot/react-api": "^0.37.0-beta.139", - "@polkadot/react-identicon": "^0.47.0-beta.12", - "@polkadot/react-query": "^0.37.0-beta.139", - "@polkadot/ui-keyring": "^0.47.0-beta.12", - "@polkadot/ui-settings": "^0.47.0-beta.12", + "@polkadot/react-api": "^0.37.0", + "@polkadot/react-identicon": "^0.47.1", + "@polkadot/react-query": "^0.37.0", + "@polkadot/ui-keyring": "^0.47.1", + "@polkadot/ui-settings": "^0.47.1", "@types/chart.js": "^2.8.10", "@types/i18next": "^13.0.0", "@types/react-copy-to-clipboard": "^4.3.0", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index f79daefc2996..da2b18969f69 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0-beta.139", + "version": "0.37.0", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 233eefb5413d..6e35acd0c84b 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0-beta.139", + "version": "0.37.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.139" + "@polkadot/react-components": "^0.37.0" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index aeeb56002daa..26a1ea5f73b0 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0-beta.139", + "version": "0.37.0", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index e560b1a22c90..73bd7600cc90 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0-beta.139", + "version": "0.37.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0-beta.139", - "@polkadot/react-qr": "^0.47.0-beta.12" + "@polkadot/react-components": "^0.37.0", + "@polkadot/react-qr": "^0.47.1" } } diff --git a/yarn.lock b/yarn.lock index e63f635a84c4..55e0b33feb05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,35 +2029,35 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^0.97.1": - version "0.97.1" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.1.tgz#e5ae3e7f97ca1367c2ecf78267666e3d5e323391" - integrity sha512-rpj8SYZrkL1TjlIfAHa2KKhnaOzpE3msuG1/257lzAKbrFTQefuuO0ePRPGZiZaveg4kbWhOwy0HiyB1EpxhDA== +"@polkadot/api-contract@^0.98.0-beta.0": + version "0.98.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.98.0-beta.0.tgz#218b763c43f66f4f6446d16fe0d275bad188246f" + integrity sha512-GMAMHgGOXXp6GHfoL6syfpicXWtmFM9izcphao1VBm4p0u4fCvuiLBQCtK4a2mCiiX7ej2GSe5/zKzDm/JPUlw== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.1" + "@polkadot/types" "^0.98.0-beta.0" -"@polkadot/api-derive@^0.97.1": - version "0.97.1" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.1.tgz#f0ef55f7b3e91a2060db1a88d301cc8a96ef497d" - integrity sha512-lZowtrvqSfNO3LL89xSS4Gf7ec6fNOj4H8ywglnM58Msxd+WOho9uieIY7ywZhiWozXN5DXM8iwqCKHxVoVGOA== +"@polkadot/api-derive@^0.98.0-beta.0": + version "0.98.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.98.0-beta.0.tgz#23ecace3c930ab56ac8bb6c7882a7953b1eaf5b9" + integrity sha512-UCsHYg3rGAZ5cwIypGQmaxnXibHOiP63NQUdglQOGvTCnSlBxGeT2Y51PHHwZuSLOGgLnbR6XennCnYGNAauKA== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api" "^0.97.1" - "@polkadot/types" "^0.97.1" + "@polkadot/api" "^0.98.0-beta.0" + "@polkadot/types" "^0.98.0-beta.0" -"@polkadot/api@^0.97.1": - version "0.97.1" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.1.tgz#10fcf0c72c8bd45a78443fbb360ae74a0feba1d6" - integrity sha512-Hd7xabK37D9EJ4zdo83MvMjwyy2l97L7GI62bwWjzojvmkapLIHY5lGA02Gi/LL7tLOTPdw+jkdXSbyE2ysziA== +"@polkadot/api@^0.98.0-beta.0": + version "0.98.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.98.0-beta.0.tgz#44bb55e19bab49f73c99c528094a7094082da941" + integrity sha512-Mh0/2/8PKAIriAA2vBrZHJhdRkw/XMOhTWS1Bp22PnjsGKxQ3hZmV9tYLf1oGFD9S9V05G3v4KU72oiKIlKhjA== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api-derive" "^0.97.1" + "@polkadot/api-derive" "^0.98.0-beta.0" "@polkadot/keyring" "^1.7.1" - "@polkadot/metadata" "^0.97.1" - "@polkadot/rpc-core" "^0.97.1" - "@polkadot/rpc-provider" "^0.97.1" - "@polkadot/types" "^0.97.1" + "@polkadot/metadata" "^0.98.0-beta.0" + "@polkadot/rpc-core" "^0.98.0-beta.0" + "@polkadot/rpc-provider" "^0.98.0-beta.0" + "@polkadot/types" "^0.98.0-beta.0" "@polkadot/util-crypto" "^1.7.1" "@polkadot/dev-react@^0.32.0-beta.15": @@ -2161,10 +2161,10 @@ dependencies: "@babel/runtime" "^7.7.4" -"@polkadot/jsonrpc@^0.97.1": - version "0.97.1" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.1.tgz#40db2edf06a248d76b0e1900c1036881414aff9e" - integrity sha512-4f/t1YrOOluUhxQXsVaQy4XJ96QiZjML3bTmIOMTIx6VKFIzTX7oRmhPeafVwyg9oj4p04WCuslmzUVV4dXbyQ== +"@polkadot/jsonrpc@^0.98.0-beta.0": + version "0.98.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.98.0-beta.0.tgz#041f5ad81053ce7dba451114f0fb54a994b4bcb5" + integrity sha512-XmYxvdsNl0/GdOn/9h65Qrwyn3X7ZXTtRYNi5kmvDPBYjvblbGf5goeWSMIUNj5X0BvIkfOQ1t8TIQH3zObK0w== dependencies: "@babel/runtime" "^7.7.4" @@ -2177,24 +2177,24 @@ "@polkadot/util" "^1.7.1" "@polkadot/util-crypto" "^1.7.1" -"@polkadot/metadata@^0.97.1": - version "0.97.1" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.1.tgz#31c3ecdaa5afbd9ab896521e88504904d8c68bf1" - integrity sha512-RbU0aNi2VwGJ2U902d0vuCIjgeZRgE8G0MJm0kR6F0nR+Ya5iSRAdLx4J6hm4kMdu9wvVDK2eUOuXiCmNskJww== +"@polkadot/metadata@^0.98.0-beta.0": + version "0.98.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.98.0-beta.0.tgz#b02d1c76ed4622ec8c5ae846e286c4262dd99dd1" + integrity sha512-Fc4d8hjVrZQbzEBY/hK4j4mrk+LJAxvs0gLZIVr6A77hCdwrSuxVSMLzF+JWnn15Ufismhnh35sasTjjFBhOYg== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.1" + "@polkadot/types" "^0.98.0-beta.0" "@polkadot/util" "^1.7.1" "@polkadot/util-crypto" "^1.7.1" -"@polkadot/react-identicon@^0.47.0-beta.12": - version "0.47.0-beta.12" - resolved "https://registry.yarnpkg.com/@polkadot/react-identicon/-/react-identicon-0.47.0-beta.12.tgz#f0e66e0053ec865d5098ca37e17e6859ca9a9b5c" - integrity sha512-U+7BXvpa1015FLwUZ4/ChqOq3TLZb0uH0iAHqEdZ+yXZ4461VWBcO12O9OHmM1vGXfaEQZPn/LmIHrY4ybKVEQ== +"@polkadot/react-identicon@^0.47.1": + version "0.47.1" + resolved "https://registry.yarnpkg.com/@polkadot/react-identicon/-/react-identicon-0.47.1.tgz#792889d6170f4693dc3fffc4165f8e8e43e44e39" + integrity sha512-9G5wxhCTY7LZIO8Vd7rHeEXyVI8OUrv7zPiePuthvVLyCMLX3OWFMqALm/+10R4ZsmLK8yBFl+fvAcfuWZm1vw== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/ui-settings" "^0.47.0-beta.12" - "@polkadot/ui-shared" "^0.47.0-beta.12" + "@polkadot/ui-settings" "^0.47.1" + "@polkadot/ui-shared" "^0.47.1" "@types/color" "^3.0.0" "@types/react-copy-to-clipboard" "^4.3.0" color "^3.1.2" @@ -2202,35 +2202,35 @@ react-copy-to-clipboard "^5.0.2" styled-components "^4.4.1" -"@polkadot/react-qr@^0.47.0-beta.12": - version "0.47.0-beta.12" - resolved "https://registry.yarnpkg.com/@polkadot/react-qr/-/react-qr-0.47.0-beta.12.tgz#f8a697a9a6b5ab3ccb23033242292ad3d83c6dae" - integrity sha512-o7ee8qqqUJt4zf/KdfsVON75NUG/yJ+9PCO/L931etoRqdOapuXPeLGPKPdLX7YlTKBMsTDiwA+w1a7bAwBJbg== +"@polkadot/react-qr@^0.47.1": + version "0.47.1" + resolved "https://registry.yarnpkg.com/@polkadot/react-qr/-/react-qr-0.47.1.tgz#b8d897284727eb833ed771b440f210d41cb8b937" + integrity sha512-CnEqmjYS/ypGPTWEZZa61YVD3hrswMYTxeZOSe/E7MvxGxuCKcLUx4V/syaW8FRRbA/KR2+e4SvZ9F0pxS1rwQ== dependencies: "@babel/runtime" "^7.7.4" "@types/react-qr-reader" "^2.1.1" qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.1": - version "0.97.1" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.1.tgz#bfeb69849c9101222abb12fcbd603d8921b1c83a" - integrity sha512-Np4uCupKuESxFYqPYxSYRr95F6nfy+lZOms/QM86w3wWusOkry8qFubJ0gra6LQ9qQi1s1CPHEyz+K6JkSxrHg== +"@polkadot/rpc-core@^0.98.0-beta.0": + version "0.98.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.98.0-beta.0.tgz#868c82bc17883120a2ab88381e4480db720d0cda" + integrity sha512-CqYOvqxuo7GLvuXF1eQFoC+WDLo7AGUS6aT9Muk6PoSRaOHKHLeXnbaWskSLrF0jWhhcSAMlqlh3uOLuRDdtAA== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/jsonrpc" "^0.97.1" - "@polkadot/rpc-provider" "^0.97.1" - "@polkadot/types" "^0.97.1" + "@polkadot/jsonrpc" "^0.98.0-beta.0" + "@polkadot/rpc-provider" "^0.98.0-beta.0" + "@polkadot/types" "^0.98.0-beta.0" "@polkadot/util" "^1.7.1" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.1": - version "0.97.1" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.1.tgz#19da466081bde6702e347e064f4dde952a94c187" - integrity sha512-YU9+5wHyYw8LbuZclEgzDQtTwAdNWjqW3lBxL4xvu3ptGjnzlUjXHOxR0p8sLIU6DO6Bi8/RttVuJnm9gMZQYQ== +"@polkadot/rpc-provider@^0.98.0-beta.0": + version "0.98.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.98.0-beta.0.tgz#9503e9071dfdeff007a9b2a7c4d51d0df7a90678" + integrity sha512-quQm+mTD0IgqN1RWc0EKOq3LEIQVzPcgN5yt/l9HOpf9FFde1OaPzyRQVpOITK0LcmvpAY2HA/WvvvvRCcAbxA== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/metadata" "^0.97.1" + "@polkadot/metadata" "^0.98.0-beta.0" "@polkadot/util" "^1.7.1" "@polkadot/util-crypto" "^1.7.1" eventemitter3 "^4.0.0" @@ -2244,10 +2244,10 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.1": - version "0.97.1" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.1.tgz#382bcc1ec392ebd8d1e6bccba3c80c395df4e4b9" - integrity sha512-0NkE8/d2m2BQSwvnfVAsEkTFs9l1R4ao15D8lAtJZeAe/B5ohs0rcg9bndK8PntGZZ5dUW+Xmy+JqnLCjLiPwQ== +"@polkadot/types@^0.98.0-beta.0": + version "0.98.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.98.0-beta.0.tgz#5c51c234772c1c456ac43bbef71c3804e65e0e02" + integrity sha512-pmATM5HA4wHJHATvYOZym48TXvpST5xxG49+E5qHMi9Wsoij0RFiFNqyuOl/RIeFd8Xp1xhCIxZo0NbS17NT9g== dependencies: "@babel/runtime" "^7.7.4" "@polkadot/util" "^1.7.1" @@ -2255,17 +2255,17 @@ "@types/memoizee" "^0.4.3" memoizee "^0.4.14" -"@polkadot/ui-assets@^0.47.0-beta.12": - version "0.47.0-beta.12" - resolved "https://registry.yarnpkg.com/@polkadot/ui-assets/-/ui-assets-0.47.0-beta.12.tgz#74f339d9e39572b93415c41acebea1425f4eef4e" - integrity sha512-+fxQvbPb5rLUXLMhgRJG6PPGpxyb6xEy0O8PDND0//rhMuOjkiP/JpHQm94ICCVUoo/iuKnueVIZw/WCtvYz6Q== +"@polkadot/ui-assets@^0.47.1": + version "0.47.1" + resolved "https://registry.yarnpkg.com/@polkadot/ui-assets/-/ui-assets-0.47.1.tgz#83a6ec5372ec7961374bac04d4cba35ace527765" + integrity sha512-U+U6NW8+Bi5KRKz2OvronxVhAo8A3Ofb/zEB8YruC7PkyVeKDxj9f7j97DCp1Quo9slxr4JWyBstH1Yo2SdHCw== dependencies: "@babel/runtime" "^7.7.4" -"@polkadot/ui-keyring@^0.47.0-beta.12": - version "0.47.0-beta.12" - resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.47.0-beta.12.tgz#5bba2e64833e99c8a2a785aca36629594caa7992" - integrity sha512-JFytEF/V+xvcH5QwnBVvg0e1MjjkplrGJb+QeqEH8qbDVmDLGr2QGT3mLYAelFNxKVJicrBxnT//rTpwfOWJXg== +"@polkadot/ui-keyring@^0.47.1": + version "0.47.1" + resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.47.1.tgz#023db1b1c8044bd76c93f4fffd9be293d4c88bc7" + integrity sha512-nz92ZeuI9M0RYB1JtYZxB6vci9xDGujsWDBEfzAHOv7FeB8OxVhTWLFaMDXmrfCOeE8ddcoX4LdS27TzX07h6w== dependencies: "@babel/runtime" "^7.7.4" "@ledgerhq/hw-transport-u2f" "^4.73.7" @@ -2281,19 +2281,19 @@ optionalDependencies: "@ledgerhq/hw-transport-node-hid" "^4.73.7" -"@polkadot/ui-settings@^0.47.0-beta.12": - version "0.47.0-beta.12" - resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.47.0-beta.12.tgz#d9b7d1130a920f564d120faf54111dec28403272" - integrity sha512-qXkMHwbWWJMKUKGvSVFw/9AuIx9l78UjU0YCRmfo7p5uoDSeJMEdPhoLPwJVB7QgGFLwyDpDo1m4hO47cWXM7A== +"@polkadot/ui-settings@^0.47.1": + version "0.47.1" + resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.47.1.tgz#1cbcab943557538baab30b80d80ac74f6d17199d" + integrity sha512-vvKNvznkkL2WShFyJxWG3AYHukVKDo+Z3k5x4beTQNVXmfXpM5RjZJlhHq8nGAdMjR4rml+RqkjAjJ9KQ6bg8A== dependencies: "@babel/runtime" "^7.7.4" "@types/store" "^2.0.2" store "^2.0.12" -"@polkadot/ui-shared@^0.47.0-beta.12": - version "0.47.0-beta.12" - resolved "https://registry.yarnpkg.com/@polkadot/ui-shared/-/ui-shared-0.47.0-beta.12.tgz#fe1fc1ee4de2e261ac901f0f2666c66b12459267" - integrity sha512-8pVUaGGDwMuo4LQbcCI5Fg7EIeBNPLMJlWyJRuriJvVuDDsc+xe4TQqY1oEKnQ9Cbl/yt65FcG111jnzkQcyFQ== +"@polkadot/ui-shared@^0.47.1": + version "0.47.1" + resolved "https://registry.yarnpkg.com/@polkadot/ui-shared/-/ui-shared-0.47.1.tgz#21132058ab1d66a1cf58eb45597fde7c22d6c72e" + integrity sha512-Un1NtBx115/037c4GgqxgA2qCk3lJDedKCgP03XXZ7keXKelxa+hpWHCi0Jl28vMO1stXQpSkAuZ78WkBMkB6A== dependencies: "@babel/runtime" "^7.7.4" "@types/color" "^3.0.0" From c39ee0dd59f0361e75868a28f72f7015105da8a9 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Fri, 29 Nov 2019 15:57:23 +0000 Subject: [PATCH 152/154] [CI Skip] 0.37.1 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/apps/public/locales/en/app-staking.json | 3 ++- packages/apps/public/locales/en/ui.json | 3 ++- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 32 files changed, 72 insertions(+), 70 deletions(-) diff --git a/lerna.json b/lerna.json index da2d6fd187a3..6fbdf93e8aa2 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.0" + "version": "0.37.1" } diff --git a/package.json b/package.json index 5bbc5601ae40..489be0402e0b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.0-beta.139", + "version": "0.37.1", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 922e07f3b67b..531485ec887b 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.0", + "version": "0.37.1", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0" + "@polkadot/react-components": "^0.37.1" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 326408e904ae..58b8f2ffba8f 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.0", + "version": "0.37.1", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", + "@polkadot/react-components": "^0.37.1", "@polkadot/react-qr": "^0.47.1", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index 549aac225452..d533e084b5d3 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.0", + "version": "0.37.1", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0" + "@polkadot/react-components": "^0.37.1" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index d760496486f0..dacc4c426e62 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.0", + "version": "0.37.1", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0" + "@polkadot/react-components": "^0.37.1" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index d658b405e691..623ac84a9fb9 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.0", + "version": "0.37.1", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/api-contract": "^0.98.0-beta.0", - "@polkadot/react-components": "^0.37.0" + "@polkadot/react-components": "^0.37.1" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index e57329904a37..c60548c616a0 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.0", + "version": "0.37.1", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", - "@polkadot/react-query": "^0.37.0" + "@polkadot/react-components": "^0.37.1", + "@polkadot/react-query": "^0.37.1" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index 91da541c85a7..a725cc8e9171 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.0", + "version": "0.37.1", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/apps-routing": "^0.37.0", - "@polkadot/react-components": "^0.37.0" + "@polkadot/apps-routing": "^0.37.1", + "@polkadot/react-components": "^0.37.1" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index 399f018c30db..ae9be817bc8f 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.0", + "version": "0.37.1", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", - "@polkadot/react-query": "^0.37.0" + "@polkadot/react-components": "^0.37.1", + "@polkadot/react-query": "^0.37.1" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index b8ca1d3ed195..0d6519f0d497 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.0", + "version": "0.37.1", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0" + "@polkadot/react-components": "^0.37.1" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 2ac7b807fb28..ce046b4c9fb4 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.0", + "version": "0.37.1", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", - "@polkadot/react-params": "^0.37.0", - "@polkadot/react-signer": "^0.37.0" + "@polkadot/react-components": "^0.37.1", + "@polkadot/react-params": "^0.37.1", + "@polkadot/react-signer": "^0.37.1" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index fed992eb3b68..b709d95ab804 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.0", + "version": "0.37.1", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0" + "@polkadot/react-components": "^0.37.1" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 187989c89e5e..13dbba49c811 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.0", + "version": "0.37.1", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", + "@polkadot/react-components": "^0.37.1", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index ab8877d356ea..27697924f966 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.0", + "version": "0.37.1", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", - "@polkadot/react-query": "^0.37.0" + "@polkadot/react-components": "^0.37.1", + "@polkadot/react-query": "^0.37.1" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index d7130b08533b..4e4122a2983f 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.0", + "version": "0.37.1", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", - "@polkadot/react-query": "^0.37.0", + "@polkadot/react-components": "^0.37.1", + "@polkadot/react-query": "^0.37.1", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 8bfd7ce5998b..13b44022d8fb 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.0", + "version": "0.37.1", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/app-explorer": "^0.37.0", - "@polkadot/react-components": "^0.37.0", - "@polkadot/react-query": "^0.37.0" + "@polkadot/app-explorer": "^0.37.1", + "@polkadot/react-components": "^0.37.1", + "@polkadot/react-query": "^0.37.1" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 6698603ce524..02fe54ee9623 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.0", + "version": "0.37.1", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", - "@polkadot/react-params": "^0.37.0" + "@polkadot/react-components": "^0.37.1", + "@polkadot/react-params": "^0.37.1" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index c57c5e09dee0..8e275887f400 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.0", + "version": "0.37.1", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0" + "@polkadot/react-components": "^0.37.1" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index 3b22bfd6b889..c5531d563b04 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.0", + "version": "0.37.1", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0" + "@polkadot/react-components": "^0.37.1" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index 7701b3c452bf..a8cd8f6383e5 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.0", + "version": "0.37.1", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", - "@polkadot/react-query": "^0.37.0" + "@polkadot/react-components": "^0.37.1", + "@polkadot/react-query": "^0.37.1" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index 9e71c0a38814..b151520a9525 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.0", + "version": "0.37.1", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", - "@polkadot/react-query": "^0.37.0" + "@polkadot/react-components": "^0.37.1", + "@polkadot/react-query": "^0.37.1" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 01ae56dbee94..35d6e4161873 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.0", + "version": "0.37.1", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index ef22e4fe604e..5eb65069dd2d 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.0", + "version": "0.37.1", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", - "@polkadot/react-signer": "^0.37.0", + "@polkadot/react-components": "^0.37.1", + "@polkadot/react-signer": "^0.37.1", "@polkadot/ui-assets": "^0.47.1", "query-string": "^6.8.3" } diff --git a/packages/apps/public/locales/en/app-staking.json b/packages/apps/public/locales/en/app-staking.json index 076e8162299d..b0646cfe7e7a 100644 --- a/packages/apps/public/locales/en/app-staking.json +++ b/packages/apps/public/locales/en/app-staking.json @@ -135,5 +135,6 @@ "last reward": "last reward", "The percentage reward (0-100) that should be applied for the validator": "The percentage reward (0-100) that should be applied for the validator", "reward commission percentage": "reward commission percentage", - "validator payment": "validator payment" + "validator payment": "validator payment", + "Validator info not available": "Validator info not available" } diff --git a/packages/apps/public/locales/en/ui.json b/packages/apps/public/locales/en/ui.json index 5733258adf17..1a13a71373e7 100644 --- a/packages/apps/public/locales/en/ui.json +++ b/packages/apps/public/locales/en/ui.json @@ -654,5 +654,6 @@ "last reward": "", "The percentage reward (0-100) that should be applied for the validator": "", "reward commission percentage": "", - "validator payment": "" + "validator payment": "", + "Validator info not available": "" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 84a91ccaa951..5d984e7a0cfd 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.0", + "version": "0.37.1", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index f73a7018b31e..ef1a8d3feb37 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.0", + "version": "0.37.1", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/keyring": "^1.7.1", - "@polkadot/react-api": "^0.37.0", + "@polkadot/react-api": "^0.37.1", "@polkadot/react-identicon": "^0.47.1", - "@polkadot/react-query": "^0.37.0", + "@polkadot/react-query": "^0.37.1", "@polkadot/ui-keyring": "^0.47.1", "@polkadot/ui-settings": "^0.47.1", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index da2b18969f69..fecf4c6f11b9 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.0", + "version": "0.37.1", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 6e35acd0c84b..87d2e21c7cb8 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.0", + "version": "0.37.1", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0" + "@polkadot/react-components": "^0.37.1" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 26a1ea5f73b0..519cab4530ec 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.0", + "version": "0.37.1", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 73bd7600cc90..d3815a7cf050 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.0", + "version": "0.37.1", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.0", + "@polkadot/react-components": "^0.37.1", "@polkadot/react-qr": "^0.47.1" } } From df5340b785700ac05993cca1e4d5f8ef2f7ae093 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 29 Nov 2019 20:17:16 +0100 Subject: [PATCH 153/154] Fix change session keys --- packages/app-staking/src/Actions/Account/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app-staking/src/Actions/Account/index.tsx b/packages/app-staking/src/Actions/Account/index.tsx index 009acce9b29f..9d79a2c56d92 100644 --- a/packages/app-staking/src/Actions/Account/index.tsx +++ b/packages/app-staking/src/Actions/Account/index.tsx @@ -364,7 +364,7 @@ class Account extends React.PureComponent { private renderPopupMenu (): React.ReactNode { const { balances_all, isOwnStash, isSubstrateV2, t } = this.props; - const { hexSessionIdNext, isStashNominating, isStashValidating, sessionIds } = this.state; + const { isStashNominating, isStashValidating } = this.state; // only show a "Bond Additional" button if this stash account actually doesn't bond everything already // staking_ledger.total gives the total amount that can be slashed (any active amount + what is being unlocked) @@ -401,7 +401,7 @@ class Account extends React.PureComponent { {t('Change validator preferences')} } - {!isStashNominating && (!!sessionIds.length || (isSubstrateV2 && hexSessionIdNext !== '0x')) && + {!isStashNominating && {isSubstrateV2 ? t('Change session keys') : t('Change session account')} From 05e2a668b04efe9e3b5594957ab0b5fb5a81b8a1 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Fri, 29 Nov 2019 19:23:00 +0000 Subject: [PATCH 154/154] [CI Skip] 0.38.0-beta.0 skip-checks: true --- lerna.json | 2 +- package.json | 2 +- packages/app-123code/package.json | 4 ++-- packages/app-accounts/package.json | 4 ++-- packages/app-address-book/package.json | 4 ++-- packages/app-claims/package.json | 4 ++-- packages/app-contracts/package.json | 4 ++-- packages/app-council/package.json | 6 +++--- packages/app-dashboard/package.json | 6 +++--- packages/app-democracy/package.json | 6 +++--- packages/app-explorer/package.json | 4 ++-- packages/app-extrinsics/package.json | 8 ++++---- packages/app-generic-asset/package.json | 4 ++-- packages/app-js/package.json | 4 ++-- packages/app-parachains/package.json | 6 +++--- packages/app-settings/package.json | 6 +++--- packages/app-staking/package.json | 8 ++++---- packages/app-storage/package.json | 6 +++--- packages/app-sudo/package.json | 4 ++-- packages/app-toolbox/package.json | 4 ++-- packages/app-transfer/package.json | 6 +++--- packages/app-treasury/package.json | 6 +++--- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +++--- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +++--- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 ++-- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lerna.json b/lerna.json index 6fbdf93e8aa2..4caf789fc484 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.37.1" + "version": "0.38.0-beta.0" } diff --git a/package.json b/package.json index 489be0402e0b..75e1730f0902 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "0.37.1", + "version": "0.38.0-beta.0", "private": true, "engines": { "node": ">=10.13.0", diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json index 531485ec887b..24afdb574ca6 100644 --- a/packages/app-123code/package.json +++ b/packages/app-123code/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-123code", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0" } } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index 58b8f2ffba8f..4875598fa1fc 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.37.1", + "version": "0.38.0-beta.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", + "@polkadot/react-components": "^0.38.0-beta.0", "@polkadot/react-qr": "^0.47.1", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json index d533e084b5d3..b30d5e095ab9 100644 --- a/packages/app-address-book/package.json +++ b/packages/app-address-book/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-address-book", - "version": "0.37.1", + "version": "0.38.0-beta.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0" } } diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json index dacc4c426e62..ebae77494168 100644 --- a/packages/app-claims/package.json +++ b/packages/app-claims/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-claims", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0" } } diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 623ac84a9fb9..2ee35a63d58e 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-contracts", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/api-contract": "^0.98.0-beta.0", - "@polkadot/react-components": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0" } } diff --git a/packages/app-council/package.json b/packages/app-council/package.json index c60548c616a0..e19915e2e068 100644 --- a/packages/app-council/package.json +++ b/packages/app-council/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-council", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "Council", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", - "@polkadot/react-query": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0", + "@polkadot/react-query": "^0.38.0-beta.0" } } diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json index a725cc8e9171..f1fc676df956 100644 --- a/packages/app-dashboard/package.json +++ b/packages/app-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-dashboard", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/apps-routing": "^0.37.1", - "@polkadot/react-components": "^0.37.1" + "@polkadot/apps-routing": "^0.38.0-beta.0", + "@polkadot/react-components": "^0.38.0-beta.0" } } diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json index ae9be817bc8f..466837aa94ae 100644 --- a/packages/app-democracy/package.json +++ b/packages/app-democracy/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-democracy", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", - "@polkadot/react-query": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0", + "@polkadot/react-query": "^0.38.0-beta.0" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index 0d6519f0d497..8f7a9f5949cd 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.37.1", + "version": "0.38.0-beta.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0" } } diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index ce046b4c9fb4..050bf090a188 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.37.1", + "version": "0.38.0-beta.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", - "@polkadot/react-params": "^0.37.1", - "@polkadot/react-signer": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0", + "@polkadot/react-params": "^0.38.0-beta.0", + "@polkadot/react-signer": "^0.38.0-beta.0" } } diff --git a/packages/app-generic-asset/package.json b/packages/app-generic-asset/package.json index b709d95ab804..d634ceebeda4 100644 --- a/packages/app-generic-asset/package.json +++ b/packages/app-generic-asset/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-generic-asset", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0" } } diff --git a/packages/app-js/package.json b/packages/app-js/package.json index 13dbba49c811..f9bfa5b18225 100644 --- a/packages/app-js/package.json +++ b/packages/app-js/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-js", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", + "@polkadot/react-components": "^0.38.0-beta.0", "snappyjs": "^0.6.0" } } diff --git a/packages/app-parachains/package.json b/packages/app-parachains/package.json index 27697924f966..cb8caba008c0 100644 --- a/packages/app-parachains/package.json +++ b/packages/app-parachains/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-parachains", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", - "@polkadot/react-query": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0", + "@polkadot/react-query": "^0.38.0-beta.0" } } diff --git a/packages/app-settings/package.json b/packages/app-settings/package.json index 4e4122a2983f..bb432e3d0c0a 100644 --- a/packages/app-settings/package.json +++ b/packages/app-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-settings", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", - "@polkadot/react-query": "^0.37.1", + "@polkadot/react-components": "^0.38.0-beta.0", + "@polkadot/react-query": "^0.38.0-beta.0", "query-string": "^6.8.3" } } diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json index 13b44022d8fb..b5a48b6f02c6 100644 --- a/packages/app-staking/package.json +++ b/packages/app-staking/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-staking", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/app-explorer": "^0.37.1", - "@polkadot/react-components": "^0.37.1", - "@polkadot/react-query": "^0.37.1" + "@polkadot/app-explorer": "^0.38.0-beta.0", + "@polkadot/react-components": "^0.38.0-beta.0", + "@polkadot/react-query": "^0.38.0-beta.0" } } diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 02fe54ee9623..d9f1cfe49421 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.37.1", + "version": "0.38.0-beta.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", - "@polkadot/react-params": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0", + "@polkadot/react-params": "^0.38.0-beta.0" } } diff --git a/packages/app-sudo/package.json b/packages/app-sudo/package.json index 8e275887f400..aa877d526835 100644 --- a/packages/app-sudo/package.json +++ b/packages/app-sudo/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-sudo", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0" } } diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index c5531d563b04..fd78c567096e 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.37.1", + "version": "0.38.0-beta.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0" } } diff --git a/packages/app-transfer/package.json b/packages/app-transfer/package.json index a8cd8f6383e5..977c47c5076e 100644 --- a/packages/app-transfer/package.json +++ b/packages/app-transfer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-transfer", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "A basic transfer app", "main": "index.js", "scripts": {}, @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", - "@polkadot/react-query": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0", + "@polkadot/react-query": "^0.38.0-beta.0" } } diff --git a/packages/app-treasury/package.json b/packages/app-treasury/package.json index b151520a9525..9da3ede5e4d1 100644 --- a/packages/app-treasury/package.json +++ b/packages/app-treasury/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-treasury", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", - "@polkadot/react-query": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0", + "@polkadot/react-query": "^0.38.0-beta.0" } } diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 35d6e4161873..ac087a94765c 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps-routing", - "version": "0.37.1", + "version": "0.38.0-beta.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 5eb65069dd2d..0845fc074112 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -14,8 +14,8 @@ "dependencies": { "@babel/polyfill": "^7.7.0", "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", - "@polkadot/react-signer": "^0.37.1", + "@polkadot/react-components": "^0.38.0-beta.0", + "@polkadot/react-signer": "^0.38.0-beta.0", "@polkadot/ui-assets": "^0.47.1", "query-string": "^6.8.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 5d984e7a0cfd..a0b75cf70c16 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index ef1a8d3feb37..70ba05c7d577 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.37.1", + "version": "0.38.0-beta.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.7.4", "@polkadot/keyring": "^1.7.1", - "@polkadot/react-api": "^0.37.1", + "@polkadot/react-api": "^0.38.0-beta.0", "@polkadot/react-identicon": "^0.47.1", - "@polkadot/react-query": "^0.37.1", + "@polkadot/react-query": "^0.38.0-beta.0", "@polkadot/ui-keyring": "^0.47.1", "@polkadot/ui-settings": "^0.47.1", "@types/chart.js": "^2.8.10", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index fecf4c6f11b9..bd9ed10fa40e 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 87d2e21c7cb8..d007838bbf08 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.37.1", + "version": "0.38.0-beta.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1" + "@polkadot/react-components": "^0.38.0-beta.0" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 519cab4530ec..98743b459447 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.37.1", + "version": "0.38.0-beta.0", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index d3815a7cf050..bf1a9fa21ad0 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.37.1", + "version": "0.38.0-beta.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/react-components": "^0.37.1", + "@polkadot/react-components": "^0.38.0-beta.0", "@polkadot/react-qr": "^0.47.1" } }