From ea2394f3905b3ff6bc5ebae95cce2262a5875b61 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 5 Dec 2018 13:17:11 +0100 Subject: [PATCH] Cleanup issues, allow travis build (#1) * Cleanup issues, allow travis build * Add missing xmlserializer package * xmlserializer as dev dep --- packages/ui-identicon/package.json | 4 ++ packages/ui-keyring/package.json | 1 + packages/ui-keyring/src/options/KeyPair.tsx | 18 +----- packages/ui-keyring/src/options/item.tsx | 10 ++- yarn.lock | 71 +++++++++------------ 5 files changed, 45 insertions(+), 59 deletions(-) diff --git a/packages/ui-identicon/package.json b/packages/ui-identicon/package.json index fb12504c..18e8eea6 100644 --- a/packages/ui-identicon/package.json +++ b/packages/ui-identicon/package.json @@ -14,7 +14,11 @@ "@polkadot/ui-settings": "^0.22.0", "@polkadot/util-crypto": "^0.33.7", "@types/color": "^3.0.0", + "@types/react-copy-to-clipboard": "^4.2.6", "color": "^3.0.0", "react-copy-to-clipboard": "^5.0.1" + }, + "devDependencies": { + "xmlserializer": "^0.6.1" } } diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json index 7fb14818..9aff2e91 100644 --- a/packages/ui-keyring/package.json +++ b/packages/ui-keyring/package.json @@ -12,6 +12,7 @@ "dependencies": { "@babel/runtime": "^7.1.5", "@polkadot/keyring": "^0.33.7", + "@polkadot/types": "^0.32.21", "store": "^2.0.12" } } diff --git a/packages/ui-keyring/src/options/KeyPair.tsx b/packages/ui-keyring/src/options/KeyPair.tsx index 0bffb97d..051010c5 100644 --- a/packages/ui-keyring/src/options/KeyPair.tsx +++ b/packages/ui-keyring/src/options/KeyPair.tsx @@ -5,26 +5,20 @@ import './KeyPair.css'; import React from 'react'; -import { AccountId } from '@polkadot/types'; -import IdentityIcon from '@polkadot/ui-app/IdentityIcon'; -import { withMulti, withObservable } from '@polkadot/ui-react-rx/with/index'; +import IdentityIcon from '@polkadot/ui-identicon/index'; type Props = { address: string, className?: string, name: string, - sessionValidators?: Array, style?: { [index: string]: string } }; -class KeyPair extends React.PureComponent { +export default class KeyPair extends React.PureComponent { render () { - const { address, className, name, sessionValidators = [], style } = this.props; - const isValidator = sessionValidators.find((validator) => - validator.toString() === address - ); + const { address, className, name, style } = this.props; return (
{ > @@ -47,8 +40,3 @@ class KeyPair extends React.PureComponent { ); } } - -export default withMulti( - KeyPair, - withObservable('sessionValidators') -); diff --git a/packages/ui-keyring/src/options/item.tsx b/packages/ui-keyring/src/options/item.tsx index d4795c9c..c8f74ee8 100644 --- a/packages/ui-keyring/src/options/item.tsx +++ b/packages/ui-keyring/src/options/item.tsx @@ -5,13 +5,17 @@ import { KeyringSectionOption } from './types'; import React from 'react'; -import toShortAddress from '@polkadot/ui-app/util/toShortAddress'; +import { isUndefined } from '@polkadot/util'; import KeyPair from './KeyPair'; export default function createItem (address: string, _name?: string): KeyringSectionOption { - const name = _name === undefined - ? toShortAddress(address) + const name = isUndefined(_name) + ? ( + (address.length > 15) + ? `${address.slice(0, 7)}…${address.slice(-7)}` + : address + ) : _name; return { diff --git a/yarn.lock b/yarn.lock index 2d0cba1b..0032ed72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1425,6 +1425,15 @@ resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.40.tgz#d5e8af7e37a3382165d387c2cddf5930879a4c45" integrity sha512-OKPToc6z4NnO+i6tNh0GewhFzQZFchn87Iv1IB1AXEqhzN3kRHlYWbnJh+iQ73C0zTwrx7BxmhMyv9pnEJScHQ== +"@polkadot/types@^0.32.21": + version "0.32.23" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.32.23.tgz#415ece266fcb16e08cc4e40df2994f05fabb8998" + integrity sha512-vFK1hmdlDoeXgjnqrzgUL7KeSerFXItvVGGsqdpuGteiYgPGteigrU/3PC4eiMO1yH/6/lhJdDNwbyAsZlphMw== + dependencies: + "@babel/runtime" "^7.1.5" + "@polkadot/keyring" "^0.33.7" + "@polkadot/util" "^0.33.7" + "@polkadot/util-crypto@^0.33.7": version "0.33.7" resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.33.7.tgz#420d7c919feb0dd20b353051e033646582f98667" @@ -1601,6 +1610,13 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.6.tgz#9c03d3fed70a8d517c191b7734da2879b50ca26c" integrity sha512-ZBFR7TROLVzCkswA3Fmqq+IIJt62/T7aY/Dmz+QkU7CaW2QFqAitCE8Ups7IzmGhcN1YWMBT4Qcoc07jU9hOJQ== +"@types/react-copy-to-clipboard@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@types/react-copy-to-clipboard/-/react-copy-to-clipboard-4.2.6.tgz#d1374550dec803f17f26ec71b62783c5737bfc02" + integrity sha512-v4/yLsuPf8GSFuTy9fA1ABpL5uuy04vwW7qs+cfxSe1UU/M/KK95rF3N3GRseismoK9tA28SvpwVsAg/GWoF3A== + dependencies: + "@types/react" "*" + "@types/react-dom@^16.0.10": version "16.0.11" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.11.tgz#bd10ccb0d9260343f4b9a49d4f7a8330a5c1f081" @@ -1966,11 +1982,6 @@ ansi-escapes@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw== -ansi-regex@*, ansi-regex@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9" - integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w== - ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -1981,6 +1992,11 @@ ansi-regex@^3.0.0, ansi-regex@~3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9" + integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -3881,7 +3897,7 @@ debug@^4.0.0, debug@^4.1.0: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -5878,7 +5894,7 @@ import-local@^2.0.0: pkg-dir "^3.0.0" resolve-cwd "^2.0.0" -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -7284,11 +7300,6 @@ lockfile@~1.0.1, lockfile@~1.0.3: dependencies: signal-exit "^3.0.2" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -7297,33 +7308,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= - -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= - lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -7374,11 +7363,6 @@ lodash.padstart@^4.1.0: resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= -lodash.restparam@*: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -9993,7 +9977,7 @@ readable-stream@~2.1.5: string_decoder "~0.10.x" util-deprecate "~1.0.1" -readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0: +readdir-scoped-modules@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747" integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c= @@ -12153,7 +12137,7 @@ v8-compile-cache@^2.0.0, v8-compile-cache@^2.0.2: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c" integrity sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw== -validate-npm-package-license@*, validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3, validate-npm-package-license@~3.0.1: +validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3, validate-npm-package-license@~3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== @@ -12624,6 +12608,11 @@ xml-name-validator@^3.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== +xmlserializer@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/xmlserializer/-/xmlserializer-0.6.1.tgz#14099f60272e16cb608be3758992f998070cc29a" + integrity sha512-FNb0eEqqUUbnuvxuHqNuKH8qCGKqxu+558Zi8UzOoQk8Z9LdvpONK+v7m3gpKVHrk5Aq+0nNLsKxu/6OYh7Umw== + xregexp@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"