Skip to content

Commit a4979ed

Browse files
authored
Merge pull request #106 from ssvlabs/stage
Stage to Stage
2 parents 834763c + 4f36157 commit a4979ed

File tree

18 files changed

+345
-101
lines changed

18 files changed

+345
-101
lines changed

.env.development

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REACT_APP_DEBUG=true
2-
REACT_APP_API_BASE_URL=https://api.stage.ssv.network/api/v4/prater
2+
REACT_APP_API_BASE_URL=https://api.stage.ssv.network/api/v4/holesky
33
REACT_APP_LINK_SSV_WEBAPP=https://app.stage.ssv.network/
44
REACT_APP_GOOGLE_TAG_SECRET=
55
REACT_APP_GOOGLE_TAG_URL=
Lines changed: 15 additions & 0 deletions
Loading
Lines changed: 15 additions & 0 deletions
Loading
Lines changed: 15 additions & 0 deletions
Loading
Lines changed: 15 additions & 0 deletions
Loading

public/images/website_logo_dark.svg

Lines changed: 24 additions & 6 deletions
Loading

public/images/website_logo_light.svg

Lines changed: 17 additions & 24 deletions
Loading

src/app/common/components/AppBar/AppBar.styles.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ export const useStyles = makeStyles((theme) => ({
132132
textDecoration: 'none',
133133
},
134134
},
135+
networkSwitchWrapper: {
136+
paddingRight: 12,
137+
},
135138
drawer: {
136139
'& > .MuiDrawer-paper': {
137140
backgroundColor: '#A1ABBE',
@@ -167,14 +170,4 @@ export const useStyles = makeStyles((theme) => ({
167170
backgroundColor: 'lightgreen',
168171
},
169172
},
170-
PraterButton: {
171-
backgroundColor: theme.colors.tint80,
172-
color: theme.colors.primary,
173-
'&:hover': {
174-
cursor: 'default',
175-
},
176-
'&:active': {
177-
backgroundColor: theme.colors.tint80,
178-
},
179-
},
180173
}));

src/app/common/components/AppBar/AppBar.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { useStyles as useAppStyles } from '~app/components/Styles';
2525
import ApplicationStore from '~app/common/stores/Application.store';
2626
import DarkModeSwitcher from '~app/common/components/DarkModeSwitcher';
2727
import Grid from '@material-ui/core/Grid';
28+
import NetworkSelect from '~app/common/components/NetworkSelect';
2829

2930
const DrawerButtonsContainers = styled.div`
3031
font-size: 12px;
@@ -165,11 +166,12 @@ const AppBarComponent = () => {
165166
display={{ xs: 'none', sm: 'none', md: 'none', lg: 'block' }}>
166167
<div className={classes.toolbarButtons}>
167168
{!isOverviewPage() && <SmartSearch placeholder={'Search...'} inAppBar />}
169+
<div className={classes.networkSwitchWrapper}>
170+
<NetworkSelect />
171+
</div>
168172
<Link href={joinSsvLink} target="_blank">
169173
<Button disable={false} type={'primary'} text={'Join SSV Network'} />
170174
</Link>
171-
<Button disable={false} extendClass={classes.PraterButton} type={'secondary'}
172-
text={`${capitalize(currentNetwork)}`} />
173175
<DarkModeSwitcher style={{ marginLeft: 'auto', marginRight: 0, minWidth: 'auto', width: 70 }} />
174176
</div>
175177
</Box>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import React, { ImgHTMLAttributes } from 'react';
2+
import { useStores } from '~app/hooks/useStores';
3+
import ApplicationStore from '~app/common/stores/Application.store';
4+
import { EChain } from '~lib/utils/ChainService';
5+
6+
const NetworkIcon = (props: { network: EChain } & ImgHTMLAttributes<unknown>) => {
7+
const stores = useStores();
8+
const applicationStore: ApplicationStore = stores.Application;
9+
const imgSrc = `/images/networks/${props.network}${applicationStore.isDarkMode ? '_light' : '_dark'}.svg`;
10+
11+
return (
12+
<img width="24" height="24" src={imgSrc} alt={props.network} {...props} />
13+
);
14+
};
15+
16+
export default NetworkIcon;

0 commit comments

Comments
 (0)