diff --git a/web/cashtab/extension/public/manifest.json b/web/cashtab/extension/public/manifest.json --- a/web/cashtab/extension/public/manifest.json +++ b/web/cashtab/extension/public/manifest.json @@ -3,7 +3,7 @@ "name": "Cashtab", "description": "A browser-integrated BCHA wallet from Bitcoin ABC", - "version": "0.0.8", + "version": "0.0.9", "content_scripts": [ { "matches": ["file://*/*", "http://*/*", "https://*/*"], diff --git a/web/cashtab/extension/src/components/App.js b/web/cashtab/extension/src/components/App.js --- a/web/cashtab/extension/src/components/App.js +++ b/web/cashtab/extension/src/components/App.js @@ -7,8 +7,10 @@ FolderOpenFilled, CaretRightOutlined, SettingFilled, + AppstoreAddOutlined, } from '@ant-design/icons'; import Wallet from '@components/Wallet/Wallet'; +import Tokens from '@components/Tokens/Tokens'; import Send from '@components/Send/Send'; import SendToken from '@components/Send/SendToken'; import Configure from '@components/Configure/Configure'; @@ -63,6 +65,7 @@ `; const Footer = styled.div` + z-index: 2; background-color: ${props => props.theme.footer.background}; border-radius: 20px; position: fixed; @@ -89,9 +92,15 @@ cursor: pointer; padding: 24px 12px 12px 12px; margin: 0 28px; - @media (max-width: 360px) { + @media (max-width: 475px) { + margin: 0 20px; + } + @media (max-width: 420px) { margin: 0 12px; } + @media (max-width: 350px) { + margin: 0 8px; + } background-color: ${props => props.theme.footer.background}; border: none; font-size: 12px; @@ -208,6 +217,9 @@ <Route path="/wallet"> <Wallet /> </Route> + <Route path="/tokens"> + <Tokens /> + </Route> <Route path="/send"> <Send /> </Route> @@ -236,6 +248,14 @@ <fbt desc="Wallet menu button">Wallet</fbt> </NavButton> + <NavButton + active={selectedKey === 'tokens'} + onClick={() => history.push('/tokens')} + > + <AppstoreAddOutlined /> + Tokens + </NavButton> + <NavButton active={selectedKey === 'send'} onClick={() => history.push('/send')}