Skip to content

Commit

Permalink
Merge branch 'master' of github.com:polkadot-js/apps into sd-app-js-s…
Browse files Browse the repository at this point in the history
…ave-code-snippets

# By Jaco Greeff (6) and Travis CI (6)
# Via Travis CI
* 'master' of github.com:polkadot-js/apps:
  [CI Skip]  0.23.33
  Warp ui--row inside Params (#727)
  [CI Skip]  0.23.32
  Fix InputBalance with initial value (#726)
  [CI Skip]  0.23.31
  Pull in @polkadot/ui-util (#724)
  [CI Skip]  0.23.30
  Fix validatorPrefs input (#721)
  [CI Skip]  0.23.29
  Bump deps (#720)
  [CI Skip]  0.23.28
  Schnorrkel support (#710)

Conflicts:
	yarn.lock
  • Loading branch information
Stefie committed Feb 18, 2019
2 parents ef8b057 + 2bd2139 commit cd3dd21
Show file tree
Hide file tree
Showing 87 changed files with 1,101 additions and 1,340 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"packages": [
"packages/*"
],
"version": "0.23.27"
"version": "0.23.33"
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.23.27",
"version": "0.23.33",
"private": true,
"engines": {
"node": ">=10.13.0",
Expand All @@ -11,23 +11,23 @@
],
"resolutions": {
"babel-core": "^7.0.0-bridge.0",
"rxjs": "^6.3.2",
"typescript": "^3.2.2"
"rxjs": "^6.4.0",
"typescript": "^3.3.3"
},
"scripts": {
"analyze": "yarn run build && cd packages/apps && yarn run source-map-explorer build/main.*.js",
"build": "polkadot-dev-build-ts",
"check": "tslint --project . && tsc --noEmit --pretty",
"clean": "polkadot-dev-clean-build",
"postinstall": "polkadot-dev-yarn-only",
"test": "jest --coverage",
"test": "echo \"skipping tests\"",
"deploy:ghpages": "gh-pages --dist packages/apps/build --remove locales,static,*.css,*.js,*.json,*.map,*.md",
"vanitygen": "node packages/app-accounts/scripts/vanitygen.js",
"start": "cd packages/apps && webpack-serve --config webpack.config.js --port 3000"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"@polkadot/dev-react": "^0.23.14",
"@polkadot/dev-react": "^0.24.2",
"@polkadot/ts": "^0.1.52",
"autoprefixer": "^9.4.5",
"empty": "^0.10.1",
Expand All @@ -41,6 +41,6 @@
"postcss-sass": "^0.3.5",
"postcss-simple-vars": "^5.0.0",
"precss": "^4.0.0",
"source-map-explorer": "^1.6.0"
"source-map-explorer": "^1.7.0"
}
}
4 changes: 2 additions & 2 deletions packages/app-123code/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@polkadot/app-123code",
"version": "0.23.27",
"version": "0.23.33",
"description": "A baasic app that shows the ropes on customisation",
"main": "index.js",
"scripts": {},
Expand All @@ -11,6 +11,6 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.2.0",
"@polkadot/ui-app": "^0.23.27"
"@polkadot/ui-app": "^0.23.33"
}
}
2 changes: 1 addition & 1 deletion packages/app-123code/src/SummaryBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import React from 'react';
import { AccountId, RuntimeVersion } from '@polkadot/types';
import { withCalls } from '@polkadot/ui-api/with';
import { Bubble, IdentityIcon } from '@polkadot/ui-app/index';
import { formatBalance, formatNumber } from '@polkadot/ui-app/util';
import { formatBalance, formatNumber } from '@polkadot/ui-util';

import translate from './translate';

Expand Down
8 changes: 4 additions & 4 deletions packages/app-accounts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@polkadot/app-accounts",
"version": "0.23.27",
"version": "0.23.33",
"main": "index.js",
"repository": "https://github.com/polkadot-js/apps.git",
"author": "Jaco Greeff <[email protected]>",
Expand All @@ -11,13 +11,13 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.2.0",
"@polkadot/ui-app": "^0.23.27",
"@polkadot/ui-app": "^0.23.33",
"@types/file-saver": "^2.0.0",
"@types/yargs": "^12.0.5",
"@types/yargs": "^12.0.9",
"babel-plugin-module-resolver": "^3.1.1",
"file-saver": "^2.0.0",
"libsodium-wrappers": "^0.7.3",
"yargs": "^12.0.5"
"yargs": "^13.2.0"
},
"optionalDependencies": {
"sodium": "^3.0.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/app-addresses/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@polkadot/app-addresses",
"version": "0.23.27",
"version": "0.23.33",
"main": "index.js",
"repository": "https://github.com/polkadot-js/apps.git",
"author": "Jaco Greeff <[email protected]>",
Expand All @@ -11,6 +11,6 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.2.0",
"@polkadot/ui-app": "^0.23.27"
"@polkadot/ui-app": "^0.23.33"
}
}
6 changes: 3 additions & 3 deletions packages/app-democracy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@polkadot/app-democracy",
"version": "0.23.27",
"version": "0.23.33",
"description": "A referendum & proposal app",
"main": "index.js",
"scripts": {},
Expand All @@ -11,7 +11,7 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.2.0",
"@polkadot/ui-app": "^0.23.27",
"@polkadot/ui-reactive": "^0.23.27"
"@polkadot/ui-app": "^0.23.33",
"@polkadot/ui-reactive": "^0.23.33"
}
}
2 changes: 1 addition & 1 deletion packages/app-democracy/src/Item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import BN from 'bn.js';
import React from 'react';
import { Method, Proposal } from '@polkadot/types';
import { Call } from '@polkadot/ui-app/index';
import { formatNumber } from '@polkadot/ui-app/util';
import { formatNumber } from '@polkadot/ui-util';

