Merge pull request #571 from alleslabs/fix/only-native-funds-for-main

Use native funds in select funds(to main branch)

CHANGELOG.md

@@ -113,6 +113,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#570](https://github.com/alleslabs/celatone-frontend/pull/570) Use native tokens in attached funds
 - [#567](https://github.com/alleslabs/celatone-frontend/pull/567) Fix attached funds in code snippet
 - [#539](https://github.com/alleslabs/celatone-frontend/pull/539) Fix JSON schema upload text
 - [#527](https://github.com/alleslabs/celatone-frontend/pull/527) Fix ellipsis explorer link

src/lib/app-provider/hooks/useBaseApiRoute.ts

@@ -13,7 +13,6 @@ export const useBaseApiRoute = (
     | "rest"
     | "icns_names"
     | "icns_address"
-    | "native_tokens"
     | "cosmwasm"
 ): string => {
   const {
@@ -49,8 +48,6 @@ export const useBaseApiRoute = (
       return `${api}/icns/names`;
     case "icns_address":
       return `${api}/icns/address`;
-    case "native_tokens":
-      return `${api}/native-assets/${chain}/${currentChainId}`;
     case "cosmwasm":
       return `${api}/cosmwasm/${chain}/${currentChainId}`;
     default:

src/lib/components/fund/selectFund.tsx

@@ -26,7 +26,7 @@ export const SelectFund = ({
   assetsSelect,
   labelBgColor,
 }: SelectFundProps) => {
-  const { data: assetInfos = [] } = useAssetInfoList();
+  const { data: assetInfos = [] } = useAssetInfoList({ assetType: "native" });
   const { fields, append, remove } = useFieldArray({
     control,
     name: ASSETS_SELECT,

src/lib/services/assetService.ts

@@ -34,23 +34,21 @@ export const useAssetInfos = ({
   };
 };
 
-export const useAssetInfoList = () => {
-  const assetsApiRoute = useBaseApiRoute("assets");
-  return useQuery(
-    [CELATONE_QUERY_KEYS.ASSET_INFO_LIST, assetsApiRoute],
-    async () => getAssetInfosWithoutPricesPath(assetsApiRoute),
-    { enabled: Boolean(assetsApiRoute), retry: 1, refetchOnWindowFocus: false }
+export const useAssetInfoList = ({
+  assetType,
+}: {
+  assetType: "all" | "native" | "cw20";
+}) => {
+  const assetsApiRoute = useBaseApiRoute("assets").concat(
+    assetType !== "all" ? `/type/${assetType}` : ""
   );
-};
-
-export const useNativeTokensInfo = () => {
-  const nativeTokensApiRoute = useBaseApiRoute("native_tokens");
 
   return useQuery(
-    [CELATONE_QUERY_KEYS.NATIVE_TOKENS_INFO, nativeTokensApiRoute],
-    async () => getAssetInfosWithoutPricesPath(nativeTokensApiRoute),
+    [CELATONE_QUERY_KEYS.ASSET_INFO_LIST, assetsApiRoute],
+    async () => getAssetInfosWithoutPricesPath(assetsApiRoute),
     {
-      enabled: Boolean(nativeTokensApiRoute),
+      enabled: Boolean(assetsApiRoute),
+      retry: 1,
       refetchOnWindowFocus: false,
     }
   );