hotfix evm -> evm and ui your position

oraidex · Aug 29, 2024 · 8a9f992 · 8a9f992
1 parent cc1e4d9
commit 8a9f992
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 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 */
@@ -160,12 +163,6 @@
           }
         }
       }
-      .aprInfo {
-        @include mobile {
-          display: flex;
-          align-items: center;
-        }
-      }
     }
   }
 

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={classNames(styles.item, styles.aprInfo)}>
+          <div className={classNames(styles.item)}>
             <p>APR</p>
             <span className={classNames(styles.value, styles.apr)}>
               {numberWithCommas(aprInfo.total * 100, undefined, { maximumFractionDigits: 2 })}%&nbsp;

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) {