From cc1e4d95b9e2a44849709c8429b538d0f51a966c Mon Sep 17 00:00:00 2001
From: Hau Nguyen Van <nguyenvanhauit1997@gmail.com>
Date: Thu, 29 Aug 2024 14:35:27 +0700
Subject: [PATCH 1/2] fix ui your position

---
 .../components/PositionItem/index.module.scss |  6 ++++++
 .../Pool-V3/components/PositionItem/index.tsx | 20 ++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/pages/Pool-V3/components/PositionItem/index.module.scss b/src/pages/Pool-V3/components/PositionItem/index.module.scss
index aca1e7ca1..492e6f494 100644
--- a/src/pages/Pool-V3/components/PositionItem/index.module.scss
+++ b/src/pages/Pool-V3/components/PositionItem/index.module.scss
@@ -160,6 +160,12 @@
           }
         }
       }
+      .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
index 352ff58a1..4a2db7ce5 100644
--- 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, styles.aprInfo)}>
             <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>
                 );
               })}

From 8a9f992d118dd3c70f9992eceb614ba3d0b3c4b9 Mon Sep 17 00:00:00 2001
From: Hau Nguyen Van <nguyenvanhauit1997@gmail.com>
Date: Thu, 29 Aug 2024 15:05:04 +0700
Subject: [PATCH 2/2] hotfix evm -> evm and ui your position

---
 .../Pool-V3/components/PositionItem/index.module.scss    | 9 +++------
 src/pages/Pool-V3/components/PositionItem/index.tsx      | 2 +-
 src/pages/UniversalSwap/helpers.ts                       | 4 +++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/pages/Pool-V3/components/PositionItem/index.module.scss b/src/pages/Pool-V3/components/PositionItem/index.module.scss
index 492e6f494..d53d0ae4d 100644
--- 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
index 4a2db7ce5..30989c5db 100644
--- 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
index e7b1d7eaf..6c38c6cbd 100644
--- 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) {