cleanup account, admin-dashboard and dashboard

accounts/package-lock.json

@@ -15,7 +15,6 @@
                 "redux-logger": "^3.0.6",
                 "compression": "^1.7.4",
                 "loadable-components": "^2.2.3",
-                "@beam-australia/react-env": "^2.1.2",
                 "redux-thunk": "^2.2.0",
                 "redux": "^3.7.2",
                 "react-reveal": "^1.2.2",
@@ -33,7 +32,6 @@
                 "universal-cookie": "^4.0.0",
                 "react-router-dom": "^4.2.2",
                 "history": "^4.7.2",
-                "browserslist": "^4.6.1",
                 "puppeteer-cluster": "^0.22.0",
                 "react-router-redux": "^4.0.8",
                 "card-validator": "^4.3.0",
@@ -21491,20 +21489,6 @@
                 "node": ">=7.0.0"
             }
         },
-        "node_modules/@beam-australia/react-env": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/@beam-australia/react-env/-/react-env-2.1.2.tgz",
-            "integrity": "sha512-gXcCGGGb2oRM/oeqT861JXsSTJjOxGTBMkj7J5ujEBb6Vmv5I108NcALPYYdGdzFCV6ebdVP+E5k0W1xAbzA7w==",
-            "dependencies": {
-                "cross-spawn": "^6.0.5",
-                "dotenv": "^8.0.0",
-                "dotenv-expand": "^5.1.0",
-                "minimist": "^1.2.0"
-            },
-            "bin": {
-                "react-env": "dist/cli.js"
-            }
-        },
         "node_modules/@babel/plugin-proposal-class-properties": {
             "version": "7.13.0",
             "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz",
@@ -23942,17 +23926,6 @@
             "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
             "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
         },
-        "@beam-australia/react-env": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/@beam-australia/react-env/-/react-env-2.1.2.tgz",
-            "integrity": "sha512-gXcCGGGb2oRM/oeqT861JXsSTJjOxGTBMkj7J5ujEBb6Vmv5I108NcALPYYdGdzFCV6ebdVP+E5k0W1xAbzA7w==",
-            "requires": {
-                "cross-spawn": "^6.0.5",
-                "dotenv": "^8.0.0",
-                "dotenv-expand": "^5.1.0",
-                "minimist": "^1.2.0"
-            }
-        },
         "@cnakazawa/watch": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",

accounts/package.json

