fix: don't let COMMENTED review override APPROVED or CHANGES_REQUESTED

Make a COMMENTED state never override an APPROVED or CHANGES_REQUESTED
state, for the purposes of the state indicator we show in Reviewers.
Make the indicator stay at the most-significant state.

Fixes dlvhdr#728 (comment)

Author: sideshowbarker

internal/tui/components/prview/prview.go

@@ -350,6 +350,11 @@ func (m *Model) renderRequestedReviewers() string {
 	reviewStates := make(map[string]string)
 	for _, review := range reviews {
 		login := review.Author.Login
+		existingState := reviewStates[login]
+		// Don't override APPROVED or CHANGES_REQUESTED with COMMENTED
+		if review.State == "COMMENTED" && (existingState == "APPROVED" || existingState == "CHANGES_REQUESTED") {
+			continue
+		}
 		reviewStates[login] = review.State
 	}
 

internal/tui/components/prview/reviewers_test.go

@@ -202,6 +202,24 @@ func TestRenderRequestedReviewers(t *testing.T) {
 			},
 			wantContains: []string{"Reviewers", "@charlie", constants.CommentIcon},
 		},
+		"reviewer who approved then commented": {
+			reviewRequests: []data.ReviewRequestNode{},
+			reviews: []data.Review{
+				{Author: struct{ Login string }{Login: "alice"}, State: "APPROVED"},
+				{Author: struct{ Login string }{Login: "alice"}, State: "COMMENTED"},
+			},
+			wantContains:   []string{"Reviewers", "@alice", constants.ApprovedIcon},
+			wantNotContain: []string{constants.CommentIcon},
+		},
+		"reviewer who requested changes then commented": {
+			reviewRequests: []data.ReviewRequestNode{},
+			reviews: []data.Review{
+				{Author: struct{ Login string }{Login: "bob"}, State: "CHANGES_REQUESTED"},
+				{Author: struct{ Login string }{Login: "bob"}, State: "COMMENTED"},
+			},
+			wantContains:   []string{"Reviewers", "@bob", constants.ChangesRequestedIcon},
+			wantNotContain: []string{constants.CommentIcon},
+		},
 		"mix of pending and completed reviews": {
 			reviewRequests: []data.ReviewRequestNode{
 				{