Merge branch 'develop' into CROCSWAP-2687-border-settings-not-editable

CrocSwap · Oct 16, 2024 · f97a054 · f97a054
2 parents be44354 + 9c6bc6a
commit f97a054
Show file tree

Hide file tree

Showing 210 changed files with 6,611 additions and 8,443 deletions.
diff --git a/.env b/.env
@@ -3,6 +3,10 @@ VITE_META_KEYWORDS=""
 VITE_OG_TITLE=""
 VITE_OG_DESCRIPTION=""
 VITE_OG_URL=""
-VITE_SITE_TITLE=""
+VITE_SITE_TITLE=Ambient
 VITE_OG_IMAGE=""
-VITE_TWITTER_SITE=""
+VITE_TWITTER_SITE=""
+VITE_FAVICON_16_16=/favicon-16x16.png
+VITE_FAVICON_32_32=/favicon-32x32.png
+VITE_APPLE_TOUCH_ICON=/apple-touch-icon.png
+VITE_SAFARI_PINNED_TAB=/safari-pinned-tab.svg
diff --git a/.env.futa b/.env.futa
@@ -8,4 +8,8 @@ VITE_OG_DESCRIPTION="FUTA | Fully Universal Ticker Auction"
 VITE_OG_URL="https://futa.finance"
 VITE_SITE_TITLE="FUTA Finance" 
 VITE_OG_IMAGE=""
-VITE_TWITTER_SITE=""
+VITE_TWITTER_SITE=""
+VITE_FAVICON_16_16="/futa-favicon-16x16.png"
+VITE_FAVICON_32_32="/futa-favicon-32x32.png"
+VITE_APPLE_TOUCH_ICON=""
+VITE_SAFARI_PINNED_TAB=""
diff --git a/e2e/helpers/utils.ts b/e2e/helpers/utils.ts
@@ -73,16 +73,15 @@ export async function initWallet(context: BrowserContext) {
     await waiter(2);
 
     console.log('.............................');
-    console.log(process.env);
-    console.log(process.env.local);
+    console.log('Environment variables loaded');
     console.log('.............................');
 
     const seedEnv = process.env.TEST_METAMASK_SEED
         ? process.env.TEST_METAMASK_SEED
         : '';
     const seed = seedEnv.split(',');
 
-    console.log(seed);
+    console.log('Seed phrase loaded');
 
     async function processWallet(page) {
         const elementHandle = await page.$('#onboarding__terms-checkbox');
@@ -162,7 +161,7 @@ export async function initWallet(context: BrowserContext) {
             page.url().includes('chrome-extension') &&
             page.url().includes('home.html')
         ) {
-            console.log('page found', page.url());
+            console.log('Page found with URL:', page.url());
             await processWallet(page);
         }
     });

diff --git a/index.html b/index.html
@@ -6,24 +6,24 @@
         <link
             rel="apple-touch-icon"
             sizes="180x180"
-            href="/apple-touch-icon.png"
+            href="%VITE_APPLE_TOUCH_ICON%"
         />
         <link
             rel="icon"
             type="image/png"
             sizes="32x32"
-            href="/favicon-32x32.png"
+            href="%VITE_FAVICON_32_32%"
         />
         <link
             rel="icon"
             type="image/png"
             sizes="16x16"
-            href="/favicon-16x16.png"
+            href="%VITE_FAVICON_16_16%"
         />
         <link rel="manifest" href="/site.webmanifest" />
         <link
             rel="mask-icon"
-            href="/safari-pinned-tab.svg"
+            href="%VITE_SAFARI_PINNED_TAB%"
             color="#7371fc"
         />
         <meta name="msapplication-TileColor" content="#0d1117" />

