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
diff --git a/src/hooks/v3/useV3Farms.ts b/src/hooks/v3/useV3Farms.ts
index af4ee2a74..908dc64ae 100644
--- a/src/hooks/v3/useV3Farms.ts
+++ b/src/hooks/v3/useV3Farms.ts
@@ -328,6 +328,7 @@ export const useGetMerklFarms = () => {
}
resFarmData.push(...farmData);
}
+
if (!resFarmData) return [];
const farmList: any[] = [];
resFarmData.forEach((farmData: any) => {
@@ -396,6 +397,7 @@ export const useGetMerklFarms = () => {
farmList.push(farm);
});
+
return farmList;
};
const lastTx = useLastTransactionHash();