Merge pull request #940 from oraichain/fix/price-impact

Fix/price impact
oraichain · Aug 29, 2024 · 5c96f9e · 5c96f9e
2 parents 3baf30d + 8a9f992
commit 5c96f9e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/src/pages/Pool-V3/components/PositionItem/index.module.scss b/src/pages/Pool-V3/components/PositionItem/index.module.scss
@@ -126,6 +126,9 @@
           @include theme {
             color: theme-get('neutral-9');
           }
+          @include mobile {
+            text-align: right;
+          }
           font-size: 14px;
           font-weight: 400;
           line-height: 150%; /* 21px */

diff --git a/src/pages/Pool-V3/components/PositionItem/index.tsx b/src/pages/Pool-V3/components/PositionItem/index.tsx
@@ -263,7 +263,7 @@ const PositionItem = ({ position }) => {
             <p>My Liquidity</p>
             <span className={styles.value}>{formatDisplayUsdt(position.tokenXLiqInUsd + position.tokenYLiqInUsd)}</span>
           </div>
-          <div className={styles.item}>
+          <div className={classNames(styles.item)}>
             <p>APR</p>
             <span className={classNames(styles.value, styles.apr)}>
               {numberWithCommas(aprInfo.total * 100, undefined, { maximumFractionDigits: 2 })}%&nbsp;
@@ -468,14 +468,16 @@ const PositionItem = ({ position }) => {
                 return (
                   <div className={styles.itemRow} key={'incentEarned-' + i}>
                     <span className={styles.usd}></span>
-                    <span className={classNames(styles.token, styles[theme])}></span>
-                    <span className={classNames(styles.token, styles[theme])}>
-                      {theme === 'light' ? <token.IconLight /> : <token.Icon />}
-                      {!amount || !Number(amount)
-                        ? '--'
-                        : toDisplay(amount.toString(), token.decimals || CW20_DECIMALS)}{' '}
-                      {token?.name}
-                    </span>
+                    <div className={classNames(styles.itemAsset, styles[theme])}>
+                      <span className={classNames(styles.token, styles[theme])}></span>
+                      <span className={classNames(styles.token, styles[theme])}>
+                        {theme === 'light' ? <token.IconLight /> : <token.Icon />}
+                        {!amount || !Number(amount)
+                          ? '--'
+                          : toDisplay(amount.toString(), token.decimals || CW20_DECIMALS)}{' '}
+                        {token?.name}
+                      </span>
+                    </div>
                   </div>
                 );
               })}

diff --git a/src/pages/UniversalSwap/helpers.ts b/src/pages/UniversalSwap/helpers.ts
@@ -425,7 +425,9 @@ export const isAllowIBCWasm = (fromToken: TokenItemType, toToken: TokenItemType)
   }
   // Oraichain or Cosmos -> Evm
   if ((fromTokenIsOraichain || fromTokenIsCosmos) && !toTokenIsCosmos) return true;
-  // Evm -> Oraichain or Cosmos or EVM
+  // Evm -> EVM
+  if (!fromTokenIsCosmos && !toTokenIsCosmos && toToken.chainId === fromToken.chainId) return false;
+  // Evm -> Oraichain or Cosmos
   if (!fromTokenIsCosmos) return true;
   // Cosmos -> Cosmos or Oraichain
   if (fromTokenIsCosmos && toTokenIsCosmos) {