Solve conflicts

This commit is contained in:
Nicola Benaglia
2025-04-10 09:08:02 +02:00
parent 2cce4ec7c6
commit d687db11f2
6 changed files with 1146 additions and 2319 deletions

View File

@@ -358,7 +358,6 @@ export const AppsCategoryInfoLabel = styled(Typography)(({ theme }) => ({
fontSize: "12px",
fontWeight: 700,
lineHeight: 1.2,
color: "#8D8F93",
backgroundColor: theme.palette.background.default,
color: theme.palette.text.primary,
}));

View File

@@ -74,9 +74,6 @@ const {getIndividualUserInfo} = useContext(MyContext)
const [selectedReaction, setSelectedReaction] = useState(null);
const [userInfo, setUserInfo] = useState(null)
const [anchorEl, setAnchorEl] = useState(null);
const [selectedReaction, setSelectedReaction] = useState(null);
useEffect(()=> {
const getInfo = async ()=> {
if(!message?.sender) return

View File

@@ -94,7 +94,6 @@ export const DesktopSideBar = ({
hasUnreadDirects || hasUnreadGroups
? "var(--unread)"
: theme.palette.text.primary
? "rgba(250, 250, 250, 0.5)"
}
/>
</IconWrapper>