From f30a94b2bc8124de3f955322af1da6e43d966d32 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sun, 1 Sep 2019 16:00:13 +0200 Subject: [PATCH] Return object in onScan result (#195) --- packages/react-qr/src/ScanAddress.tsx | 9 +++++++-- packages/react-qr/src/ScanSignature.tsx | 9 +++++++-- tsconfig.eslint.json | 4 ++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/packages/react-qr/src/ScanAddress.tsx b/packages/react-qr/src/ScanAddress.tsx index 9d70cbb9..5bd0b5b2 100644 --- a/packages/react-qr/src/ScanAddress.tsx +++ b/packages/react-qr/src/ScanAddress.tsx @@ -11,9 +11,14 @@ import { ADDRESS_PREFIX } from './constants'; import QrScan from './Scan'; import { decodeAddress } from '@polkadot/util-crypto'; +interface ScanType { + address: string; + genesisHash: string; +} + interface Props extends BaseProps { onError?: (error: Error) => void; - onScan?: (aqddress: string, genesisHash: string) => void; + onScan?: (scanned: ScanType) => void; } export default class ScanAddress extends React.PureComponent { @@ -44,7 +49,7 @@ export default class ScanAddress extends React.PureComponent { assert(prefix === ADDRESS_PREFIX, `Invalid address received, expected '${ADDRESS_PREFIX}', found '${prefix}'`); decodeAddress(address); - onScan(address, genesisHash); + onScan({ address, genesisHash }); } catch (error) { console.error('@polkadot/react-qr:QrScanAddress', error.message, data); } diff --git a/packages/react-qr/src/ScanSignature.tsx b/packages/react-qr/src/ScanSignature.tsx index aa9db865..543a3e58 100644 --- a/packages/react-qr/src/ScanSignature.tsx +++ b/packages/react-qr/src/ScanSignature.tsx @@ -5,13 +5,18 @@ import { BaseProps } from './types'; import React from 'react'; +import { u8aToHex } from '@polkadot/util'; import QrScan from './Scan'; import { encodeString } from './util'; +interface ScanType { + signature: string; +} + interface Props extends BaseProps { onError?: (error: Error) => void; - onScan?: (data: Uint8Array) => void; + onScan?: (scanned: ScanType) => void; } export default class ScanSignature extends React.PureComponent { @@ -36,6 +41,6 @@ export default class ScanSignature extends React.PureComponent { return; } - onScan(encodeString(data)); + onScan({ signature: u8aToHex(encodeString(data)) }); } } diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json index 537a8286..73a45f85 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.eslint.json @@ -1,5 +1,9 @@ { "extends": "./tsconfig.json", + "exclude": [ + "build", + "packages/*/build" + ], "include": [ "packages/**/*.d.ts", "packages/**/*.ts",