import translate from './translate';

Expand Down
2 changes: 1 addition & 1 deletion packages/app-democracy/src/Proposal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import React from 'react';
import { AccountId, Balance, Proposal, Tuple, Vector } from '@polkadot/types';
import { AddressMini, Labelled, Static } from '@polkadot/ui-app/index';
import { withCall, withMulti } from '@polkadot/ui-api/index';
import { formatBalance } from '@polkadot/ui-app/util/index';
import { formatBalance } from '@polkadot/ui-util';

import Item from './Item';
import translate from './translate';
Expand Down
2 changes: 1 addition & 1 deletion packages/app-democracy/src/Referendum.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { ReferendumInfo } from '@polkadot/types';
import { Chart, Static } from '@polkadot/ui-app/index';
import VoteThreshold from '@polkadot/ui-params/Param/VoteThreshold';
import { withCalls } from '@polkadot/ui-api/index';
import { formatBalance, formatNumber } from '@polkadot/ui-app/util/index';
import { formatBalance, formatNumber } from '@polkadot/ui-util';
import settings from '@polkadot/ui-settings';

import Item from './Item';
Expand Down
2 changes: 1 addition & 1 deletion packages/app-democracy/src/Summary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
import BN from 'bn.js';
import React from 'react';
import { CardSummary } from '@polkadot/ui-app/index';
import { formatNumber } from '@polkadot/ui-app/util/index';
import { formatNumber } from '@polkadot/ui-util';
import { withCalls } from '@polkadot/ui-api/index';

import translate from './translate';
Expand Down
4 changes: 2 additions & 2 deletions packages/app-explorer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@polkadot/app-explorer",
"version": "0.23.27",
"version": "0.23.33",
"main": "index.js",
"repository": "https://github.com/polkadot-js/apps.git",
"author": "Jaco Greeff <[email protected]>",
Expand All @@ -11,6 +11,6 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.2.0",
"@polkadot/ui-app": "^0.23.27"
"@polkadot/ui-app": "^0.23.33"
}
}
2 changes: 1 addition & 1 deletion packages/app-explorer/src/BlockByHash/Extrinsics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/ui-app/types';

import React from 'react';
import { AddressMini, Call } from '@polkadot/ui-app/index';
import { formatNumber } from '@polkadot/ui-app/util';
import { formatNumber } from '@polkadot/ui-util';
import { Extrinsic, Method } from '@polkadot/types';

import translate from '../translate';
Expand Down
2 changes: 1 addition & 1 deletion packages/app-explorer/src/BlockHeader/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import React from 'react';
import { Link } from 'react-router-dom';
import { HeaderExtended } from '@polkadot/types';
import { AddressMini } from '@polkadot/ui-app/index';
import { formatNumber } from '@polkadot/ui-app/util';
import { formatNumber } from '@polkadot/ui-util';

