diff --git a/packages/react-hooks/src/useTxBatch.ts b/packages/react-hooks/src/useTxBatch.ts index 43cc43d054..db16c357c8 100644 --- a/packages/react-hooks/src/useTxBatch.ts +++ b/packages/react-hooks/src/useTxBatch.ts @@ -47,7 +47,7 @@ function useTxBatchImpl (txs?: SubmittableExtrinsic<'promise'>[] | null | false, const [batchSize, setBatchSize] = useState(() => Math.floor(options?.max || 64)); useEffect((): void => { - txs && txs.length && allAccounts[0] && api.call.transactionPaymentApi && + txs && txs.length && allAccounts[0] && txs[0].hasPaymentInfo && nextTick(async (): Promise => { try { const paymentInfo = await txs[0].paymentInfo(allAccounts[0]); diff --git a/packages/react-signer/src/PaymentInfo.tsx b/packages/react-signer/src/PaymentInfo.tsx index abfe49d5d6..1fa4461a01 100644 --- a/packages/react-signer/src/PaymentInfo.tsx +++ b/packages/react-signer/src/PaymentInfo.tsx @@ -32,7 +32,7 @@ function PaymentInfo ({ accountId, className = '', extrinsic }: Props): React.Re const mountedRef = useIsMountedRef(); useEffect((): void => { - accountId && extrinsic && api.call.transactionPaymentApi && + accountId && extrinsic && extrinsic.hasPaymentInfo && nextTick(async (): Promise => { try { const info = await extrinsic.paymentInfo(accountId);