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

Render SpRuntimeDispatchError via DispatchError (#6932)

Browse Source
This commit is contained in:
Jaco 2022-02-07 08:32:15 +01:00 committed by GitHub
parent 5a9ad38a59
commit d8708d90d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/react-params/src/Param/DispatchError.tsx
View File

@ -5,6 +5,7 @@ import type { DispatchError } from '@polkadot/types/interfaces';
import type { Props as BaseProps } from '../types';
import React, { useEffect, useState } from 'react';
import styled from 'styled-components';
import { Input } from '@polkadot/react-components';
@ -22,7 +23,10 @@ interface Props extends BaseProps {
}
function isDispatchError (value?: unknown): value is DispatchError {
return !!(value && ((value as DispatchError).isModule || (value as DispatchError).isToken));
return !!(value && (
(value as DispatchError).isModule ||
(value as DispatchError).isToken
));
}
function ErrorDisplay (props: Props): React.ReactElement<Props> {
@ -81,4 +85,8 @@ function ErrorDisplay (props: Props): React.ReactElement<Props> {
);
}
export default React.memo(ErrorDisplay);
export default React.memo(styled(ErrorDisplay)`
// .ui--Labelled-content {
// background: rgba(196, 0, 0, 0.1);
// }
`);

10
packages/react-params/src/Param/findComponent.ts
View File

@ -52,7 +52,7 @@ const componentDef: TypeToComponent[] = [
{ c: Bytes, t: ['Bytes'] },
{ c: Call, t: ['Call', 'Proposal'] },
{ c: Code, t: ['Code'] },
{ c: DispatchError, t: ['DispatchError'] },
{ c: DispatchError, t: ['DispatchError', 'SpRuntimeDispatchError'] },
{ c: DispatchResult, t: ['DispatchResult'] },
{ c: Raw, t: ['Raw', 'RuntimeSessionKeys', 'Keys'] },
{ c: Enum, t: ['Enum'] },
@ -136,10 +136,12 @@ function fromDef ({ displayName, info, lookupName, sub, type }: TypeDef): string
}
export default function findComponent (registry: Registry, def: TypeDef, overrides: ComponentMap = {}): React.ComponentType<Props> {
const findOne = (type: string): React.ComponentType<Props> | null =>
overrides[type] || components[type];
const findOne = (type?: string): React.ComponentType<Props> | null =>
type
? overrides[type] || components[type]
: null;
const type = fromDef(def);
let Component = findOne(type);
let Component = findOne(def.lookupName) || findOne(type);
if (!Component) {
let error: string | null = null;