neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure light connect issues doesn't break app (#7331)

Browse Source
This commit is contained in:
Jaco 2022-04-08 14:32:50 +02:00 committed by GitHub
parent 78ab0f633e
commit e3588f194f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
packages/react-api/src/Api.tsx
View File

@ -184,25 +184,30 @@ async function loadOnReady (api: ApiPromise, endpoint: LinkOption | null, inject
}
// eslint-disable-next-line @typescript-eslint/require-await
async function createApi (apiUrl: string, signer: ApiSigner): Promise<Record<string, Record<string, string>>> {
async function createApi (apiUrl: string, signer: ApiSigner, onError: (error: unknown) => void): Promise<Record<string, Record<string, string>>> {
const types = getDevTypes();
const isLight = apiUrl.startsWith('light://');
const provider = isLight
? new ScProvider(apiUrl.replace('light://substrate-connect/', '') as 'polkadot')
: new WsProvider(apiUrl);
api = new ApiPromise({
provider,
registry,
signer,
types,
typesBundle,
typesChain
});
try {
const provider = isLight
? new ScProvider(apiUrl.replace('light://substrate-connect/', '') as 'polkadot')
: new WsProvider(apiUrl);
// See https://github.com/polkadot-js/api/pull/4672#issuecomment-1078843960
if (isLight) {
await provider.connect();
api = new ApiPromise({
provider,
registry,
signer,
types,
typesBundle,
typesChain
});
// See https://github.com/polkadot-js/api/pull/4672#issuecomment-1078843960
if (isLight) {
await provider.connect();
}
} catch (error) {
onError(error);
}
return types;
@ -239,7 +244,7 @@ function Api ({ apiUrl, children, isElectron, store }: Props): React.ReactElemen
// initial initialization
useEffect((): void => {
createApi(apiUrl, new ApiSigner(registry, queuePayload, queueSetTxStatus))
createApi(apiUrl, new ApiSigner(registry, queuePayload, queueSetTxStatus), onError)
.then((types): void => {
api.on('connected', () => setIsApiConnected(true));
api.on('disconnected', () => setIsApiConnected(false));