Merge branch 'develop' into transaction-table-header-changes-tablet

CrocSwap · Nov 11, 2024 · 673bd31 · 673bd31
2 parents e263f6a + dd648c9
commit 673bd31
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,6 @@ Note: Node v18+ is required
 
 Configure your build environment by adding a dotfile (e.g. `.env.local`) with variable definitions to the top level directory before starting the server. Please reference `.gitignore` in the root directory for dotfile naming conventions.
 
-
 #### Infura
 
 This is a key for the Infura API which is used to pull metadata from on-chain.
@@ -68,7 +67,7 @@ Code changes are viewable on GitHub [Link](https://github.com/CrocSwap/ambient-t
 Summary:
 
 -   Added the ability to switch to the Scroll network and a test network (Görli) using the network selector in the page header
--   Added an external link to [Canto](https://beta.canto.io/lp) in the network selector
+-   Added an external link to [Canto](https://www.canto.io/lp) in the network selector
 -   Updated the pool initialization form to enable additionally minting of an initial liquidity position
 -   Fixed a bug preventing approvals of certain tokens (thanks [busimus](https://github.com/busimus)!)
 -   Added the ability to annotate the price charts with trend lines and horizontal rays

diff --git a/src/App/components/PageHeader/NetworkSelector/NetworkSelector.tsx b/src/App/components/PageHeader/NetworkSelector/NetworkSelector.tsx
@@ -167,7 +167,7 @@ export default function NetworkSelector(props: propsIF) {
             custom: 1,
             isExternal: true,
             testnet: false,
-            link: 'https://app.canto.io/lp',
+            link: 'https://www.canto.io/lp',
             condition: includeCanto && platformName === 'ambient',
         },
         {

diff --git a/src/App/components/PageHeader/PageHeader.module.css b/src/App/components/PageHeader/PageHeader.module.css
@@ -127,6 +127,23 @@
     .logoContainer img:nth-of-type(1) {
         margin: 0 4px;
     }
+
+    .primaryHeader{
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+
+    }
+
+    .left_side{
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        gap: 1rem;
+    }
+
+
 }
 
 @media (max-width: 1200px) {

diff --git a/src/App/components/PageHeader/PageHeader.tsx b/src/App/components/PageHeader/PageHeader.tsx
@@ -57,7 +57,6 @@ import {
     ReceiptContext,
     ReceiptContextIF,
 } from '../../../contexts/ReceiptContext';
-import { BrandContext, BrandContextIF } from '../../../contexts/BrandContext';
 import styles from './PageHeader.module.css';
 import { useBottomSheet } from '../../../contexts/BottomSheetContext';
 
@@ -69,7 +68,6 @@ const PageHeader = function () {
     } = useContext<AppStateContextIF>(AppStateContext);
     const { crocEnv, setCrocEnv } =
         useContext<CrocEnvContextIF>(CrocEnvContext);
-    const { headerImage } = useContext<BrandContextIF>(BrandContext);
     const { resetTokenBalances } =
         useContext<TokenBalanceContextIF>(TokenBalanceContext);
     const { resetUserGraphData } =
@@ -451,25 +449,22 @@ const PageHeader = function () {
                             appHeaderDropdown.setIsActive(false);
                         }
                     }}
+                    className={styles.left_side}
                 >
                     <Link
                         to='/'
                         className={styles.logoContainer}
                         aria-label='Home'
                     >
-                        {desktopScreen ? (
-                            <img src={headerImage} alt='ambient' />
-                        ) : (
-                            <img
-                                className={styles.logoText}
-                                src={logo}
-                                alt='ambient'
-                                width='70px'
-                            />
-                        )}
+                        <img
+                            className={styles.logoText}
+                            src={logo}
+                            alt='ambient'
+                            width='60px'
+                        />
                     </Link>
+                    {routeDisplay}
                 </div>
-                {routeDisplay}
                 <div className={styles.rightSide}>
                     {show ? (
                         <div className={styles.tradeNowDiv}>