fix bridge inj

oraidex · Jan 9, 2025 · a18f807 · a18f807
1 parent f8c3b82
commit a18f807
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/pages/Balance/TransferConvertToken/index.tsx b/src/pages/Balance/TransferConvertToken/index.tsx
@@ -311,8 +311,6 @@ const TransferConvertToken: FC<TransferConvertProps> = ({
 
   const isBTCLegacy = token?.contractAddress === BTC_CONTRACT;
 
-  console.log({ networks });
-
   return (
     <div className={classNames(styles.tokenFromGroup, styles.small)} style={{ flexWrap: 'wrap' }}>
       <div className={styles.tokenSubAmouts}>

diff --git a/src/pages/Balance/index.tsx b/src/pages/Balance/index.tsx
@@ -137,7 +137,7 @@ const Balance: React.FC<BalanceProps> = () => {
   const [isFastMode, setIsFastMode] = useState(true);
   const [loadingInspector, setLoadingInspector] = useState(false);
   const [toToken, setToToken] = useState<TokenItemType>();
-  const [toTokens, setToTokens] = useState();
+  const [toTokens, setToTokens] = useState<any>();
 
   const [filterNetworkUI, setFilterNetworkUI] = useConfigReducer('filterNetwork');
   const [hideOtherSmallAmount, setHideOtherSmallAmount] = useConfigReducer('hideOtherSmallAmount');
@@ -202,8 +202,8 @@ const Balance: React.FC<BalanceProps> = () => {
 
   const loadTokenAmounts = useLoadTokens();
   const { data: prices } = useCoinGeckoPrices();
-  useGetFeeConfig();
 
+  useGetFeeConfig();
   useEffect(() => {
     if (!searchTokenAddress) return setTokens([otherChainTokenCommon, oraichainTokensCommon]);
 
@@ -247,10 +247,6 @@ const Balance: React.FC<BalanceProps> = () => {
     });
   }, []);
 
-  // useEffect(() => {
-  //   setTokenBridge([undefined, undefined]);
-  // }, [filterNetworkUI]);
-
   const processTxResult = (rpc: string, result: DeliverTxResponse, customLink?: string) => {
     if (isDeliverTxFailure(result)) {
       displayToast(TToastType.TX_FAILED, {
@@ -645,8 +641,7 @@ const Balance: React.FC<BalanceProps> = () => {
       let result: DeliverTxResponse | string | any;
       let newToToken = to;
 
-      // TODO: @haunv - why we need to find newToToken here?
-      if (toNetworkChainId && !toToken) {
+      if (toNetworkChainId && (!toToken || toToken?.chainId !== toNetworkChainId)) {
         newToToken = [...otherChainTokens, ...oraichainTokens].find(
           (flat) => flat.chainId === toNetworkChainId && flat.coinGeckoId === from.coinGeckoId
         );