Skip to content

Commit

Permalink
Merge branch 'develop' into fix-candles-broken-when-refresh-swap-page
Browse files Browse the repository at this point in the history
  • Loading branch information
benwolski authored Jan 15, 2025
2 parents 966a6e6 + 2b60fbc commit c20e8fe
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 28 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ambient-ts-app",
"version": "3.1.10",
"version": "3.1.11",
"private": true,
"type": "module",
"dependencies": {
Expand Down
11 changes: 5 additions & 6 deletions src/assets/branding/ambientProductionBrandAssets.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import blastLogo from '../../assets/images/logos/blast_logo.svg';
import plumeLogo from '../../assets/images/logos/plume_brand_logo.svg';
import scrollLogo from '../../assets/images/logos/scroll_brand_logo.svg';
import swellLogo from '../../assets/images/logos/swell_dark_theme_logo.svg';
import large from '../images/logos/large.svg';
Expand All @@ -21,11 +20,11 @@ export const ambientProductionBrandAssets: brandIF = {
cobrandingLogo: swellLogo,
},
// plume mainnet
'0x18231': {
color: ['purple_dark', 'purple_light', 'futa_dark'],
premiumColor: [],
cobrandingLogo: plumeLogo,
},
// '0x18231': {
// color: ['purple_dark', 'purple_light', 'futa_dark'],
// premiumColor: [],
// cobrandingLogo: plumeLogo,
// },
// scroll mainnet
'0x82750': {
// first value in array is default color scheme
Expand Down
21 changes: 0 additions & 21 deletions src/components/Global/TabComponent/TabComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,27 +137,6 @@ 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, outsideControl]);

function handleOutside2() {
if (!outsideControl) {
return;
Expand Down

0 comments on commit c20e8fe

Please sign in to comment.