diff --git a/apps/mobile/src/features/pull-requests/PullRequestStatusRows.tsx b/apps/mobile/src/features/pull-requests/PullRequestStatusRows.tsx index 311c9c37cec78..ba08ccf57a076 100644 --- a/apps/mobile/src/features/pull-requests/PullRequestStatusRows.tsx +++ b/apps/mobile/src/features/pull-requests/PullRequestStatusRows.tsx @@ -321,7 +321,9 @@ export function PullRequestReviewersRow(props: RowProps) { key={review.id} accessibilityLabel={`${review.author?.login ?? gt("Unknown reviewer")}, ${ review.reviewState === "APPROVED" - ? gt("Approved", { $context: "review state" }) + ? review.outdated + ? gt("Approved before the latest commit") + : gt("Approved", { $context: "review state" }) : review.reviewState === "CHANGES_REQUESTED" ? gt("Changes requested") : gt("Commented", { $context: "review state" }) @@ -338,7 +340,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" @@ -349,6 +351,9 @@ export function PullRequestReviewersRow(props: RowProps) { {review.author?.login ?? gt("Unknown reviewer")} + {review.outdated ? ( + {gt("Outdated")} + ) : null} ))} {props.pr.reviewers diff --git a/apps/mobile/src/features/pull-requests/pullRequestStatus.test.ts b/apps/mobile/src/features/pull-requests/pullRequestStatus.test.ts index e5cb4551db56b..d25dfd621b84c 100644 --- a/apps/mobile/src/features/pull-requests/pullRequestStatus.test.ts +++ b/apps/mobile/src/features/pull-requests/pullRequestStatus.test.ts @@ -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", () => { diff --git a/apps/mobile/src/features/pull-requests/pullRequestStatus.ts b/apps/mobile/src/features/pull-requests/pullRequestStatus.ts index 2b950be41e076..3cdcfb072d160 100644 --- a/apps/mobile/src/features/pull-requests/pullRequestStatus.ts +++ b/apps/mobile/src/features/pull-requests/pullRequestStatus.ts @@ -225,17 +225,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 { diff --git a/apps/mobile/src/i18n/translations/de.json b/apps/mobile/src/i18n/translations/de.json index 37470078895b1..3bc39c9c7967c 100644 --- a/apps/mobile/src/i18n/translations/de.json +++ b/apps/mobile/src/i18n/translations/de.json @@ -2904,8 +2904,10 @@ "750195d317fe7e9e": "Branch, {summary}", "0dafdeb64cb13711": "Per {method, select, merge {Merge} rebase {Rebase} other {{method}}} aktualisieren", "301edbbd0597cf4d": "Unbekannter Reviewer", + "cf3ad61859b09910": "Vor dem letzten Commit genehmigt", "1e74602ca35d4c7e": "Genehmigt", "9f3f817e9111e162": "Kommentiert", + "3e562db94c685f71": "Veraltet", "82e3cbf8c92aa519": "{login}, Review angefordert", "b7b4efdb71c594be": "Reviewer beim Anbieter ansehen", "406bfbc6b51dda02": "Keine Checks gemeldet.", diff --git a/apps/mobile/src/i18n/translations/en.json b/apps/mobile/src/i18n/translations/en.json index f89c5bddb7eb2..dc4eae59e8eaf 100644 --- a/apps/mobile/src/i18n/translations/en.json +++ b/apps/mobile/src/i18n/translations/en.json @@ -2906,8 +2906,10 @@ "750195d317fe7e9e": "Branch, {summary}", "0dafdeb64cb13711": "Update with {method, select, merge {merge} rebase {rebase} other {{method}}}", "301edbbd0597cf4d": "Unknown reviewer", + "cf3ad61859b09910": "Approved before the latest commit", "1e74602ca35d4c7e": "Approved", "9f3f817e9111e162": "Commented", + "3e562db94c685f71": "Outdated", "82e3cbf8c92aa519": "{login}, Review requested", "b7b4efdb71c594be": "View reviewers on provider", "406bfbc6b51dda02": "No checks reported.", diff --git a/apps/mobile/src/i18n/translations/es.json b/apps/mobile/src/i18n/translations/es.json index a0df74614dfda..8ccfa707743b8 100644 --- a/apps/mobile/src/i18n/translations/es.json +++ b/apps/mobile/src/i18n/translations/es.json @@ -2900,8 +2900,10 @@ "750195d317fe7e9e": "Rama, {summary}", "0dafdeb64cb13711": "Actualizar con {method, select, merge {merge} rebase {rebase} other {{method}}}", "301edbbd0597cf4d": "Revisor desconocido", + "cf3ad61859b09910": "Aprobado antes del último commit", "1e74602ca35d4c7e": "Aprobada", "9f3f817e9111e162": "Comentó", + "3e562db94c685f71": "Desactualizado", "82e3cbf8c92aa519": "{login}, revisión solicitada", "b7b4efdb71c594be": "Ver revisores en el proveedor", "406bfbc6b51dda02": "No se informó de ninguna comprobación.", diff --git a/apps/mobile/src/i18n/translations/fr.json b/apps/mobile/src/i18n/translations/fr.json index 9e9d733338aff..14df2f3f1be04 100644 --- a/apps/mobile/src/i18n/translations/fr.json +++ b/apps/mobile/src/i18n/translations/fr.json @@ -2900,8 +2900,10 @@ "750195d317fe7e9e": "Branche, {summary}", "0dafdeb64cb13711": "Mettre à jour avec {method, select, merge {merge} rebase {rebase} other {{method}}}", "301edbbd0597cf4d": "Relecteur inconnu", + "cf3ad61859b09910": "Approuvé avant le dernier commit", "1e74602ca35d4c7e": "Approuvée", "9f3f817e9111e162": "Commentée", + "3e562db94c685f71": "Obsolète", "82e3cbf8c92aa519": "{login}, revue demandée", "b7b4efdb71c594be": "Voir les relecteurs chez le fournisseur", "406bfbc6b51dda02": "Aucun check signalé.", diff --git a/apps/mobile/src/i18n/translations/ja.json b/apps/mobile/src/i18n/translations/ja.json index f8c3f391742a3..8c048d7ecd0af 100644 --- a/apps/mobile/src/i18n/translations/ja.json +++ b/apps/mobile/src/i18n/translations/ja.json @@ -2897,8 +2897,10 @@ "750195d317fe7e9e": "ブランチ、{summary}", "0dafdeb64cb13711": "{method, select, merge {マージ} rebase {リベース} other {{method}}}で更新", "301edbbd0597cf4d": "不明なレビュアー", + "cf3ad61859b09910": "最新のコミットより前に承認", "1e74602ca35d4c7e": "承認済み", "9f3f817e9111e162": "コメント済み", + "3e562db94c685f71": "古い", "82e3cbf8c92aa519": "{login}、レビューをリクエスト済み", "b7b4efdb71c594be": "プロバイダーでレビュアーを表示", "406bfbc6b51dda02": "報告されたチェックはありません。", diff --git a/apps/mobile/src/i18n/translations/ko.json b/apps/mobile/src/i18n/translations/ko.json index 368b459f45b56..edf5a80204dee 100644 --- a/apps/mobile/src/i18n/translations/ko.json +++ b/apps/mobile/src/i18n/translations/ko.json @@ -2901,8 +2901,10 @@ "750195d317fe7e9e": "브랜치, {summary}", "0dafdeb64cb13711": "{method, select, merge {병합} rebase {리베이스} other {{method}}}(으)로 업데이트", "301edbbd0597cf4d": "알 수 없는 검토자", + "cf3ad61859b09910": "최신 커밋 이전에 승인됨", "1e74602ca35d4c7e": "승인함", "9f3f817e9111e162": "댓글 남김", + "3e562db94c685f71": "오래됨", "82e3cbf8c92aa519": "{login}, 검토 요청됨", "b7b4efdb71c594be": "제공자에서 검토자 보기", "406bfbc6b51dda02": "보고된 검사가 없습니다.", diff --git a/apps/mobile/src/i18n/translations/pt-BR.json b/apps/mobile/src/i18n/translations/pt-BR.json index 7529fe5138851..7ed3545d60b8a 100644 --- a/apps/mobile/src/i18n/translations/pt-BR.json +++ b/apps/mobile/src/i18n/translations/pt-BR.json @@ -2900,8 +2900,10 @@ "750195d317fe7e9e": "Branch, {summary}", "0dafdeb64cb13711": "Atualizar com {method, select, merge {merge} rebase {rebase} other {{method}}}", "301edbbd0597cf4d": "Revisor desconhecido", + "cf3ad61859b09910": "Aprovado antes do último commit", "1e74602ca35d4c7e": "Aprovou", "9f3f817e9111e162": "Comentou", + "3e562db94c685f71": "Desatualizado", "82e3cbf8c92aa519": "{login}, revisão solicitada", "b7b4efdb71c594be": "Ver revisores no provedor", "406bfbc6b51dda02": "Nenhuma verificação informada.", diff --git a/apps/mobile/src/i18n/translations/ru.json b/apps/mobile/src/i18n/translations/ru.json index 976f53ecf6dec..357c71a142aee 100644 --- a/apps/mobile/src/i18n/translations/ru.json +++ b/apps/mobile/src/i18n/translations/ru.json @@ -2954,8 +2954,10 @@ "750195d317fe7e9e": "Ветка, {summary}", "0dafdeb64cb13711": "Обновить через {method, select, merge {merge} rebase {rebase} other {{method}}}", "301edbbd0597cf4d": "Неизвестный ревьюер", + "cf3ad61859b09910": "Одобрено до последнего коммита", "1e74602ca35d4c7e": "Одобрено", "9f3f817e9111e162": "Прокомментировано", + "3e562db94c685f71": "Устарело", "82e3cbf8c92aa519": "{login}, запрошено ревью", "b7b4efdb71c594be": "Посмотреть ревьюеров у провайдера", "406bfbc6b51dda02": "Нет проверок.", diff --git a/apps/mobile/src/i18n/translations/sv.json b/apps/mobile/src/i18n/translations/sv.json index 45a259d11d34b..0e6f34ea5dfe6 100644 --- a/apps/mobile/src/i18n/translations/sv.json +++ b/apps/mobile/src/i18n/translations/sv.json @@ -2906,8 +2906,10 @@ "750195d317fe7e9e": "Gren, {summary}", "0dafdeb64cb13711": "Uppdatera med {method, select, merge {merge} rebase {rebase} other {{method}}}", "301edbbd0597cf4d": "Okänd granskare", + "cf3ad61859b09910": "Godkänd före den senaste committen", "1e74602ca35d4c7e": "Godkänd", "9f3f817e9111e162": "Kommenterad", + "3e562db94c685f71": "Inaktuell", "82e3cbf8c92aa519": "{login}, granskning begärd", "b7b4efdb71c594be": "Visa granskare hos leverantören", "406bfbc6b51dda02": "Inga kontroller rapporterade.", diff --git a/apps/mobile/src/i18n/translations/zh.json b/apps/mobile/src/i18n/translations/zh.json index 860ff98a0f10c..837ee9d37cf47 100644 --- a/apps/mobile/src/i18n/translations/zh.json +++ b/apps/mobile/src/i18n/translations/zh.json @@ -2901,8 +2901,10 @@ "750195d317fe7e9e": "分支,{summary}", "0dafdeb64cb13711": "使用{method, select, merge {合并} rebase {变基} other {{method}}}更新", "301edbbd0597cf4d": "未知审查者", + "cf3ad61859b09910": "在最新提交之前批准", "1e74602ca35d4c7e": "已批准", "9f3f817e9111e162": "已评论", + "3e562db94c685f71": "已过时", "82e3cbf8c92aa519": "{login},已请求审查", "b7b4efdb71c594be": "在提供方上查看审查者", "406bfbc6b51dda02": "未报告任何检查。",