diff --git a/packages/react-qr/src/ScanAddress.tsx b/packages/react-qr/src/ScanAddress.tsx index 43e09ddc..57dc158d 100644 --- a/packages/react-qr/src/ScanAddress.tsx +++ b/packages/react-qr/src/ScanAddress.tsx @@ -14,6 +14,7 @@ import { decodeAddress } from '@polkadot/util-crypto'; interface ScanType { address: string; genesisHash: string; + name?: string; } interface Props extends BaseProps { @@ -44,12 +45,12 @@ export default class ScanAddress extends React.PureComponent { } try { - const [prefix, address, genesisHash] = data.split(':'); + const [prefix, address, genesisHash, name] = data.split(':'); assert(prefix === ADDRESS_PREFIX, `Invalid address received, expected '${ADDRESS_PREFIX}', found '${prefix}'`); decodeAddress(address); - onScan({ address, genesisHash }); + onScan({ address, genesisHash, name }); } catch (error) { console.error('@polkadot/react-qr:QrScanAddress', error.message, data); } diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json index da899b7c..56d5dd22 100644 --- a/packages/ui-keyring/package.json +++ b/packages/ui-keyring/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@polkadot/keyring": "^2.0.0-beta.4", - "@polkadot/types": "^1.0.0-beta.7", + "@polkadot/types": "^1.0.0-beta.13", "@polkadot/util": "^2.0.0-beta.4" }, "optionalDependencies": { diff --git a/yarn.lock b/yarn.lock index f3d477e2..401fc6f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2237,15 +2237,15 @@ "@polkadot/util" "^2.0.0-beta.4" "@polkadot/util-crypto" "^2.0.0-beta.4" -"@polkadot/metadata@^1.0.0-beta.7": - version "1.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.0.0-beta.7.tgz#fb59f49701733b64beff9833695df63d05a271ab" - integrity sha512-I54dag0cm1gE38i2DWXiYPjPO/lgNLZTBRkiruYbE8ZZ/mWPgRdeqeH5ao/e0y0hAFrrGZeKNlyBlO/QVmSwpA== +"@polkadot/metadata@^1.0.0-beta.13": + version "1.0.0-beta.13" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.0.0-beta.13.tgz#14a98ba637b1a7fc3af1555d5ab96d62b332f1d4" + integrity sha512-Kaira59039p/41WDp+DG9gfWA0wv+vfYaYL7+T3kFguuANvp0vqK66p8VSdaYYpL3IF4alQdUoneHBDOUnFaAA== dependencies: "@babel/runtime" "^7.7.7" - "@polkadot/types" "^1.0.0-beta.7" - "@polkadot/util" "^2.0.0-beta.2" - "@polkadot/util-crypto" "^2.0.0-beta.2" + "@polkadot/types" "^1.0.0-beta.13" + "@polkadot/util" "^2.0.0-beta.4" + "@polkadot/util-crypto" "^2.0.0-beta.4" "@polkadot/ts@^0.1.90": version "0.1.90" @@ -2254,19 +2254,19 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^1.0.0-beta.7": - version "1.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.0.0-beta.7.tgz#2b812525ba2be1a7d8fcb14e6f1bd3aab33d5132" - integrity sha512-ZfDKvtUrQNL+RZbqtFAlgRqAd7LOr+MdfXnIefm0jWlF+avh/JSwDHXmhMZ6RCwRiankPRGAigB/WktNIW29oQ== +"@polkadot/types@^1.0.0-beta.13": + version "1.0.0-beta.13" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.0.0-beta.13.tgz#200e9468285920ad6ed3749ca4022adc46fe8ecf" + integrity sha512-iDrCMqdy5g087yEeKXGlzMehFgg3jVcTerhJTckh0RQEE91IzMh7TWj9rBubB5ym3HhjKWxdEpEhtbiIfOiqJA== dependencies: "@babel/runtime" "^7.7.7" - "@polkadot/metadata" "^1.0.0-beta.7" - "@polkadot/util" "^2.0.0-beta.2" - "@polkadot/util-crypto" "^2.0.0-beta.2" + "@polkadot/metadata" "^1.0.0-beta.13" + "@polkadot/util" "^2.0.0-beta.4" + "@polkadot/util-crypto" "^2.0.0-beta.4" "@types/memoizee" "^0.4.3" memoizee "^0.4.14" -"@polkadot/util-crypto@^2.0.0-beta.2", "@polkadot/util-crypto@^2.0.0-beta.4": +"@polkadot/util-crypto@^2.0.0-beta.4": version "2.0.0-beta.4" resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-2.0.0-beta.4.tgz#1828ccf34a4f7246f74cd51de29977263296eaaf" integrity sha512-gKbLx4bm3EyR/C/P0ckFTuB17JRK31CKgY6a7bYxiNzOXLLEVBlFm8IznJv54trYb1St2xb3JpijMdJ2cuBL6w== @@ -2288,7 +2288,7 @@ tweetnacl "^1.0.1" xxhashjs "^0.2.2" -"@polkadot/util@^2.0.0-beta.2", "@polkadot/util@^2.0.0-beta.4": +"@polkadot/util@^2.0.0-beta.4": version "2.0.0-beta.4" resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-2.0.0-beta.4.tgz#f7be2e17abe85596c6860d980ee3af686154467a" integrity sha512-OsmCYd5Go0QQcYPNVcwv8brEGTDw25SLaWgaaU2YPJqLnHkJp/1vZW6VP6TSW15BpAxN0+GhZs84Ja+1gYHM/g== @@ -6952,6 +6952,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fast-text-encoding@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz#3e5ce8293409cfaa7177a71b9ca84e1b1e6f25ef" + integrity sha512-R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ== + fastq@^1.6.0: version "1.6.0" resolved "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2"