chore: solve merge from main

This commit is contained in:
Tristan Yang
2023-03-23 21:57:46 +08:00
11 changed files with 31 additions and 24 deletions
+2 -4
View File
@@ -14,7 +14,6 @@ import Version from "../../common/component/Version";
import ConfigAgora from "./config/Agora";
import { useAppSelector } from "../../app/store";
import ServerVersionChecker from "../../common/component/ServerVersionChecker";
import useLicense from "../../common/hook/useLicense";
const navs = [
{
@@ -98,10 +97,9 @@ const navs = [
];
const useNavs = () => {
const { upgraded } = useLicense();
const { t } = useTranslation("setting");
const loginUser = useAppSelector((store) => {
return store.authData.user;
const { loginUser, upgraded } = useAppSelector((store) => {
return { loginUser: store.authData.user, upgraded: store.server.upgraded };
});
const transformedNavs = navs.map(n => {
const { name, items, ...rest } = n;