diff --git a/package.json b/package.json index d1b4e1a582..f8227befa4 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^1.0.0-beta.13", - "@polkadot/api-contract": "^1.0.0-beta.13", + "@polkadot/api": "^1.0.0-beta.14", + "@polkadot/api-contract": "^1.0.0-beta.14", "@polkadot/keyring": "^2.0.0-beta.4", - "@polkadot/types": "^1.0.0-beta.13", + "@polkadot/types": "^1.0.0-beta.14", "@polkadot/util": "^2.0.0-beta.4", "@polkadot/util-crypto": "^2.0.0-beta.4", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index dd503d8407..7b4b81559f 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -12,7 +12,7 @@ "dependencies": { "@babel/runtime": "^7.7.7", "@polkadot/react-components": "^0.39.0-beta.77", - "@polkadot/react-qr": "^0.48.0-beta.12", + "@polkadot/react-qr": "^0.48.0-beta.13", "@types/file-saver": "^2.0.0", "@types/yargs": "^13.0.2", "detect-browser": "^4.8.0", diff --git a/packages/app-accounts/src/modals/Qr.tsx b/packages/app-accounts/src/modals/Qr.tsx index 0b4f2ad8e5..b2aecd26b7 100644 --- a/packages/app-accounts/src/modals/Qr.tsx +++ b/packages/app-accounts/src/modals/Qr.tsx @@ -6,7 +6,7 @@ import { ModalProps } from '../types'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { AddressRow, Button, Input, InputAddress, Modal } from '@polkadot/react-components'; +import { AddressRow, Button, ButtonCancel, Input, InputAddress, Modal } from '@polkadot/react-components'; import { QrScanAddress } from '@polkadot/react-qr'; import keyring from '@polkadot/ui-keyring'; @@ -15,6 +15,7 @@ import { useTranslation } from '../translate'; interface Scanned { address: string; genesisHash: string; + name?: string; } interface Props extends ModalProps { @@ -27,6 +28,13 @@ function QrModal ({ className, onClose, onStatusChange }: Props): React.ReactEle const [scanned, setScanned] = useState(null); const _onNameChange = (name: string): void => setName({ isNameValid: !!name.trim(), name }); + const _onScan = (scanned: Scanned): void => { + setScanned(scanned); + + if (scanned.name) { + _onNameChange(scanned.name); + } + }; const _onSave = (): void => { if (!scanned || !isNameValid) { return; @@ -75,19 +83,14 @@ function QrModal ({ className, onClose, onStatusChange }: Props): React.ReactEle ) : (
- +
) } -