From ce5e1823900ad01a67d7b759cf354ae3cfed4c86 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Sun, 26 Sep 2021 16:47:58 +0300
Subject: [PATCH] Support lookupName in UI component lookups (#6202)

---
 packages/react-params/src/Param/findComponent.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/react-params/src/Param/findComponent.ts b/packages/react-params/src/Param/findComponent.ts
index bb3650e9f7..0c2d1b7697 100644
--- a/packages/react-params/src/Param/findComponent.ts
+++ b/packages/react-params/src/Param/findComponent.ts
@@ -85,7 +85,7 @@ const components: ComponentMap = componentDef.reduce((components, { c, t }): Com
 
 const warnList: string[] = [];
 
-function fromDef ({ displayName, info, sub, type }: TypeDef): string {
+function fromDef ({ displayName, info, lookupName, sub, type }: TypeDef): string {
   if (displayName && SPECIAL_TYPES.includes(displayName)) {
     return displayName;
   }
@@ -127,7 +127,7 @@ function fromDef ({ displayName, info, sub, type }: TypeDef): string {
       return 'VecFixed';
 
     default:
-      return type;
+      return lookupName || type;
   }
 }
 
@@ -144,13 +144,13 @@ export default function findComponent (registry: Registry, def: TypeDef, overrid
       const instance = registry.createType(type as 'u32');
       const raw = getTypeDef(instance.toRawType());
 
-      Component = findOne(raw.type);
+      Component = findOne(raw.lookupName || raw.type);
 
       if (Component) {
         return Component;
       } else if (isBn(instance)) {
         return Amount;
-      } else if ([TypeDefInfo.Enum, TypeDefInfo.Struct, TypeDefInfo.Tuple].includes(raw.info)) {
+      } else if ([TypeDefInfo.Enum, TypeDefInfo.Struct, TypeDefInfo.Tuple, TypeDefInfo.Vec].includes(raw.info)) {
         return findComponent(registry, raw, overrides);
       } else if (raw.info === TypeDefInfo.VecFixed && (raw.sub as TypeDef).type !== 'u8') {
         return findComponent(registry, raw, overrides);
@@ -163,7 +163,7 @@ export default function findComponent (registry: Registry, def: TypeDef, overrid
     if (!warnList.includes(type)) {
       warnList.push(type);
       error && console.error(`params: findComponent: ${error}`);
-      console.info(`params: findComponent: No pre-defined component for type ${type} from ${JSON.stringify(def)}, using defaults`);
+      console.info(`params: findComponent: No pre-defined component for type ${type} from ${TypeDefInfo[def.info]}: ${JSON.stringify(def)}`);
     }
   }