Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ export function PullRequestReviewersRow(props: RowProps) {
{summary.reviews.map((review) => (
<View
key={review.id}
accessibilityLabel={`${review.author?.login ?? "Unknown reviewer"}, ${review.reviewState === "APPROVED" ? "Approved" : review.reviewState === "CHANGES_REQUESTED" ? "Changes requested" : "Commented"}`}
accessibilityLabel={`${review.author?.login ?? "Unknown reviewer"}, ${review.reviewState === "APPROVED" ? (review.outdated ? "Approved before the latest commit" : "Approved") : review.reviewState === "CHANGES_REQUESTED" ? "Changes requested" : "Commented"}`}
className="min-h-14 flex-row items-center gap-3 px-4 py-2"
>
<SymbolView
Expand All @@ -295,7 +295,7 @@ export function PullRequestReviewersRow(props: RowProps) {
}
size={18}
tintColorClassName={
review.reviewState === "APPROVED"
review.reviewState === "APPROVED" && !review.outdated
? "accent-adaptive-emerald-600-400"
: review.reviewState === "CHANGES_REQUESTED"
? "accent-danger-foreground"
Expand All @@ -306,6 +306,9 @@ export function PullRequestReviewersRow(props: RowProps) {
<Text className="min-w-0 flex-1 text-sm font-t3-medium" numberOfLines={1}>
{review.author?.login ?? "Unknown reviewer"}
</Text>
{review.outdated ? (
<Text className="shrink-0 text-sm text-foreground-muted">Outdated</Text>
) : null}
</View>
))}
{props.pr.reviewers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ describe("mobile overview review status", () => {
},
);
expect(result.title).toBe("Awaiting review");
expect(result.reviews.map((review) => review.outdated)).toEqual([true]);
});

it("keeps an approval when a later review only comments, and normalizes provider spelling", () => {
Expand Down
15 changes: 9 additions & 6 deletions apps/mobile/src/features/pull-requests/pullRequestStatus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,17 +165,20 @@ export function pullRequestReviewSummary(
if (!previous || Date.parse(review.createdAt) >= Date.parse(previous.createdAt))
latest.set(key, { ...review, reviewState: state });
}
const reviews = [
...[...latest.values()].filter((review) => review.reviewState !== "DISMISSED"),
...[...comments.entries()].filter(([key]) => !latest.has(key)).map(([, review]) => review),
];
const requested = reviews.filter((review) => review.reviewState === "CHANGES_REQUESTED");
const newestCommit = Math.max(
0,
...(activity?.commits.map((commit) => Date.parse(commit.committedDate)) ?? []),
);
const reviews = [
...[...latest.values()].filter((review) => review.reviewState !== "DISMISSED"),
...[...comments.entries()].filter(([key]) => !latest.has(key)).map(([, review]) => review),
].map((review) => ({
...review,
outdated: review.reviewState === "APPROVED" && Date.parse(review.createdAt) < newestCommit,
}));
const requested = reviews.filter((review) => review.reviewState === "CHANGES_REQUESTED");
const approved = reviews.filter(
(review) => review.reviewState === "APPROVED" && Date.parse(review.createdAt) >= newestCommit,
(review) => review.reviewState === "APPROVED" && !review.outdated,
);
if (requested.length)
return {
Expand Down
Loading