Merge pull request #917 from oraichain/hotfix/pool_v3

fix pool v3
oraidex · Aug 12, 2024 · d7280a2 · d7280a2
2 parents 9079390 + b641fa1
commit d7280a2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/pages/Balance/index.tsx b/src/pages/Balance/index.tsx
@@ -511,6 +511,7 @@ const Balance: React.FC<BalanceProps> = () => {
           fromAmount,
           relayerFee,
           userSlippage: 0,
+          bridgeFee: 1,
           amounts: amountsBalance,
           simulateAmount
         },

diff --git a/src/pages/Pool-V3/components/PositionItem/index.tsx b/src/pages/Pool-V3/components/PositionItem/index.tsx
@@ -152,6 +152,9 @@ const PositionItem = ({ position, setStatusRemove }) => {
     return () => {};
   }, []);
 
+  const earnXDisplay = toDisplay((earnX || 0).toString(), tokenXDecimal);
+  const earnYDisplay = toDisplay((earnY || 0).toString(), tokenYDecimal);
+
   const [tokenXClaim, tokenYClaim, tokenXClaimInUsd, tokenYClaimInUsd, incentivesUSD] = useMemo(() => {
     if (isClaimSuccess) return [0, 0, 0, 0, 0];
     if (position?.poolData && openCollapse && tick.lowerTick && tick.lowerTick && incentives) {
@@ -395,25 +398,18 @@ const PositionItem = ({ position, setStatusRemove }) => {
             <h4>Total Reward Earned</h4>
             <div className={styles.itemRow}>
               <span className={styles.usd}>
-                {formatDisplayUsdt(
-                  new BigDecimal(toDisplay((earnX || 0).toString(), tokenXDecimal) * tokenXUsd)
-                    .add(toDisplay((earnY || 0).toString(), tokenYDecimal) * tokenYUsd)
-                    .add(totalEarnIncentiveUsd)
-                    .toNumber(),
-                  6,
-                  6
-                )}
+                {formatDisplayUsdt(earnXDisplay * tokenXUsd + earnYDisplay * tokenYUsd + totalEarnIncentiveUsd, 6, 6)}
               </span>
               <span className={classNames(styles.token, styles[theme])}>
                 <position.tokenXIcon />
-                {numberWithCommas(toDisplay((earnX || 0).toString(), tokenXDecimal), undefined, {
+                {numberWithCommas(earnXDisplay, undefined, {
                   maximumFractionDigits: 6
                 })}{' '}
                 {position?.tokenX.name}
               </span>
               <span className={classNames(styles.token, styles[theme])}>
                 <position.tokenYIcon />
-                {numberWithCommas(toDisplay((earnY || 0).toString(), tokenYDecimal), undefined, {
+                {numberWithCommas(earnYDisplay, undefined, {
                   maximumFractionDigits: 6
                 })}{' '}
                 {position?.tokenY.name}

diff --git a/src/pages/UniversalSwap/Swap/index.tsx b/src/pages/UniversalSwap/Swap/index.tsx
@@ -297,6 +297,7 @@ const SwapComponent: React.FC<{
         fromAmount: fromAmountToken,
         simulateAmount,
         userSlippage,
+        bridgeFee: 1,
         amounts: amountsBalance,
         simulatePrice:
           // @ts-ignore
@@ -626,7 +627,7 @@ const SwapComponent: React.FC<{
               <img src={getSwitchIcon()} onClick={handleRotateSwapDirection} alt="ant" />
             </div>
             <div className={cx('swap-ai-dot')}>
-              {originalFromToken.cosmosBased && originalToToken.cosmosBased && useAlphaSmartRouter && (
+              {originalFromToken.cosmosBased && originalToToken.cosmosBased && (
                 <AIRouteSwitch isLoading={isPreviousSimulate} />
               )}
               {generateRatioComp()}