fix: Fix outdated files

Author: lw-cdm

packages/extension-web-ui/src/hooks/transaction/confirmation/useMetadata.ts

@@ -33,31 +33,47 @@ export default function useMetadata (genesisHash?: string | null, isPartial?: bo
     setLoadingChain(true);
 
     if (genesisHash) {
-      const getChainByMetaStore = () => {
-        getMetadata(genesisHash, isPartial)
-          .then(setChain)
-          .catch((error): void => {
-            console.error(error);
-            setChain(null);
-          })
-          .finally(() => {
-            setLoadingChain(false);
-          });
+      const getChainByMetaStore = async () => {
+        try {
+          const chain = await getMetadata(genesisHash, isPartial);
+
+          return chain;
+        } catch (error) {
+          console.error(error);
+
+          return null;
+        }
       };
 
-      getMetadataRaw(chainInfo, genesisHash)
-        .then((chain) => {
-          if (chain) {
-            setChain(chain);
+      const fetchData = async () => {
+        try {
+          const chainFromRaw = await getMetadataRaw(chainInfo, genesisHash);
+          const chainFromMetaStore = await getChainByMetaStore();
+
+          if (chainFromRaw && chainFromMetaStore) {
+            if (chainFromRaw.specVersion >= chainFromMetaStore.specVersion) {
+              setChain(chainFromRaw);
+            } else {
+              setChain(chainFromMetaStore);
+            }
+
             setLoadingChain(false);
           } else {
-            getChainByMetaStore();
+            setChain(chainFromRaw || chainFromMetaStore || null);
+            setLoadingChain(false);
           }
-        })
-        .catch((e) => {
-          console.error(e);
-          getChainByMetaStore();
-        });
+        } catch (error) {
+          console.error(error);
+          setChain(null);
+          setLoadingChain(false);
+        }
+      };
+
+      fetchData().catch((error) => {
+        console.error(error);
+        setChain(null);
+        setLoadingChain(false);
+      });
     } else {
       setLoadingChain(false);
       setChain(null);

packages/extension-web-ui/src/hooks/transaction/confirmation/useParseSubstrateRequestPayload.ts

@@ -12,6 +12,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { TypeRegistry } from '@polkadot/types';
 import { ExtrinsicPayload } from '@polkadot/types/interfaces';
 import { SignerPayloadJSON } from '@polkadot/types/types';
+import { HexString } from '@polkadot/util/types';
 
 import { useGetChainInfoByGenesisHash } from '../../chain';
 
@@ -79,7 +80,7 @@ const useParseSubstrateRequestPayload = (chain: Chain | null, request?: RequestS
 
         if (metadataHash) {
           _payload.mode = 1;
-          _payload.metadataHash = `0x${metadataHash}`;
+          _payload.metadataHash = metadataHash as HexString;
         }
 
         return _registry.createType('ExtrinsicPayload', _payload, { version: _payload.version });