fix: spacing and always use last commit msg in ui

dlvhdr · Sep 6, 2024 · 439f61c · 439f61c
1 parent 0dfd6ac
commit 439f61c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/ui/components/branch/branch.go b/ui/components/branch/branch.go
@@ -178,7 +178,7 @@ func (b *Branch) renderExtendedTitle(isSelected bool) string {
 	baseStyle := b.getBaseStyle(isSelected)
 	width := b.getMaxWidth()
 
-	title := b.renderPRTitleOrCommigMsg(isSelected, width)
+	title := b.renderLastCommigMsg(isSelected, width)
 	branch := b.renderBranch(isSelected, width)
 	return baseStyle.Render(lipgloss.JoinVertical(lipgloss.Left, branch, title))
 }
@@ -332,12 +332,10 @@ func (b *Branch) renderCommitsAheadBehind(isSelected bool) string {
 	return lipgloss.JoinHorizontal(lipgloss.Top, commitsAhead, commitsBehind)
 }
 
-func (b *Branch) renderPRTitleOrCommigMsg(isSelected bool, width int) string {
+func (b *Branch) renderLastCommigMsg(isSelected bool, width int) string {
 	baseStyle := b.getBaseStyle(isSelected)
 	title := "-"
-	if b.PR != nil {
-		title = fmt.Sprintf("#%d %s", b.PR.Number, b.PR.Title)
-	} else if b.Data.LastCommitMsg != nil {
+	if b.Data.LastCommitMsg != nil {
 		title = *b.Data.LastCommitMsg
 	}
 	return baseStyle.Foreground(b.Ctx.Theme.SecondaryText).Width(width).MaxWidth(width).Render(title)

diff --git a/ui/components/branchsidebar/branchsidebar.go b/ui/components/branchsidebar/branchsidebar.go
@@ -34,6 +34,7 @@ func (m Model) View() string {
 
 	s.WriteString(m.branch.Data.Name)
 	if m.branch.PR != nil {
+		s.WriteString("\n")
 		s.WriteString(fmt.Sprintf("#%d %s", m.branch.PR.GetNumber(), m.branch.PR.Title))
 	}