Enhance token comparison logic and update prioritizeToken array in Se…

…lectToken component
oraidex · Jan 9, 2025 · d18da43 · d18da43
1 parent 439f2d3
commit d18da43
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/initCommon.ts b/src/initCommon.ts
@@ -1,6 +1,13 @@
 import { OraidexCommon, TokenItemType } from '@oraichain/oraidex-common';
 import { AnyAction, Dispatch } from '@reduxjs/toolkit';
 import { updateAllOraichainTokens, updateAllOtherChainTokens } from 'reducer/token';
+import { store } from 'store/configure';
+
+const arraysAreDifferent = (arr1: TokenItemType[], arr2: TokenItemType[]): boolean => {
+  const sortedArr1 = JSON.stringify([...arr1].sort());
+  const sortedArr2 = JSON.stringify([...arr2].sort());
+  return sortedArr1 !== sortedArr2;
+};
 
 let oraidexCommonOg = await OraidexCommon.load();
 while (!oraidexCommonOg) {
@@ -12,9 +19,10 @@ export const oraidexCommon = oraidexCommonOg;
 export const initializeOraidexCommon = async (dispatch: Dispatch<AnyAction>, allOraichainTokens: TokenItemType[]) => {
   const oraichainTokens = oraidexCommonOg.oraichainTokens;
   const otherChainTokens = oraidexCommonOg.otherChainTokens;
-  if (oraichainTokens.length > (allOraichainTokens || []).length) {
+  if (arraysAreDifferent(oraichainTokens, allOraichainTokens)) {
     dispatch(updateAllOraichainTokens(oraichainTokens));
   }
+
   if (otherChainTokens.length > 0) {
     dispatch(updateAllOtherChainTokens(otherChainTokens));
   }

diff --git a/src/pages/UniversalSwap/Swap/components/SelectToken/SelectToken.tsx b/src/pages/UniversalSwap/Swap/components/SelectToken/SelectToken.tsx
@@ -103,8 +103,9 @@ export default function SelectToken({
 
   const RACKS_ORAICHAIN_DENOM =
     'factory/orai1wuvhex9xqs3r539mvc6mtm7n20fcj3qr2m0y9khx6n5vtlngfzes3k0rq9/D7yP4ycfsRWUGYionGpi64sLF2ddZ2JXxuRAti2M7uck';
-  // const prioritizeToken = RACKS_ORAICHAIN_DENOM;
-  const prioritizeToken = [MAX_ORAICHAIN_DENOM, RACKS_ORAICHAIN_DENOM];
+  const GNRT_ORAICHAIN_DENOM =
+    'factory/orai1wuvhex9xqs3r539mvc6mtm7n20fcj3qr2m0y9khx6n5vtlngfzes3k0rq9/oraiJP7H3LAt57DkFXNLDbLdBFNRRPvS8jg2j5AZkd9';
+  const prioritizeToken = [MAX_ORAICHAIN_DENOM, RACKS_ORAICHAIN_DENOM, GNRT_ORAICHAIN_DENOM];
 
   return (
     <div className={`${styles.selectToken} ${isSelectToken ? styles.active : ''}`}>