diff --git a/.vscode/settings.json b/.vscode/settings.json index 0a275427..3ad670fc 100644 --- a/.vscode/settings.json +++ b/.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" diff --git a/package.json b/package.json index 4bcc94af..5906eb0c 100644 --- a/package.json +++ b/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" } diff --git a/templates/chain-admin/components/asset-list/AssetListSection.tsx b/templates/chain-admin/components/asset-list/AssetListSection.tsx index ac78f049..36fddd2e 100644 --- a/templates/chain-admin/components/asset-list/AssetListSection.tsx +++ b/templates/chain-admin/components/asset-list/AssetListSection.tsx @@ -47,7 +47,11 @@ export const AssetListSection = ({ chainName }: AssetListSectionProps) => { value != null + ) + )} selectedChainName={chainName} refetch={refetch} /> diff --git a/templates/chain-admin/components/asset-list/AssetsOverview.tsx b/templates/chain-admin/components/asset-list/AssetsOverview.tsx index e03acc32..6d7bd5d6 100644 --- a/templates/chain-admin/components/asset-list/AssetsOverview.tsx +++ b/templates/chain-admin/components/asset-list/AssetsOverview.tsx @@ -162,7 +162,11 @@ const AssetsOverview = ({ {data && dropdownTransferInfo && ( value != null + ) + )} assets={ibcAssets} transferInfoState={{ transferInfo: dropdownTransferInfo, @@ -176,7 +180,11 @@ const AssetsOverview = ({ {rowTransferInfo && ( value != null + ) + )} transferInfo={rowTransferInfo} updateData={refetch} modalControl={rowModalControl} diff --git a/templates/chain-admin/components/asset-list/DropdownTransferModal.tsx b/templates/chain-admin/components/asset-list/DropdownTransferModal.tsx index da0e33dd..46b3c73e 100644 --- a/templates/chain-admin/components/asset-list/DropdownTransferModal.tsx +++ b/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, diff --git a/templates/chain-admin/components/asset-list/RowTransferModal.tsx b/templates/chain-admin/components/asset-list/RowTransferModal.tsx index c42fe775..cc40b20d 100644 --- a/templates/chain-admin/components/asset-list/RowTransferModal.tsx +++ b/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, diff --git a/templates/chain-admin/components/common/Sidebar/SidebarContent.tsx b/templates/chain-admin/components/common/Sidebar/SidebarContent.tsx index b5dc5f35..47d625b2 100644 --- a/templates/chain-admin/components/common/Sidebar/SidebarContent.tsx +++ b/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 ( <> diff --git a/templates/chain-admin/components/contract/common/AttachFundsRadio.tsx b/templates/chain-admin/components/contract/common/AttachFundsRadio.tsx index 759db0f0..b524990c 100644 --- a/templates/chain-admin/components/contract/common/AttachFundsRadio.tsx +++ b/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'; diff --git a/templates/chain-admin/components/contract/common/SelectAssetContent.tsx b/templates/chain-admin/components/contract/common/SelectAssetContent.tsx index 95c06588..5945d43c 100644 --- a/templates/chain-admin/components/contract/common/SelectAssetContent.tsx +++ b/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 { diff --git a/templates/chain-admin/components/contract/common/SelectAssetItem.tsx b/templates/chain-admin/components/contract/common/SelectAssetItem.tsx index 1c5997bc..2d918b56 100644 --- a/templates/chain-admin/components/contract/common/SelectAssetItem.tsx +++ b/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, diff --git a/templates/chain-admin/components/contract/deploy/DeployJsContract.tsx b/templates/chain-admin/components/contract/deploy/DeployJsContract.tsx index ca412e90..72532efe 100644 --- a/templates/chain-admin/components/contract/deploy/DeployJsContract.tsx +++ b/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 diff --git a/templates/chain-admin/components/contract/deploy/InstantiateContract.tsx b/templates/chain-admin/components/contract/deploy/InstantiateContract.tsx index 1b4200da..623ee1e7 100644 --- a/templates/chain-admin/components/contract/deploy/InstantiateContract.tsx +++ b/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[] = [ diff --git a/templates/chain-admin/components/contract/execute/ExecuteJsContract.tsx b/templates/chain-admin/components/contract/execute/ExecuteJsContract.tsx index 3d8dd3fd..20fde7a5 100644 --- a/templates/chain-admin/components/contract/execute/ExecuteJsContract.tsx +++ b/templates/chain-admin/components/contract/execute/ExecuteJsContract.tsx @@ -101,8 +101,8 @@ export const ExecuteJsContract = ({ />