Merge branch 'develop' into rearrange-landing-sections-largedevices

CrocSwap · Jan 15, 2025 · 6a37b51 · 6a37b51
2 parents 5f530c9 + 670625e
commit 6a37b51
Show file tree

Hide file tree

Showing 75 changed files with 1,313 additions and 864 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ambient-ts-app",
-    "version": "3.1.8",
+    "version": "3.1.12",
     "private": true,
     "type": "module",
     "dependencies": {
@@ -19,7 +19,7 @@
         "framer-motion": "4.1.17",
         "intro.js": "^7.0.0",
         "intro.js-react": "^1.0.0",
-        "modern-screenshot": "^4.4.25",
+        "modern-screenshot": "^4.5.5",
         "moment": "^2.30.1",
         "numbro": "^2.5.0",
         "re-resizable": "^6.10.3",
@@ -92,7 +92,7 @@
         "husky": "^9.1.7",
         "lint-staged": "^15.2.11",
         "playwright": "^1.49.1",
-        "prettier": "^3.3.3",
+        "prettier": "^3.4.2",
         "rollup-plugin-visualizer": "^5.12.0",
         "superagent": "^10.0.0",
         "typescript": "^4.4.2",

diff --git a/src/App/App.css b/src/App/App.css
@@ -58,6 +58,7 @@ svg:hover {
     cursor: pointer;
 }
 
+
 button:hover > svg {
     color: var(--accent1);
     cursor: pointer;

diff --git a/src/App/hooks/useDrawSettings.ts b/src/App/hooks/useDrawSettings.ts
@@ -16,7 +16,7 @@ export const useDrawSettings = (chartThemeColors: ChartThemeIF | undefined) => {
             : '#7371fc';
 
     const d3BackgroundColor = chartThemeColors
-        ? chartThemeColors.drawngShapeDefaultColor?.copy()
+        ? chartThemeColors.drawngShapeDefaultColor
         : undefined;
 
     if (d3BackgroundColor) d3BackgroundColor.opacity = 0.15;

diff --git a/src/ambient-utils/constants/ambient-token-list.json b/src/ambient-utils/constants/ambient-token-list.json
@@ -424,7 +424,7 @@
             "symbol": "sUSDe",
             "decimals": 18,
             "chainId": 534352,
-            "logoURI": ""
+            "logoURI": "https://s2.coinmarketcap.com/static/img/coins/64x64/29471.png"
         },
         {
             "name": "Wrapped SOL",
@@ -626,6 +626,22 @@
             "chainId": 1923,
             "logoURI": "https://s2.coinmarketcap.com/static/img/coins/64x64/29470.png"
         },
+        {
+            "name": "Staked USDe",
+            "address": "0x211Cc4DD073734dA055fbF44a2b4667d5E5fE5d2",
+            "symbol": "sUSDe",
+            "decimals": 18,
+            "chainId": 1923,
+            "logoURI": "https://s2.coinmarketcap.com/static/img/coins/64x64/29471.png"
+        },
+        {
+            "name": "Ethena",
+            "address": "0x58538e6A46E07434d7E7375Bc268D3cb839C0133",
+            "symbol": "ENA",
+            "decimals": 18,
+            "chainId": 1923,
+            "logoURI": "https://mantlescan.xyz/token/images/ethena_32.png"
+        },
         {
             "name": "Native Ether",
             "address": "0x0000000000000000000000000000000000000000",

diff --git a/src/ambient-utils/constants/defaultTokens.ts b/src/ambient-utils/constants/defaultTokens.ts
@@ -671,13 +671,13 @@ export const scrollAxlUSDC: TokenIF = registerToken({
     logoURI: '',
 });
 
-export const scrollsUSDe: TokenIF = registerToken({
+export const scrollSUSDe: TokenIF = registerToken({
     name: 'Staked USDe',
     address: '0x211Cc4DD073734dA055fbF44a2b4667d5E5fE5d2',
     symbol: 'sUSDe',
     decimals: 18,
     chainId: 534352,
-    logoURI: '',
+    logoURI: 'https://s2.coinmarketcap.com/static/img/coins/64x64/29471.png',
 });
 
 export const scrollUSDE: TokenIF = registerToken({
@@ -974,6 +974,24 @@ export const swellUSDE: TokenIF = registerToken({
     logoURI: 'https://s2.coinmarketcap.com/static/img/coins/64x64/29470.png',
 });
 
+export const swellSUSDe: TokenIF = registerToken({
+    name: 'Staked USDe',
+    address: '0x211Cc4DD073734dA055fbF44a2b4667d5E5fE5d2',
+    symbol: 'sUSDe',
+    decimals: 18,
+    chainId: 1923,
+    logoURI: 'https://s2.coinmarketcap.com/static/img/coins/64x64/29471.png',
+});
+
+export const swellENA: TokenIF = registerToken({
+    name: 'Ethena',
+    address: '0x58538e6A46E07434d7E7375Bc268D3cb839C0133',
+    symbol: 'ENA',
+    decimals: 18,
+    chainId: 1923,
+    logoURI: 'https://mantlescan.xyz/token/images/ethena_32.png',
+});
+
 export const plumeNativeETH: TokenIF = registerToken({
     name: 'Native Ether',
     address: '0x0000000000000000000000000000000000000000',

diff --git a/src/ambient-utils/constants/networks/ethereumMainnet.ts b/src/ambient-utils/constants/networks/ethereumMainnet.ts
@@ -57,11 +57,11 @@ export const ethereumMainnet: NetworkIF = {
     vaultsEnabled: true,
     tempestApiNetworkName: 'ethereum',
     topPools: [
+        new TopPool(mainnetRSWETH, mainnetETH, chainSpecFromSDK.poolIndex),
         new TopPool(mainnetETH, mainnetUSDC, chainSpecFromSDK.poolIndex),
         new TopPool(mainnetRSWETH, mainnetSWELL, chainSpecFromSDK.poolIndex),
         new TopPool(mainnetETH, mainnetUSDT, chainSpecFromSDK.poolIndex),
         new TopPool(mainnetETH, mainnetWBTC, chainSpecFromSDK.poolIndex),
-        new TopPool(mainnetUSDT, mainnetUSDC, chainSpecFromSDK.poolIndex),
     ],
     getGasPriceInGwei: async (provider?: Provider) => {
         if (!provider) return 0;

diff --git a/src/ambient-utils/constants/networks/plumeMainnet.ts b/src/ambient-utils/constants/networks/plumeMainnet.ts
@@ -58,9 +58,10 @@ export const plumeMainnet: NetworkIF = {
     tempestApiNetworkName: '',
     topPools: [
         new TopPool(plumeNativeETH, plumeUSDC, chainSpecFromSDK.poolIndex),
-        new TopPool(plumeNRWA, plumePUSD, chainSpecFromSDK.poolIndex),
-        new TopPool(plumePETH, plumePUSD, chainSpecFromSDK.poolIndex),
+        new TopPool(plumePUSD, plumeUSDC, chainSpecFromSDK.poolIndex),
         new TopPool(plumePETH, plumeUSDC, chainSpecFromSDK.poolIndex),
+        new TopPool(plumePETH, plumePUSD, chainSpecFromSDK.poolIndex),
+        new TopPool(plumeNRWA, plumePUSD, chainSpecFromSDK.poolIndex),
     ],
     getGasPriceInGwei: async (provider?: Provider) => {
         if (!provider) return 0;

diff --git a/src/ambient-utils/constants/networks/scrollMainnet.ts b/src/ambient-utils/constants/networks/scrollMainnet.ts
@@ -4,10 +4,10 @@ import { Provider } from 'ethers';
 import { NetworkIF } from '../../types/NetworkIF';
 import {
     scrollETH,
-    scrollPufETH,
     scrollSCR,
     scrollUSDC,
     scrollUSDT,
+    scrollWBTC,
 } from '../defaultTokens';
 import { GCGO_SCROLL_URL } from '../gcgo';
 import { TopPool } from './TopPool';
@@ -57,10 +57,10 @@ export const scrollMainnet: NetworkIF = {
     tempestApiNetworkName: 'scroll',
     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(scrollUSDT, scrollUSDC, chainSpecFromSDK.poolIndex),
-        new TopPool(scrollPufETH, scrollETH, chainSpecFromSDK.poolIndex),
+        new TopPool(scrollETH, scrollWBTC, chainSpecFromSDK.poolIndex),
     ],
     getGasPriceInGwei: async (provider?: Provider) => {
         if (!provider) return 0;

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

diff --git a/src/ambient-utils/constants/testnet-token-list.json b/src/ambient-utils/constants/testnet-token-list.json
@@ -149,7 +149,7 @@
         {
             "name": "Ambient USDC",
             "address": "0x1B98743bB9297A60FF9e75EA2630A77bf72bc17c",
-            "symbol": "USDT",
+            "symbol": "USDC",
             "decimals": 6,
             "chainId": 84532,
             "logoURI": ""

diff --git a/src/ambient-utils/dataLayer/functions/getMoneynessRank.ts b/src/ambient-utils/dataLayer/functions/getMoneynessRank.ts
@@ -1,13 +1,13 @@
 import { defaultTokens } from '../../constants/defaultTokens';
 
 export const getTranslatedSymbol = (tokenSymbol: string) =>
-    tokenSymbol.toUpperCase() === 'USD+'
+    tokenSymbol?.toUpperCase() === 'USD+'
         ? 'USDPLUS'
-        : tokenSymbol.toUpperCase() === 'USDC.E'
+        : tokenSymbol?.toUpperCase() === 'USDC.E'
           ? 'USDC'
-          : tokenSymbol.toUpperCase() === 'SOLVBTC.B'
+          : tokenSymbol?.toUpperCase() === 'SOLVBTC.B'
             ? 'SOLVBTC'
-            : tokenSymbol.toUpperCase();
+            : tokenSymbol?.toUpperCase();
 
 export const getMoneynessRank = (tokenSymbol: string): number => {
     /* 

diff --git a/src/ambient-utils/dataLayer/functions/stablePairs.ts b/src/ambient-utils/dataLayer/functions/stablePairs.ts
@@ -44,6 +44,7 @@ import {
     scrollRswETH,
     scrollSOLVBTC,
     scrollSTONE,
+    scrollSUSDe,
     scrollSepoliaUSDC,
     scrollUSDC,
     scrollUSDE,
@@ -53,14 +54,14 @@ import {
     scrollWeETH,
     scrollWrsETH,
     scrollWstETH,
-    scrollsUSDe,
     sepoliaUSDC,
     sepoliaWBTC,
     swellEZETH,
     swellPZETH,
     swellRSETH,
     swellRSWETH,
     swellSTBTC,
+    swellSUSDe,
     swellSWBTC,
     swellSWELL,
     swellSWETH,
@@ -166,11 +167,12 @@ export const STABLE_USD_TOKENS = [
     scrollDAI,
     scrollAxlUSDC,
     scrollUSDE,
-    scrollsUSDe,
+    scrollSUSDe,
     plumeSepoliaUSD,
     plumeSepoliaNEV,
     swellSepoliaUSDT,
     swellUSDE,
+    swellSUSDe,
     baseSepoliaUSDT,
     plumeNTBILL,
     plumeNYIELD,

diff --git a/src/assets/branding/ambientProductionBrandAssets.ts b/src/assets/branding/ambientProductionBrandAssets.ts
@@ -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';
@@ -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

diff --git a/src/assets/images/tokens/ENA.svg b/src/assets/images/tokens/ENA.svg
diff --git a/src/assets/images/tokens/NRWA.svg b/src/assets/images/tokens/NRWA.svg
diff --git a/src/assets/images/tokens/NTBILL.svg b/src/assets/images/tokens/NTBILL.svg
diff --git a/src/assets/images/tokens/NYIELD.svg b/src/assets/images/tokens/NYIELD.svg
diff --git a/src/assets/images/tokens/exports.ts b/src/assets/images/tokens/exports.ts
@@ -7,6 +7,7 @@ import BIG from './BIG.jpg';
 import BLAST from './BLAST.png';
 import BLUR from './BLUR.png';
 import DAI from './DAI.svg';
+import ENA from './ENA.svg';
 import ESE from './ESE.jpg';
 import ETH from './ETH.png';
 import ETHX from './ETHX.svg';
@@ -76,6 +77,7 @@ export {
     BLAST,
     BLUR,
     DAI,
+    ENA,
     ESE,
     ETH,
     ETHX,