Eason/bugfix

.vscode/settings.json

@@ -1,10 +1,21 @@
 {
   "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[javascript]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
   "[javascriptreact]": {
-    "editor.formatOnSave": false
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "[javascript]": {
-    "editor.formatOnSave": false
+  "[typescript]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"

package.json

@@ -41,5 +41,5 @@
     "type": "git",
     "url": "https://github.com/hyperweb-io/create-hyperweb-app"
   },
-  "packageManager": "yarn@4.1.0"
+  "packageManager": "yarn@4.3.0"
 }

templates/chain-admin/components/asset-list/AssetListSection.tsx

@@ -47,7 +47,11 @@ export const AssetListSection = ({ chainName }: AssetListSectionProps) => {
       <AssetsOverview
         isLoading={isLoading || !data}
         assets={data?.assets ?? []}
-        prices={data?.prices ?? {}}
+        prices={Object.fromEntries(
+          Object.entries(data?.prices ?? {}).filter(
+            ([, value]) => value != null
+          )
+        )}
         selectedChainName={chainName}
         refetch={refetch}
       />

templates/chain-admin/components/asset-list/AssetsOverview.tsx

@@ -162,7 +162,11 @@ const AssetsOverview = ({
 
       {data && dropdownTransferInfo && (
         <DropdownTransferModal
-          prices={data?.prices ?? {}}
+          prices={Object.fromEntries(
+            Object.entries(data?.prices ?? {}).filter(
+              ([, value]) => value != null
+            )
+          )}
           assets={ibcAssets}
           transferInfoState={{
             transferInfo: dropdownTransferInfo,
@@ -176,7 +180,11 @@ const AssetsOverview = ({
 
       {rowTransferInfo && (
         <RowTransferModal
-          prices={data?.prices ?? {}}
+          prices={Object.fromEntries(
+            Object.entries(data?.prices ?? {}).filter(
+              ([, value]) => value != null
+            )
+          )}
           transferInfo={rowTransferInfo}
           updateData={refetch}
           modalControl={rowModalControl}

templates/chain-admin/components/asset-list/DropdownTransferModal.tsx

@@ -99,7 +99,7 @@ const OverviewTransferWrapper = (
   const toastHandlers = useToastHandlers();
   const { data: signingClient } = useSigningClient(sourceChainName);
   const { mutate: transfer, isLoading } = useTransfer({
-    clientResolver: signingClient,
+    clientResolver: signingClient as any,
     options: {
       context: defaultContext,
       ...toastHandlers,

templates/chain-admin/components/asset-list/RowTransferModal.tsx

@@ -77,7 +77,7 @@ const TransferModalBody = (
   const toastHandlers = useToastHandlers();
   const { data: signingClient } = useSigningClient(sourceChainName);
   const { mutate: transfer, isLoading } = useTransfer({
-    clientResolver: signingClient,
+    clientResolver: signingClient as any,
     options: {
       context: defaultContext,
       ...toastHandlers,

templates/chain-admin/components/common/Sidebar/SidebarContent.tsx

@@ -61,7 +61,7 @@ const ConnectButton = () => {
   const walletLogo =
     typeof walletInfo?.logo === 'string'
       ? walletInfo.logo
-      : walletInfo.logo.major || walletInfo.logo.minor;
+      : walletInfo?.logo?.major || walletInfo?.logo?.minor;
 
   return (
     <>

templates/chain-admin/components/contract/common/AttachFundsRadio.tsx

@@ -1,11 +1,11 @@
 import { useEffect, useMemo, useState } from 'react';
 import { Box } from '@interchain-ui/react';
-import { Asset } from '@chain-registry/v2-types';
+import { Asset } from '@chain-registry/types';
 import BigNumber from 'bignumber.js';
 import { TbCurrencyDollarOff } from 'react-icons/tb';
 import { LuListPlus } from 'react-icons/lu';
 import { VscJson } from 'react-icons/vsc';
-import { Coin } from '@interchainjs/react/types';
+import { Coin } from '@interchainjs/react/cosmos/base/v1beta1/coin';
 
 import { JsonInput } from './JsonInput';
 import { SelectAssetContent } from './SelectAssetContent';

templates/chain-admin/components/contract/common/SelectAssetContent.tsx

@@ -1,5 +1,5 @@
 import { Dispatch, SetStateAction, useMemo } from 'react';
-import { assetLists } from '@chain-registry/v2';
+import { assetLists } from 'chain-registry';
 import { LuPlus } from 'react-icons/lu';
 
 import {

templates/chain-admin/components/contract/common/SelectAssetItem.tsx

@@ -1,6 +1,6 @@
 import { Dispatch, SetStateAction, useState } from 'react';
 import { HiOutlineTrash } from 'react-icons/hi';
-import { Asset } from '@chain-registry/v2-types';
+import { Asset } from '@chain-registry/types';
 import {
   Avatar,
   Box,

templates/chain-admin/components/contract/deploy/DeployJsContract.tsx

@@ -6,6 +6,7 @@ import { DeliverTxResponse } from 'hyperwebjs';
 import {
   formatTxFee,
   getContractIndex,
+  getContractAddress,
   shortenAddress,
   readFileContent,
 } from '@/utils';
@@ -51,7 +52,7 @@ export const DeployJsContract = ({
       code: await readFileContent(jsFile),
       onTxSucceed: (txInfo) => {
         setIsLoading(false);
-        setTxResult(txInfo);
+        setTxResult(txInfo as DeliverTxResponse);
         updateMyContracts();
         onSuccess?.();
       },
@@ -73,6 +74,7 @@ export const DeployJsContract = ({
       txResult.events.find((e) => e.type === 'tx')?.attributes[0].value ?? '';
 
     const contractIndex = getContractIndex(txResult);
+    const contractAddress = getContractAddress(txResult);
 
     const infoItems: TxInfoItem[] = [
       {
@@ -81,6 +83,12 @@ export const DeployJsContract = ({
         copyValue: contractIndex,
         showCopy: true,
       },
+      {
+        label: 'Contract Address',
+        value: contractAddress,
+        copyValue: contractAddress,
+        showCopy: true,
+      },
       {
         label: 'Tx Hash',
         value: shortenAddress(txResult.transactionHash),
@@ -109,7 +117,7 @@ export const DeployJsContract = ({
               width="$full"
               variant="primary"
               onClick={() => {
-                switchTab?.(contractIndex, TabLabel.Query);
+                switchTab?.(contractAddress, TabLabel.Query);
               }}
             >
               Query
@@ -118,7 +126,7 @@ export const DeployJsContract = ({
               width="$full"
               variant="primary"
               onClick={() => {
-                switchTab?.(contractIndex, TabLabel.Execute);
+                switchTab?.(contractAddress, TabLabel.Execute);
               }}
             >
               Execute

templates/chain-admin/components/contract/deploy/InstantiateContract.tsx

@@ -8,7 +8,8 @@ import {
 } from '@interchain-ui/react';
 import { IoChevronDown } from 'react-icons/io5';
 import { useChain } from '@interchain-kit/react';
-import { Coin, DeliverTxResponse } from '@interchainjs/react/types';
+import { DeliverTxResponse } from '@interchainjs/react/types';
+import { Coin } from '@interchainjs/react/cosmos/base/v1beta1/coin';
 
 import { CodeIdField } from './CodeIdField';
 import {
@@ -123,7 +124,6 @@ export const InstantiateContract = ({
       txResult.events.find((e) => e.type === 'instantiate')?.attributes[0]
         .value ?? '';
 
-    // @ts-expect-error
     const transactionHash = txResult?.hash || txResult?.transactionHash || '';
 
     const infoItems: TxInfoItem[] = [

templates/chain-admin/components/contract/execute/ExecuteJsContract.tsx

@@ -101,8 +101,8 @@ export const ExecuteJsContract = ({
         />
       </InputField>
       <Button
-        onClick={handleExecute}
         disabled={isButtonDisabled}
+        onClick={handleExecute}
         isLoading={isLoading}
         width="100%"
         variant="primary"

templates/chain-admin/components/contract/execute/ExecuteWasmContract.tsx

@@ -1,7 +1,7 @@
 import { useMemo, useState } from 'react';
 import { Box, Text } from '@interchain-ui/react';
 import { useChain } from '@interchain-kit/react';
-import { Coin } from '@interchainjs/react/types';
+import { Coin } from '@interchainjs/react/cosmos/base/v1beta1/coin';
 
 import {
   JsonInput,

templates/chain-admin/components/staking/DelegateModal.tsx

@@ -70,7 +70,7 @@ export const DelegateModal = ({
   const toastHandlers = useToastHandlers();
   const { data: signingClient } = useSigningClient(chainName);
   const { mutate: delegate, isLoading: isDelegating } = useDelegate({
-    clientResolver: signingClient,
+    clientResolver: signingClient as any,
     options: {
       context: defaultContext,
       ...toastHandlers,

templates/chain-admin/components/staking/Overview.tsx

@@ -39,7 +39,7 @@ const Overview = ({
   const { data: signingClient } = useSigningClient(chainName);
   const { mutate: withdrawDelegatorReward, isLoading: isClaiming } =
     useWithdrawDelegatorReward({
-      clientResolver: signingClient,
+      clientResolver: signingClient as any,
       options: {
         context: defaultContext,
         ...toastHandlers,

templates/chain-admin/components/staking/RedelegateModal.tsx

@@ -56,7 +56,7 @@ export const RedelegateModal = ({
   const { data: signingClient } = useSigningClient(chainName);
   const { mutate: beginRedelegate, isLoading: isRedelegating } =
     useBeginRedelegate({
-      clientResolver: signingClient,
+      clientResolver: signingClient as any,
       options: {
         context: defaultContext,
         ...toastHandlers,

templates/chain-admin/components/staking/UndelegateModal.tsx

@@ -59,7 +59,7 @@ export const UndelegateModal = ({
   const toastHandlers = useToastHandlers();
   const { data: signingClient } = useSigningClient(chainName);
   const { mutate: undelegate, isLoading: isUndelegating } = useUndelegate({
-    clientResolver: signingClient,
+    clientResolver: signingClient as any,
     options: {
       context: defaultContext,
       ...toastHandlers,

templates/chain-admin/components/voting/Voting.tsx

@@ -58,7 +58,7 @@ export function Voting({ chainName }: VotingProps) {
   const { modal, open: openModal, close: closeModal, setTitle } = useModal('');
   const [tallies, setTallies] = useState<{ [key: string]: TallyResult }>({});
 
-  const chain = chains.find((c) => c.chain_name === chainName);
+  const chain = chains.find((c) => c.chainName === chainName);
 
   useEffect(() => {
     if (!data.proposals || data.proposals.length === 0) return;

templates/chain-admin/hooks/asset-list/useAssets.ts

@@ -3,7 +3,7 @@ import { useChain } from '@interchain-kit/react';
 import { defaultContext } from '@tanstack/react-query';
 import BigNumber from 'bignumber.js';
 import { useGetAllBalances } from '@interchainjs/react/cosmos/bank/v1beta1/query.rpc.react';
-import { Coin } from '@interchainjs/react/types';
+import { Coin } from '@interchainjs/react/cosmos/base/v1beta1/coin';
 
 import { PrettyAsset } from '@/components';
 import { useChainUtils } from './useChainUtils';
@@ -73,7 +73,12 @@ export const useAssets = (chainName: string) => {
       Object.entries(dataQueries).map(([key, query]) => [key, query.data])
     ) as QueriesData;
 
-    const { allBalances, prices } = queriesData;
+    const { allBalances, prices: rawPrices } = queriesData;
+
+    // Filter out undefined values to ensure proper indexing
+    const prices = Object.fromEntries(
+      Object.entries(rawPrices ?? {}).filter(([, value]) => value != null)
+    );
 
     const nativeAndIbcBalances: Coin[] = allBalances?.filter(
       ({ denom }) => !denom.startsWith('gamm') && prices[denom]
@@ -100,7 +105,7 @@ export const useAssets = (chainName: string) => {
         const dollarValue = calcCoinDollarValue(prices, { amount, denom });
         return {
           symbol,
-          logoUrl: asset.logo_URIs?.png || asset.logo_URIs?.svg,
+          logoUrl: asset?.logoURIs?.png || asset?.logoURIs?.svg,
           prettyChainName: getPrettyChainName(denom),
           displayAmount: convRawToDispAmount(denom, amount),
           dollarValue,

templates/chain-admin/hooks/asset-list/useChainAssetsPrices.ts

@@ -8,19 +8,19 @@ type CoinGeckoUSD = { usd: number };
 type CoinGeckoUSDResponse = Record<CoinGeckoId, CoinGeckoUSD>;
 
 const getAssetsWithGeckoIds = (assets: Asset[]) => {
-  return assets.filter((asset) => !!asset?.coingecko_id);
+  return assets.filter((asset) => !!asset?.coingeckoId);
 };
 
 const getGeckoIds = (assets: Asset[]) => {
-  return assets.map((asset) => asset.coingecko_id) as string[];
+  return assets.map((asset) => asset.coingeckoId) as string[];
 };
 
 const formatPrices = (
   prices: CoinGeckoUSDResponse,
   assets: Asset[]
 ): Record<string, number> => {
   return Object.entries(prices).reduce((priceHash, cur) => {
-    const denom = assets.find((asset) => asset.coingecko_id === cur[0])!.base;
+    const denom = assets.find((asset) => asset.coingeckoId === cur[0])!.base;
     return { ...priceHash, [denom]: cur[1].usd };
   }, {});
 };
@@ -48,12 +48,27 @@ export const useChainAssetsPrices = (chainName: string) => {
   return useQuery({
     queryKey: ['useChainAssetsPrices', chainName],
     queryFn: () => fetchPrices(geckoIds),
-    select: (data) => ({
-      ...formatPrices(data, assetsWithGeckoIds),
-      ...(isStarshipChain
-        ? { [allAssets[0].base]: DEFAULT_HYPERWEB_TOKEN_PRICE }
-        : {}),
-    }),
+    select: (data) => {
+      const formattedPrices = formatPrices(data, assetsWithGeckoIds);
+
+      // Always add hyperweb price for hyperweb chain
+      const hyperwebPrice =
+        chainName === 'hyperweb'
+          ? { uhyper: DEFAULT_HYPERWEB_TOKEN_PRICE }
+          : {};
+
+      // Also add for starship chains if detected
+      const starshipPrice =
+        isStarshipChain && allAssets.length > 0
+          ? { [allAssets[0].base]: DEFAULT_HYPERWEB_TOKEN_PRICE }
+          : {};
+
+      return {
+        ...formattedPrices,
+        ...hyperwebPrice,
+        ...starshipPrice,
+      };
+    },
     staleTime: Infinity,
   });
 };