Skip to content

Commit

Permalink
chore(issue-details): Update resolved in pull request activity (#78796)
Browse files Browse the repository at this point in the history
  • Loading branch information
roggenkemper authored Oct 9, 2024
1 parent 146cdc5 commit 0f258d7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
16 changes: 12 additions & 4 deletions static/app/views/issueDetails/streamline/activitySection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,14 @@ function StreamlinedActivitySection({group}: {group: Group}) {
title={
<TitleWrapper>
{title}
{item.type === GroupActivityType.NOTE && (
<NoteDropdown onDelete={() => handleDelete(item)} user={item.user} />
)}
<NoteDropdownWrapper>
{item.type === GroupActivityType.NOTE && (
<NoteDropdown
onDelete={() => handleDelete(item)}
user={item.user}
/>
)}
</NoteDropdownWrapper>
</TitleWrapper>
}
timestamp={<SmallTimestamp date={item.dateCreated} />}
Expand All @@ -142,10 +147,13 @@ const Author = styled('span')`
font-weight: ${p => p.theme.fontWeightBold};
`;

const NoteDropdownWrapper = styled('span')`
font-weight: normal;
`;

const TitleWrapper = styled('div')`
display: flex;
align-items: center;
font-weight: normal;
gap: ${space(0.5)};
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
IconChat,
IconCheckmark,
IconClose,
IconCommit,
IconDelete,
IconEdit,
IconFire,
Expand Down Expand Up @@ -40,7 +41,7 @@ export const groupActivityTypeIconMapping: Record<
defaultProps: {},
},
[GroupActivityType.SET_RESOLVED_IN_PULL_REQUEST]: {
Component: IconCheckmark,
Component: IconCommit,
defaultProps: {},
},
[GroupActivityType.SET_UNRESOLVED]: {Component: IconClose, defaultProps: {}},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ export default function getGroupActivityItem(
const {data} = activity;
const {pullRequest} = data;
return {
title: t('Resolved'),
message: tct('[author] has created a PR for this issue: [pullRequest]', {
title: t('Pull Request Created'),
message: tct(' by [author]: [pullRequest]', {
author,
pullRequest: pullRequest ? (
<PullRequestLink
Expand Down

0 comments on commit 0f258d7

Please sign in to comment.