Merge branch 'main' into feat/new-v3

oraidex · Oct 22, 2024 · 7df40f6 · 7df40f6
2 parents ae305cb + 64fd04f
commit 7df40f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 31 deletions.
diff --git a/src/pages/BitcoinDashboardV2/components/ConvertBitcoinV2/index.tsx b/src/pages/BitcoinDashboardV2/components/ConvertBitcoinV2/index.tsx
@@ -3,17 +3,9 @@ import useConfigReducer from 'hooks/useConfigReducer';
 import React, { useContext, useEffect, useState } from 'react';
 import styles from './index.module.scss';
 import { formatDisplayUsdt, numberWithCommas } from 'helper/format';
-import {
-  BridgeAppCurrency,
-  calculateTimeoutTimestamp,
-  getTokensFromNetwork,
-  toAmount,
-  toDisplay,
-  TokenItemType
-} from '@oraichain/oraidex-common';
+import { calculateTimeoutTimestamp, toAmount, toDisplay } from '@oraichain/oraidex-common';
 import { ReactComponent as BitcoinIcon } from 'assets/icons/bitcoin.svg';
 import { getUsd } from 'libs/utils';
-import { ORAIX_DECIMAL, ORAIX_TOKEN_INFO } from 'pages/Staking/constants';
 import Loader from 'components/Loader';
 import { Button } from 'components/Button';
 import NumberFormat from 'react-number-format';
@@ -32,6 +24,7 @@ import { btcTokens, oraichainTokens } from 'config/bridgeTokens';
 import { PendingWithdraws } from 'pages/BitcoinDashboard/components/PendingWithdraws';
 import { useGetPendingDeposits } from 'pages/BitcoinDashboardV2/hooks';
 
+export const BTC_TOKEN = oraichainTokens.find((e) => e.coinGeckoId === 'bitcoin');
 const ConvertBitcoinV2: React.FC<{}> = ({}) => {
   const cwBitcoinContext = useContext(CwBitcoinContext);
   const { relayerFee } = useRelayerFeeToken(
@@ -44,13 +37,12 @@ const ConvertBitcoinV2: React.FC<{}> = ({}) => {
   });
   const depositFeeV2Btc = useDepositFeesBitcoinV2(true);
   const [oraiAddress] = useConfigReducer('address');
-  const fetchedPendingDeposits = useGetPendingDeposits(oraiAddress);
   const PENDING_WITHDRAW_STORAGE_KEY = `PENDING_WITHDRAW_${oraiAddress}`;
   const amounts = useSelector((state: RootState) => state.token.amounts);
   const [coeff, setCoeff] = useState(0);
   const { data: prices } = useCoinGeckoPrices();
   const [amount, setAmount] = useState<number>(0);
-  const amountUSD = getUsd(toAmount(amount), ORAIX_TOKEN_INFO, prices);
+  const amountUSD = getUsd(toAmount(amount), BTC_TOKEN, prices);
   const [loading, setLoading] = useState<boolean>(false);
   const [fee, setFee] = useState<number>(0);
   const [cachePendingWithdrawAddrs, setCachePendingWithdrawAddrs] = useState<string[]>([]);

diff --git a/src/pages/UniversalSwap/helpers.ts b/src/pages/UniversalSwap/helpers.ts
@@ -388,14 +388,8 @@ export const getProtocolsSmartRoute = (
 };
 
 export const isAllowAlphaIbcWasm = (fromToken: TokenItemType, toToken: TokenItemType) => {
-  if (
-    !fromToken.cosmosBased &&
-    (toToken.chainId === COSMOS_CHAIN_ID_COMMON.INJECTVE_CHAIN_ID ||
-      toToken.chainId === COSMOS_CHAIN_ID_COMMON.CELESTIA_CHAIN_ID)
-  )
-    return true;
-
-  // from chainId and to chainId is CELESTIA_CHAIN_ID
+  // from chainId and to chainId is CELESTIA_CHAIN_ID & INJECTVE_CHAIN_ID
+  if ([toToken.chainId, fromToken.chainId].includes(COSMOS_CHAIN_ID_COMMON.INJECTVE_CHAIN_ID)) return true;
   if ([toToken.chainId, fromToken.chainId].includes(COSMOS_CHAIN_ID_COMMON.CELESTIA_CHAIN_ID)) return true;
   return false;
 };
@@ -434,8 +428,9 @@ export const isAllowIBCWasm = (fromToken: TokenItemType, toToken: TokenItemType)
   const toTokenIsOraichain = toToken.chainId === 'Oraichain';
   const toTokenIsCosmos = toToken.cosmosBased;
 
-  // from chainId and to chainId is CELESTIA_CHAIN_ID
+  // from chainId and to chainId is CELESTIA_CHAIN_ID or INJECTVE_CHAIN_ID
   if ([toToken.chainId, fromToken.chainId].includes(COSMOS_CHAIN_ID_COMMON.CELESTIA_CHAIN_ID)) return false;
+  if ([toToken.chainId, fromToken.chainId].includes(COSMOS_CHAIN_ID_COMMON.INJECTVE_CHAIN_ID)) return false;
 
   // Oraichain -> Oraichain or Cosmos
   if (fromTokenIsOraichain) {
@@ -447,17 +442,7 @@ export const isAllowIBCWasm = (fromToken: TokenItemType, toToken: TokenItemType)
   // Evm -> EVM
   if (!fromTokenIsCosmos && !toTokenIsCosmos && toToken.chainId === fromToken.chainId) return false;
   // Evm -> Oraichain or Cosmos
-  if (!fromTokenIsCosmos) {
-    // Evm -> INJ or TIA
-    if (
-      toToken.chainId === COSMOS_CHAIN_ID_COMMON.INJECTVE_CHAIN_ID ||
-      toToken.chainId === COSMOS_CHAIN_ID_COMMON.CELESTIA_CHAIN_ID
-    ) {
-      return false;
-    }
-
-    return true;
-  }
+  if (!fromTokenIsCosmos) return true;
 
   // Cosmos -> Cosmos or Oraichain
   if (fromTokenIsCosmos && toTokenIsCosmos) {