fix frontier and fix hardcode swap milky

src/config/pools.ts

@@ -2,7 +2,7 @@ import { fromBinary, toBinary } from '@cosmjs/cosmwasm-stargate';
 import { parseAssetInfo } from 'helper';
 import { flatten, uniq } from 'lodash';
 import { TokenItemType, assetInfoMap } from './bridgeTokens';
-import { ORAI } from './constants';
+import { MILKY, ORAI, STABLE_DENOM } from './constants';
 import { AssetInfo, MulticallQueryClient, MulticallReadOnlyInterface } from '@oraichain/common-contracts-sdk';
 import { PairInfo } from '@oraichain/oraidex-contracts-sdk';
 import { network } from './networks';

src/helper/index.tsx

@@ -1,6 +1,6 @@
-import { BSC_SCAN, ETHEREUM_SCAN, HIGH_GAS_PRICE, KWT_SCAN, MULTIPLIER, TRON_SCAN } from 'config/constants';
+import { BSC_SCAN, ETHEREUM_SCAN, HIGH_GAS_PRICE, KWT_SCAN, MULTIPLIER, ORAI, TRON_SCAN } from 'config/constants';
 
-import { EvmDenom, TokenItemType } from 'config/bridgeTokens';
+import { EvmDenom, oraichainTokens, TokenItemType } from 'config/bridgeTokens';
 import { network } from 'config/networks';
 
 import { displayToast, TToastType } from 'components/Toasts/Toast';
@@ -62,7 +62,7 @@ export const getNetworkGasPrice = async (): Promise<number> => {
     if (findToken) {
       return findToken.feeCurrencies[0].gasPriceStep.average;
     }
-  } catch {}
+  } catch { }
   return 0;
 };
 
