From 946bb17311e952cd217628d3f2352dd96ce0efc6 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 1 Mar 2019 11:19:36 +0100 Subject: [PATCH] Handle unknown types (via createType) (#771) * Handle unknown types (via createType) * Bump deps --- package.json | 1 - packages/apps/package.json | 2 +- packages/ui-api/package.json | 4 +- packages/ui-app/package.json | 8 +- packages/ui-params/src/Param/findComponent.ts | 12 +- packages/ui-params/src/initValue.ts | 11 +- yarn.lock | 198 +++++++++--------- 7 files changed, 122 insertions(+), 114 deletions(-) diff --git a/package.json b/package.json index 270ccddc01..7935ba3c64 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "clean": "polkadot-dev-clean-build", "postinstall": "polkadot-dev-yarn-only", "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 --config webpack.config.js" }, diff --git a/packages/apps/package.json b/packages/apps/package.json index 200ea68e2b..01f62b3362 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -14,7 +14,7 @@ "dependencies": { "@babel/runtime": "^7.3.4", "@polkadot/ui-app": "^0.24.23", - "@polkadot/ui-assets": "^0.28.5", + "@polkadot/ui-assets": "^0.28.6", "@polkadot/ui-signer": "^0.24.23" } } diff --git a/packages/ui-api/package.json b/packages/ui-api/package.json index 3e0951e9ce..6ee034dc85 100644 --- a/packages/ui-api/package.json +++ b/packages/ui-api/package.json @@ -31,8 +31,8 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.3.4", - "@polkadot/api": "^0.45.18", - "@polkadot/ui-util": "^0.28.5", + "@polkadot/api": "^0.45.20", + "@polkadot/ui-util": "^0.28.6", "rxjs-compat": "^6.3.2" } } diff --git a/packages/ui-app/package.json b/packages/ui-app/package.json index 6833440e21..7779e8f0f4 100644 --- a/packages/ui-app/package.json +++ b/packages/ui-app/package.json @@ -12,11 +12,11 @@ "dependencies": { "@babel/runtime": "^7.3.4", "@polkadot/ui-api": "^0.24.23", - "@polkadot/ui-identicon": "^0.28.5", - "@polkadot/ui-keyring": "^0.28.5", + "@polkadot/ui-identicon": "^0.28.6", + "@polkadot/ui-keyring": "^0.28.6", "@polkadot/ui-reactive": "^0.24.23", - "@polkadot/ui-settings": "^0.28.5", - "@polkadot/ui-util": "^0.28.5", + "@polkadot/ui-settings": "^0.28.6", + "@polkadot/ui-util": "^0.28.6", "@types/chart.js": "^2.7.45", "@types/i18next": "^12.1.0", "@types/react-copy-to-clipboard": "^4.2.6", diff --git a/packages/ui-params/src/Param/findComponent.ts b/packages/ui-params/src/Param/findComponent.ts index 7fc3f9ef4d..59b0c34ce2 100644 --- a/packages/ui-params/src/Param/findComponent.ts +++ b/packages/ui-params/src/Param/findComponent.ts @@ -30,7 +30,7 @@ type TypeToComponent = { const components: ComponentMap = ([ { c: Account, t: ['AccountId', 'AccountIdOf', 'Address', 'SessionKey'] }, - { c: Amount, t: ['AccountIndex', 'BlockNumber', 'Gas', 'Index', 'ParaId', 'ProposalIndex', 'PropIndex', 'ReferendumIndex', 'u16', 'u32', 'u64', 'u128', 'u256', 'VoteIndex'] }, + { c: Amount, t: ['AccountIndex', 'BlockNumber', 'Gas', 'Index', 'Nonce', 'ParaId', 'ProposalIndex', 'PropIndex', 'ReferendumIndex', 'u16', 'u32', 'u64', 'u128', 'u256', 'VoteIndex'] }, { c: Balance, t: ['Amount', 'AssetOf', 'Balance', 'BalanceOf'] }, { c: Bool, t: ['bool'] }, { c: Bytes, t: ['Bytes'] }, @@ -75,10 +75,14 @@ export default function findComponent (def: TypeDef, overrides: ComponentMap = { let Component = overrides[type] || components[type]; if (!Component) { - const instance = createType(type); + try { + const instance = createType(type); - if (instance instanceof UInt) { - return Amount; + if (instance instanceof UInt) { + return Amount; + } + } catch (error) { + // console.error(error.message); } } diff --git a/packages/ui-params/src/initValue.ts b/packages/ui-params/src/initValue.ts index be69ceb74e..eb25fa2fdc 100644 --- a/packages/ui-params/src/initValue.ts +++ b/packages/ui-params/src/initValue.ts @@ -31,6 +31,7 @@ export default function getInitValue (def: TypeDef): RawParam$Value | Array