diff --git a/package.json b/package.json
@@ -1,28 +1,22 @@
 {
     "name": "ambient-ts-app",
-    "version": "2.9.0",
+    "version": "2.9.6",
     "private": true,
     "type": "module",
     "dependencies": {
-        "@crocswap-libs/sdk": "^1.0.2",
+        "@crocswap-libs/sdk": "^1.0.7",
         "@d3fc/d3fc-extent": "^4.0.2",
-        "@emotion/babel-plugin": "^11.12.0",
-        "@emotion/is-prop-valid": "^1.2.1",
         "@emotion/react": "^11.10.5",
         "@emotion/styled": "^11.10.5",
         "@material-ui/core": "^4.12.4",
         "@mui/material": "^5.8.2",
-        "@types/react-blockies": "^1.4.4",
-        "@types/react-color": "^3.0.12",
-        "@vitejs/plugin-react": "^4.3.1",
         "@web3modal/ethers": "4.2.1",
-        "alchemy-sdk": "^3.2.0",
         "alea": "^1.0.1",
         "babel-plugin-styled-components": "^2.1.4",
         "d3": "^7.4.4",
         "d3fc": "^15.2.4",
         "emoji-picker-react": "^4.11.1",
-        "ethers": "^6.13.0",
+        "ethers": "^6.13.3",
         "framer-motion": "4.1.17",
         "i18next": "^21.8.16",
         "i18next-browser-languagedetector": "^8.0.0",
@@ -31,26 +25,23 @@
         "modern-screenshot": "^4.4.25",
         "moment": "^2.30.1",
         "numbro": "^2.5.0",
-        "p5": "^1.9.4",
-        "p5.j5": "^1.2.0",
-        "re-resizable": "^6.6.11",
+        "p5": "^1.11.0",
+        "re-resizable": "^6.10.0",
         "react": "^18.3.1",
         "react-blockies": "^1.4.1",
         "react-color": "^2.19.3",
         "react-dom": "^18.3.1",
         "react-i18next": "^12.3.1",
-        "react-icons": "^5.2.1",
+        "react-icons": "^5.3.0",
         "react-idle-timer": "^5.7.2",
         "react-jazzicon": "^1.0.4",
         "react-lottie-player": "^2.1.0",
         "react-reveal": "^1.2.2",
         "react-router-dom": "^6.3.0",
         "react-transition-group": "^4.4.2",
         "react-use-websocket": "^4.8.1",
-        "simplex-noise": "^4.0.1",
+        "simplex-noise": "^4.0.3",
         "styled-components": "6.0.3",
-        "vite": "^5.3.5",
-        "vite-plugin-babel-macros": "^1.0.6",
         "web-vitals": "^2.1.0"
     },
     "resolutions": {
@@ -84,13 +75,17 @@
     ],
     "devDependencies": {
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+        "@emotion/is-prop-valid": "^1.3.1",
         "@testing-library/react": "^13.2.0",
         "@testing-library/user-event": "^14.5.2",
         "@types/adm-zip": "^0.5.4",
         "@types/d3": "^7.1.0",
         "@types/p5": "^1.7.6",
+        "@types/react-blockies": "^1.4.4",
+        "@types/react-color": "^3.0.12",
         "@typescript-eslint/eslint-plugin": "^5.22.0",
         "@typescript-eslint/parser": "^7.1.0",
+        "@vitejs/plugin-react": "^4.3.2",
         "adm-zip": "^0.5.10",
         "eslint": "^7.32.0",
         "eslint-config-prettier": "^9.1.0",
@@ -101,9 +96,11 @@
         "eslint-plugin-react-hooks": "^4.6.2",
         "lint-staged": "^15.2.8",
         "playwright": "^1.45.3",
-        "prettier": "^3.3.1",
+        "prettier": "^3.3.3",
         "superagent": "^10.0.0",
         "typescript": "^4.4.2",
+        "vite": "^5.4.8",
+        "vite-plugin-babel-macros": "^1.0.6",
         "vite-plugin-checker": "^0.6.4",
         "vitest": "^1.6.0"
     }

diff --git a/public/ambient-token-list.json b/public/ambient-token-list.json
@@ -42,6 +42,14 @@
             "logoURI": "https://etherscan.io/token/images/swellnetwork_32.png",
             "symbol": "swETH"
         },
+        {
+            "name": "Restaked Swell ETH",
+            "address": "0xFAe103DC9cf190eD75350761e95403b7b8aFa6c0",
+            "chainId": 1,
+            "decimals": 18,
+            "logoURI": "https://etherscan.io/token/images/rsweth_32.png?=v3",
+            "symbol": "rswETH"
+        },
         {
             "name": "Maker",
             "address": "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2",
@@ -323,6 +331,14 @@
             "chainId": 534352,
             "logoURI": "https://assets.coingecko.com/coins/images/6319/thumb/USD_Coin_icon.png"
         },