@@ -151,3 +151,31 @@ export const isFactoryV1 = (assetInfos: [AssetInfo, AssetInfo]): boolean => {
 export const floatToPercent = (value: number): number => {
   return value * 100;
 };
+
+export const getPairSwapV2 = (contractAddress) => {
+  let arr = [];
+  let arrDenom = ORAI;
+  if (!contractAddress) return { arrLength: 0 };
+  const pairMapping = Pairs.pairs.filter((p) =>
+    p?.asset_infos.find(
+      (asset: { token: { contract_addr: string } }) => asset?.token?.contract_addr === contractAddress
+    )
+  );
+  if (pairMapping.length) {
+    for (const info of pairMapping) {
+      const assets0 = parseAssetInfo(info?.asset_infos?.[0]);
+      const assets1 = parseAssetInfo(info?.asset_infos?.[1]);
+      if (assets0 !== contractAddress) arr.push(assets0);
+      if (assets1 !== contractAddress) arr.push(assets1);
+    }
+  }
+  if (arr.length) {
+    arrDenom = oraichainTokens.find((e) => e.contractAddress === arr[0])?.denom ?? arr[0];
+  }
+  return {
+    arr,
+    arrLength: arr?.length,
+    arrDenom,
+    arrIncludesOrai: arr?.includes(ORAI),
+  };
+};

src/pages/BalanceNew/TransferConvertToken/index.module.scss

@@ -348,7 +348,7 @@
   width: 100%;
   background: #2b2d3b;
   border: 1.5px solid #5a5270;
-
+  z-index: 1;
   &.light {
     background: #efefef;
     border-color: none;

src/pages/Pools/LiquidityModal/LiquidityModal.tsx

@@ -27,6 +27,7 @@ import { FC, useEffect, useState } from 'react';
 import NumberFormat from 'react-number-format';
 import { useDispatch, useSelector } from 'react-redux';
 import { isMobile } from '@walletconnect/browser-utils';
+import { PairInfoExtend } from 'types/token';
 import {
   fetchTokenAllowance,
   generateContractMessages,
@@ -41,6 +42,9 @@ import { handleCheckAddress, handleErrorTransaction } from 'helper';
 import { TooltipIcon } from 'components/Modals/SettingTooltip';
 import SlippageModal from 'components/Modals/SlippageModal';
 import { ReactComponent as CloseIcon } from 'assets/icons/close.svg';
+import { updateLpPools } from 'reducer/token';
+import { fetchCacheLpPools } from '../helpers';
+import { MulticallQueryClient } from '@oraichain/common-contracts-sdk';
 import { isBigIntZero } from '../helpers';
 
 const cx = cn.bind(styles);
@@ -57,8 +61,8 @@ interface ModalProps {
   lpTokenBalance: string;
   pairAmountInfoData: PairAmountInfo;
   refetchPairAmountInfo: Function;
-  fetchCachedLpTokenAll: (address, dispatch) => void;
   pairInfoData: PairInfo;
+  pairs?: PairInfoExtend[];
 }
 
 const LiquidityModal: FC<ModalProps> = ({
@@ -71,8 +75,8 @@ const LiquidityModal: FC<ModalProps> = ({
   lpTokenBalance: lpTokenBalanceValue,
   pairAmountInfoData,
   refetchPairAmountInfo,
-  fetchCachedLpTokenAll,
-  pairInfoData
+  pairInfoData,
+  pairs
 }) => {
   const token1 = token1InfoData;
   const token2 = token2InfoData;
@@ -98,6 +102,7 @@ const LiquidityModal: FC<ModalProps> = ({
   const amounts = useSelector((state: RootState) => state.token.amounts);
 
   const loadTokenAmounts = useLoadTokens();
+  const setCachedLpPools = (payload: LpPoolDetails) => dispatch(updateLpPools(payload));
 
   let token1Balance = BigInt(amounts[token1?.denom] ?? '0');
   let token2Balance = BigInt(amounts[token2?.denom] ?? '0');
@@ -171,9 +176,18 @@ const LiquidityModal: FC<ModalProps> = ({
     setEstimatedLP(estimatedLP);
   };
 
+  const fetchCachedLpTokenAll = async () => {
+    const lpTokenData = await fetchCacheLpPools(
+      pairs,
+      address,
+      new MulticallQueryClient(window.client, network.multicall)
+    );
+    setCachedLpPools(lpTokenData);
+  }
+
   const onLiquidityChange = () => {
     refetchPairAmountInfo();
-    fetchCachedLpTokenAll(address, dispatch);
+    fetchCachedLpTokenAll()
     loadTokenAmounts({ oraiAddress: address });
   };
 
@@ -368,7 +382,7 @@ const LiquidityModal: FC<ModalProps> = ({
         </div>
       </div>
       <div className={cx('swap-icon')}>
-        <img src={FluentAddImg} onClick={() => {}} />
+        <img src={FluentAddImg} onClick={() => { }} />
       </div>
       <div className={cx('supply', theme)}>
         <div className={cx('header')}>

src/pages/Pools/NewTokenModal/ModalComponent.tsx

@@ -7,6 +7,7 @@ import { Pairs } from 'config/pools';
 import { ReactComponent as SuccessIcon } from 'assets/icons/success.svg';
 import { ReactComponent as TokensIcon } from 'assets/icons/tokens.svg';
 import { OraiswapTokenQueryClient } from '@oraichain/oraidex-contracts-sdk';
+import CheckBox from 'components/CheckBox';
 
 const cx = cn.bind(styles);
 
@@ -46,7 +47,7 @@ export const ModalListToken = ({
 }) => {
   const [contractAddr, setContractAddr] = useState('');
   const [isAddToken, setIsAddToken] = useState(null);
-
+  const [isToken, setIsToken] = useState(false);
   return (
     <div className={cx('dropdown-reward')}>
       <div>
@@ -92,9 +93,18 @@ export const ModalListToken = ({
           </div>
         </div>
         <AddTokenStatus status={isAddToken} />
+        <div style={{
+          display: 'flex',
+          justifyContent: 'space-around',
+          paddingTop: 10
+        }}>
+          <CheckBox radioBox label="Token" checked={!isToken} onCheck={() => isToken && setIsToken(false)} />
+          <CheckBox radioBox label="Native Token" checked={isToken} onCheck={() => !isToken && setIsToken(true)} />
+        </div>
         <div className={cx('list')}>
           <ul>
             {[...Pairs.getPoolTokens(), ...tokensNew]
+              .filter(p => isToken ? !p.contractAddress : p.contractAddress)
               .filter((pair) => !allRewardSelect.includes(pair.denom))
               .map((t, index) => {
                 return (

src/pages/Pools/PoolDetail.tsx

@@ -30,10 +30,14 @@ import UnbondModal from './UnbondModal/UnbondModal';
 import { ReactComponent as LpTokenIcon } from 'assets/icons/lp_token.svg';
 import { network } from 'config/networks';
 import { PairInfo } from '@oraichain/oraidex-contracts-sdk';
+import { useFetchAllPairs } from './hooks';
+import { MulticallQueryClient } from '@oraichain/common-contracts-sdk';
+import { updateLpPools } from 'reducer/token';
+
 import { useCoinGeckoPrices } from 'hooks/useCoingecko';
 const cx = cn.bind(styles);
 
-interface PoolDetailProps {}
+interface PoolDetailProps { }
 
 const PoolDetail: React.FC<PoolDetailProps> = () => {
   let { poolUrl } = useParams();
@@ -46,9 +50,11 @@ const PoolDetail: React.FC<PoolDetailProps> = () => {
   const [theme] = useConfigReducer('theme');
   const { data: prices } = useCoinGeckoPrices();
   const [assetToken, setAssetToken] = useState<TokenItemType>();
+  const pairs = useFetchAllPairs();
   const lpPools = useSelector((state: RootState) => state.token.lpPools);
   const dispatch = useDispatch();
   const loadTokenAmounts = useLoadTokens();
+  const setCachedLpPools = (payload: LpPoolDetails) => dispatch(updateLpPools(payload));
   const getPairInfo = async () => {
     if (!poolUrl) return;
     const pairRawData = poolUrl.split('_');
@@ -72,10 +78,19 @@ const PoolDetail: React.FC<PoolDetailProps> = () => {
     };
   };
 
+  const fetchCachedLpTokenAll = async () => {
+    const lpTokenData = await fetchCacheLpPools(
+      pairs,
+      address,
+      new MulticallQueryClient(window.client, network.multicall)
+    );
+    setCachedLpPools(lpTokenData);
+  }
+
   const onBondingAction = () => {
     refetchRewardInfo();
     refetchPairAmountInfo();
-    fetchCacheLpPools(address, dispatch);
+    fetchCachedLpTokenAll();
     loadTokenAmounts({ oraiAddress: address });
   };
 
@@ -374,7 +389,7 @@ const PoolDetail: React.FC<PoolDetailProps> = () => {
                 pairAmountInfoData={pairAmountInfoData}
                 refetchPairAmountInfo={refetchPairAmountInfo}
                 pairInfoData={pairInfoData.info}
-                fetchCachedLpTokenAll={fetchCacheLpPools}
+                pairs={pairs}
               />
             )}
           {isOpenBondingModal && lpTokenInfoData && lpTokenBalance > 0 && (

src/pages/Pools/helpers.ts

@@ -276,10 +276,7 @@ const getInfoLiquidityPool = ({ denom, contract_addr }) => {
   return { native_token: { denom } };
 };
 
-const fetchCacheLpPools = async (address, dispatch) => {
-  if (!address || !dispatch) return;
-  const setCachedLpPools = (payload: LpPoolDetails) => dispatch(updateLpPools(payload));
-  const pairs = await Pairs.getAllPairsFromTwoFactoryVersions();
+const generateLpPoolsInfoQueries = (pairs: PairInfo[], address: string) => {
   const queries = pairs.map((pair) => ({
     address: pair.liquidity_token,
     data: toBinary({
@@ -288,12 +285,10 @@ const fetchCacheLpPools = async (address, dispatch) => {
       }
     })
   }));
+  return queries;
+};
 
-  const multicall = new MulticallQueryClient(window.client, network.multicall);
-  const res = await multicall.aggregate({
-    queries
-  });
-
+const calculateLpPools = (pairs: PairInfo[], res: AggregateResult) => {
   const lpTokenData = Object.fromEntries(
     pairs.map((pair, ind) => {
       const data = res.return_data[ind];
@@ -303,7 +298,15 @@ const fetchCacheLpPools = async (address, dispatch) => {
       return [pair.liquidity_token, fromBinary(data.data)];
     })
   );
-  setCachedLpPools(lpTokenData);
+  return lpTokenData;
+};
+
+const fetchCacheLpPools = async (pairs: PairInfo[], address: string, multicall: MulticallReadOnlyInterface) => {
+  const queries = generateLpPoolsInfoQueries(pairs, address);
+  const res = await multicall.aggregate({
+    queries
+  });
+  return calculateLpPools(pairs, res);
 };
 
 const isBigIntZero = (value: BigInt): boolean => {

src/pages/Pools/hooks.ts

@@ -6,9 +6,16 @@ import { CoinGeckoPrices } from 'hooks/useCoingecko';
 import useConfigReducer from 'hooks/useConfigReducer';
 import { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { updatePairs } from 'reducer/token';
+import { updateLpPools, updatePairs } from 'reducer/token';
 import { RootState } from 'store/configure';
-import { PairInfoData, fetchAprResult, fetchMyPairsData, fetchPairsData, fetchPoolListAndOraiPrice } from './helpers';
+import {
+  PairInfoData,
+  fetchAprResult,
+  fetchMyPairsData,
+  fetchPairsData,
+  fetchPoolListAndOraiPrice,
+  fetchCacheLpPools
+} from './helpers';
 import { updatePairInfos } from 'reducer/pairs';
 import { PairInfoExtend } from 'types/token';
 
@@ -47,6 +54,26 @@ export const useFetchApr = (pairs: PairInfo[], pairInfos: PairInfoData[], prices
   return [cachedApr];
 };
 
+// Fetch all lp pools
+export const useFetchCacheLpPools = (pairs: PairInfo[], typeFilter: string) => {
+  const dispatch = useDispatch();
+  const [address] = useConfigReducer('address');
+  const setCachedLpPools = (payload: LpPoolDetails) => dispatch(updateLpPools(payload));
+
+  const fetchCachedLpPool = async () => {
+    const lpTokenData = await fetchCacheLpPools(
+      pairs,
+      address,
+      new MulticallQueryClient(window.client, network.multicall)
+    );
+    setCachedLpPools(lpTokenData);
+  };
+
+  useEffect(() => {
+    if (pairs.length > 0 && address) fetchCachedLpPool();
+  }, [typeFilter]);
+};
+
 // Fetch all pair data
 export const useFetchCachePairs = (pairs: PairInfo[]) => {
   const dispatch = useDispatch();

src/pages/Pools/index.tsx

@@ -7,17 +7,18 @@ import { useCoinGeckoPrices } from 'hooks/useCoingecko';
 import useConfigReducer from 'hooks/useConfigReducer';
 import Content from 'layouts/Content';
 import sumBy from 'lodash/sumBy';
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
 import React, { FC, memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { fetchCacheLpPools, PairInfoData } from './helpers';
-import { useFetchAllPairs, useFetchApr, useFetchCachePairs, useFetchMyPairs, useFetchPairInfoDataList } from './hooks';
+import { PairInfoData } from './helpers';
+import { useFetchAllPairs, useFetchApr, useFetchCacheLpPools, useFetchCachePairs, useFetchMyPairs, useFetchPairInfoDataList } from './hooks';
 import styles from './index.module.scss';
 import NewPoolModal from './NewPoolModal/NewPoolModal';
 import { RootState } from 'store/configure';
 import NewTokenModal from './NewTokenModal/NewTokenModal';
 import { parseTokenInfo, parseTokenInfoRawDenom } from 'rest/api';
 import classNames from 'classnames';
+import { PairInfo } from '@oraichain/oraidex-contracts-sdk';
 
 interface PoolsProps { }
 
@@ -122,12 +123,12 @@ const ListPools = memo<{
   allPoolApr: { [key: string]: number };
   setIsOpenNewTokenModal?: (isOpenNewToken: boolean) => void;
   theme?: string;
-}>(({ pairInfos, allPoolApr, setIsOpenNewTokenModal, theme }) => {
+  pairs: PairInfo[];
+}>(({ pairInfos, allPoolApr, setIsOpenNewTokenModal, theme, pairs }) => {
   const [filteredPairInfos, setFilteredPairInfos] = useState<PairInfoData[]>([]);
   const [typeFilter, setTypeFilter] = useConfigReducer('filterDefaultPool');
   const lpPools = useSelector((state: RootState) => state.token.lpPools);
-  const [address] = useConfigReducer('address');
-  const dispatch = useDispatch();
+  useFetchCacheLpPools(pairs, typeFilter);
   useEffect(() => {
     if (!!!typeFilter) {
       setTypeFilter(KeyFilterPool.all_pool);
@@ -151,10 +152,6 @@ const ListPools = memo<{
     }
   }, [listMyPool, typeFilter, pairInfos]);
 
-  useEffect(() => {
-    fetchCacheLpPools(address, dispatch);
-  }, [typeFilter])
-
   const filterPairs = useCallback(
     (text: string) => {
       const listPairs = typeFilter === KeyFilterPool.all_pool ? pairInfos : listMyPool;
@@ -244,6 +241,7 @@ const Pools: React.FC<PoolsProps> = () => {
           pairInfos={pairInfos}
           allPoolApr={cachedApr}
           theme={theme}
+          pairs={pairs}
         />
         <NewPoolModal
           isOpen={isOpenNewPoolModal}