Skip to content

Commit a670db5

Browse files
committed
fix type incompatible
1 parent 54da643 commit a670db5

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

e2e/zombienet/src/utils.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { development, Props, TypinkProvider } from 'typink';
1+
import { development, InjectedSigner, Props, SignerPayloadJSON, TypinkProvider } from 'typink';
22
import Keyring from '@polkadot/keyring';
33
import { FlipperContractApi } from './contracts/flipper';
44
// @ts-ignore
@@ -7,7 +7,6 @@ import { ContractDeployer, parseRawMetadata } from 'dedot/contracts';
77
import { assert, deferred } from 'dedot/utils';
88
import { cryptoWaitReady } from '@polkadot/util-crypto';
99
import { KeyringPair } from '@polkadot/keyring/types';
10-
import { Signer, SignerPayloadJSON } from '@polkadot/types/types';
1110
import { TypeRegistry } from '@polkadot/types';
1211

1312
await cryptoWaitReady();
@@ -33,7 +32,7 @@ export const mockSigner = {
3332
...result,
3433
};
3534
},
36-
} as Signer;
35+
} as InjectedSigner;
3736

3837
export const wrapper = ({ children }: Props) => (
3938
<TypinkProvider

packages/typink/src/pjs-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export interface InjectedSigner {
4949

5050
export interface SignerPayloadJSON {
5151
address: string;
52-
assetId?: number | object;
52+
assetId?: HexString;
5353
blockHash: HexString;
5454
blockNumber: HexString;
5555
era: HexString;

packages/typink/src/providers/WalletProvider.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { createContext, useContext } from 'react';
2-
import { InjectedAccount, Props } from '../types.js';
3-
import type { Signer as InjectedSigner } from '@polkadot/api/types';
2+
import { InjectedAccount, InjectedSigner, Props } from '../types.js';
43

54
export interface WalletContextProps {
65
signer?: InjectedSigner;

packages/typink/src/providers/WalletSetupProvider.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { createContext, useContext, useEffect, useMemo, useState } from 'react';
22
import { useLocalStorage } from 'react-use';
33
import { useIsFirstRender, useWallets } from '../hooks/index.js';
4-
import { InjectedAccount } from '../types.js';
4+
import { InjectedAccount, InjectedSigner } from '../types.js';
55
import { Wallet } from '../wallets/index.js';
66
import { assert } from 'dedot/utils';
7-
import type { Signer as InjectedSigner } from '@polkadot/api/types';
87
import { noop } from '../utils/index.js';
98
import { WalletProvider, WalletProviderProps } from './WalletProvider.js';
109

0 commit comments

Comments
 (0)