diff --git a/nym-connect/src/components/AppWindowFrame.tsx b/nym-connect/src/components/AppWindowFrame.tsx index e8e18f31a4..6d880b36f5 100644 --- a/nym-connect/src/components/AppWindowFrame.tsx +++ b/nym-connect/src/components/AppWindowFrame.tsx @@ -5,7 +5,7 @@ import { NymWordmark } from '@nymproject/react/logo/NymWordmark'; export const AppWindowFrame: React.FC = ({ children }) => ( { - if (color === '#60D6EF') { + if (color === '#F4B02D') { return '#21D072'; } - return '#60D6EF'; + return '#F4B02D'; }; const getStatusFillColor = (status: ConnectionStatusKind, hover: boolean, isError: boolean): string => { @@ -21,10 +21,10 @@ const getStatusFillColor = (status: ConnectionStatusKind, hover: boolean, isErro if (hover) { return '#21D072'; } - return '#60D6EF'; + return '#F4B02D'; case ConnectionStatusKind.connecting: case ConnectionStatusKind.disconnecting: - return '#60D6EF'; + return '#F4B02D'; default: // connected if (hover) { diff --git a/nym-connect/src/components/ServiceProviderSelector.tsx b/nym-connect/src/components/ServiceProviderSelector.tsx index b2fd29f42b..08cda8eb8a 100644 --- a/nym-connect/src/components/ServiceProviderSelector.tsx +++ b/nym-connect/src/components/ServiceProviderSelector.tsx @@ -2,8 +2,10 @@ import React, { useEffect, useMemo } from 'react'; import IconButton from '@mui/material/IconButton'; import Menu from '@mui/material/Menu'; import MenuItem from '@mui/material/MenuItem'; -import ArrowDropDownCircleIcon from '@mui/icons-material/ArrowDropDownCircle'; -import { Box, CircularProgress, Stack, Tooltip, Typography } from '@mui/material'; +import KeyboardArrowDownRoundedIcon from '@mui/icons-material/KeyboardArrowDownRounded'; +import KeyboardArrowUpRoundedIcon from '@mui/icons-material/KeyboardArrowUpRounded'; +import { Box, CircularProgress, Stack, Tooltip, Typography, ListItemIcon } from '@mui/material'; +import Check from '@mui/icons-material/Check'; import { ServiceProvider, Service, Services } from '../types/directory'; type ServiceWithRandomSp = { @@ -62,7 +64,7 @@ export const ServiceProviderSelector: React.FC<{ Loading services... - + {open ? : } ); @@ -80,14 +82,14 @@ export const ServiceProviderSelector: React.FC<{ return ( <> - - (serviceProvider ? undefined : theme.palette.primary.main)} - > - {service ? service.description : 'Select a service'} + `1px solid ${theme.palette.info.main}` }} + > + theme.palette.info.main}> + {!service ? 'Select a service' : service.description} - + {open ? : } {servicesWithRandomSp.map(({ id, description, sp }) => ( - handleClose(sp)}> + handleClose(sp)} + > @@ -143,6 +164,16 @@ export const ServiceProviderSelector: React.FC<{ > {description} + {id === service?.id && ( + + + + )} ))} diff --git a/nym-connect/src/theme/theme.tsx b/nym-connect/src/theme/theme.tsx index 18064bf504..e0153e6824 100644 --- a/nym-connect/src/theme/theme.tsx +++ b/nym-connect/src/theme/theme.tsx @@ -24,17 +24,17 @@ const nymPalette: NymPalette = { success: '#21D073', info: '#60D7EF', fee: '#967FF0', - background: { light: '#F4F6F8', dark: '#121726' }, + background: { light: '#F4F6F8', dark: '#1D2125' }, text: { light: '#F2F2F2', - dark: '#121726', + dark: '#1D2125', }, }; const darkMode: NymPaletteVariant = { mode: 'dark', background: { - main: '#121726', + main: '#1D2125', paper: '#242C3D', }, text: { @@ -52,7 +52,7 @@ const lightMode: NymPaletteVariant = { paper: '#FFFFFF', }, text: { - main: '#121726', + main: '#1D2125', }, topNav: { background: '#111826',