diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index c50905d2e..601a184cb 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -2134,8 +2134,8 @@ function _Chat() {
             onInput={(e) => onInput(e.currentTarget.value)}
             value={userInput}
             onKeyDown={onInputKeyDown}
-            onFocus={scrollToBottom}
-            onClick={scrollToBottom}
+            // onFocus={scrollToBottom}
+            // onClick={scrollToBottom}
             onPaste={handlePaste}
             rows={inputRows}
             autoFocus={autoFocus}
diff --git a/app/store/chat.ts b/app/store/chat.ts
index dbc0b3849..366b0c054 100644
--- a/app/store/chat.ts
+++ b/app/store/chat.ts
@@ -324,7 +324,7 @@ export const useChatStore = createPersistStore(
         );
       },
 
-      currentSession() {
+      currentSession(): ChatSession {
         let index = get().currentSessionIndex;
         const sessions = get().sessions;
 
diff --git a/app/utils/store.ts b/app/utils/store.ts
index b3440b318..ff15bee14 100644
--- a/app/utils/store.ts
+++ b/app/utils/store.ts
@@ -34,7 +34,6 @@ export function createPersistStore<T extends object, M>(
   ) => M,
   persistOptions: SecondParam<typeof persist<T & M & MakeUpdater<T>>>,
 ) {
-  // TODO: merge 报错，很离谱，后续再排查
   persistOptions.storage = createJSONStorage(() => indexedDBStorage);
   const oldOonRehydrateStorage = persistOptions?.onRehydrateStorage;
   persistOptions.onRehydrateStorage = (state) => {