diff --git a/packages/bridge/src/hooks/useLockedFundsAccounts.tsx b/packages/bridge/src/hooks/useLockedFundsAccounts.tsx index d2aadb9..6d33e4c 100644 --- a/packages/bridge/src/hooks/useLockedFundsAccounts.tsx +++ b/packages/bridge/src/hooks/useLockedFundsAccounts.tsx @@ -3,7 +3,7 @@ import {contexts} from "@oyster/common"; import * as BufferLayout from 'buffer-layout' import {WORMHOLE_PROGRAM_ID} from "../utils/ids"; import BN from "bn.js"; -import {getAssetAmountInUSD, getAssetName, getAssetTokenSymbol} from "../utils/assets"; +import {ASSET_CHAIN, getAssetAmountInUSD, getAssetName, getAssetTokenSymbol} from "../utils/assets"; const { useConnection } = contexts.Connection; @@ -53,9 +53,9 @@ export const useLockedFundsAccounts = () => { programAccounts.map(acc => { try { const parsedAccount = dataLayout.decode(acc.account.data) - - if ((parsedAccount.assetChain === 1 || parsedAccount.assetChain ===2 ) && - (parsedAccount.toChain === 1 || parsedAccount.toChain === 2)) { + const chains = [ASSET_CHAIN.Solana, ASSET_CHAIN.Ethereum] + if (chains.indexOf(parsedAccount.assetChain) >= 0 && + chains.indexOf(parsedAccount.toChain) >= 0) { const dec = new BN(10).pow(new BN(parsedAccount.assetDecimals)); const rawAmount = new BN(parsedAccount.amount, 2, "le") const amount = rawAmount.div(dec).toNumber(); diff --git a/packages/bridge/src/utils/assets.ts b/packages/bridge/src/utils/assets.ts index 1a661d2..5c303bb 100644 --- a/packages/bridge/src/utils/assets.ts +++ b/packages/bridge/src/utils/assets.ts @@ -19,3 +19,8 @@ export const getAssetAmountInUSD = ( ) => { return amount; }; + +export enum ASSET_CHAIN { + Solana = 1, + Ethereum = 2, +} diff --git a/packages/bridge/src/views/home/index.tsx b/packages/bridge/src/views/home/index.tsx index ad347a3..65ad95c 100644 --- a/packages/bridge/src/views/home/index.tsx +++ b/packages/bridge/src/views/home/index.tsx @@ -11,6 +11,7 @@ import { Totals } from '../../models/totals'; import { Link } from 'react-router-dom'; import {useLockedFundsAccounts} from "../../hooks/useLockedFundsAccounts"; import {EtherscanLink} from "@oyster/common/dist/lib/components/EtherscanLink"; +import {ASSET_CHAIN} from "../../utils/assets"; const { fromLamports, getTokenName, wadToLamports } = utils; const { cache } = contexts.Accounts; const { useConnectionConfig } = contexts.Connection; @@ -87,10 +88,10 @@ export const HomeView = () => { symbol: acc.tokenSymbol, name: acc.tokenName, amount: acc.amountInUSD, - sourceAddress: acc.parsedAccount.assetChain === 1 ? + sourceAddress: acc.parsedAccount.assetChain === ASSET_CHAIN.Solana ? : , - targetAddress: acc.parsedAccount.toChain === 1 ? + targetAddress: acc.parsedAccount.toChain === ASSET_CHAIN.Solana ? : , }