resolve conflict

.github/workflows/sync.yml

@@ -1,16 +1,29 @@
-# .github/workflows/sync.yml
-name: Sync Fork
+name: Upstream Sync
 
 on:
   schedule:
-        - cron: "0 8 * * *" # 每天0点触发
+    - cron: '0 */12 * * *' # every 12 hours
+  workflow_dispatch: # on button click
+
 jobs:
-    repo-sync:
+  sync_latest_from_upstream:
+    name: Sync latest commits from upstream repo
     runs-on: ubuntu-latest
+
     steps:
-            - uses: TG908/fork-sync@v1.1
+    # Step 1: run a standard checkout action, provided by github
+    - name: Checkout target repo
+      uses: actions/checkout@v3
+
+    # Step 2: run the sync action
+    - name: Sync upstream changes
+      id: sync
+      uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
       with:
-                  github_token: ${{ secrets.GITHUB_TOKEN }} # 这个 token action 会默认配置, 这里只需这样写就行
-                  owner: Yidadaa # fork 上游项目 owner
-                  head: main # fork 上游项目需要同步的分支
-                  base: main # 需要同步到本项目的目标分支
+        upstream_sync_repo: Yidadaa/ChatGPT-Next-Web
+        upstream_sync_branch: main
+        target_sync_branch: main
+        target_repo_token: ${{ secrets.GITHUB_TOKEN }} # automatically generated, no need to set
+        
+        # Set test_mode true to run tests instead of the true action!!
+        test_mode: false

app/components/home.tsx

@@ -146,7 +146,7 @@ export function ChatList() {
         {sidebarCollapse ? <BotIcon /> : null}
       </div>
 
-      <div className={styles["chat-list-collapse"]}>
+      <div className={styles["chat-list"]}>
         {sessions.map((item, i) => (
           <ChatItem
             title={item.topic}
@@ -155,7 +155,7 @@ export function ChatList() {
             key={i}
             selected={i === selectedIndex}
             onClick={() => selectSession(i)}
-            onDelete={() => removeSession(i)}
+            onDelete={() => confirm(Locale.Home.DeleteChat) && removeSession(i)}
           />
         ))}
       </div>
@@ -494,7 +494,10 @@ export function Chat() {
                       className="markdown-body"
                       style={{ fontSize: `${fontSize}px` }}
                       onContextMenu={(e) => onRightClick(e, message)}
-                      onDoubleClickCapture={() => setUserInput(message.content)}
+                      onDoubleClickCapture={() => {
+                        if (!isMobileScreen()) return;
+                        setUserInput(message.content);
+                      }}
                     >
                       <Markdown content={message.content} />
                     </div>
@@ -511,7 +514,7 @@ export function Chat() {
             </div>
           );
         })}
-        <div ref={latestMessageRef} style={{ opacity: 0, height: "4em" }}>
+        <div ref={latestMessageRef} style={{ opacity: 0, height: "1px" }}>
           -
         </div>
       </div>