@@ -4,10 +4,8 @@
     "private": true,
     "homepage": "/",
     "dependencies": {
-        "@beam-australia/react-env": "^2.1.2",
         "amplitude-js": "^5.8.0",
         "axios": "^0.21.1",
-        "browserslist": "^4.6.1",
         "card-validator": "^4.3.0",
         "cli-table": "^0.3.1",
         "compression": "^1.7.4",
@@ -52,7 +50,7 @@
         "light-house": "node lighthouse.js --web",
         "light-house-mobile": "node lighthouse.js --mobile",
         "preinstall": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'",
-        "dep-check": "depcheck ./ --skip-missing=true --ignores='browserslist,loadable-components,@beam-australia/react-env'"
+        "dep-check": "depcheck ./ --skip-missing=true --ignores='loadable-components'"
     },
     "devDependencies": {
         "chrome-launcher": "^0.13.2",

admin-dashboard/package.json

@@ -3,11 +3,8 @@
     "version": "3.0.0",
     "private": true,
     "dependencies": {
-        "@beam-australia/react-env": "^2.1.2",
         "@trendmicro/react-dropdown": "^1.4.0",
-        "acorn": "^7.1.1",
         "axios": "^0.21.1",
-        "browserslist": "^4.6.1",
         "card-validator": "^6.2.0",
         "clipboard": "^2.0.1",
         "express": "^4.16.4",
@@ -16,7 +13,6 @@
         "fuzzy-match-utils": "^1.3.0",
         "history": "^4.7.2",
         "jest": "^25.2.4",
-        "js-uuid": "0.0.6",
         "loadable-components": "^2.2.3",
         "mixpanel-browser": "^2.22.3",
         "moment": "^2.22.2",
@@ -43,6 +39,7 @@
         "redux-thunk": "^2.2.0",
         "sane-email-validation": "^1.1.0",
         "universal-cookie": "^4.0.0",
+        "uuid": "^3.2.1",
         "valid-url": "^1.0.9"
     },
     "scripts": {
@@ -53,14 +50,9 @@
         "start": "node index.js",
         "audit": "npm audit --audit-level=low",
         "preinstall": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'",
-        "dep-check": "depcheck ./ --skip-missing=true --ignores='babel-*,browserslist,loadable-components,js-uuid,acorn,@beam-australia/react-env'"
+        "dep-check": "depcheck ./ --skip-missing=true --ignores='babel-*,loadable-components'"
     },
     "devDependencies": {
-        "babel-core": "^6.26.3",
-        "babel-loader": "^8.0.6",
-        "babel-preset-es2015": "^6.24.1",
-        "babel-preset-react": "^6.24.1",
-        "babel-runtime": "^6.26.0",
         "depcheck": "^0.9.2",
         "jest-localstorage-mock": "^2.2.0",
         "npm-force-resolutions": "0.0.3",

admin-dashboard/src/components/Dashboard.js

@@ -4,7 +4,6 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import SideNav from './nav/SideNav';
 import TopNav from './nav/TopNav';
-import { withRouter } from 'react-router';
 import { Link } from 'react-router-dom';
 import ShouldRender from './basic/ShouldRender';
 import ProfileMenu from './profile/ProfileMenu';
@@ -295,6 +294,4 @@ DashboardApp.contextTypes = {
     mixpanel: PropTypes.object.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(DashboardApp)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(DashboardApp);

admin-dashboard/src/components/project/ProjectBlockBox.js

@@ -2,7 +2,6 @@ import uuid from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -118,6 +117,4 @@ ProjectBlockBox.contextTypes = {
     mixpanel: PropTypes.object.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(ProjectBlockBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(ProjectBlockBox);

admin-dashboard/src/components/project/ProjectDeleteBox.js

@@ -2,7 +2,6 @@ import uuid from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -118,6 +117,4 @@ ProjectDeleteBox.contextTypes = {
     mixpanel: PropTypes.object.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(ProjectDeleteBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(ProjectDeleteBox);

admin-dashboard/src/components/project/ProjectRestoreBox.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -90,6 +89,4 @@ ProjectRestoreBox.contextTypes = {
     mixpanel: PropTypes.object.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(ProjectRestoreBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(ProjectRestoreBox);

admin-dashboard/src/components/project/ProjectUnblockBox.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -90,6 +89,4 @@ ProjectUnblockBox.contextTypes = {
     mixpanel: PropTypes.object.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(ProjectUnblockBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(ProjectUnblockBox);

admin-dashboard/src/components/user/UserBlockBox.js

@@ -2,7 +2,6 @@ import uuid from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -119,6 +118,4 @@ UserBlockBox.contextTypes = {
     mixpanel: PropTypes.object.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(UserBlockBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(UserBlockBox);

admin-dashboard/src/components/user/UserDeleteBox.js

@@ -2,7 +2,6 @@ import uuid from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -122,6 +121,4 @@ UserDeleteBox.contextTypes = {
     mixpanel: PropTypes.object.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(UserDeleteBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(UserDeleteBox);

admin-dashboard/src/components/user/UserRestoreBox.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -95,6 +94,4 @@ UserRestoreBox.contextTypes = {
     mixpanel: PropTypes.object.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(UserRestoreBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(UserRestoreBox);

admin-dashboard/src/components/user/UserUnblockBox.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -95,6 +94,4 @@ UserUnblockBox.contextTypes = {
     mixpanel: PropTypes.object.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(UserUnblockBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(UserUnblockBox);

dashboard/.storybook/Container.js

@@ -13,7 +13,7 @@ import { storiesOf } from '@storybook/react';
 import store from '../src/store'
 import Login from '../src/pages/Login'
 import { Provider } from 'react-redux';
-import { Router } from 'react-router';
+import { Router } from 'react-router-dom';
 import { history } from '../src/store';
 import ErrorBoundary from '../src/components/basic/ErrorBoundary';
 

dashboard/package.json

@@ -3,7 +3,6 @@
     "version": "3.0.0",
     "private": true,
     "dependencies": {
-        "@beam-australia/react-env": "^2.1.2",
         "@date-io/date-fns": "^1.3.11",
         "@date-io/moment": "^1.3.13",
         "@material-ui/core": "^4.7.0",
@@ -11,7 +10,6 @@
         "@trendmicro/react-dropdown": "^1.3.0",
         "amplitude-js": "^5.8.0",
         "axios": "^0.21.1",
-        "browserslist": "^4.6.1",
         "card-validator": "^6.2.0",
         "clipboard": "^2.0.1",
         "clsx": "^1.0.4",
@@ -95,7 +93,7 @@
         "test": "jest --forceExit --testSequencer ./src/test/puppeteer/CustomSequencer.js --runInBand ./src/test/puppeteer/*.test.js",
         "enterprise-test": "jest --forceExit --runInBand ./src/test/puppeteer/*.test.enterprise.js",
         "start": "node index.js",
-        "dep-check": "depcheck ./ --skip-missing=true --ignores='eslint,babel-*,browserslist,loadable-components,@beam-australia/react-env'",
+        "dep-check": "depcheck ./",
         "audit": "npm audit --audit-level=low",
         "fix-lint": "eslint . --fix",
         "preinstall": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'"
@@ -103,9 +101,6 @@
     "devDependencies": {
         "@jest/test-sequencer": "^26.0.1",
         "axios-mock-adapter": "^1.15.0",
-        "babel-preset-es2015": "^6.24.1",
-        "babel-preset-react": "^6.24.1",
-        "babel-runtime": "^6.26.0",
         "depcheck": "^1.3.1",
         "fyipe": "^3.0.10051",
         "jest-localstorage-mock": "^2.2.0",

dashboard/src/components/Dashboard.js

@@ -8,7 +8,7 @@ import { getProjects } from '../actions/project';
 import CreateProjectModal from './project/CreateProjectModal';
 import UpgradePlanModal from './project/UpgradePlanModal';
 import DeleteProjectModal from './project/DeleteProjectModal';
-import { withRouter } from 'react-router';
+import { withRouter } from 'react-router-dom';
 import ShouldRender from './basic/ShouldRender';
 import ProfileMenu from './profile/ProfileMenu';
 import { showForm } from '../actions/project';

dashboard/src/components/alert/AlertCharges.js

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import PropTypes from 'prop-types';
 import AlertChargesList from './AlertChargesList';
@@ -185,6 +184,4 @@ AlertCharge.propTypes = {
 
 AlertCharge.displayName = 'AlertCharge';
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(AlertCharge)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(AlertCharge);

dashboard/src/components/incident/IncidentAlert.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import ShouldRender from '../basic/ShouldRender';
 import { AlertTableRows, AlertTableHeader } from '../alert/AlertTable';
@@ -265,6 +264,4 @@ IncidentAlert.propTypes = {
     ]),
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(IncidentAlert)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(IncidentAlert);

dashboard/src/components/incident/IncidentDeleteBox.js

@@ -2,7 +2,6 @@ import { v4 as uuidv4 } from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -132,6 +131,4 @@ IncidentDeleteBox.propTypes = {
     componentSlug: PropTypes.string,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(IncidentDeleteBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(IncidentDeleteBox);

dashboard/src/components/invoice/Invoice.js

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import InvoiceList from './InvoiceList';
 import {
@@ -141,6 +140,4 @@ Invoice.propTypes = {
 
 Invoice.displayName = 'Invoice';
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(Invoice)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(Invoice);

dashboard/src/components/monitor/MonitorViewChangeComponentBox.js

@@ -2,7 +2,6 @@ import { v4 as uuidv4 } from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -142,6 +141,7 @@ MonitorViewChangeComponentBox.propTypes = {
     component: PropTypes.object,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(MonitorViewChangeComponentBox)
-);
+export default connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(MonitorViewChangeComponentBox);

dashboard/src/components/monitor/MonitorViewDeleteBox.js

@@ -2,7 +2,6 @@ import { v4 as uuidv4 } from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -143,6 +142,7 @@ MonitorViewDeleteBox.propTypes = {
     deleteMonitor: PropTypes.func.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(MonitorViewDeleteBox)
-);
+export default connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(MonitorViewDeleteBox);

dashboard/src/components/monitor/MonitorViewDisableBox.js

@@ -2,7 +2,6 @@ import { v4 as uuidv4 } from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -145,6 +144,7 @@ MonitorViewDisableBox.propTypes = {
     tabSelected: PropTypes.func.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(MonitorViewDisableBox)
-);
+export default connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(MonitorViewDisableBox);

dashboard/src/components/paymentCard/PaymentCard.js

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { v4 as uuidv4 } from 'uuid';
 import { bindActionCreators } from 'redux';
 import PropTypes from 'prop-types';
@@ -564,6 +563,4 @@ const mapStateToProps = state => {
 const mapDispatchToProps = dispatch =>
     bindActionCreators({ openModal, fetchCards, setDefaultCard }, dispatch);
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(PaymentCard)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(PaymentCard);

dashboard/src/components/profileSettings/DeleteAccountBox.js

@@ -2,7 +2,6 @@ import { v4 as uuidv4 } from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -100,6 +99,4 @@ DeleteAccountBox.propTypes = {
     deleteAccountSetting: PropTypes.shape({ requesting: PropTypes.bool }),
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(DeleteAccountBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(DeleteAccountBox);

dashboard/src/components/project/CreateProjectModal.js

@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import { SubmissionError } from 'redux-form';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import ProjectForm from './ProjectForm';
 import { hideForm, createProject, switchProject } from '../../actions/project';
 import PropTypes from 'prop-types';
@@ -77,7 +76,6 @@ CreateProjectModal.displayName = 'CreateProjectModal';
 
 CreateProjectModal.propTypes = {
     dispatch: PropTypes.func.isRequired,
-    history: PropTypes.object.isRequired,
     hideForm: PropTypes.func.isRequired,
     switchProject: PropTypes.func.isRequired,
     createProject: PropTypes.func.isRequired,
@@ -85,10 +83,7 @@ CreateProjectModal.propTypes = {
         PropTypes.object,
         PropTypes.oneOf([null, undefined]),
     ]),
-    match: PropTypes.object.isRequired,
     visible: PropTypes.bool,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(CreateProjectModal)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(CreateProjectModal);

dashboard/src/components/project/DeleteProjectModal.js

@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import ClickOutside from 'react-click-outside';
 import DeleteCaution from './DeleteCaution';
 import { IS_SAAS_SERVICE } from '../../config';
@@ -150,6 +149,4 @@ DeleteProjectModal.propTypes = {
     deletedProjectSuccess: PropTypes.bool,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(DeleteProjectModal)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(DeleteProjectModal);

dashboard/src/components/project/ProjectSwitcher.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import ReactHoverObserver from 'react-hover-observer';
 import {
@@ -234,6 +233,4 @@ ProjectSwitcher.propTypes = {
     getSubProjects: PropTypes.func,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(ProjectSwitcher)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(ProjectSwitcher);

dashboard/src/components/project/UpgradePlanModal.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import UpgradeForm from '../project/UpgradeForm';
 import {
     hideUpgradeForm,
@@ -120,7 +119,6 @@ UpgradePlanModal.displayName = 'UpgradePlanModal';
 
 UpgradePlanModal.propTypes = {
     dispatch: PropTypes.func.isRequired,
-    history: PropTypes.object.isRequired,
     hideUpgradeForm: PropTypes.func.isRequired,
     changePlan: PropTypes.func.isRequired,
     resetCreateMonitor: PropTypes.func.isRequired,
@@ -136,10 +134,7 @@ UpgradePlanModal.propTypes = {
         PropTypes.object,
         PropTypes.oneOf([null, undefined]),
     ]),
-    match: PropTypes.object.isRequired,
     visible: PropTypes.bool,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(UpgradePlanModal)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(UpgradePlanModal);

dashboard/src/components/schedule/DeleteBox.js

@@ -2,7 +2,7 @@ import { v4 as uuidv4 } from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
+import { withRouter } from 'react-router-dom';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';

dashboard/src/components/schedule/EscalationSummary.js

@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { withRouter } from 'react-router';
 import { ListLoader } from '../basic/Loader';
 import EscalationSummarySingle from './EscalationSummarySingle';
 
@@ -206,6 +205,4 @@ const mapStateToProps = (state_ignored, props_ignored) => {
     return {};
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(EscalationSummary)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(EscalationSummary);

dashboard/src/components/schedule/OnCallAlertBox.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { reduxForm, FieldArray, arrayPush } from 'redux-form';
-import { withRouter } from 'react-router';
+import { withRouter } from 'react-router-dom';
 import { getEscalation, addEscalation } from '../../actions/schedule';
 import { getProjectGroups } from '../../actions/group';
 import { subProjectTeamLoading } from '../../actions/team';

dashboard/src/components/schedule/RenameScheduleBox.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { Validate } from '../../config';
-import { withRouter } from 'react-router';
+import { withRouter } from 'react-router-dom';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';

dashboard/src/components/schedule/UserBox.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { withRouter } from 'react-router';
+import { withRouter } from 'react-router-dom';
 import UserInputs from './UserInputs';
 import { FormLoader, Spinner } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';

dashboard/src/components/settings/DeleteProject.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';
@@ -85,6 +84,4 @@ const mapDispatchToProps = dispatch =>
         dispatch
     );
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(DeleteProjectBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(DeleteProjectBox);

dashboard/src/components/settings/ExitProject.js

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { v4 as uuidv4 } from 'uuid';
 import { User } from '../../config';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import { switchProject, getProjects, exitProject } from '../../actions/project';
@@ -132,6 +131,4 @@ ExitProjectBox.propTypes = {
     isRequesting: PropTypes.oneOf([null, undefined, true, false]),
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(ExitProjectBox)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(ExitProjectBox);

dashboard/src/components/statusPage/DeleteBox.js

@@ -2,7 +2,7 @@ import { v4 as uuidv4 } from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
+import { withRouter } from 'react-router-dom';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';

dashboard/src/components/statusPage/DuplicateStatusPage.js

@@ -2,7 +2,7 @@ import { v4 as uuidv4 } from 'uuid';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
+import { withRouter } from 'react-router-dom';
 import { bindActionCreators } from 'redux';
 import { FormLoader } from '../basic/Loader';
 import ShouldRender from '../basic/ShouldRender';

dashboard/src/components/subscriber/subscriberAlert.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import ShouldRender from '../basic/ShouldRender';
 import {
@@ -280,6 +279,4 @@ SubscriberAlert.propTypes = {
     page: PropTypes.number,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(SubscriberAlert)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(SubscriberAlert);

dashboard/src/pages/AlertLog.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import Dashboard from '../components/Dashboard';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import Fade from 'react-reveal/Fade';
 import { fetchAlert, fetchProjectAlert } from '../actions/alert';
@@ -303,6 +302,4 @@ AlertLog.propTypes = {
 
 AlertLog.displayName = 'AlertLog';
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(AlertLog)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(AlertLog);

dashboard/src/pages/Billing.js

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import Fade from 'react-reveal/Fade';
 import Dashboard from '../components/Dashboard';
 import CustomerBalance from '../components/paymentCard/CustomerBalance';
@@ -97,6 +96,4 @@ Billing.propTypes = {
     getSmtpConfig: PropTypes.func.isRequired,
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(Billing)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(Billing);

dashboard/src/pages/OnCall.js

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { bindActionCreators } from 'redux';
 import Fade from 'react-reveal/Fade';
 import Dashboard from '../components/Dashboard';
@@ -448,4 +447,4 @@ OnCall.propTypes = {
 
 OnCall.displayName = 'OnCall';
 
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(OnCall));
+export default connect(mapStateToProps, mapDispatchToProps)(OnCall);

dashboard/src/pages/ProfileBilling.js

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import Fade from 'react-reveal/Fade';
 import Dashboard from '../components/Dashboard';
 import Invoice from '../components/invoice/Invoice';
@@ -56,4 +55,4 @@ ProfileBilling.propTypes = {
     }),
 };
 
-export default withRouter(connect(null, null)(ProfileBilling));
+export default connect(null, null)(ProfileBilling);

dashboard/src/pages/Resources.js

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { withRouter } from 'react-router';
 import { PropTypes } from 'prop-types';
 import Fade from 'react-reveal/Fade';
 import Dashboard from '../components/Dashboard';
@@ -67,4 +66,4 @@ Resources.propTypes = {
 
 Resources.displayName = 'Resources';
 
-export default withRouter(connect(null, null)(Resources));
+export default connect(null, null)(Resources);

dashboard/src/pages/Schedule.js

@@ -11,7 +11,6 @@ import EscalationSummary from '../components/schedule/EscalationSummary';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { fetchSubProject } from '../actions/subProject';
-import { withRouter } from 'react-router';
 import { subProjectTeamLoading } from '../actions/team';
 import { getEscalation } from '../actions/schedule';
 import { teamLoading } from '../actions/team';
@@ -199,6 +198,4 @@ Schedule.propTypes = {
     }),
 };
 
-export default withRouter(
-    connect(mapStateToProps, mapDispatchToProps)(Schedule)
-);
+export default connect(mapStateToProps, mapDispatchToProps)(Schedule);