From 47cc0151b9977f96ba4679b1c025805648b2ec29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trung=20B=E1=BA=A1ch?=
 <66735837+trungbach@users.noreply.github.com>
Date: Thu, 9 Jan 2025 16:03:14 +0700
Subject: [PATCH] Add support for addedTokens in initializeOraidexCommon
 function (#1124)

---
 src/initCommon.ts   | 14 +++++++++++---
 src/layouts/App.tsx |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/initCommon.ts b/src/initCommon.ts
index 9c47d8c64..f94f2d76a 100644
--- a/src/initCommon.ts
+++ b/src/initCommon.ts
@@ -15,11 +15,19 @@ while (!oraidexCommonOg) {
 }
 export const oraidexCommon = oraidexCommonOg;
 
-export const initializeOraidexCommon = async (dispatch: Dispatch<AnyAction>, allOraichainTokens: TokenItemType[]) => {
+export const initializeOraidexCommon = async (
+  dispatch: Dispatch<AnyAction>,
+  allOraichainTokens: TokenItemType[],
+  addedTokens: TokenItemType[]
+) => {
   const oraichainTokens = oraidexCommonOg.oraichainTokens;
   const otherChainTokens = oraidexCommonOg.otherChainTokens;
-  if (arraysAreDifferent(oraichainTokens, allOraichainTokens)) {
-    dispatch(updateAllOraichainTokens(oraichainTokens));
+
+  const allVerifiedOraichainTokens = allOraichainTokens.filter(
+    (token) => !addedTokens.find((addedToken) => addedToken.denom === token.denom)
+  );
+  if (arraysAreDifferent(oraichainTokens, allVerifiedOraichainTokens)) {
+    dispatch(updateAllOraichainTokens([...oraichainTokens, ...addedTokens]));
   }
 
   if (otherChainTokens.length > 0) {
diff --git a/src/layouts/App.tsx b/src/layouts/App.tsx
index 31e8a2aff..4df9c3ddd 100644
--- a/src/layouts/App.tsx
+++ b/src/layouts/App.tsx
@@ -52,6 +52,7 @@ const App = () => {
   const { tron, evm } = walletByNetworks;
   const ethOwallet = window.eth_owallet;
   const allOraichainTokens = useSelector((state: RootState) => state.token.allOraichainTokens || []);
+  const addedTokens = useSelector((state: RootState) => state.token.addedTokens || []);
   const dispatch = useDispatch();
   const solanaWallet = useWallet();
 
@@ -67,7 +68,7 @@ const App = () => {
   });
 
   useEffect(() => {
-    initializeOraidexCommon(dispatch, allOraichainTokens);
+    initializeOraidexCommon(dispatch, allOraichainTokens, addedTokens);
   }, [allOraichainTokens]);
 
   useEffect(() => {