@@ -101,20 +102,4 @@ const Account = (props: AccountProps) => {
)
}
-interface AccountProps {
- buddyList: User[];
- ignoreList: User[];
- serverName: string;
- serverVersion: string;
- user: User;
-}
-
-const mapStateToProps = state => ({
- buddyList: ServerSelectors.getBuddyList(state),
- ignoreList: ServerSelectors.getIgnoreList(state),
- serverName: ServerSelectors.getName(state),
- serverVersion: ServerSelectors.getVersion(state),
- user: ServerSelectors.getUser(state),
-});
-
-export default connect(mapStateToProps)(Account);
+export default Account;
diff --git a/webclient/src/containers/App/AppShellRoutes.tsx b/webclient/src/containers/App/AppShellRoutes.tsx
index c80f74c30..b07961eef 100644
--- a/webclient/src/containers/App/AppShellRoutes.tsx
+++ b/webclient/src/containers/App/AppShellRoutes.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Navigate, Route, Routes } from 'react-router-dom';
+import { Route, Routes } from 'react-router-dom';
import { RouteEnum } from 'types';
import {
diff --git a/webclient/src/containers/App/FeatureDetection.tsx b/webclient/src/containers/App/FeatureDetection.tsx
index ed9e1f241..d7ef75aeb 100644
--- a/webclient/src/containers/App/FeatureDetection.tsx
+++ b/webclient/src/containers/App/FeatureDetection.tsx
@@ -11,7 +11,7 @@ const FeatureDetection = () => {
detectIndexedDB(),
];
- Promise.all(features).catch((e) => setUnsupported(true));
+ Promise.all(features).catch(() => setUnsupported(true));
}, []);
return unsupported
diff --git a/webclient/src/containers/Initialize/Initialize.tsx b/webclient/src/containers/Initialize/Initialize.tsx
index bc777f065..92f8223e7 100644
--- a/webclient/src/containers/Initialize/Initialize.tsx
+++ b/webclient/src/containers/Initialize/Initialize.tsx
@@ -1,7 +1,5 @@
-import { useState } from 'react';
import { styled } from '@mui/material/styles';
import { useTranslation, Trans } from 'react-i18next';
-import { connect } from 'react-redux';
import { Navigate } from 'react-router-dom';
import Typography from '@mui/material/Typography';
@@ -9,6 +7,7 @@ import { Images } from 'images';
import { ServerSelectors } from 'store';
import { RouteEnum } from 'types';
import Layout from 'containers/Layout/Layout';
+import { useAppSelector } from 'store/store';
import './Initialize.css';
@@ -30,7 +29,8 @@ const Root = styled('div')(({ theme }) => ({
}
}));
-const Initialize = ({ initialized }: InitializeProps) => {
+const Initialize = () => {
+ const initialized = useAppSelector(state => ServerSelectors.getInitialized(state));
const { t } = useTranslation();
return initialized
@@ -60,12 +60,4 @@ const Initialize = ({ initialized }: InitializeProps) => {
);
}
-interface InitializeProps {
- initialized: boolean;
-}
-
-const mapStateToProps = state => ({
- initialized: ServerSelectors.getInitialized(state),
-});
-
-export default connect(mapStateToProps)(Initialize);
+export default Initialize;
diff --git a/webclient/src/containers/Layout/Layout.tsx b/webclient/src/containers/Layout/Layout.tsx
index 6d04172ba..858011b42 100644
--- a/webclient/src/containers/Layout/Layout.tsx
+++ b/webclient/src/containers/Layout/Layout.tsx
@@ -22,7 +22,7 @@ function Layout(props:LayoutProps) {
)
}
-function BottomBar(props) {
+function BottomBar() {
return (
diff --git a/webclient/src/containers/Layout/LeftNav.tsx b/webclient/src/containers/Layout/LeftNav.tsx
index a81eb6ce2..196087d7a 100644
--- a/webclient/src/containers/Layout/LeftNav.tsx
+++ b/webclient/src/containers/Layout/LeftNav.tsx
@@ -1,5 +1,4 @@
import React, { useState, useEffect } from 'react';
-import { connect } from 'react-redux';
import { NavLink, useNavigate, generatePath } from 'react-router-dom';
import IconButton from '@mui/material/IconButton';
import Menu from '@mui/material/Menu';
@@ -8,17 +7,26 @@ import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
import CloseIcon from '@mui/icons-material/Close';
import MailOutlineRoundedIcon from '@mui/icons-material/MailOutline';
import MenuRoundedIcon from '@mui/icons-material/MenuRounded';
-import * as _ from 'lodash';
import { AuthenticationService, RoomsService } from 'api';
import { CardImportDialog } from 'dialogs';
import { Images } from 'images';
import { RoomsSelectors, ServerSelectors } from 'store';
-import { Room, RouteEnum, User } from 'types';
+import { RouteEnum } from 'types';
+import { useAppSelector } from 'store/store';
import './LeftNav.css';
-const LeftNav = ({ joinedRooms, serverState, user }: LeftNavProps) => {
+interface LeftNavState {
+ anchorEl: Element;
+ showCardImportDialog: boolean;
+ options: string[];
+}
+
+const LeftNav = () => {
+ const joinedRooms = useAppSelector(state => RoomsSelectors.getJoinedRooms(state));
+ const serverState = useAppSelector(state => ServerSelectors.getState(state));
+ const user = useAppSelector(state => ServerSelectors.getUser(state));
const navigate = useNavigate();
const [state, setState] = useState
({
anchorEl: null,
@@ -147,12 +155,12 @@ const LeftNav = ({ joinedRooms, serverState, user }: LeftNavProps) => {
}}
>
{state.options.map((option) => (
- 
-