Merge pull request #1151 from oraidex/fix/minor-bug

fix minor bug

src/hooks/useTokenFee.ts

@@ -82,7 +82,7 @@ export const useRelayerFeeToken = (originalFromToken: TokenItemType, originalToT
   const { data: relayerFeeAmount } = useQuery(
     ['simulate-relayer-data', originalFromToken, originalToToken, relayerFeeInOrai],
     () => {
-      const routerClient = new OraiswapRouterQueryClient(window.client, network.router);
+      const routerClient = new OraiswapRouterQueryClient(window.client, network.mixer_router);
       const oraiToken = oraichainTokens.find((token) => token.coinGeckoId === 'oraichain-token');
 
       if (!oraiToken || !originalToToken) {
@@ -149,7 +149,7 @@ export const useRelayerFeeToken = (originalFromToken: TokenItemType, originalToT
   };
 };
 export const useUsdtToBtc = (amount) => {
-  const routerClient = new OraiswapRouterQueryClient(window.client, network.router);
+  const routerClient = new OraiswapRouterQueryClient(window.client, network.mixer_router);
   const originalFromToken = oraichainTokens.find((token) => token.coinGeckoId === 'tether');
   const originalToToken = oraichainTokens.find((token) => token.coinGeckoId === 'bitcoin');
   const { data } = useQuery(

src/pages/CoHarvest/components/Bidding/index.tsx

@@ -53,7 +53,7 @@ const Bidding = ({ openExplainModal, isEnd, round, isStarted, isCurrentRound, ba
 
   const originalFromToken = tokenMap['oraix'];
   const originalToToken = tokenMap['usdc'];
-  const routerClient = new OraiswapRouterQueryClient(window.client, network.router);
+  const routerClient = new OraiswapRouterQueryClient(window.client, network.mixer_router);
 
   const amountUsd = getUsd(toAmount(amount), ORAIX_TOKEN_INFO, prices);
   const [address] = useConfigReducer('address');

src/pages/CoHarvest/components/BiddingHistory/index.tsx

@@ -26,7 +26,7 @@ const BiddingHistory = ({ round, filterRound, setFilterRound, handleUpdateRoundU
 
   const originalFromToken = tokenMap['oraix'];
   const originalToToken = tokenMap['usdc'];
-  const routerClient = new OraiswapRouterQueryClient(window.client, network.router);
+  const routerClient = new OraiswapRouterQueryClient(window.client, network.mixer_router);
 
   const [activeTab, setActiveTab] = useState(TAB_HISTORY.MY_BID);
 

src/pages/Staking/components/CompoundModal/index.tsx

@@ -21,9 +21,18 @@ export type CompoundModalProps = {
   onConfirm: () => void;
   reward: number | string;
   oraixAmount: number | string;
+  estOraixSwap: number | string;
 };
 
-const CompoundModal = ({ loading, open, onClose, onConfirm, reward, oraixAmount }: CompoundModalProps) => {
+const CompoundModal = ({
+  estOraixSwap,
+  loading,
+  open,
+  onClose,
+  onConfirm,
+  reward,
+  oraixAmount
+}: CompoundModalProps) => {
   const ref = useRef(null);
   const mobileMode = isMobile();
   const theme = useTheme();
@@ -91,7 +100,7 @@ const CompoundModal = ({ loading, open, onClose, onConfirm, reward, oraixAmount
         </div>
         <div className={styles.button}>
           <Button
-            disabled={!oraixAmount}
+            disabled={!oraixAmount || !estOraixSwap}
             type={btnConfirmType}
             onClick={() => {
               onConfirm();

src/pages/Staking/components/StakeInfo/index.tsx

@@ -1,4 +1,4 @@
-import { CW20_STAKING_CONTRACT, ORAI, calculateMinReceive, toDisplay } from '@oraichain/oraidex-common';
+import { CW20_STAKING_CONTRACT, ORAI, TokenItemType, calculateMinReceive, toDisplay } from '@oraichain/oraidex-common';
 import OraiXIcon from 'assets/icons/oraix.svg?react';
 import OraiXLightIcon from 'assets/icons/oraix_light.svg?react';
 import UsdcIcon from 'assets/icons/usd_coin.svg?react';
@@ -36,23 +36,25 @@ const StakeInfo = () => {
 
   const stakedAmount = myStakeRewardInfo?.stakedAmount || '0';
   const reward = myStakeRewardInfo?.rewardPending || '0';
+  const USDC_TOKEN = USDC_TOKEN_INFO as TokenItemType;
+  const ORAIX_TOKEN = ORAIX_TOKEN_INFO as TokenItemType;
 
-  const stakeAmountUsd = getUsd(stakedAmount, ORAIX_TOKEN_INFO, prices);
-  const rewardUsd = getUsd(reward, USDC_TOKEN_INFO, prices);
+  const stakeAmountUsd = getUsd(stakedAmount, ORAIX_TOKEN, prices);
+  const rewardUsd = getUsd(reward, USDC_TOKEN, prices);
   const [openCompound, setOpenCompound] = useState<boolean>(false);
   const [loading, setLoading] = useState<boolean>(false);
   const [loadingCompound, setLoadingCompound] = useState<boolean>(false);
   const [estOraixSwap, setEstOraixSwap] = useState<number>(0);
 
-  const routerClient = new OraiswapRouterQueryClient(window.client, network.router);
+  const routerClient = new OraiswapRouterQueryClient(window.client, network.mixer_router);
 
   useEffect(() => {
     (async () => {
       const simulateData = await UniversalSwapHelper.handleSimulateSwap({
         flattenTokens: flattenTokens,
         oraichainTokens: oraichainTokens,
-        originalFromInfo: USDC_TOKEN_INFO,
-        originalToInfo: ORAIX_TOKEN_INFO,
+        originalFromInfo: USDC_TOKEN,
+        originalToInfo: ORAIX_TOKEN,
         originalAmount: toDisplay(reward),
         routerClient,
         routerOption: {
@@ -110,8 +112,8 @@ const StakeInfo = () => {
         UniversalSwapHelper.handleSimulateSwap({
           flattenTokens: flattenTokens,
           oraichainTokens: oraichainTokens,
-          originalFromInfo: USDC_TOKEN_INFO,
-          originalToInfo: ORAIX_TOKEN_INFO,
+          originalFromInfo: USDC_TOKEN,
+          originalToInfo: ORAIX_TOKEN,
           originalAmount: 1,
           routerClient,
           routerOption: {
@@ -122,12 +124,12 @@ const StakeInfo = () => {
       ]);
 
       const slippage = 1;
-      const minimumReceive = calculateMinReceive(averageRatioData.amount, reward, slippage, USDC_TOKEN_INFO.decimals);
+      const minimumReceive = calculateMinReceive(averageRatioData.amount, reward, slippage, USDC_TOKEN.decimals);
 
       const msgSwap = generateContractMessages({
         type: Type.SWAP,
-        fromInfo: USDC_TOKEN_INFO,
-        toInfo: ORAIX_TOKEN_INFO,
+        fromInfo: USDC_TOKEN,
+        toInfo: ORAIX_TOKEN,
         amount: reward,
         sender: address,
         minimumReceive
@@ -215,6 +217,7 @@ const StakeInfo = () => {
         onConfirm={() => handleCompoundStaking()}
         reward={numberWithCommas(toDisplay(String(reward)), undefined, { maximumFractionDigits: 6 })}
         oraixAmount={numberWithCommas(estOraixSwap, undefined, { maximumFractionDigits: 6 })}
+        estOraixSwap={estOraixSwap}
       />
     </div>
   );

src/pages/Staking/constants/index.ts

@@ -29,8 +29,10 @@ export enum STAKE_TAB {
 }
 
 export const ORAIX_TOKEN_INFO = oraichainTokens.find((e) => e.coinGeckoId === 'oraidex') ?? {
-  contractAddress: ORAIX_CONTRACT
+  contractAddress: ORAIX_CONTRACT,
+  decimals: 6
 };
 export const USDC_TOKEN_INFO = oraichainTokens.find((e) => e.coinGeckoId === 'usd-coin') ?? {
-  contractAddress: USDC_CONTRACT
+  contractAddress: USDC_CONTRACT,
+  decimals: 6
 };

src/pages/UniversalSwap/Swap/hooks/useCalculateDataSwap.ts

@@ -40,7 +40,7 @@ const useCalculateDataSwap = ({ originalFromToken, originalToToken, fromToken, t
   const useAlphaIbcWasm = isAllowAlphaIbcWasm(originalFromToken, originalToToken);
   const useIbcWasm = isAllowIBCWasm(originalFromToken, originalToToken);
   const isOraichain = originalFromToken.chainId === 'Oraichain' && originalToToken.chainId === 'Oraichain';
-  const routerClient = new OraiswapRouterQueryClient(window.client, network.router);
+  const routerClient = new OraiswapRouterQueryClient(window.client, network.mixer_router);
   const protocols = getProtocolsSmartRoute(originalFromToken, originalToToken, { useIbcWasm, useAlphaIbcWasm });
   const maxSplits = isOraichain
     ? splitsOSOR.ORAICHAIN

src/rest/api.ts

@@ -118,7 +118,7 @@ export async function fetchPairPriceWithStablecoin(
   toTokenInfo: TokenItemType
 ): Promise<string> {
   if (!fromTokenInfo.denom || !toTokenInfo.denom) return '0';
-  const routerClient = new OraiswapRouterQueryClient(window.client, network.router);
+  const routerClient = new OraiswapRouterQueryClient(window.client, network.mixer_router);
   const storage = store.getState();
   const allOraichainTokens = storage.token.allOraichainTokens || [];
   const allOtherChainTokens = storage.token.allOtherChainTokens || [];
@@ -424,7 +424,7 @@ function generateContractMessages(
   const { type, sender, ...params } = query;
   let funds: Coin[] | null;
   // for withdraw & provide liquidity methods, we need to interact with the oraiswap pair contract
-  let contractAddr = network.router;
+  let contractAddr = network.mixer_router;
   let input: any;
   switch (type) {
     case Type.SWAP:
@@ -527,7 +527,7 @@ function generateMiningMsgs(data: MiningLP): ExecuteInstruction {
   const { type, sender, ...params } = data;
   let funds: Coin[] | null;
   // for withdraw & provide liquidity methods, we need to interact with the oraiswap pair contract
-  let contractAddr = network.router;
+  let contractAddr = network.mixer_router;
   let input: JsonObject;
   switch (type) {
     case Type.BOND_LIQUIDITY: {