Merge branch 'develop'

molvqingtai · Nov 7, 2024 · adc93b8 · adc93b8
2 parents 47d863b + d325be4
commit adc93b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/src/app/content/App.tsx b/src/app/content/App.tsx
@@ -10,7 +10,6 @@ import Setup from '@/app/content/views/Setup'
 import MessageListDomain from '@/domain/MessageList'
 import { useEffect, useRef } from 'react'
 import { Toaster } from 'sonner'
-import { AnimatePresence, motion } from 'framer-motion'
 
 import DanmakuContainer from './components/DanmakuContainer'
 import DanmakuDomain from '@/domain/Danmaku'
@@ -69,18 +68,7 @@ export default function App() {
           <Header />
           <Main />
           <Footer />
-          <AnimatePresence>
-            {notUserInfo && (
-              <motion.div
-                className="contents"
-                initial={{ opacity: 1 }}
-                exit={{ opacity: 0 }}
-                transition={{ duration: 0.3 }}
-              >
-                <Setup></Setup>
-              </motion.div>
-            )}
-          </AnimatePresence>
+          {notUserInfo && <Setup></Setup>}
           <Toaster richColors offset="70px" visibleToasts={1} position="top-center"></Toaster>
         </AppMain>
         <AppButton></AppButton>

diff --git a/src/app/content/views/Setup/index.tsx b/src/app/content/views/Setup/index.tsx
@@ -71,8 +71,8 @@ const Setup: FC = () => {
   const [userInfo, setUserInfo] = useState<UserInfo>()
 
   const handleSetup = () => {
-    send(userInfoDomain.command.UpdateUserInfoCommand(userInfo!))
     send(messageListDomain.command.ClearListCommand())
+    send(userInfoDomain.command.UpdateUserInfoCommand(userInfo!))
   }
 
   const refreshUserInfo = async () => {