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 @@ -259,6 +259,14 @@ flex: 2; margin-top: 5px; } + ${({ active, ...props }) => + active && + ` + color: ${props.theme.navActive}; + svg { + fill: ${props.theme.navActive}; + } + `} `; export const NavButton = styled.button` :focus, @@ -312,6 +320,8 @@ export const HeaderCtn = styled.div` display: flex; + flex-direction: column; + gap: 1rem; align-items: center; justify-content: space-between; width: 100%; @@ -335,6 +345,21 @@ max-width: 20px; `; +const NavHeader = styled.div` + display: flex; + justify-content: center; + align-items: center; + width: 100%; + height: 1rem; + color: ${props => props.theme.navActive}; + svg { + padding: 0.2rem; + fill: ${props => props.theme.navActive}; + height: 33px; + width: 30px; + } +`; + const App = () => { const ContextValue = React.useContext(WalletContext); const { wallet, loading } = ContextValue; @@ -524,6 +549,25 @@ + {selectedKey === 'airdrop' && ( + + Airdrop + + + )} + {selectedKey === 'configure' && ( + + Settings + + + )} + {selectedKey === 'signverifymsg' && ( + + {' '} + Sign & Verify Msg + + + )} {/*Begin extension-only components*/} + active && + ` + color: ${props.theme.navActive}; + svg { + fill: ${props.theme.navActive}; + } + `} `; export const NavButton = styled.button` @@ -313,6 +321,8 @@ export const HeaderCtn = styled.div` display: flex; + flex-direction: column; + gap: 1rem; align-items: center; justify-content: center; width: 100%; @@ -353,6 +363,21 @@ } `; +const NavHeader = styled.div` + display: flex; + justify-content: center; + align-items: center; + width: 100%; + height: 1rem; + color: ${props => props.theme.navActive}; + svg { + padding: 0.2rem; + fill: ${props => props.theme.navActive}; + height: 33px; + width: 30px; + } +`; + const App = () => { const ContextValue = React.useContext(WalletContext); const { wallet, loading } = ContextValue; @@ -412,6 +437,25 @@ + {selectedKey === 'airdrop' && ( + + Airdrop + + + )} + {selectedKey === 'configure' && ( + + Settings + + + )} + {selectedKey === 'signverifymsg' && ( + + {' '} + Sign & Verify Msg + + + )} {/*Begin component not included in extension as desktop only*/} {hasTab && ( @@ -500,7 +544,6 @@ > - diff --git a/web/cashtab/src/components/Common/CustomIcons.js b/web/cashtab/src/components/Common/CustomIcons.js --- a/web/cashtab/src/components/Common/CustomIcons.js +++ b/web/cashtab/src/components/Common/CustomIcons.js @@ -181,7 +181,7 @@ export const GenesisIcon = () => ; export const UnparsedIcon = () => ; export const HomeIcon = () => ; -export const SettingsIcon = () => ; +export const SettingsIcon = () => ; export const AirdropIcon = () => ;