合并冲突

This commit is contained in:
Yukino_fox
2026-04-19 12:33:58 +08:00
parent 6e74534e21
commit 6ce87541b7
6 changed files with 158 additions and 154 deletions
+2 -7
View File
@@ -250,9 +250,7 @@ function MainContent(): React.JSX.Element {
}, [])
useEffect(() => {
const handleOAuthUserUpdated = (
event: Event
) => {
const handleOAuthUserUpdated = (event: Event) => {
const customEvent = event as CustomEvent<{
user?: { name?: string } | null
}>
@@ -267,10 +265,7 @@ function MainContent(): React.JSX.Element {
window.addEventListener("ss:oauth-user-updated", handleOAuthUserUpdated as EventListener)
return () => {
window.removeEventListener(
"ss:oauth-user-updated",
handleOAuthUserUpdated as EventListener
)
window.removeEventListener("ss:oauth-user-updated", handleOAuthUserUpdated as EventListener)
}
}, [refreshPermissionFromAuth])