Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development to Staging #2569

Merged
merged 3 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
ESLINT_NO_DEV_ERRORS=true
EXTEND_ESLINT=true
REACT_APP_GOVERNANCE_TIMELOCK=false
REACT_APP_GRAVIAURA_CHART=true
REACT_APP_GOVERNANCE_TAB=false
REACT_APP_GRAVIAURA_CHART=true
2 changes: 0 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
ESLINT_NO_DEV_ERRORS=true
EXTEND_ESLINT=true
REACT_APP_GOVERNANCE_TIMELOCK=false
REACT_APP_GRAVIAURA_CHART=true
REACT_APP_GOVERNANCE_TAB=false
REACT_APP_WALLET_CONNECT_PROJECT_ID=dcdb98454f70814fa8bf6983dca8b5a9
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
"devDependencies": {
"axios": "^1.2.4",
"glob": "^8.0.3",
"lokijs": "^1.5.12",
"source-map-explorer": "^2.5.3"
},
"jest": {
Expand Down
18 changes: 0 additions & 18 deletions src/components-v2/navbar/NavbarSocialContact.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { Grid, Link, makeStyles } from '@material-ui/core';
import clsx from 'clsx';
import React from 'react';
import { Typography } from 'ui-library/Typography';

import { FLAGS } from '../../config/environment';

const useStyles = makeStyles(() => ({
socialIcon: {
height: '14px',
Expand All @@ -17,9 +14,6 @@ const useStyles = makeStyles(() => ({
twitter: {
margin: '0px 16px 0px 8px',
},
governance: {
margin: '0px 18px',
},
}));

export const NavbarSocialContact = (): JSX.Element => {
Expand Down Expand Up @@ -49,18 +43,6 @@ export const NavbarSocialContact = (): JSX.Element => {
</Link>
</Typography>
</Grid>
<Grid item className={classes.governance}>
<Typography variant="helperText">
<Link
color="inherit"
href={FLAGS.GOVERNANCE_TIMELOCK ? '/governance' : 'https://snapshot.org/#/badgerdao.eth'}
target={FLAGS.GOVERNANCE_TIMELOCK ? undefined : '_blank'}
rel="noopener"
>
GOVERNANCE
</Link>
</Typography>
</Grid>
<Grid item>
<Typography variant="helperText">
<Link color="inherit" href="https://forum.badger.finance" target="_blank" rel="noopener">
Expand Down
9 changes: 0 additions & 9 deletions src/components-v2/navbar/NavbarTabs.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { makeStyles, Tab, Tabs, useMediaQuery, useTheme } from '@material-ui/core';
import { FLAGS } from 'config/environment';
import { StoreContext } from 'mobx/stores/store-context';
import { observer } from 'mobx-react-lite';
import { QueryParams, Route } from 'mobx-router';
Expand Down Expand Up @@ -70,14 +69,6 @@ export const NavbarTabs = observer((): JSX.Element => {
value={routes.IbBTC.path}
/>
)}
{FLAGS.GOVERNANCE_TAB && config.governance && (
<Tab
classes={{ root: classes.tab }}
label="GOVERNANCE"
onClick={() => goToTab(routes.governance)}
value={routes.governance.path}
/>
)}
</Tabs>
);
});
4 changes: 0 additions & 4 deletions src/components-v2/sidebar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Drawer, IconButton, useTheme } from '@material-ui/core';
import { makeStyles } from '@material-ui/core/styles';
import CloseIcon from '@material-ui/icons/Close';
import { SITE_VERSION } from 'config/constants';
import routes from 'config/routes';
import { StoreContext } from 'mobx/stores/store-context';
import { observer } from 'mobx-react-lite';
import React, { useContext } from 'react';
Expand Down Expand Up @@ -88,9 +87,6 @@ const Sidebar = observer(() => {
<MenuItem button onClick={() => window.open('https://docs.badger.com/')}>
Wiki
</MenuItem>
<MenuItem button onClick={() => store.router.goTo(routes.governance)}>
Governance
</MenuItem>
<MenuItem button onClick={() => window.open('https://forum.badger.finance')}>
Forum
</MenuItem>
Expand Down
47 changes: 0 additions & 47 deletions src/components/Governance/AddressInfoCard.tsx

This file was deleted.

154 changes: 0 additions & 154 deletions src/components/Governance/EventsTable.tsx

This file was deleted.

32 changes: 0 additions & 32 deletions src/components/Governance/EventsTableItem.tsx

This file was deleted.

Loading
Loading