Skip to content

Commit c879d45

Browse files
flambohflamboh
committed
fix(mobile): pull request badges show merged, closed and draft states
The thread list badge, composer PR suggestions and the Git sheet's linked PR rows always drew the open pull request glyph, so merged, closed and draft PRs looked alike. They now pick the state glyph and tone from pullRequestStatus, matching web. Android composer suggestions no longer show a merge icon for every PR.
1 parent 67b2f33 commit c879d45

4 files changed

Lines changed: 26 additions & 6 deletions

File tree

‎apps/mobile/src/features/threads/ComposerCommandPopover.tsx‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { SymbolView, type AppSymbolName } from "../../components/ui/AppSymbol";
1616
import { AppText as Text } from "../../components/ui/AppText";
1717
import { GlassSurface } from "../../components/ui/GlassSurface";
1818
import { PierreEntryIcon } from "../../components/PierreEntryIcon";
19-
import { PullRequestGlyph } from "../pull-requests/pullRequestGlyphs";
19+
import { pullRequestStatus } from "../pull-requests/pullRequestStatus";
2020
export type ComposerCommandItem =
2121
| {
2222
readonly id: string;
@@ -100,7 +100,7 @@ const SKILL_SOURCE_SYMBOL_BY_KIND: Record<ProviderSkillSourceKind, AppSymbolName
100100
function itemIcon(item: ComposerCommandItem): AppSymbolName | null {
101101
switch (item.type) {
102102
case "pull-request":
103-
return PullRequestGlyph.pullRequest;
103+
return pullRequestStatus(item.pullRequest).icon;
104104
case "slash-command":
105105
case "provider-slash-command":
106106
return "terminal";
@@ -167,7 +167,11 @@ const CommandRow = memo(function CommandRow(props: {
167167
<SymbolView
168168
name={iconName}
169169
size={14}
170-
tintColorClassName={"accent-icon-subtle"}
170+
tintColorClassName={
171+
props.item.type === "pull-request"
172+
? pullRequestStatus(props.item.pullRequest).tint
173+
: "accent-icon-subtle"
174+
}
171175
type="monochrome"
172176
/>
173177
) : null}

‎apps/mobile/src/features/threads/git/GitOverviewSheet.tsx‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import { vcsEnvironment } from "../../../state/vcs";
4646
import { resolveGitOverviewReviewNavigationAction } from "./git-overview-navigation";
4747
import { MetaCard, SheetListRow, menuItemIconName, statusSummary } from "./gitSheetComponents";
4848
import { PullRequestGlyph } from "../../pull-requests/pullRequestGlyphs";
49+
import { pullRequestStatus } from "../../pull-requests/pullRequestStatus";
4950

5051
const HEADER_SCROLL_EDGE_EFFECTS = nativeHeaderScrollEdgeEffects(Platform.OS, Platform.Version);
5152

@@ -385,7 +386,14 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
385386
<View className="ml-12 h-px bg-border" />
386387
) : null}
387388
<SheetListRow
388-
icon={PullRequestGlyph.pullRequest}
389+
icon={
390+
link.snapshot === null
391+
? PullRequestGlyph.pullRequest
392+
: pullRequestStatus(link.snapshot).icon
393+
}
394+
iconTintClassName={
395+
link.snapshot ? pullRequestStatus(link.snapshot).tint : undefined
396+
}
389397
title={`#${link.number} ${link.snapshot?.title ?? "Pull request"}`}
390398
subtitle={`${link.repository} · ${link.snapshot === null ? "Status pending" : link.snapshot.isDraft && link.snapshot.state === "open" ? "Draft" : link.snapshot.state}${link.watch === undefined ? "" : " · Watching"}`}
391399
onPress={() => {

‎apps/mobile/src/features/threads/git/gitSheetComponents.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ export function MetaCard(props: { readonly label: string; readonly value: string
8383

8484
export function SheetListRow(props: {
8585
readonly icon: ComponentProps<typeof SymbolView>["name"];
86+
readonly iconTintClassName?: string | undefined;
8687
readonly title: string;
8788
readonly subtitle?: string | null;
8889
readonly disabled?: boolean;
@@ -98,7 +99,7 @@ export function SheetListRow(props: {
9899
<SymbolView
99100
name={props.icon}
100101
size={Platform.OS === "android" ? 24 : 16}
101-
tintColorClassName="accent-icon"
102+
tintColorClassName={props.iconTintClassName ?? "accent-icon"}
102103
type="monochrome"
103104
/>
104105
</View>

‎apps/mobile/src/features/threads/thread-list-v2-items.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ import { QueuedMessageIcon } from "./queued-message-icon";
5555
import { shouldRecedeThreadRow } from "./thread-row-emphasis";
5656
import { ThreadSearchMatchExcerpt } from "./thread-search-match";
5757
import { PullRequestGlyph } from "../pull-requests/pullRequestGlyphs";
58+
import { pullRequestStatus } from "../pull-requests/pullRequestStatus";
5859

5960
interface StatusLabel {
6061
readonly label: string;
@@ -1043,7 +1044,13 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
10431044
{pr ? (
10441045
<View className="flex-row items-center gap-1" accessibilityLabel={pr.accessibilityLabel}>
10451046
<SymbolView
1046-
name={pr.kind === "stack" ? PullRequestGlyph.stack : PullRequestGlyph.pullRequest}
1047+
name={
1048+
pr.kind === "stack"
1049+
? PullRequestGlyph.stack
1050+
: pr.state === null
1051+
? PullRequestGlyph.pullRequest
1052+
: pullRequestStatus({ state: pr.state, isDraft: pr.isDraft }).icon
1053+
}
10471054
size={12}
10481055
tintColorClassName={
10491056
pr.state === null || pr.isDraft

0 commit comments

Comments
 (0)