Merge branch 'rome/release/2024-01-26' into rome/test

This commit is contained in:
Patrick Fic
2024-01-29 12:42:00 -08:00

View File

@@ -14,7 +14,7 @@ import Icon, {
//GlobalOutlined, //GlobalOutlined,
HomeFilled, HomeFilled,
ImportOutlined, ImportOutlined,
InfoCircleOutlined, // InfoCircleOutlined,
LineChartOutlined, LineChartOutlined,
PaperClipOutlined, PaperClipOutlined,
PhoneOutlined, PhoneOutlined,
@@ -27,8 +27,11 @@ import Icon, {
UserOutlined, UserOutlined,
} from "@ant-design/icons"; } from "@ant-design/icons";
import { useTreatments } from "@splitsoftware/splitio-react"; import { useTreatments } from "@splitsoftware/splitio-react";
import { Layout, Menu, Switch, Tooltip } from "antd"; import {
import React, { useEffect, useState } from "react"; Layout,
Menu, // Switch, Tooltip
} from "antd";
import React from "react"; //, { useEffect, useState }
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { BsKanban } from "react-icons/bs"; import { BsKanban } from "react-icons/bs";
import { import {
@@ -53,7 +56,7 @@ import {
selectBodyshop, selectBodyshop,
selectCurrentUser, selectCurrentUser,
} from "../../redux/user/user.selectors"; } from "../../redux/user/user.selectors";
import { handleBeta, setBeta, checkBeta } from "../../utils/handleBeta"; //import { handleBeta, setBeta, checkBeta } from "../../utils/handleBeta";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser, currentUser: selectCurrentUser,
@@ -104,20 +107,20 @@ function Header({
{}, {},
bodyshop && bodyshop.imexshopid bodyshop && bodyshop.imexshopid
); );
const [betaSwitch, setBetaSwitch] = useState(false); //const [betaSwitch, setBetaSwitch] = useState(false);
const { t } = useTranslation(); const { t } = useTranslation();
useEffect(() => { // useEffect(() => {
const isBeta = checkBeta(); // const isBeta = checkBeta();
setBetaSwitch(isBeta); // setBetaSwitch(isBeta);
}, []); // }, []);
const betaSwitchChange = (checked) => { // const betaSwitchChange = (checked) => {
setBeta(checked); // setBeta(checked);
setBetaSwitch(checked); // setBetaSwitch(checked);
handleBeta(); // handleBeta();
}; // };
return ( return (
<Layout.Header> <Layout.Header>