+        {
+            "chainId": 534352,
+            "address": "0xd29687c813d741e2f938f4ac377128810e217b1b",
+            "name": "Scroll",
+            "symbol": "SCR",
+            "decimals": 18,
+            "logoURI": "https://assets.coingecko.com/coins/images/50571/thumb/scroll.jpg?1728376125"
+        },
         {
             "name": "Pirex Ether OFT",
             "address": "0x9e0d7d79735e1c63333128149c7b616a0dc0bbdb",
@@ -355,14 +371,6 @@
             "chainId": 534352,
             "logoURI": ""
         },
-        {
-            "name": "Tranchess DAO Token",
-            "address": "0x9735fb1126b521a913697a541f768376011bccf9",
-            "symbol": "CHESS",
-            "decimals": 18,
-            "chainId": 534352,
-            "logoURI": "https://scrollscan.com/token/images/tranchess_32.png"
-        },
         {
             "name": "StargateToken",
             "address": "0x8731d54E9D02c286767d56ac03e8037C07e01e98",
@@ -546,30 +554,6 @@
             "decimals": 18,
             "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png",
             "symbol": "DAI"
-        },
-        {
-            "name": "Native Ether",
-            "address": "0x0000000000000000000000000000000000000000",
-            "chainId": 11155111,
-            "decimals": 18,
-            "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png",
-            "symbol": "ETH"
-        },
-        {
-            "name": "USDC",
-            "address": "0x60bBA138A74C5e7326885De5090700626950d509",
-            "chainId": 11155111,
-            "decimals": 6,
-            "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png",
-            "symbol": "USDC"
-        },
-        {
-            "name": "Wrapped BTC",
-            "address": "0xCA97CC9c1a1dfA54A252DaAFE9b5Cd1E16C81328",
-            "chainId": 11155111,
-            "decimals": 8,
-            "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png",
-            "symbol": "WBTC"
         }
     ]
 }
diff --git a/public/futa-favicon-16x16.png b/public/futa-favicon-16x16.png
diff --git a/public/futa-favicon-32x32.png b/public/futa-favicon-32x32.png
diff --git a/src/App/App.css b/src/App/App.css
@@ -231,40 +231,7 @@ input[type='number'] {
     appearance: textfield;
     -moz-appearance: textfield;
 }
-.custom_scroll_ambient {
-    overflow-y: auto !important;
-
-}
-.custom_scroll_ambient::-webkit-scrollbar,
-.content-container::-webkit-scrollbar {
-    width: 8px !important; /* Adjust the width as needed */
-}
-.custom_scroll_ambient::-webkit-scrollbar-thumb,
-.content-container::-webkit-scrollbar-thumb {
-    border: 2px solid transparent !important; /* Space for the border */
-    background-clip: padding-box !important; /* Create space for the border */
-    border-radius: 8px !important; /* Adjust the border radius as needed */
-    background-image: linear-gradient(#06060c, #06060c),
-        linear-gradient(
-            0deg,
-            var(--accent1) 0%,
-            var(--accent5) 49.48%,
-            var(--accent1) 100%
-        ) !important;
-    background-origin: border-box !important;
-    background-clip: content-box, border-box !important; /* Clip the border to show gradient */
-    min-height: 50px !important; /* Set the minimum height for the scrollbar thumb */;
-
-
-
-}
-.custom_scroll_ambient::-webkit-scrollbar-track,
-.content-container::-webkit-scrollbar-track {
-    background: #06060c !important; /* Background color of the scrollbar track */
-    border-radius: 8px !important; /* Adjust the border radius as needed */
-    padding: 2px !important; /* Add padding to the track */;
-
-}
+
 /* -----------------------FUTA------------ */
 
 .futa_main {
@@ -350,9 +317,35 @@ input[type='number'] {
         position: fixed;
         top: 56px;
         bottom: 64px;
+        left: 0;
+        right: 0;
         z-index: 2;
+        pointer-events: none;
         /* display: none; */
     }
+
+    .custom_scroll_ambient::-webkit-scrollbar {
+        width: 5px !important;
+      }
+
+
+      /* Handle */
+      .custom_scroll_ambient::-webkit-scrollbar-thumb {
+        background: 
+        linear-gradient(
+            0deg,
+            var(--accent1) 0%,
+            var(--accent5) 49.48%,
+            var(--accent1) 100%
+        ) !important;
+      }
+
+      /* .custom_scroll_ambient{
+        scrollbar-width: thin;
+scrollbar-color: transparent;
+      } */
+
+
 }
 
 @media only screen and (min-width: 1280px) {