From 67b2276e812baf7c0e255f176f1b85d858215168 Mon Sep 17 00:00:00 2001 From: Jiro Date: Mon, 31 Mar 2025 02:07:17 -0700 Subject: [PATCH 1/4] Add log to debug for soneium farm --- src/hooks/v3/useV3Farms.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/hooks/v3/useV3Farms.ts b/src/hooks/v3/useV3Farms.ts index af4ee2a74..388c84cde 100644 --- a/src/hooks/v3/useV3Farms.ts +++ b/src/hooks/v3/useV3Farms.ts @@ -328,7 +328,9 @@ export const useGetMerklFarms = () => { } resFarmData.push(...farmData); } + if (!resFarmData) return []; + console.log('resFarmData', resFarmData); const farmList: any[] = []; resFarmData.forEach((farmData: any) => { if (farmData.chainId !== chainId || farmData.status !== 'LIVE') return; @@ -396,6 +398,9 @@ export const useGetMerklFarms = () => { farmList.push(farm); }); + + console.log('farmList', farmList); + return farmList; }; const lastTx = useLastTransactionHash(); @@ -420,6 +425,7 @@ export const useMerklFarms = () => { const { isLoading: loadingGamma, data: gammaData } = useGammaData(); const { loading: loadingICHI, data: ichiVaults } = useICHIVaults(); const ichiVaultsFiltered = useMemo(() => { + console.log('merklFarms', merklFarms); if (!merklFarms) return []; return ichiVaults.filter( (vault) => From 458224307e594bf6223f77cf6d46208c1844edfa Mon Sep 17 00:00:00 2001 From: Jiro Date: Mon, 31 Mar 2025 03:42:54 -0700 Subject: [PATCH 2/4] remove soneium farm logs --- src/hooks/v3/useV3Farms.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/hooks/v3/useV3Farms.ts b/src/hooks/v3/useV3Farms.ts index 388c84cde..908dc64ae 100644 --- a/src/hooks/v3/useV3Farms.ts +++ b/src/hooks/v3/useV3Farms.ts @@ -330,7 +330,6 @@ export const useGetMerklFarms = () => { } if (!resFarmData) return []; - console.log('resFarmData', resFarmData); const farmList: any[] = []; resFarmData.forEach((farmData: any) => { if (farmData.chainId !== chainId || farmData.status !== 'LIVE') return; @@ -399,8 +398,6 @@ export const useGetMerklFarms = () => { farmList.push(farm); }); - console.log('farmList', farmList); - return farmList; }; const lastTx = useLastTransactionHash(); @@ -425,7 +422,6 @@ export const useMerklFarms = () => { const { isLoading: loadingGamma, data: gammaData } = useGammaData(); const { loading: loadingICHI, data: ichiVaults } = useICHIVaults(); const ichiVaultsFiltered = useMemo(() => { - console.log('merklFarms', merklFarms); if (!merklFarms) return []; return ichiVaults.filter( (vault) => From 075468347ee972bc3b1f6c89281759b8312165a8 Mon Sep 17 00:00:00 2001 From: Sameep Singhania Date: Tue, 1 Apr 2025 12:40:39 +0530 Subject: [PATCH 3/4] Removed orderly --- .env | 2 +- src/App.tsx | 314 +++++++++++------------ src/components/AssetModal/AssetModal.tsx | 10 +- src/config/polygon.json | 2 +- src/config/zkmainnet.json | 2 +- 5 files changed, 164 insertions(+), 166 deletions(-) diff --git a/.env b/.env index 923c75d58..2c5ac111e 100644 --- a/.env +++ b/.env @@ -63,5 +63,5 @@ REACT_APP_PASSPORT_CLIENT_ID="C0jTTUsIDawXEzwNndQ0GGiQE63hvdj6" REACT_APP_PASSPORT_PUBLISHABLE_KEY="pk_imapik-wMbkTLhUd0N9My@3kZ1L" REACT_APP_QUICK_BURN_AMOUNT_URL="https://script.google.com/macros/s/AKfycbx3J09UZx7ALs-gY4mxiD2CLODs7uCVgcZzMLFdrPKx5u83WFY0e9vvVBJd5U0mWD-12A/exec" REACT_APP_QUICK_BURN_APY_URL="https://script.google.com/macros/s/AKfycbwaapPTyJ4haGLv7Ml3z3j-ZpmjqGMIfksUA39o-wG56todJ66enyhyC-TLWG4jkhQ_/exec" -REACT_APP_ORDERLY_API_URL="https://api-evm.orderly.org" +REACT_APP_ORDERLY_API_URL="https://api-evm01.orderly.org" REACT_APP_SOULZAP_API_ENDPOINT="https://soulsolidity-zap-api-902f1d839e8d.herokuapp.com" diff --git a/src/App.tsx b/src/App.tsx index b75865ce3..13a01bb66 100755 --- a/src/App.tsx +++ b/src/App.tsx @@ -173,164 +173,162 @@ const App: React.FC = () => { queryClient={queryClient} > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/AssetModal/AssetModal.tsx b/src/components/AssetModal/AssetModal.tsx index b392eeb48..d392c41ac 100644 --- a/src/components/AssetModal/AssetModal.tsx +++ b/src/components/AssetModal/AssetModal.tsx @@ -60,15 +60,15 @@ const AssetModal: React.FC = ({ const currency = useCurrency(token?.address); const { account } = useAccount(); const [depositTx, setDepositTx] = useState(undefined); - const { data } = useQuery( + /**const { data } = useQuery( `/v1/public/token/?chain_id=${chainId}`, - ); + );*/ - let withdrawalFee = 1; + const withdrawalFee = 1; - if (data) { + /**if (data) { withdrawalFee = data[0].chain_details[0].withdrawal_fee; - } + }*/ const [aggregatedData] = usePositionStream(); const unsettledPnl = Number(aggregatedData?.aggregated?.unsettledPnL ?? 0); diff --git a/src/config/polygon.json b/src/config/polygon.json index 001568cb9..f5d3fc320 100644 --- a/src/config/polygon.json +++ b/src/config/polygon.json @@ -80,7 +80,7 @@ "available": false }, "perpsV2": { - "available": true + "available": false }, "bos": { "available": false diff --git a/src/config/zkmainnet.json b/src/config/zkmainnet.json index fe5d0a9fc..7efe2dca0 100644 --- a/src/config/zkmainnet.json +++ b/src/config/zkmainnet.json @@ -74,7 +74,7 @@ "available": true }, "perps": { - "available": true + "available": false }, "hydra": { "available": true From 97543593a419966b446f15baccd22b9c97944fb4 Mon Sep 17 00:00:00 2001 From: Sameep Singhania Date: Tue, 1 Apr 2025 12:41:19 +0530 Subject: [PATCH 4/4] Removed orderly --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 2c5ac111e..923c75d58 100644 --- a/.env +++ b/.env @@ -63,5 +63,5 @@ REACT_APP_PASSPORT_CLIENT_ID="C0jTTUsIDawXEzwNndQ0GGiQE63hvdj6" REACT_APP_PASSPORT_PUBLISHABLE_KEY="pk_imapik-wMbkTLhUd0N9My@3kZ1L" REACT_APP_QUICK_BURN_AMOUNT_URL="https://script.google.com/macros/s/AKfycbx3J09UZx7ALs-gY4mxiD2CLODs7uCVgcZzMLFdrPKx5u83WFY0e9vvVBJd5U0mWD-12A/exec" REACT_APP_QUICK_BURN_APY_URL="https://script.google.com/macros/s/AKfycbwaapPTyJ4haGLv7Ml3z3j-ZpmjqGMIfksUA39o-wG56todJ66enyhyC-TLWG4jkhQ_/exec" -REACT_APP_ORDERLY_API_URL="https://api-evm01.orderly.org" +REACT_APP_ORDERLY_API_URL="https://api-evm.orderly.org" REACT_APP_SOULZAP_API_ENDPOINT="https://soulsolidity-zap-api-902f1d839e8d.herokuapp.com"