From 24503ce208db8b68cc649d4a5845674bc1736abe Mon Sep 17 00:00:00 2001
From: phlpsong <philsongfei@gmail.com>
Date: Mon, 18 Mar 2024 22:17:48 +0800
Subject: [PATCH 1/2] fix: branch picker refresh issue and switch branch issue

---
 .../CodeEditUI/Views/ToolbarBranchPicker.swift         | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift b/CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift
index 91ed648356..4f88e61079 100644
--- a/CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift
+++ b/CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift
@@ -82,6 +82,7 @@ struct ToolbarBranchPicker: View {
         }
         .task {
             await self.sourceControlManager?.refreshCurrentBranch()
+            await self.sourceControlManager?.refreshBranches()
         }
     }
 
@@ -159,9 +160,6 @@ struct ToolbarBranchPicker: View {
             .padding(.top, 10)
             .padding(5)
             .frame(width: 340)
-            .task {
-                await sourceControlManager.refreshBranches()
-            }
         }
 
         func headerLabel(_ title: String) -> some View {
@@ -193,9 +191,6 @@ struct ToolbarBranchPicker: View {
                 self.title = title
             }
 
-            @Environment(\.dismiss)
-            private var dismiss
-
             var body: some View {
                 Button {
                     switchBranch()
@@ -215,9 +210,6 @@ struct ToolbarBranchPicker: View {
                 Task {
                     do {
                         try await sourceControlManager.checkoutBranch(branch: branch)
-                        await MainActor.run {
-                            dismiss()
-                        }
                     } catch {
                         await sourceControlManager.showAlertForError(title: "Failed to checkout", error: error)
                     }

From 48d102f714763eb9307a12788563c061224de1c2 Mon Sep 17 00:00:00 2001
From: phlpsong <philsongfei@gmail.com>
Date: Mon, 18 Mar 2024 23:18:32 +0800
Subject: [PATCH 2/2] fix: source control history view not refresh after switch
 branch

---
 .../History/Views/SourceControlNavigatorHistoryView.swift    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift b/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift
index 800f489db3..2b54d39ced 100644
--- a/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift
+++ b/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift
@@ -89,6 +89,11 @@ struct SourceControlNavigatorHistoryView: View {
                 }
             }
         }
+        .onReceive(sourceControlManager.$currentBranch) { _ in
+            Task {
+                await updateCommitHistory()
+            }
+        }
         .task {
             await updateCommitHistory()
         }