From 193b1c79d02f4524a285e3f75df71efad0974faa Mon Sep 17 00:00:00 2001
From: Griko Nibras <griko@nibras.co>
Date: Wed, 31 Jan 2024 06:56:55 +0700
Subject: [PATCH 1/2] chore: update route display text grouping

Signed-off-by: Griko Nibras <griko@nibras.co>
---
 src/components/RouteDisplay.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/RouteDisplay.tsx b/src/components/RouteDisplay.tsx
index 4b57e710..b1ff72a8 100644
--- a/src/components/RouteDisplay.tsx
+++ b/src/components/RouteDisplay.tsx
@@ -473,8 +473,8 @@ function SwapStep({ action, actions, id, statusData }: SwapStepProps) {
             />
             <span className="font-semibold text-black">{assetOut.recommendedSymbol}</span>
           </Gap.Child>
-          <span>on</span>
           <Gap.Child>
+            <span>on</span>
             <img
               className="inline-block h-4 w-4"
               src={venue.imageURL}

From 21ac9b9094265036373a82cc89a5d1351f892949 Mon Sep 17 00:00:00 2001
From: Griko Nibras <griko@nibras.co>
Date: Wed, 31 Jan 2024 06:57:05 +0700
Subject: [PATCH 2/2] fix: update fee asset resolver

Signed-off-by: Griko Nibras <griko@nibras.co>
---
 src/context/assets.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/context/assets.tsx b/src/context/assets.tsx
index 3d96408c..4fdd40e1 100644
--- a/src/context/assets.tsx
+++ b/src/context/assets.tsx
@@ -68,13 +68,18 @@ export function AssetsProvider({ children }: { children: ReactNode }) {
 
       if (!feeAsset) {
         const chain = (chains ?? []).find((chain) => chain.chainID === chainID);
-        chain?.feeAssets && ([feeAsset] = chain.feeAssets.sort(sortFeeAssets));
+        if (!chain) return;
+        [feeAsset] = chain.feeAssets.sort(sortFeeAssets);
+      }
+      if (!feeAsset) {
+        return;
       }
 
-      const asset = feeAsset && getAsset(feeAsset.denom, chainID);
+      const asset = getAsset(feeAsset.denom, chainID);
       if (!asset) return;
 
-      return (feeAssetCache[chainID] = asset), asset;
+      feeAssetCache[chainID] = asset;
+      return asset;
     },
     [chains, getAsset, skipClient],
   );