Merge pull request #4645 from CrocSwap/fix-candle-clicking-bug

fix candle clicking bug
CrocSwap · Jan 15, 2025 · 25b8edc · 25b8edc
2 parents e34e4f4 + 1628efe
commit 25b8edc
Show file tree

Hide file tree

Showing 5 changed files with 327 additions and 306 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ambient-ts-app",
-    "version": "3.1.12",
+    "version": "3.1.13",
     "private": true,
     "type": "module",
     "dependencies": {

diff --git a/src/ambient-utils/constants/networks/scrollMainnet.ts b/src/ambient-utils/constants/networks/scrollMainnet.ts
@@ -58,8 +58,8 @@ export const scrollMainnet: NetworkIF = {
     topPools: [
         new TopPool(scrollETH, scrollUSDC, chainSpecFromSDK.poolIndex),
         new TopPool(scrollUSDT, scrollUSDC, chainSpecFromSDK.poolIndex),
-        new TopPool(scrollETH, scrollUSDT, chainSpecFromSDK.poolIndex),
         new TopPool(scrollSCR, scrollETH, chainSpecFromSDK.poolIndex),
+        new TopPool(scrollETH, scrollUSDT, chainSpecFromSDK.poolIndex),
         new TopPool(scrollETH, scrollWBTC, chainSpecFromSDK.poolIndex),
     ],
     getGasPriceInGwei: async (provider?: Provider) => {

diff --git a/src/ambient-utils/constants/networks/swellMainnet.ts b/src/ambient-utils/constants/networks/swellMainnet.ts
@@ -4,7 +4,7 @@ import { Provider } from 'ethers';
 import { NetworkIF } from '../../types/NetworkIF';
 import {
     swellETH,
-    swellEZETH,
+    swellRSETH,
     swellRSWETH,
     swellSWELL,
     swellUSDE,
@@ -60,9 +60,9 @@ export const swellMainnet: NetworkIF = {
     topPools: [
         new TopPool(swellETH, swellUSDE, chainSpecFromSDK.poolIndex),
         new TopPool(swellWEETH, swellRSWETH, chainSpecFromSDK.poolIndex),
-        new TopPool(swellEZETH, swellETH, chainSpecFromSDK.poolIndex),
-        new TopPool(swellRSWETH, swellETH, chainSpecFromSDK.poolIndex),
+        new TopPool(swellRSETH, swellWEETH, chainSpecFromSDK.poolIndex),
         new TopPool(swellETH, swellSWELL, chainSpecFromSDK.poolIndex),
+        new TopPool(swellRSWETH, swellETH, chainSpecFromSDK.poolIndex),
     ],
     getGasPriceInGwei: async (provider?: Provider) => {
         if (!provider) return 0;

diff --git a/src/components/Global/TabComponent/TabComponent.tsx b/src/components/Global/TabComponent/TabComponent.tsx
@@ -137,6 +137,27 @@ export default function TabComponent(props: TabPropsIF) {
         if (tradeTableState === 'Collapsed') toggleTradeTable();
     }
 
+    useEffect(() => {
+        const currentTabData = data.find(
+            (item) => item.label === selectedTab.label,
+        );
+        if (currentTabData) {
+            setSelectedTab(currentTabData);
+            if (
+                [
+                    'transactions',
+                    'limits',
+                    'liquidity',
+                    'wallet balances',
+                    'exchange balances',
+                    'dex balances',
+                ].includes(currentTabData.label.toLowerCase())
+            ) {
+                setActiveTradeTab(currentTabData.label.toLowerCase());
+            }
+        }
+    }, [data]);
+
     function handleOutside2() {
         if (!outsideControl) {
             return;