diff --git a/packages/page-contracts/src/Codes/Code.tsx b/packages/page-contracts/src/Codes/Code.tsx index 08f018dac3..a22ba8f9cd 100644 --- a/packages/page-contracts/src/Codes/Code.tsx +++ b/packages/page-contracts/src/Codes/Code.tsx @@ -30,14 +30,12 @@ function Code ({ className, code, onShowDeploy }: Props): React.ReactElement onShowDeploy(codeHash)(), + () => onShowDeploy(codeHash)(), [codeHash, onShowDeploy] ); const _onDeployConstructor = useCallback( - (constructorIndex = 0): void => { - codeHash && onShowDeploy && onShowDeploy(codeHash, constructorIndex)(); - }, + (constructorIndex = 0) => codeHash && onShowDeploy && onShowDeploy(codeHash, constructorIndex)(), [codeHash, onShowDeploy] ); diff --git a/packages/page-contracts/src/Contracts/Call.tsx b/packages/page-contracts/src/Contracts/Call.tsx index 70c41f6d24..c17bc35f57 100644 --- a/packages/page-contracts/src/Contracts/Call.tsx +++ b/packages/page-contracts/src/Contracts/Call.tsx @@ -75,7 +75,7 @@ function Call (props: Props): React.ReactElement | null { ); const _constructTx = useCallback( - (): any[] => { + (): unknown[] => { if (!accountId || !callMessage || !callMessage.fn || !callContract || !callContract.address) { return []; } @@ -102,14 +102,12 @@ function Call (props: Props): React.ReactElement | null { ); const _onClearOutcomes = useCallback( - (): void => setOutcomes([]), + () => setOutcomes([]), [] ); const _onClearOutcome = useCallback( - (outcomeIndex: number) => (): void => { - setOutcomes(outcomes.slice(0, outcomeIndex).concat(outcomes.slice(outcomeIndex + 1))); - }, + (outcomeIndex: number) => () => setOutcomes(outcomes.slice(0, outcomeIndex).concat(outcomes.slice(outcomeIndex + 1))), [outcomes] ); diff --git a/packages/page-contracts/src/Deploy.tsx b/packages/page-contracts/src/Deploy.tsx index 58e470439f..2e65be3aaf 100644 --- a/packages/page-contracts/src/Deploy.tsx +++ b/packages/page-contracts/src/Deploy.tsx @@ -2,8 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { AccountId } from '@polkadot/types/interfaces'; import { StringOrNull, VoidFn } from '@polkadot/react-components/types'; +import { AccountId } from '@polkadot/types/interfaces'; +import { CodecArg } from '@polkadot/types/types'; import { CodeStored } from './types'; import BN from 'bn.js'; @@ -73,38 +74,29 @@ function Deploy ({ allCodes, basePath, codeHash, constructorIndex = 0, isOpen, o return []; } - return contractAbi.abi.contract.constructors.map( - (constr, index) => { - return { - key: `${index}`, - text: ( - - ), - value: `${index}` - }; - }); + return contractAbi.abi.contract.constructors.map((message, index) => ({ + key: `${index}`, + text: ( + + ), + value: `${index}` + })); }, [contractAbi] ); - const [params, setParams] = useState( - contractAbi && constructorIndex >= 0 ? contractAbi.abi.contract.constructors[constructorIndex].args : [] - ); + const [params, setParams] = useState(contractAbi && constructorIndex >= 0 ? contractAbi.abi.contract.constructors[constructorIndex].args : []); useEffect( - (): void => { - setParams(contractAbi ? contractAbi.abi.contract.constructors[constructorIndex].args : []); - }, + () => setParams(contractAbi ? contractAbi.abi.contract.constructors[constructorIndex].args : []), [constructorIndex, contractAbi] ); useEffect( - (): void => { - setName(t(defaultContractName(code.json.name))); - }, + () => setName(t(defaultContractName(code.json.name))), [code, setName, t] ); @@ -114,7 +106,7 @@ function Deploy ({ allCodes, basePath, codeHash, constructorIndex = 0, isOpen, o return []; } - return [endowment, weight, codeHash, contractAbi.constructors[constructorIndex](...params)]; + return [endowment, weight, codeHash, contractAbi.constructors[constructorIndex](...(params as CodecArg[]))]; }, [codeHash, constructorIndex, contractAbi, endowment, params, weight] ); diff --git a/packages/page-contracts/src/shared/CodeRow.tsx b/packages/page-contracts/src/shared/CodeRow.tsx index 9916e49afa..5844843d84 100644 --- a/packages/page-contracts/src/shared/CodeRow.tsx +++ b/packages/page-contracts/src/shared/CodeRow.tsx @@ -51,10 +51,9 @@ function CodeRow ({ buttons, children, className, code: { json }, isInline, with const _onSaveTags = useCallback( (): void => { - if (codeHash) { - contracts.saveCode(createType(registry, 'Hash', codeHash), { tags }) - .catch((e): void => console.error(e)); - } + codeHash && contracts + .saveCode(createType(registry, 'Hash', codeHash), { tags }) + .catch((e): void => console.error(e)); }, [codeHash, tags] ); diff --git a/packages/page-contracts/src/shared/Params.tsx b/packages/page-contracts/src/shared/Params.tsx index d23a1e9f45..8fc3f477f7 100644 --- a/packages/page-contracts/src/shared/Params.tsx +++ b/packages/page-contracts/src/shared/Params.tsx @@ -29,7 +29,7 @@ function Params ({ isDisabled, onChange, onEnter, params: propParams }: Props): }, [propParams]); const _onChange = useCallback( - (values: RawParams) => onChange(values.map(({ value }): any => value)), + (values: RawParams) => onChange(values.map(({ value }) => value)), [onChange] );