Merge pull request #646 from burnt-labs/chore/addtypes

separate types from useDashBoard

Author: liangping

package.json

@@ -13,6 +13,7 @@
     "type-check": "vue-tsc --noEmit"
   },
   "dependencies": {
+    "@chain-registry/types": "^0.50.162",
     "@chenfengyuan/vue-countdown": "2",
     "@cosmjs/amino": "^0.32.3",
     "@cosmjs/crypto": "^0.32.3",

src/layouts/components/ChainProfile.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { useBlockchain, useBaseStore, type Endpoint } from '@/stores';
+import { useBlockchain, useBaseStore } from '@/stores';
+import type { Endpoint } from '@/types/chaindata';
 import { useRouter } from 'vue-router';
 const chainStore = useBlockchain();
 const baseStore = useBaseStore();

src/layouts/components/DefaultLayout.vue

@@ -9,7 +9,8 @@ import NavbarSearch from '@/layouts/components/NavbarSearch.vue';
 import ChainProfile from '@/layouts/components/ChainProfile.vue';
 import Sponsors from '@/layouts/components/Sponsors.vue';
 
-import { NetworkType, useDashboard } from '@/stores/useDashboard';
+import { useDashboard } from '@/stores/useDashboard';
+import { NetworkType } from '@/types/chaindata';
 import { useBaseStore, useBlockchain } from '@/stores';
 
 import NavBarI18n from './NavBarI18n.vue';

src/modules/[chain]/staking/index.vue

@@ -144,7 +144,7 @@ const list = computed(() => {
     if (endpoint) {
       endpoint.push('ping');
       return staking.validators
-        .filter((x) => isFeatured(endpoint, x.description))
+        .filter((x) => isFeatured(endpoint.filter(Boolean) as string[], x.description))
         .map((x, i) => ({ v: x, rank: 'primary', logo: logo(x.description.identity) }));
     }
     return [];

src/modules/[chain]/supply/index.vue

@@ -8,7 +8,7 @@ import {
   type DenomMetadata,
 } from '@/types';
 import { onMounted } from 'vue';
-import type { Asset } from '@ping-pub/chain-registry-client/dist/types';
+import type { Asset } from '@/types/chaindata';
 import PaginationBar from '@/components/PaginationBar.vue';
 const props = defineProps(['chain']);
 
@@ -45,7 +45,7 @@ async function mergeDenomMetadata(denom: string, denomsMetadatas: DenomMetadata[
   if (asset && denomMetadata) {
     asset = { ...denomMetadata, ...asset };
     asset.display = denomMetadata.display;
-    asset.logo = asset.logo_URIs?.svg || asset.logo_URIs?.png || asset.logo_URIs?.jpeg || undefined;
+    asset.logo = asset.logo_URIs?.svg || asset.logo_URIs?.png || undefined;
   } else if (denomMetadata) {
     return denomMetadata as SupplyAsset;
   }
@@ -65,7 +65,7 @@ function pageload(p: number) {
           amount: format.tokenAmountNumber({ amount: coin.amount, denom: denom }).toString(),
           base: asset.base || coin.denom,
           info: asset.display || coin.denom,
-          logo: asset?.logo_URIs?.svg || asset?.logo_URIs?.png || asset?.logo_URIs?.jpeg || '/logo.svg',
+          logo: asset?.logo_URIs?.svg || asset?.logo_URIs?.png || '/logo.svg',
         };
       })
     );

src/modules/wallet/keplr.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
-import { useDashboard, type ChainConfig, useBlockchain } from '@/stores';
+import { useDashboard, useBlockchain } from '@/stores';
+import type { ChainConfig, DenomUnit } from '@/types/chaindata';
 import { CosmosRestClient } from '@/libs/client';
 import { onMounted } from 'vue';
 import AdBanner from '@/components/ad/AdBanner.vue';
@@ -29,7 +30,7 @@ async function initParamsForKeplr() {
     high: 0.03,
   };
   const coinDecimals =
-    chain.assets[0].denom_units.find((x) => x.denom === chain.assets[0].symbol.toLowerCase())?.exponent || 6;
+    chain.assets[0].denom_units.find((x: DenomUnit) => x.denom === chain.assets[0].symbol.toLowerCase())?.exponent || 6;
   conf.value = JSON.stringify(
     {
       chainId: chainid,

src/modules/wallet/suggest.vue

@@ -3,10 +3,10 @@ import { computed, ref } from 'vue';
 import { suggestChain } from '@leapwallet/cosmos-snap-provider';
 import {
   useDashboard,
-  type ChainConfig,
   useBlockchain,
-  NetworkType,
 } from '@/stores';
+import type { ChainConfig } from '@/types/chaindata';
+import { NetworkType } from '@/types/chaindata';
 import { CosmosRestClient } from '@/libs/client';
 import { onMounted } from 'vue';
 import AdBanner from '@/components/ad/AdBanner.vue';

src/modules/wallet/unisat.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
-import { useDashboard, type ChainConfig, useBlockchain } from '@/stores';
+import { useDashboard, useBlockchain } from '@/stores';
+import type { ChainConfig } from '@/types/chaindata';
 import { CosmosRestClient } from '@/libs/client';
 import { onMounted } from 'vue';
 import AdBanner from '@/components/ad/AdBanner.vue';

src/pages/index.vue

@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { Icon } from '@iconify/vue';
-import { useDashboard, LoadingStatus, type ChainConfig } from '@/stores/useDashboard';
+import { useDashboard, LoadingStatus } from '@/stores';
+import type { ChainConfig } from '@/types/chaindata';
 import ChainSummary from '@/components/ChainSummary.vue';
 import AdBanner from '@/components/ad/AdBanner.vue';
 

src/stores/useBlockchain.ts

@@ -1,5 +1,6 @@
 import { defineStore } from 'pinia';
-import { useDashboard, type ChainConfig, type Endpoint, EndpointType } from './useDashboard';
+import type { ChainConfig, Endpoint } from '@/types/chaindata';
+import { useDashboard} from './useDashboard';
 import type { NavGroup, NavLink, NavSectionTitle, VerticalNavItems } from '@/layouts/types';
 import { useRouter } from 'vue-router';
 import { CosmosRestClient } from '@/libs/client';
@@ -22,11 +23,7 @@ export const useBlockchain = defineStore('blockchain', {
       status: {} as Record<string, string>,
       rest: '',
       chainName: '',
-      endpoint: {} as {
-        type?: EndpointType;
-        address: string;
-        provider: string;
-      },
+      endpoint: {} as Endpoint,
       connErr: '',
     };
   },