Merge branch 'main' of github.com:yamijuan/oyster into wallet-connect

packages/bridge/src/App.less

@@ -303,6 +303,11 @@ em {
   }
 }
 
+.ant-layout-footer {
+  padding: 0px;
+  background-color: transparent;
+}
+
 .dashboard-amount-quote-stat {
   font-size: 10px;
   font-style: normal;

packages/bridge/src/components/Footer/index.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { GithubOutlined, TwitterOutlined } from '@ant-design/icons';
-import { Link } from 'react-router-dom';
 import { SecurityAuditButton } from '../SecurityAuditButton';
 import { Button } from 'antd';
 

packages/bridge/src/components/Layout/index.tsx

@@ -6,16 +6,12 @@ import { Link, useLocation } from 'react-router-dom';
 import metamaskIcon from '../../assets/metamask.svg';
 
 import { LABELS } from '../../constants';
-import { contexts, AppBar, shortenAddress, useWallet } from '@oyster/common';
+import { AppBar } from '@oyster/common';
 import Wormhole from '../Wormhole';
-import { useEthereum } from '../../contexts';
-import { useCorrectNetwork } from '../../hooks/useCorrectNetwork';
-import { SecurityAuditButton } from '../SecurityAuditButton';
-import { Footer } from '../Footer';
+import { Footer as AppFooter } from './../Footer';
 import { EthereumConnect } from '../EthereumConnect';
 
-const { Header, Content } = Layout;
-const { useConnectionConfig } = contexts.Connection;
+const { Header, Content, Footer } = Layout;
 
 export const AppLayout = React.memo((props: any) => {
   const location = useLocation();
@@ -25,7 +21,7 @@ export const AppLayout = React.memo((props: any) => {
     '/faucet': '7',
   };
 
-  const isRoot = location.pathname !== '/';
+  const isRoot = location.pathname === '/';
 
   const current =
     [...Object.keys(paths)].find(key => location.pathname.startsWith(key)) ||
@@ -39,7 +35,7 @@ export const AppLayout = React.memo((props: any) => {
           rotate={true}
         >
           <Layout title={LABELS.APP_TITLE}>
-            {isRoot && (
+            {!isRoot && (
               <Header className="App-Bar">
                 <div className="app-title">
                   <Link to="/">
@@ -52,6 +48,9 @@ export const AppLayout = React.memo((props: any) => {
             <Content style={{ padding: '0 50px', flexDirection: 'column' }}>
               {props.children}
             </Content>
+            <Footer style={{ textAlign: 'center' }}>
+              <AppFooter />
+            </Footer>
           </Layout>
         </Wormhole>
       </div>

packages/bridge/src/views/home/index.tsx

@@ -7,7 +7,6 @@ import { Link } from 'react-router-dom';
 import { useWormholeAccounts } from '../../hooks/useWormholeAccounts';
 import { TokenDisplay } from '../../components/TokenDisplay';
 import { toChainSymbol } from '../../contexts/chainPair';
-import { Footer } from '../../components/Footer';
 
 export const HomeView = () => {
   const {
@@ -140,7 +139,6 @@ export const HomeView = () => {
           loading={loadingLockedAccounts}
         />
       </div>
-      <Footer />
     </>
   );
 };

packages/bridge/src/views/transfer/index.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import { Card } from 'antd';
 import { Transfer } from '../../components/Transfer';
-import { Footer } from '../../components/Footer';
 
 export const TransferView = () => {
   return (
@@ -15,8 +14,6 @@ export const TransferView = () => {
           <Transfer />
         </Card>
       </div>
-
-      <Footer />
     </>
   );
 };