From 5b169db1fd767d58042b09db7945bf0928f70f1d Mon Sep 17 00:00:00 2001
From: Kobe <leenderskobe@gmail.com>
Date: Sat, 1 Mar 2025 10:58:15 +0900
Subject: [PATCH] fix: improved missing oracle key check

---
 .../create-pool-loading/create-pool-loading.tsx     | 13 +++++--------
 .../components/create-pool-token.tsx                |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/apps/marginfi-v2-trading/src/components/common/Pool/CreatePoolDialog/components/create-pool-loading/create-pool-loading.tsx b/apps/marginfi-v2-trading/src/components/common/Pool/CreatePoolDialog/components/create-pool-loading/create-pool-loading.tsx
index cf81f77bb0..862c7783e8 100644
--- a/apps/marginfi-v2-trading/src/components/common/Pool/CreatePoolDialog/components/create-pool-loading/create-pool-loading.tsx
+++ b/apps/marginfi-v2-trading/src/components/common/Pool/CreatePoolDialog/components/create-pool-loading/create-pool-loading.tsx
@@ -148,10 +148,9 @@ export const CreatePoolLoading = ({ poolData, setPoolData, setCreatePoolState }:
       let updatedTokenOracleConfig = { ...tokenConfig.oracleConfig };
       let updatedQuoteOracleConfig = { ...quoteConfig.oracleConfig };
 
-      if (updatedTokenOracleConfig?.keys?.length === 0) {
+      if (!updatedTokenOracleConfig?.keys || updatedTokenOracleConfig?.keys?.length === 0) {
         const oracleCreationToken = await initializeOracle(tokenMint, tokenSymbol);
         if (!oracleCreationToken) throw new Error("Oracle creation failed");
-
         updatedTokenOracleConfig = {
           setup: OracleSetup.SwitchboardPull,
           keys: [oracleCreationToken.feedPubkey],
@@ -159,10 +158,9 @@ export const CreatePoolLoading = ({ poolData, setPoolData, setCreatePoolState }:
         pullFeedIx.push(oracleCreationToken);
       }
 
-      if (updatedQuoteOracleConfig?.keys?.length === 0) {
+      if (!updatedQuoteOracleConfig?.keys || updatedQuoteOracleConfig?.keys?.length === 0) {
         const oracleCreationQuote = await initializeOracle(quoteMint, quoteSymbol);
         if (!oracleCreationQuote) throw new Error("Oracle creation failed");
-
         updatedQuoteOracleConfig = {
           setup: OracleSetup.SwitchboardPull,
           keys: [oracleCreationQuote.feedPubkey],
@@ -217,7 +215,6 @@ export const CreatePoolLoading = ({ poolData, setPoolData, setCreatePoolState }:
       );
 
       // add oracle to banks
-
       if (
         !updatedTokenOracleConfig.setup ||
         !updatedTokenOracleConfig.keys ||
@@ -284,10 +281,10 @@ export const CreatePoolLoading = ({ poolData, setPoolData, setCreatePoolState }:
         )
       );
 
-      // create quote bank & referal token account transaction
+      // create quote bank & referal token account transaction  ...referralTokenAccountIxs
       transactions.push(
         createTransaction(
-          [...quoteBankIxWrapper.instructions, ...addOracleToQuoteBankIx.instructions, ...referralTokenAccountIxs],
+          [...quoteBankIxWrapper.instructions, ...addOracleToQuoteBankIx.instructions],
           wallet.publicKey,
           [seeds.stableBankSeed, ...quoteBankIxWrapper.keys, ...addOracleToQuoteBankIx.keys],
           blockhash
@@ -299,7 +296,7 @@ export const CreatePoolLoading = ({ poolData, setPoolData, setCreatePoolState }:
         createTransaction(
           [...tokenBankIxWrapper.instructions, ...addOracleToTokenBankIx.instructions],
           wallet.publicKey,
-          [seeds.tokenBankSeed, ...tokenBankIxWrapper.keys, ...addOracleToTokenBankIx.keys],
+          [seeds.tokenBankSeed, ...tokenBankIxWrapper.keys],
           blockhash
         )
       );
diff --git a/apps/marginfi-v2-trading/src/components/common/Pool/CreatePoolDialog/components/create-pool-token.tsx b/apps/marginfi-v2-trading/src/components/common/Pool/CreatePoolDialog/components/create-pool-token.tsx
index 50f6b9ce65..d5695da448 100644
--- a/apps/marginfi-v2-trading/src/components/common/Pool/CreatePoolDialog/components/create-pool-token.tsx
+++ b/apps/marginfi-v2-trading/src/components/common/Pool/CreatePoolDialog/components/create-pool-token.tsx
@@ -65,8 +65,6 @@ export const CreatePoolToken = ({ isSearchingToken, setIsOpen, fetchTokenInfo }:
     fetchTrendingTokens();
   }, [trendingTokens, fetchTrendingTokens, initialized]);
 
-  console.log(trendingTokens);
-
   return (
     <>
       <div className="text-center space-y-2 w-full mx-auto">