From 932c3bdc58b2d283ebc86888ca90dee5a3aaa9dd Mon Sep 17 00:00:00 2001 From: Corban Riley Date: Tue, 30 Apr 2024 11:48:28 -0400 Subject: [PATCH] Move useContractInfo to kit package --- packages/checkout/src/api/data.ts | 11 ----------- packages/checkout/src/hooks/data.ts | 12 +----------- .../CheckoutSelection/component/OrderSummaryItem.tsx | 4 ++-- .../checkout/src/views/CheckoutSelection/index.tsx | 4 ++-- packages/wallet/src/api/data.ts | 8 -------- packages/wallet/src/hooks/data.ts | 12 +----------- .../Home/components/AssetSummary/CoinTile/index.tsx | 4 ++-- 7 files changed, 8 insertions(+), 47 deletions(-) diff --git a/packages/checkout/src/api/data.ts b/packages/checkout/src/api/data.ts index fb646535..fa7c7bcd 100644 --- a/packages/checkout/src/api/data.ts +++ b/packages/checkout/src/api/data.ts @@ -147,17 +147,6 @@ export const fetchTokenMetadata = async ({ chainId, tokenId, contractAddress }: return response.tokenMetadata[0] } -export const fetchContractInfo = async ({ chainID, contractAddress }: GetContractInfoArgs): Promise => { - const { metadataClient } = getNetworkConfigAndClients(chainID) - - const response = await metadataClient.getContractInfo({ - chainID, - contractAddress - }) - - return response.contractInfo -} - export interface FetchPaperSecretArgs { chainId: number email: string diff --git a/packages/checkout/src/hooks/data.ts b/packages/checkout/src/hooks/data.ts index 57eecce7..cde681a0 100644 --- a/packages/checkout/src/hooks/data.ts +++ b/packages/checkout/src/hooks/data.ts @@ -10,8 +10,7 @@ import { getCoinPrices, GetCoinPricesArgs, fetchTokenMetadata, - GetTokenMetadataArgs, - fetchContractInfo + GetTokenMetadataArgs } from '../api/data' export const time = { @@ -55,12 +54,3 @@ export const useTokenMetadata = (args: GetTokenMetadataArgs): UseQueryResult => - useQuery({ - queryKey: ['useContractInfo', args], - queryFn: () => fetchContractInfo(args), - retry: true, - staleTime: 60 * time.oneMinute, - enabled: !!args.chainID && !!args.contractAddress - }) diff --git a/packages/checkout/src/views/CheckoutSelection/component/OrderSummaryItem.tsx b/packages/checkout/src/views/CheckoutSelection/component/OrderSummaryItem.tsx index e8755c7c..5e12c00d 100644 --- a/packages/checkout/src/views/CheckoutSelection/component/OrderSummaryItem.tsx +++ b/packages/checkout/src/views/CheckoutSelection/component/OrderSummaryItem.tsx @@ -2,11 +2,11 @@ import React from 'react' import { ethers } from 'ethers' import { useConfig } from 'wagmi' import { Box, Card, Image, Text } from '@0xsequence/design-system' -import { getNativeTokenInfoByChainId } from '@0xsequence/kit' +import { getNativeTokenInfoByChainId, useContractInfo } from '@0xsequence/kit' import { CoinIcon } from '../../../shared/components/CoinIcon' import { Skeleton } from '../../../shared/components/Skeleton' -import { useTokenMetadata, useContractInfo } from '../../../hooks' +import { useTokenMetadata } from '../../../hooks' import { formatDisplay } from '../../../utils' interface OrderSummaryItem { diff --git a/packages/checkout/src/views/CheckoutSelection/index.tsx b/packages/checkout/src/views/CheckoutSelection/index.tsx index 56681efb..33475809 100644 --- a/packages/checkout/src/views/CheckoutSelection/index.tsx +++ b/packages/checkout/src/views/CheckoutSelection/index.tsx @@ -2,7 +2,7 @@ import React from 'react' import { ethers } from 'ethers' import { Box, Button, ChevronRightIcon, Divider, Text, PaymentsIcon, vars } from '@0xsequence/design-system' -import { getNativeTokenInfoByChainId } from '@0xsequence/kit' +import { getNativeTokenInfoByChainId, useContractInfo } from '@0xsequence/kit' import { useAccount, useConfig } from 'wagmi' @@ -11,7 +11,7 @@ import { OrderSummaryItem } from './component/OrderSummaryItem' import { CoinIcon } from '../../shared/components/CoinIcon' import { Skeleton } from '../../shared/components/Skeleton' import { HEADER_HEIGHT } from '../../constants' -import { useNavigation, useCheckoutModal, useBalances, useContractInfo } from '../../hooks' +import { useNavigation, useCheckoutModal, useBalances } from '../../hooks' import { compareAddress, formatDisplay } from '../../utils' import * as styles from './styles.css' diff --git a/packages/wallet/src/api/data.ts b/packages/wallet/src/api/data.ts index b6bab7d5..5edea34d 100644 --- a/packages/wallet/src/api/data.ts +++ b/packages/wallet/src/api/data.ts @@ -520,11 +520,3 @@ export const fetchTokenMetadata = async ({ tokens }: FetchTokenMetadataArgs): Pr return response.tokenMetadata } - -export const getContractInfo = async (args: GetContractInfoArgs): Promise => { - const { metadataClient } = getNetworkConfigAndClients(Number(args.chainID)) - - const response = await metadataClient.getContractInfo(args) - - return response.contractInfo -} diff --git a/packages/wallet/src/hooks/data.ts b/packages/wallet/src/hooks/data.ts index 359a44ed..1e50afb6 100644 --- a/packages/wallet/src/hooks/data.ts +++ b/packages/wallet/src/hooks/data.ts @@ -22,8 +22,7 @@ import { getTransactionHistorySummary, GetTransactionHistorySummaryArgs, fetchTokenMetadata, - FetchTokenMetadataArgs, - getContractInfo + FetchTokenMetadataArgs } from '../api/data' import { compareAddress } from '../utils/helpers' @@ -156,12 +155,3 @@ export const useTokenMetadata = (args: FetchTokenMetadataArgs) => staleTime: time.oneMinute * 10, enabled: !!args.tokens.chainId && !!args.tokens.contractAddress }) - -export const useContractInfo = (args: GetContractInfoArgs) => - useQuery({ - queryKey: ['useContractInfo', args], - queryFn: () => getContractInfo(args), - retry: true, - staleTime: time.oneMinute * 10, - enabled: !!args.chainID && !!args.contractAddress - }) diff --git a/packages/wallet/src/views/Home/components/AssetSummary/CoinTile/index.tsx b/packages/wallet/src/views/Home/components/AssetSummary/CoinTile/index.tsx index 8c455d81..fdf929b4 100644 --- a/packages/wallet/src/views/Home/components/AssetSummary/CoinTile/index.tsx +++ b/packages/wallet/src/views/Home/components/AssetSummary/CoinTile/index.tsx @@ -6,11 +6,11 @@ import { TokenBalance } from '@0xsequence/indexer' import { CoinTileContent } from './CoinTileContent' -import { getNativeTokenInfoByChainId, useExchangeRate } from '@0xsequence/kit' +import { getNativeTokenInfoByChainId, useContractInfo, useExchangeRate } from '@0xsequence/kit' import { computeBalanceFiat, formatDisplay, getPercentagePriceChange, compareAddress } from '../../../../../utils' -import { useContractInfo, useCoinPrices, useSettings } from '../../../../../hooks' +import { useCoinPrices, useSettings } from '../../../../../hooks' interface CoinTileProps { balance: TokenBalance