From a82d468bca27fb073f4d3ab22d97235a0d927d0b Mon Sep 17 00:00:00 2001 From: michalsmiarowski Date: Tue, 16 Jan 2024 15:53:53 +0100 Subject: [PATCH] Change all tbtcv2 occurences to tbtc --- src/App.tsx | 2 +- src/components/TokenBalanceCard/index.tsx | 4 ++-- src/contexts/TokenContext.tsx | 20 +++++++++---------- src/enums/token.ts | 4 ++-- src/hooks/useFetchTvl.ts | 6 +++--- src/hooks/useTBTCTokenAddress.ts | 4 ++-- src/hooks/useTokenState.ts | 4 ++-- src/pages/tBTC/Bridge/TbtcBalanceCard.tsx | 2 +- src/pages/tBTC/Bridge/Unmint.tsx | 2 +- src/store/index.ts | 2 +- src/store/tokens/tokenSlice.ts | 2 +- src/types/token.ts | 2 +- ...kenContract.ts => useTBTCTokenContract.ts} | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) rename src/web3/hooks/{useTBTCv2TokenContract.ts => useTBTCTokenContract.ts} (75%) diff --git a/src/App.tsx b/src/App.tsx index 2ac80bf30..6eed55d2a 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -40,7 +40,7 @@ import { import { useSentry } from "./hooks/sentry" const Web3EventHandlerComponent = () => { - useSubscribeToERC20TransferEvent(Token.TBTCV2) + useSubscribeToERC20TransferEvent(Token.TBTC) useSubscribeToDepositRevealedEvent() useSubscribeToOptimisticMintingFinalizedEvent() useSubscribeToOptimisticMintingRequestedEvent() diff --git a/src/components/TokenBalanceCard/index.tsx b/src/components/TokenBalanceCard/index.tsx index 77d718581..4fd71f9be 100644 --- a/src/components/TokenBalanceCard/index.tsx +++ b/src/components/TokenBalanceCard/index.tsx @@ -6,7 +6,7 @@ import { tBTCFillBlack } from "../../static/icons/tBTCFillBlack" import { TokenBalanceProps } from "../TokenBalance" export type TokenBalanceCardProps = { - token: Extract + token: Extract title?: string | JSX.Element tokenSymbol?: string withSymbol?: boolean @@ -16,7 +16,7 @@ export type TokenBalanceCardProps = { > const tokenToIconMap = { - [Token.TBTCV2]: tBTCFillBlack, + [Token.TBTC]: tBTCFillBlack, } const TokenBalanceCard: FC = ({ diff --git a/src/contexts/TokenContext.tsx b/src/contexts/TokenContext.tsx index 88325eb4a..55c377a84 100644 --- a/src/contexts/TokenContext.tsx +++ b/src/contexts/TokenContext.tsx @@ -6,7 +6,7 @@ import { useTokenState } from "../hooks/useTokenState" import { useTokensBalanceCall } from "../hooks/useTokensBalanceCall" import { Token } from "../enums" import { TokenState } from "../types" -import { useTBTCv2TokenContract } from "../web3/hooks/useTBTCv2TokenContract" +import { useTBTCTokenContract } from "../web3/hooks/useTBTCTokenContract" interface TokenContextState extends TokenState { contract: Contract | null @@ -15,22 +15,22 @@ interface TokenContextState extends TokenState { export const TokenContext = createContext<{ [key in Token]: TokenContextState }>({ - [Token.TBTCV2]: {} as TokenContextState, + [Token.TBTC]: {} as TokenContextState, }) // Context that handles data fetching when a user connects their wallet or // switches their network export const TokenContextProvider: React.FC = ({ children }) => { - const tbtcv2 = useTBTCv2TokenContract() + const tbtc = useTBTCTokenContract() const { active, chainId, account } = useWeb3React() const { fetchTokenPriceUSD, setTokenBalance, - tbtcv2: tbtcv2Data, + tbtc: tbtcData, } = useTokenState() - const tokenContracts = [tbtcv2] + const tokenContracts = [tbtc] const fetchBalances = useTokensBalanceCall( tokenContracts, @@ -54,8 +54,8 @@ export const TokenContextProvider: React.FC = ({ children }) => { // React.useEffect(() => { if (active) { - fetchBalances().then(([tbtcv2Balance]) => { - setTokenBalance(Token.TBTCV2, tbtcv2Balance.toString()) + fetchBalances().then(([tbtcBalance]) => { + setTokenBalance(Token.TBTC, tbtcBalance.toString()) }) } else { // set all token balances to 0 if the user disconnects the wallet @@ -71,9 +71,9 @@ export const TokenContextProvider: React.FC = ({ children }) => { return ( diff --git a/src/enums/token.ts b/src/enums/token.ts index 4595e630d..dfb83a072 100644 --- a/src/enums/token.ts +++ b/src/enums/token.ts @@ -1,7 +1,7 @@ export enum Token { - TBTCV2 = "TBTCV2", + TBTC = "TBTC", } export enum CoingeckoID { - TBTCV2 = "tbtc", + TBTC = "tbtc", } diff --git a/src/hooks/useFetchTvl.ts b/src/hooks/useFetchTvl.ts index 3bfe59264..3707fccc7 100644 --- a/src/hooks/useFetchTvl.ts +++ b/src/hooks/useFetchTvl.ts @@ -4,7 +4,7 @@ import { formatUnits } from "@ethersproject/units" import { useToken } from "./useToken" import { Token } from "../enums" import { toUsdBalance } from "../utils/getUsdBalance" -import { useTBTCv2TokenContract } from "../web3/hooks/useTBTCv2TokenContract" +import { useTBTCTokenContract } from "../web3/hooks/useTBTCTokenContract" interface TvlRawData { tBTC: string @@ -26,8 +26,8 @@ export const useFetchTvl = (): [ const [rawData, setRawData] = useState(initialState) const { tBTC: tBTCTvl } = rawData - const tbtcTokenContract = useTBTCv2TokenContract() - const tBTCToken = useToken(Token.TBTCV2) + const tbtcTokenContract = useTBTCTokenContract() + const tBTCToken = useToken(Token.TBTC) const fetchTvlData = useCallback(async () => { const tBTCTokenTotalSupply: BigNumberish = diff --git a/src/hooks/useTBTCTokenAddress.ts b/src/hooks/useTBTCTokenAddress.ts index 0a166864d..034440e64 100644 --- a/src/hooks/useTBTCTokenAddress.ts +++ b/src/hooks/useTBTCTokenAddress.ts @@ -1,7 +1,7 @@ -import { useTBTCv2TokenContract } from "../web3/hooks/useTBTCv2TokenContract" +import { useTBTCTokenContract } from "../web3/hooks/useTBTCTokenContract" export const useTBTCTokenAddress = () => { - const tbtcContract = useTBTCv2TokenContract() + const tbtcContract = useTBTCTokenContract() return tbtcContract.address } diff --git a/src/hooks/useTokenState.ts b/src/hooks/useTokenState.ts index 5cd84b606..8ffeede18 100644 --- a/src/hooks/useTokenState.ts +++ b/src/hooks/useTokenState.ts @@ -9,7 +9,7 @@ import { Token } from "../enums" import { UseTokenState } from "../types/token" export const useTokenState: UseTokenState = () => { - const tbtcv2 = useSelector((state: RootState) => state.token[Token.TBTCV2]) + const tbtc = useSelector((state: RootState) => state.token[Token.TBTC]) const dispatch = useDispatch() @@ -23,7 +23,7 @@ export const useTokenState: UseTokenState = () => { dispatch(fetchTokenPriceAction({ token })) return { - tbtcv2, + tbtc, fetchTokenPriceUSD, setTokenBalance, setTokenLoading, diff --git a/src/pages/tBTC/Bridge/TbtcBalanceCard.tsx b/src/pages/tBTC/Bridge/TbtcBalanceCard.tsx index 1645ea285..92d7de384 100644 --- a/src/pages/tBTC/Bridge/TbtcBalanceCard.tsx +++ b/src/pages/tBTC/Bridge/TbtcBalanceCard.tsx @@ -8,7 +8,7 @@ export const TbtcBalanceCard: FC> = ({ }) => { return ( diff --git a/src/pages/tBTC/Bridge/Unmint.tsx b/src/pages/tBTC/Bridge/Unmint.tsx index ac8e127df..59ce10841 100644 --- a/src/pages/tBTC/Bridge/Unmint.tsx +++ b/src/pages/tBTC/Bridge/Unmint.tsx @@ -60,7 +60,7 @@ import { UnmintDetails } from "./UnmintDetails" import { BridgeProcessEmptyState } from "./components/BridgeProcessEmptyState" const UnmintFormPage: PageComponent = ({}) => { - const { balance } = useToken(Token.TBTCV2) + const { balance } = useToken(Token.TBTC) const { openModal } = useModal() const threshold = useThreshold() diff --git a/src/store/index.ts b/src/store/index.ts index 544432075..0bd0c80f8 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -31,7 +31,7 @@ const rootReducer: Reducer = (state: RootState, action: AnyAction) => { registerTBTCListeners() state = { token: { - TBTCV2: { ...state.token.TBTCV2, balance: 0 }, + TBTC: { ...state.token.TBTC, balance: 0 }, }, } as RootState } diff --git a/src/store/tokens/tokenSlice.ts b/src/store/tokens/tokenSlice.ts index 970a15410..2ba00d9bc 100644 --- a/src/store/tokens/tokenSlice.ts +++ b/src/store/tokens/tokenSlice.ts @@ -30,7 +30,7 @@ const toUsdBalance = (token: TokenState) => { export const tokenSlice = createSlice({ name: "tokens", initialState: { - [Token.TBTCV2]: { + [Token.TBTC]: { loading: false, balance: 0, usdConversion: 0, diff --git a/src/types/token.ts b/src/types/token.ts index edc6d3550..b04104135 100644 --- a/src/types/token.ts +++ b/src/types/token.ts @@ -32,7 +32,7 @@ export type TokenActionTypes = SetTokenBalance | SetTokenLoading export interface UseTokenState { (): { - tbtcv2: TokenState + tbtc: TokenState setTokenBalance: ( token: Token, balance: number | string diff --git a/src/web3/hooks/useTBTCv2TokenContract.ts b/src/web3/hooks/useTBTCTokenContract.ts similarity index 75% rename from src/web3/hooks/useTBTCv2TokenContract.ts rename to src/web3/hooks/useTBTCTokenContract.ts index dfe429ab0..51021816d 100644 --- a/src/web3/hooks/useTBTCv2TokenContract.ts +++ b/src/web3/hooks/useTBTCTokenContract.ts @@ -1,6 +1,6 @@ import { useThreshold } from "../../contexts/ThresholdContext" -export const useTBTCv2TokenContract = () => { +export const useTBTCTokenContract = () => { const threshold = useThreshold() return threshold.tbtc.tokenContract }