Skip to content

Commit 1d1ac54

Browse files
authored
Merge branch 'master' into ealam/COMSO2-742
2 parents 8711640 + 675f4fc commit 1d1ac54

File tree

16 files changed

+531
-152
lines changed

16 files changed

+531
-152
lines changed

src/discussions/common/AlertBanner.jsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const AlertBanner = ({
2424
closeReason,
2525
editByLabel,
2626
closedByLabel,
27+
postData,
2728
}) => {
2829
const intl = useIntl();
2930
const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
@@ -53,6 +54,7 @@ const AlertBanner = ({
5354
authorLabel={editByLabel}
5455
labelColor={editByLabelColor && `text-${editByLabelColor}`}
5556
reason={lastEdit.reason}
57+
postData={postData}
5658
/>
5759
)}
5860
{closed && (
@@ -62,6 +64,7 @@ const AlertBanner = ({
6264
authorLabel={closedByLabel}
6365
labelColor={closedByLabelColor && `text-${closedByLabelColor}`}
6466
reason={closeReason}
67+
postData={postData}
6568
/>
6669
)}
6770
</>
@@ -82,6 +85,7 @@ AlertBanner.propTypes = {
8285
editorUsername: PropTypes.string,
8386
reason: PropTypes.string,
8487
}),
88+
postData: PropTypes.shape({}),
8589
};
8690

8791
AlertBanner.defaultProps = {
@@ -92,6 +96,7 @@ AlertBanner.defaultProps = {
9296
closeReason: undefined,
9397
editByLabel: undefined,
9498
lastEdit: {},
99+
postData: null,
95100
};
96101

97102
export default React.memo(AlertBanner);

src/discussions/common/AlertBar.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const AlertBar = ({
1414
authorLabel,
1515
labelColor,
1616
reason,
17+
postData,
1718
}) => {
1819
const intl = useIntl();
1920

@@ -28,6 +29,7 @@ const AlertBar = ({
2829
labelColor={labelColor}
2930
linkToProfile
3031
postOrComment
32+
postData={postData}
3133
/>
3234
</span>
3335
<span
@@ -48,6 +50,7 @@ AlertBar.propTypes = {
4850
authorLabel: PropTypes.string,
4951
labelColor: PropTypes.string,
5052
reason: PropTypes.string,
53+
postData: PropTypes.shape({}),
5154
};
5255

5356
AlertBar.defaultProps = {
@@ -56,6 +59,7 @@ AlertBar.defaultProps = {
5659
authorLabel: '',
5760
labelColor: '',
5861
reason: '',
62+
postData: null,
5963
};
6064

6165
export default React.memo(AlertBar);

0 commit comments

Comments
 (0)