feat: sync staging → main

Signed-off-by: Griko Nibras <[email protected]>
skip-mev · Jan 30, 2024 · 6cfecae · 6cfecae
2 parents fd33948 + 21ac9b9
commit 6cfecae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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}

diff --git 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],
  );