Merge branch 'develop' into create-skeleton-explore

CrocSwap · Oct 8, 2024 · f38f0fc · f38f0fc
2 parents 9055329 + 9609054
commit f38f0fc
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
         "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",

diff --git a/public/ambient-token-list.json b/public/ambient-token-list.json
@@ -331,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",
@@ -363,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",

diff --git a/src/ambient-utils/constants/ambient-token-list.json b/src/ambient-utils/constants/ambient-token-list.json
@@ -331,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",
@@ -363,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",

diff --git a/src/ambient-utils/constants/defaultTokens.ts b/src/ambient-utils/constants/defaultTokens.ts
@@ -443,6 +443,16 @@ export const scrollWeETH: TokenIF = {
         'https://tokenlogo.xyz/assets/token/0x7e7d4467112689329f7e06571ed0e8cbad4910ee.svg',
 };
 
+export const scrollScroll: TokenIF = {
+    name: 'Scroll',
+    address: '0xd29687c813d741e2f938f4ac377128810e217b1b',
+    symbol: 'SCR',
+    decimals: 18,
+    chainId: 534352,
+    logoURI:
+        'https://assets.coingecko.com/coins/images/50571/thumb/scroll.jpg?1728376125',
+};
+
 export const scrollSCROLLY: TokenIF = {
     name: 'Scrolly The Map',
     address: '0xb65aD8d81d1E4Cb2975352338805AF6e39BA8Be8',
@@ -750,6 +760,7 @@ export const defaultTokens: TokenIF[] = [
     scrollWrappedETH,
     scrollWstETH,
     scrollWeETH,
+    scrollScroll,
     scrollSCROLLY,
     scrollSTG,
     scrollSCRIBES,

diff --git a/src/assets/images/tokens/SCR.svg b/src/assets/images/tokens/SCR.svg
diff --git a/src/assets/images/tokens/exports.ts b/src/assets/images/tokens/exports.ts
@@ -44,6 +44,7 @@ import BIG from './BIG.jpg';
 import PUNKETH20 from './PUNKETH-20.jpeg';
 import RSETH from './RSETH.webp';
 import SCROLLY from './SCROLLY.webp';
+import SCR from './SCR.svg';
 import WEETH from './WEETH.svg';
 import BLAST from './BLAST.png';
 import ZCAT from './ZCAT.webp';
@@ -100,6 +101,7 @@ export {
     PUNKETH20,
     RSETH,
     SCROLLY,
+    SCR,
     WEETH,
     BLAST,
     ZCAT,

diff --git a/src/pages/platformAmbient/Explore/Explore.module.css b/src/pages/platformAmbient/Explore/Explore.module.css
@@ -71,6 +71,7 @@
     flex: 1 0 0;
     border-radius: 4px;
     background: var(--dark2, #12121a);
+    border: 1px solid var(--dark3);
 
     width: 300px;
 
@@ -138,6 +139,10 @@
     .title_text {
         font-size: 20px;
     }
+
+    .input_container{
+        border: none;
+    }
 }
 
 /* ----------------------------------- */

diff --git a/yarn.lock b/yarn.lock
@@ -8382,10 +8382,10 @@ react-i18next@^12.3.1:
     "@babel/runtime" "^7.20.6"
     html-parse-stringify "^3.0.1"
 
-react-icons@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-5.2.1.tgz#28c2040917b2a2eda639b0f797bff1888e018e4a"
-  integrity sha512-zdbW5GstTzXaVKvGSyTaBalt7HSfuK5ovrzlpyiWHAFXndXTdd/1hdDHI4xBM1Mn7YriT6aqESucFl9kEXzrdw==
+react-icons@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-5.3.0.tgz#ccad07a30aebd40a89f8cfa7d82e466019203f1c"
+  integrity sha512-DnUk8aFbTyQPSkCfF8dbX6kQjXA9DktMeJqfjrg6cK9vwQVMxmcA3BfP4QoiztVmEHtwlTgLFsPuH2NskKT6eg==
 
 react-idle-timer@^5.7.2:
   version "5.7.2"