Git branch picker not load branch list and switch branch issue (CodeE…

…ditApp#1637) * fix: branch picker refresh issue and switch branch issue * fix: source control history view not refresh after switch branch
Angelk90 · Apr 11, 2024 · 7c04cef · 7c04cef
1 parent d1911ac
commit 7c04cef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift b/CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift
@@ -83,6 +83,7 @@ struct ToolbarBranchPicker: View {
         }
         .task {
             await self.sourceControlManager?.refreshCurrentBranch()
+            await self.sourceControlManager?.refreshBranches()
         }
     }
 
@@ -160,9 +161,6 @@ struct ToolbarBranchPicker: View {
             .padding(.top, 10)
             .padding(5)
             .frame(width: 340)
-            .task {
-                await sourceControlManager.refreshBranches()
-            }
         }
 
         func headerLabel(_ title: String) -> some View {
@@ -194,9 +192,6 @@ struct ToolbarBranchPicker: View {
                 self.title = title
             }
 
-            @Environment(\.dismiss)
-            private var dismiss
-
             var body: some View {
                 Button {
                     switchBranch()
@@ -216,9 +211,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)
                     }

diff --git a/...avigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift b/...avigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift
@@ -98,6 +98,11 @@ struct SourceControlNavigatorHistoryView: View {
                 }
             }
         }
+        .onReceive(sourceControlManager.$currentBranch) { _ in
+            Task {
+                await updateCommitHistory()
+            }
+        }
         .task {
             await updateCommitHistory()
         }