type Props = BareProps & {
isSummary?: boolean,
Expand Down
2 changes: 1 addition & 1 deletion packages/app-explorer/src/Events.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
import React from 'react';
import { EventRecord } from '@polkadot/types';
import { Event as EventDisplay } from '@polkadot/ui-app/index';
import { formatNumber } from '@polkadot/ui-app/util';
import { formatNumber } from '@polkadot/ui-util';

import translate from './translate';

Expand Down
6 changes: 3 additions & 3 deletions packages/app-explorer/src/NodeInfo/Peers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/ui-app/types';

import React from 'react';
import { PeerInfo } from '@polkadot/types';
import { formatNumber } from '@polkadot/ui-app/util';
import { formatNumber } from '@polkadot/ui-util';

import translate from './translate';

Expand Down Expand Up @@ -44,7 +44,7 @@ class Peers extends React.PureComponent<Props> {
<tr>
<th className='number'>{t('index')}</th>
<th className='roles'>{t('role')}</th>
<th className='peerid'>{t('peer id')}</th>
<th className='peerid ui--media-medium'>{t('peer id')}</th>
<th className='number'>{t('best #')}</th>
<th className='hash'>{t('best hash')}</th>
</tr>
Expand All @@ -62,7 +62,7 @@ class Peers extends React.PureComponent<Props> {
<tr key={`peer:${peer.index.toNumber()}`}>
<td className='number'>{peer.index.toNumber()}</td>
<td className='roles'>{peer.roles.toString().toLowerCase()}</td>
<td className='peerid'>{peer.peerId.toString()}</td>
<td className='peerid ui--media-medium'>{peer.peerId.toString()}</td>
<td className='number'>{formatNumber(peer.bestNumber)}</td>
<td className='hash'>{peer.bestHash.toHex()}</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion packages/app-explorer/src/NodeInfo/Summary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Info } from './types';
import BN from 'bn.js';
import React from 'react';
import { CardSummary } from '@polkadot/ui-app/index';
import { formatNumber } from '@polkadot/ui-app/util';
import { formatNumber } from '@polkadot/ui-util';
import { BestNumber, Elapsed } from '@polkadot/ui-reactive/index';

import translate from './translate';
Expand Down
8 changes: 4 additions & 4 deletions packages/app-extrinsics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@polkadot/app-extrinsics",
"version": "0.23.27",
"version": "0.23.33",
"main": "index.js",
"repository": "https://github.com/polkadot-js/apps.git",
"author": "Jaco Greeff <[email protected]>",
Expand All @@ -11,8 +11,8 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.2.0",
"@polkadot/ui-app": "^0.23.27",
"@polkadot/ui-params": "^0.23.27",
"@polkadot/ui-signer": "^0.23.27"
"@polkadot/ui-app": "^0.23.33",
"@polkadot/ui-params": "^0.23.33",
"@polkadot/ui-signer": "^0.23.33"
}
}
4 changes: 2 additions & 2 deletions packages/app-js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@polkadot/app-js",
"version": "0.23.27",
"version": "0.23.33",
"description": "A simple JavaScript console for playing with the API",
"main": "index.js",
"scripts": {},
Expand All @@ -11,7 +11,7 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.2.0",
"@polkadot/ui-app": "^0.23.27",
"@polkadot/ui-app": "^0.23.33",
"codeflask": "1.4.0"
}
}
6 changes: 3 additions & 3 deletions packages/app-settings/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@polkadot/app-settings",
"version": "0.23.27",
"version": "0.23.33",
"description": "Settings management",
"main": "index.js",
"scripts": {},
Expand All @@ -11,7 +11,7 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.2.0",
"@polkadot/ui-app": "^0.23.27",
"@polkadot/ui-reactive": "^0.23.27"
"@polkadot/ui-app": "^0.23.33",
"@polkadot/ui-reactive": "^0.23.33"
}
}
8 changes: 4 additions & 4 deletions packages/app-staking/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@polkadot/app-staking",
"version": "0.23.27",
"version": "0.23.33",
"description": "A basic staking app",
"main": "index.js",
"scripts": {},
Expand All @@ -11,8 +11,8 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.2.0",
"@polkadot/app-explorer": "^0.23.27",
"@polkadot/ui-app": "^0.23.27",
"@polkadot/ui-reactive": "^0.23.27"
"@polkadot/app-explorer": "^0.23.33",
"@polkadot/ui-app": "^0.23.33",
"@polkadot/ui-reactive": "^0.23.33"
}
}
2 changes: 1 addition & 1 deletion packages/app-staking/src/Overview/CurrentList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import React from 'react';
import { AccountId, Balance, HeaderExtended } from '@polkadot/types';
import { withCall, withMulti } from '@polkadot/ui-api/with';
import { AddressMini, AddressRow } from '@polkadot/ui-app/index';
import { formatNumber } from '@polkadot/ui-app/util';
import { formatNumber } from '@polkadot/ui-util';
import keyring from '@polkadot/ui-keyring';

import translate from '../translate';
Expand Down
2 changes: 1 addition & 1 deletion packages/app-staking/src/Overview/Summary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import BN from 'bn.js';
import React from 'react';
import SummarySession from '@polkadot/app-explorer/SummarySession';
import { CardSummary } from '@polkadot/ui-app/index';
import { formatBalance } from '@polkadot/ui-app/util';
import { formatBalance } from '@polkadot/ui-util';
import { withCall, withMulti } from '@polkadot/ui-api/index';

import translate from '../translate';
Expand Down
Loading

0 comments on commit cd3dd21

Please sign in to comment.