fix: empty checks + sidebar fixes

Author: dlvhdr

ui/components/prsidebar/checks.go

@@ -41,8 +41,18 @@ func (m *Model) renderChecksOverview() string {
 	}
 
 	box := lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(borderColor).Width(w)
+	parts := make([]string, 0)
+	if review != "" {
+		parts = append(parts, review)
+	}
+	if checks != "" {
+		parts = append(parts, checks)
+	}
+	if merge != "" {
+		parts = append(parts, merge)
+	}
 
-	return box.Render(lipgloss.JoinVertical(lipgloss.Left, review, checks, merge))
+	return box.Render(lipgloss.JoinVertical(lipgloss.Left, parts...))
 }
 
 func (m *Model) viewChecksStatus() (string, checkSectionStatus) {
@@ -214,6 +224,9 @@ func (m *Model) viewCheckCategory(icon, title, subtitle string, isLast bool) str
 	if subtitle != "" {
 		category = lipgloss.JoinVertical(lipgloss.Left, category, sSub.MarginLeft(2).Render(subtitle))
 	}
+	if category == "" {
+		return ""
+	}
 	return part.Render(category)
 }
 

ui/components/prsidebar/prsidebar.go

@@ -310,7 +310,7 @@ func (m *Model) renderDescription() string {
 		desc,
 		"",
 		lipgloss.JoinHorizontal(lipgloss.Top,
-			lipgloss.NewStyle().Foreground(m.ctx.Theme.FaintText).Render(lipgloss.NewStyle().Bold(true).Render("@"+m.pr.Data.Author.Login)),
+			lipgloss.NewStyle().Foreground(m.ctx.Theme.PrimaryText).Render(lipgloss.NewStyle().Bold(true).Render("@"+m.pr.Data.Author.Login)),
 			" ",
 			lipgloss.NewStyle().Foreground(m.ctx.Theme.FaintText).Render("commented", time, "ago"),
 		),
@@ -497,3 +497,7 @@ func (m *Model) prAssignees() []string {
 	}
 	return assignees
 }
+
+func (m *Model) GoToFirstTab() {
+	m.carousel.SetCursor(0)
+}

ui/context/styles.go

@@ -97,7 +97,10 @@ func InitStyles(theme theme.Theme) Styles {
 		Dark:  "#3DF294",
 	}
 	s.Colors.OpenPR = s.Colors.OpenIssue
-	s.Colors.ClosedPR = s.Colors.ClosedIssue
+	s.Colors.ClosedPR = lipgloss.AdaptiveColor{
+		Light: "#656C76",
+		Dark:  "#656C76",
+	}
 	s.Colors.MergedPR = lipgloss.AdaptiveColor{
 		Light: "#A371F7",
 		Dark:  "#A371F7",

ui/ui.go

@@ -351,6 +351,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				cmds = append(cmds, m.openBrowser())
 
 			case key.Matches(msg, keys.PRKeys.Approve):
+				m.prSidebar.GoToFirstTab()
 				m.sidebar.IsOpen = true
 				cmd = m.prSidebar.SetIsApproving(true)
 				m.syncMainContentWidth()
@@ -359,6 +360,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				return m, cmd
 
 			case key.Matches(msg, keys.PRKeys.Assign):
+				m.prSidebar.GoToFirstTab()
 				m.sidebar.IsOpen = true
 				cmd = m.prSidebar.SetIsAssigning(true)
 				m.syncMainContentWidth()
@@ -367,6 +369,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				return m, cmd
 
 			case key.Matches(msg, keys.PRKeys.Unassign):
+				m.prSidebar.GoToFirstTab()
 				m.sidebar.IsOpen = true
 				cmd = m.prSidebar.SetIsUnassigning(true)
 				m.syncMainContentWidth()
@@ -375,6 +378,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				return m, cmd
 
 			case key.Matches(msg, keys.PRKeys.Comment):
+				m.prSidebar.GoToFirstTab()
 				m.sidebar.IsOpen = true
 				cmd = m.prSidebar.SetIsCommenting(true)
 				m.syncMainContentWidth()
@@ -672,6 +676,7 @@ func (m *Model) setCurrSectionId(newSectionId int) {
 }
 
 func (m *Model) onViewedRowChanged() tea.Cmd {
+	m.prSidebar.GoToFirstTab()
 	cmd := m.syncSidebar()
 	m.sidebar.ScrollToTop()
 	return cmd