From 874a877301ff04dec136c8cec09d23df5ae89273 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.law@cardstack.com>
Date: Wed, 25 Mar 2026 18:13:05 +0800
Subject: [PATCH 1/5] add reviewer on review section

---
 .../components/isolated/review-section.gts    | 17 ++++++++++++-----
 packages/catalog-realm/pr-card/pr-card.gts    | 14 +++++++++++++-
 packages/catalog-realm/pr-card/utils.ts       | 19 ++++++++++++++-----
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/packages/catalog-realm/pr-card/components/isolated/review-section.gts b/packages/catalog-realm/pr-card/components/isolated/review-section.gts
index 978538e68e..91723a8802 100644
--- a/packages/catalog-realm/pr-card/components/isolated/review-section.gts
+++ b/packages/catalog-realm/pr-card/components/isolated/review-section.gts
@@ -5,7 +5,10 @@ import type { ReviewState } from '../../utils';
 // ── Sub-components ──────────────────────────────────────────────────────
 
 interface ReviewStateBadgeSignature {
-  Args: { state: ReviewState };
+  Args: {
+    state: ReviewState;
+    reviewerName: string | null;
+  };
 }
 
 class ReviewStateBadge extends GlimmerComponent<ReviewStateBadgeSignature> {
@@ -34,7 +37,9 @@ class ReviewStateBadge extends GlimmerComponent<ReviewStateBadgeSignature> {
 
   <template>
     {{#if this.hasState}}
-      <span class='review-state-badge {{this.stateClass}}'>{{this.label}}</span>
+      <span class='review-state-badge {{this.stateClass}}'>{{this.label}}{{#if
+          @reviewerName
+        }} by {{@reviewerName}}{{/if}}</span>
     {{/if}}
 
     <style scoped>
@@ -88,7 +93,7 @@ class ReviewStateBadge extends GlimmerComponent<ReviewStateBadgeSignature> {
 interface ReviewSectionSignature {
   Args: {
     reviewState: ReviewState;
-    reviewerName: string;
+    reviewerName: string | null;
     comment: string;
     reviewUrl: string | undefined;
     hasReview: boolean;
@@ -113,7 +118,10 @@ export class ReviewSection extends GlimmerComponent<ReviewSectionSignature> {
     <div class='review-section'>
       <div class='review-heading-row'>
         <h2 class='section-heading'>Reviews</h2>
-        <ReviewStateBadge @state={{@reviewState}} />
+        <ReviewStateBadge
+          @state={{@reviewState}}
+          @reviewerName={{@reviewerName}}
+        />
       </div>
 
       {{#if @hasReview}}
@@ -167,7 +175,6 @@ export class ReviewSection extends GlimmerComponent<ReviewSectionSignature> {
       .review-heading-row {
         display: flex;
         align-items: center;
-        justify-content: space-between;
         gap: var(--boxel-sp-xs);
       }
       .review-list {
diff --git a/packages/catalog-realm/pr-card/pr-card.gts b/packages/catalog-realm/pr-card/pr-card.gts
index 820dcf511a..05a3b74e76 100644
--- a/packages/catalog-realm/pr-card/pr-card.gts
+++ b/packages/catalog-realm/pr-card/pr-card.gts
@@ -30,6 +30,7 @@ import {
   buildLatestReviewByReviewer,
   computeLatestReviewState,
   findLatestChangesRequestedEvent,
+  findLatestApprovedEvent,
   buildGithubEventCardRef,
   searchEventQuery,
   buildRealmHrefs,
@@ -192,6 +193,17 @@ class IsolatedTemplate extends Component<typeof PrCard> {
     return !!this.latestPrReviewCommentEventInstance;
   }
 
+  get latestReviewerName() {
+    let state = this.latestReviewState;
+    let event: any = null;
+    if (state === 'changes_requested') {
+      event = findLatestChangesRequestedEvent(this.latestReviewByReviewer);
+    } else if (state === 'approved') {
+      event = findLatestApprovedEvent(this.latestReviewByReviewer);
+    }
+    return event?.payload?.review?.user?.login ?? null;
+  }
+
   // ── Mergeability ──
   get isClosed() {
     let label = this.latestPrActionLabel;
@@ -256,7 +268,7 @@ class IsolatedTemplate extends Component<typeof PrCard> {
           <hr class='status-divider' />
           <ReviewSection
             @reviewState={{this.latestReviewState}}
-            @reviewerName={{this.latestChangesRequestedReviewerName}}
+            @reviewerName={{this.latestReviewerName}}
             @comment={{this.latestChangesRequestedComment}}
             @reviewUrl={{this.latestChangesRequestedReviewUrl}}
             @hasReview={{this.hasReview}}
diff --git a/packages/catalog-realm/pr-card/utils.ts b/packages/catalog-realm/pr-card/utils.ts
index a5f23dd11a..3b054a52c0 100644
--- a/packages/catalog-realm/pr-card/utils.ts
+++ b/packages/catalog-realm/pr-card/utils.ts
@@ -21,10 +21,7 @@ export type CiGroup = {
   items: CiItem[];
 };
 
-export type ReviewState =
-  | 'changes_requested'
-  | 'approved'
-  | 'unknown';
+export type ReviewState = 'changes_requested' | 'approved' | 'unknown';
 
 // ── PR State Helpers ─────────────────────────────────────────────────────
 
@@ -299,7 +296,9 @@ export function computeLatestReviewState(
 export function findLatestChangesRequestedEvent(
   latestReviewByReviewer: Map<string, any>,
 ): any | null {
-  let activeChangesRequestedEvents = [...latestReviewByReviewer.values()].filter(
+  let activeChangesRequestedEvents = [
+    ...latestReviewByReviewer.values(),
+  ].filter(
     (event: any) =>
       normalizeReviewState(event?.payload?.review?.state) ===
         'changes_requested' &&
@@ -308,6 +307,16 @@ export function findLatestChangesRequestedEvent(
   return activeChangesRequestedEvents[0] ?? null;
 }
 
+export function findLatestApprovedEvent(
+  latestReviewByReviewer: Map<string, any>,
+): any | null {
+  let approvedEvents = [...latestReviewByReviewer.values()].filter(
+    (event: any) =>
+      normalizeReviewState(event?.payload?.review?.state) === 'approved',
+  );
+  return approvedEvents[0] ?? null;
+}
+
 // ── Query Builders ───────────────────────────────────────────────────────
 
 export function buildGithubEventCardRef(moduleBaseUrl: string) {

From 45cb17747b2da1ef368173691e2c07140b2f7c25 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.law@cardstack.com>
Date: Thu, 26 Mar 2026 20:45:43 +0800
Subject: [PATCH 2/5] show approve comment too

---
 packages/catalog-realm/pr-card/pr-card.gts | 36 ++++++++++------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/packages/catalog-realm/pr-card/pr-card.gts b/packages/catalog-realm/pr-card/pr-card.gts
index 05a3b74e76..531d4709e0 100644
--- a/packages/catalog-realm/pr-card/pr-card.gts
+++ b/packages/catalog-realm/pr-card/pr-card.gts
@@ -169,23 +169,23 @@ class IsolatedTemplate extends Component<typeof PrCard> {
   }
 
   get latestPrReviewCommentEventInstance() {
-    return findLatestChangesRequestedEvent(this.latestReviewByReviewer);
-  }
-
-  get latestChangesRequestedReviewerName() {
-    return (
-      this.latestPrReviewCommentEventInstance?.payload?.review?.user?.login ??
-      'Unknown reviewer'
-    );
+    let state = this.latestReviewState;
+    if (state === 'changes_requested') {
+      return findLatestChangesRequestedEvent(this.latestReviewByReviewer);
+    }
+    if (state === 'approved') {
+      return findLatestApprovedEvent(this.latestReviewByReviewer);
+    }
+    return null;
   }
 
-  get latestChangesRequestedComment() {
+  get latestReviewComment() {
     let comment =
       this.latestPrReviewCommentEventInstance?.payload?.review?.body?.trim();
     return comment || '-';
   }
 
-  get latestChangesRequestedReviewUrl() {
+  get latestReviewCommentUrl() {
     return this.latestPrReviewCommentEventInstance?.payload?.review?.html_url;
   }
 
@@ -194,14 +194,10 @@ class IsolatedTemplate extends Component<typeof PrCard> {
   }
 
   get latestReviewerName() {
-    let state = this.latestReviewState;
-    let event: any = null;
-    if (state === 'changes_requested') {
-      event = findLatestChangesRequestedEvent(this.latestReviewByReviewer);
-    } else if (state === 'approved') {
-      event = findLatestApprovedEvent(this.latestReviewByReviewer);
-    }
-    return event?.payload?.review?.user?.login ?? null;
+    return (
+      this.latestPrReviewCommentEventInstance?.payload?.review?.user?.login ??
+      null
+    );
   }
 
   // ── Mergeability ──
@@ -269,8 +265,8 @@ class IsolatedTemplate extends Component<typeof PrCard> {
           <ReviewSection
             @reviewState={{this.latestReviewState}}
             @reviewerName={{this.latestReviewerName}}
-            @comment={{this.latestChangesRequestedComment}}
-            @reviewUrl={{this.latestChangesRequestedReviewUrl}}
+            @comment={{this.latestReviewComment}}
+            @reviewUrl={{this.latestReviewCommentUrl}}
             @hasReview={{this.hasReview}}
           />
         </section>

From d4c5874316c8f6290a20a79bee32366a3ccc4673 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.law@cardstack.com>
Date: Thu, 26 Mar 2026 20:56:57 +0800
Subject: [PATCH 3/5] update css

---
 .../catalog-realm/pr-card/components/isolated/review-section.gts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/catalog-realm/pr-card/components/isolated/review-section.gts b/packages/catalog-realm/pr-card/components/isolated/review-section.gts
index 91723a8802..05f24e6b9b 100644
--- a/packages/catalog-realm/pr-card/components/isolated/review-section.gts
+++ b/packages/catalog-realm/pr-card/components/isolated/review-section.gts
@@ -175,6 +175,7 @@ export class ReviewSection extends GlimmerComponent<ReviewSectionSignature> {
       .review-heading-row {
         display: flex;
         align-items: center;
+        justify-content: space-between;
         gap: var(--boxel-sp-xs);
       }
       .review-list {

From 58f84ae6b36ef23005ce860b7f9631f5cdbee78a Mon Sep 17 00:00:00 2001
From: Lucas <lucas.law@cardstack.com>
Date: Thu, 26 Mar 2026 21:05:48 +0800
Subject: [PATCH 4/5] fix codex feedback

---
 packages/catalog-realm/pr-card/utils.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/catalog-realm/pr-card/utils.ts b/packages/catalog-realm/pr-card/utils.ts
index 3b054a52c0..3b86d7c72e 100644
--- a/packages/catalog-realm/pr-card/utils.ts
+++ b/packages/catalog-realm/pr-card/utils.ts
@@ -301,8 +301,7 @@ export function findLatestChangesRequestedEvent(
   ].filter(
     (event: any) =>
       normalizeReviewState(event?.payload?.review?.state) ===
-        'changes_requested' &&
-      (event?.payload?.review?.body ?? '').trim().length > 0,
+        'changes_requested',
   );
   return activeChangesRequestedEvents[0] ?? null;
 }

From 8a29db00e079fd26da7ffeb1be8cfb7e23ca083f Mon Sep 17 00:00:00 2001
From: Lucas <lucas.law@cardstack.com>
Date: Fri, 27 Mar 2026 09:47:04 +0800
Subject: [PATCH 5/5] fix copilot feedback

---
 packages/catalog-realm/pr-card/pr-card.gts | 10 +++++-----
 packages/catalog-realm/pr-card/utils.ts    | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/catalog-realm/pr-card/pr-card.gts b/packages/catalog-realm/pr-card/pr-card.gts
index 531d4709e0..f407130666 100644
--- a/packages/catalog-realm/pr-card/pr-card.gts
+++ b/packages/catalog-realm/pr-card/pr-card.gts
@@ -168,7 +168,7 @@ class IsolatedTemplate extends Component<typeof PrCard> {
     return computeLatestReviewState(this.latestReviewByReviewer);
   }
 
-  get latestPrReviewCommentEventInstance() {
+  get latestPrReviewEventInstance() {
     let state = this.latestReviewState;
     if (state === 'changes_requested') {
       return findLatestChangesRequestedEvent(this.latestReviewByReviewer);
@@ -181,21 +181,21 @@ class IsolatedTemplate extends Component<typeof PrCard> {
 
   get latestReviewComment() {
     let comment =
-      this.latestPrReviewCommentEventInstance?.payload?.review?.body?.trim();
+      this.latestPrReviewEventInstance?.payload?.review?.body?.trim();
     return comment || '-';
   }
 
   get latestReviewCommentUrl() {
-    return this.latestPrReviewCommentEventInstance?.payload?.review?.html_url;
+    return this.latestPrReviewEventInstance?.payload?.review?.html_url;
   }
 
   get hasReview() {
-    return !!this.latestPrReviewCommentEventInstance;
+    return !!this.latestPrReviewEventInstance;
   }
 
   get latestReviewerName() {
     return (
-      this.latestPrReviewCommentEventInstance?.payload?.review?.user?.login ??
+      this.latestPrReviewEventInstance?.payload?.review?.user?.login ??
       null
     );
   }
diff --git a/packages/catalog-realm/pr-card/utils.ts b/packages/catalog-realm/pr-card/utils.ts
index 3b86d7c72e..9d7c0db079 100644
--- a/packages/catalog-realm/pr-card/utils.ts
+++ b/packages/catalog-realm/pr-card/utils.ts
@@ -296,24 +296,24 @@ export function computeLatestReviewState(
 export function findLatestChangesRequestedEvent(
   latestReviewByReviewer: Map<string, any>,
 ): any | null {
-  let activeChangesRequestedEvents = [
-    ...latestReviewByReviewer.values(),
-  ].filter(
-    (event: any) =>
-      normalizeReviewState(event?.payload?.review?.state) ===
-        'changes_requested',
+  return (
+    [...latestReviewByReviewer.values()].find(
+      (event: any) =>
+        normalizeReviewState(event?.payload?.review?.state) ===
+          'changes_requested',
+    ) ?? null
   );
-  return activeChangesRequestedEvents[0] ?? null;
 }
 
 export function findLatestApprovedEvent(
   latestReviewByReviewer: Map<string, any>,
 ): any | null {
-  let approvedEvents = [...latestReviewByReviewer.values()].filter(
-    (event: any) =>
-      normalizeReviewState(event?.payload?.review?.state) === 'approved',
+  return (
+    [...latestReviewByReviewer.values()].find(
+      (event: any) =>
+        normalizeReviewState(event?.payload?.review?.state) === 'approved',
+    ) ?? null
   );
-  return approvedEvents[0] ?? null;
 }
 
 // ── Query Builders ───────────────────────────────────────────────────────