From e166b95bce150bb655b6af679e3e8aacbe5132df Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Wed, 13 Oct 2021 18:54:45 +0300
Subject: [PATCH] Display correct lookup const types (storage results) (#6286)

---
 packages/page-storage/src/Query.tsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/page-storage/src/Query.tsx b/packages/page-storage/src/Query.tsx
index 2d2b190624..3b9a404677 100644
--- a/packages/page-storage/src/Query.tsx
+++ b/packages/page-storage/src/Query.tsx
@@ -54,7 +54,11 @@ function keyToName (isConst: boolean, _key: Uint8Array | QueryableStorageEntry<'
   return `${key.creator.section}.${key.creator.method}`;
 }
 
-function typeToString (registry: Registry, { creator: { meta: { modifier, type } } }: QueryableStorageEntry<'promise'>): string {
+function constTypeToString (registry: Registry, { meta }: ConstValue): string {
+  return getSiName(registry.lookup, meta.type);
+}
+
+function queryTypeToString (registry: Registry, { creator: { meta: { modifier, type } } }: QueryableStorageEntry<'promise'>): string {
   const _type = unwrapStorageType(registry, type);
 
   return modifier.isOptional
@@ -85,10 +89,10 @@ function getCachedComponent (registry: Registry, query: QueryTypes): CacheInstan
     let type: string;
 
     if (isConst) {
-      const { meta, method, section } = key as unknown as ConstValue;
+      const { method, section } = key as unknown as ConstValue;
 
       renderHelper = withCallDiv(`consts.${section}.${method}`, { withIndicator: true });
-      type = getSiName(registry.lookup, meta.type);
+      type = constTypeToString(registry, key as unknown as ConstValue);
     } else {
       if (isU8a(key)) {
         // subscribe to the raw key here
@@ -117,7 +121,7 @@ function getCachedComponent (registry: Registry, query: QueryTypes): CacheInstan
       }
 
       type = key.creator && key.creator.meta
-        ? typeToString(registry, key)
+        ? queryTypeToString(registry, key)
         : 'Raw';
     }
 
@@ -141,10 +145,10 @@ function Query ({ className = '', onRemove, value }: Props): React.ReactElement<
       getCachedComponent(api.registry, value),
       keyToName(value.isConst, value.key),
       value.isConst
-        ? (value.key as unknown as ConstValue).meta.type.toString()
+        ? constTypeToString(api.registry, value.key as unknown as ConstValue)
         : isU8a(value.key)
           ? 'Raw'
-          : typeToString(api.registry, value.key as QueryableStorageEntry<'promise'>)
+          : queryTypeToString(api.registry, value.key as QueryableStorageEntry<'promise'>)
     ],
     [api, value]
   );