Merge pull request #2569 from Badger-Finance/development

Development to Staging

.env

@@ -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

.env.example

@@ -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

package.json

@@ -98,6 +98,7 @@
   "devDependencies": {
     "axios": "^1.2.4",
     "glob": "^8.0.3",
+    "lokijs": "^1.5.12",
     "source-map-explorer": "^2.5.3"
   },
   "jest": {

src/components-v2/navbar/NavbarSocialContact.tsx

@@ -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',
@@ -17,9 +14,6 @@ const useStyles = makeStyles(() => ({
   twitter: {
     margin: '0px 16px 0px 8px',
   },
-  governance: {
-    margin: '0px 18px',
-  },
 }));
 
 export const NavbarSocialContact = (): JSX.Element => {
@@ -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">

src/components-v2/navbar/NavbarTabs.tsx

@@ -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';
@@ -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>
   );
 });

src/components-v2/sidebar/index.tsx

@@ -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';
@@ -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>