diff --git a/server/channels/app/migrations.go b/server/channels/app/migrations.go
index c7d1aa78127..a23fa4a3cb4 100644
--- a/server/channels/app/migrations.go
+++ b/server/channels/app/migrations.go
@@ -640,7 +640,7 @@ func (s *Server) doSetupContentFlaggingProperties() error {
 		contentFlaggingPropertyNameStatus: {
 			GroupID: group.ID,
 			Name:    contentFlaggingPropertyNameStatus,
-			Type:    model.PropertyFieldTypeText,
+			Type:    model.PropertyFieldTypeSelect,
 		},
 		contentFlaggingPropertyNameReportingUserID: {
 			GroupID: group.ID,
@@ -650,7 +650,7 @@ func (s *Server) doSetupContentFlaggingProperties() error {
 		contentFlaggingPropertyNameReportingReason: {
 			GroupID: group.ID,
 			Name:    contentFlaggingPropertyNameReportingReason,
-			Type:    model.PropertyFieldTypeText,
+			Type:    model.PropertyFieldTypeSelect,
 		},
 		contentFlaggingPropertyNameReportingComment: {
 			GroupID: group.ID,
diff --git a/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/content_reviewers.test.tsx b/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/content_reviewers.test.tsx
index 8255018fa9d..dcbb7a06cda 100644
--- a/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/content_reviewers.test.tsx
+++ b/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/content_reviewers.test.tsx
@@ -14,15 +14,16 @@ import ContentFlaggingContentReviewers from './content_reviewers';
 
 // Mock the UserMultiSelector component
 jest.mock('../../content_flagging/user_multiselector/user_multiselector', () => ({
-    UserMultiSelector: ({id, initialValue, onChange}: {id: string; initialValue: string[]; onChange: (userIds: string[]) => void}) => (
+    __esModule: true,
+    UserSelector: ({id, multiSelectInitialValue, multiSelectOnChange}: {id: string; multiSelectInitialValue: string[]; multiSelectOnChange: (userIds: string[]) => void}) => (
         <div data-testid={`user-multi-selector-${id}`}>
             <button
-                onClick={() => onChange(['user1', 'user2'])}
+                onClick={() => multiSelectOnChange(['user1', 'user2'])}
                 data-testid={`${id}-change-users`}
             >
                 {'Change Users'}
             </button>
-            <span data-testid={`${id}-initial-value`}>{initialValue.join(',')}</span>
+            <span data-testid={`${id}-initial-value`}>{multiSelectInitialValue.join(',')}</span>
         </div>
     ),
 }));
diff --git a/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/content_reviewers.tsx b/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/content_reviewers.tsx
index dbd4b4c1ebc..1f1354ad407 100644
--- a/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/content_reviewers.tsx
+++ b/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/content_reviewers.tsx
@@ -16,7 +16,7 @@ import {
     SectionHeader,
 } from 'components/admin_console/system_properties/controls';
 
-import {UserMultiSelector} from '../../content_flagging/user_multiselector/user_multiselector';
+import {UserSelector} from '../../content_flagging/user_multiselector/user_multiselector';
 import type {SystemConsoleCustomSettingsComponentProps} from '../../schema_admin_settings';
 
 import './content_reviewers.scss';
@@ -148,10 +148,11 @@ export default function ContentFlaggingContentReviewers(props: SystemConsoleCust
                             </div>
 
                             <div className='setting-content'>
-                                <UserMultiSelector
+                                <UserSelector
+                                    isMulti={true}
                                     id='content_reviewers_common_reviewers'
-                                    initialValue={reviewerSetting.CommonReviewerIds}
-                                    onChange={handleCommonReviewersChange}
+                                    multiSelectInitialValue={reviewerSetting.CommonReviewerIds}
+                                    multiSelectOnChange={handleCommonReviewersChange}
                                 />
                             </div>
                         </div>
diff --git a/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/team_reviewers_section/team_reviewers_section.test.tsx b/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/team_reviewers_section/team_reviewers_section.test.tsx
index e8526879e18..a37ce332c6b 100644
--- a/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/team_reviewers_section/team_reviewers_section.test.tsx
+++ b/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/team_reviewers_section/team_reviewers_section.test.tsx
@@ -18,21 +18,6 @@ jest.mock('mattermost-redux/actions/teams', () => ({
     searchTeams: jest.fn(),
 }));
 
-jest.mock('../../user_multiselector/user_multiselector', () => ({
-    UserMultiSelector: ({id, initialValue, onChange}: {id: string; initialValue: string[]; onChange: (ids: string[]) => void}) => (
-        <div data-testid={`user-multi-selector-${id}`}>
-            <span>{`Selected: {${initialValue.join(', ')}`}</span>
-            <button onClick={() => onChange(['user1', 'user2'])}>
-                {'Change Reviewers'}
-            </button>
-        </div>
-    ),
-}));
-
-jest.mock('components/widgets/team_icon/team_icon', () => ({
-    TeamIcon: ({content}: {content: string}) => <div data-testid='team-icon'>{content}</div>,
-}));
-
 const mockSearchTeams = jest.mocked(searchTeams);
 
 describe('TeamReviewersSection', () => {
@@ -265,40 +250,6 @@ describe('TeamReviewersSection', () => {
         });
     });
 
-    test('should handle reviewer selection changes', async () => {
-        const onChange = jest.fn();
-        renderWithContext(
-            <TeamReviewersSection
-                {...defaultProps}
-                onChange={onChange}
-            />,
-        );
-
-        await waitFor(() => {
-            expect(mockSearchTeams).toHaveBeenCalledWith('', {page: 0, per_page: 10});
-        });
-
-        await waitFor(() => {
-            const teamNameCells = screen.getAllByTestId('teamName');
-            expect(teamNameCells).toHaveLength(2);
-            expect(teamNameCells[0]).toBeVisible();
-            expect(teamNameCells[0]).toHaveTextContent('Team One');
-
-            expect(teamNameCells[1]).toBeVisible();
-            expect(teamNameCells[1]).toHaveTextContent('Team Two');
-        });
-
-        const changeReviewersButton = screen.getAllByText('Change Reviewers')[0];
-        fireEvent.click(changeReviewersButton);
-
-        expect(onChange).toHaveBeenCalledWith({
-            team1: {
-                Enabled: false,
-                ReviewerIds: ['user1', 'user2'],
-            },
-        });
-    });
-
     test('should display existing reviewer settings', async () => {
         const teamReviewersSetting = {
             team1: {
@@ -354,17 +305,6 @@ describe('TeamReviewersSection', () => {
     });
 
     test('should reset page to 0 when searching', async () => {
-        // mockSearchTeams.
-        // mockReturnValueOnce({
-        //         data: {teams: mockTeams, total_count: 20},
-        //     } as never).
-        //     mockResolvedValueOnce({
-        //         data: {teams: mockTeams, total_count: 20},
-        //     } as never).
-        //     mockResolvedValueOnce({
-        //         data: {teams: mockTeams, total_count: 5},
-        //     } as never);
-
         mockSearchTeams.mockReturnValueOnce(async () => ({
             data: {teams: mockTeams, total_count: 20},
         })).
@@ -480,10 +420,6 @@ describe('TeamReviewersSection', () => {
             expect(mockSearchTeams).toHaveBeenCalledWith('', {page: 0, per_page: 10});
         });
 
-        await waitFor(() => {
-            expect(screen.getAllByText('Team One')).toHaveLength(4);
-        });
-
         const updatedToggle = screen.getAllByRole('button', {name: /enable or disable content reviewers for this team/i})[0];
 
         // Second click - disable
diff --git a/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/team_reviewers_section/team_reviewers_section.tsx b/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/team_reviewers_section/team_reviewers_section.tsx
index 57fe019a2d4..0ce5b572f67 100644
--- a/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/team_reviewers_section/team_reviewers_section.tsx
+++ b/webapp/channels/src/components/admin_console/content_flagging/content_reviewers/team_reviewers_section/team_reviewers_section.tsx
@@ -16,7 +16,7 @@ import {TeamIcon} from 'components/widgets/team_icon/team_icon';
 
 import * as Utils from 'utils/utils';
 
-import {UserMultiSelector} from '../../user_multiselector/user_multiselector';
+import {UserSelector} from '../../user_multiselector/user_multiselector';
 
 import './team_reviewers_section.scss';
 
@@ -141,10 +141,11 @@ export default function TeamReviewers({teamReviewersSetting, onChange}: Props):
                     </div>
                 ),
                 reviewers: (
-                    <UserMultiSelector
+                    <UserSelector
+                        isMulti={true}
                         id={`team_content_reviewer_${team.id}`}
-                        initialValue={teamReviewersSetting[team.id]?.ReviewerIds || []}
-                        onChange={getHandleReviewersChange(team.id)}
+                        multiSelectInitialValue={teamReviewersSetting[team.id]?.ReviewerIds || []}
+                        multiSelectOnChange={getHandleReviewersChange(team.id)}
                     />
                 ),
                 enabled: (
diff --git a/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_multiselect.scss b/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_multiselect.scss
index 5b4ac977d0d..b67d23f9466 100644
--- a/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_multiselect.scss
+++ b/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_multiselect.scss
@@ -13,4 +13,10 @@
         display: flex;
         gap: 8px;
     }
+
+    &.singleSelect {
+        .UserMultiSelector__value-container {
+            display: flex;
+        }
+    }
 }
diff --git a/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_multiselector.tsx b/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_multiselector.tsx
index 9ec451d7a47..d3a32e0ab65 100644
--- a/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_multiselector.tsx
+++ b/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_multiselector.tsx
@@ -5,7 +5,7 @@ import classNames from 'classnames';
 import React, {type ReactElement, useCallback, useEffect, useMemo, useRef} from 'react';
 import {useIntl} from 'react-intl';
 import {useDispatch, useSelector} from 'react-redux';
-import type {MultiValue} from 'react-select';
+import type {MultiValue, SingleValue} from 'react-select';
 import AsyncSelect from 'react-select/async';
 
 import type {UserProfile} from '@mattermost/types/users';
@@ -16,9 +16,9 @@ import {getUsersByIDs} from 'mattermost-redux/selectors/entities/users';
 
 import type {GlobalState} from 'types/store';
 
-import {UserProfilePill} from './user_profile_pill';
+import {MultiUserProfilePill, SingleUserProfilePill} from './user_profile_pill';
 
-import {UserOptionComponent} from '../../content_flagging/user_multiselector/user_profile_option';
+import {MultiUserOptionComponent, SingleUserOptionComponent} from '../../content_flagging/user_multiselector/user_profile_option';
 import {LoadingIndicator} from '../../system_users/system_users_filters_popover/system_users_filter_team';
 
 import './user_multiselect.scss';
@@ -29,29 +29,51 @@ export type AutocompleteOptionType<T> = {
     raw?: T;
 }
 
-type Props = {
-    id: string;
-    className?: string;
-    onChange: (selectedUserIds: string[]) => void;
-    initialValue?: string[];
-    hasError?: boolean;
+const BASE_SELECT_COMPONENTS = {
+    LoadingIndicator,
+    DropdownIndicator: () => null,
+    IndicatorSeparator: () => null,
+};
+
+type MultiSelectProps = {
+    multiSelectOnChange?: (selectedUserIds: string[]) => void;
+    multiSelectInitialValue?: string[];
 }
 
-export function UserMultiSelector({id, className, onChange, initialValue, hasError}: Props) {
+type SingleSelectProps = {
+    singleSelectOnChange?: (selectedUserIds: string) => void;
+    singleSelectInitialValue?: string;
+}
+
+type Props = MultiSelectProps & SingleSelectProps & {
+    id: string;
+    isMulti: boolean;
+    className?: string;
+    hasError?: boolean;
+    placeholder?: React.ReactNode;
+    showDropdownIndicator?: boolean;
+};
+
+export function UserSelector({id, isMulti, className, multiSelectOnChange, multiSelectInitialValue, singleSelectOnChange, singleSelectInitialValue, hasError, placeholder, showDropdownIndicator}: Props) {
     const dispatch = useDispatch();
     const {formatMessage} = useIntl();
     const initialDataLoaded = useRef<boolean>(false);
 
+    const initialValue = useMemo(() => {
+        return isMulti ? multiSelectInitialValue : [singleSelectInitialValue || ''];
+    }, [isMulti, multiSelectInitialValue, singleSelectInitialValue]);
+
     useEffect(() => {
         const fetchInitialData = async () => {
-            await dispatch(getMissingProfilesByIds(initialValue || []));
+            const param = isMulti ? multiSelectInitialValue : [singleSelectInitialValue || ''];
+            await dispatch(getMissingProfilesByIds(param || []));
             initialDataLoaded.current = true;
         };
 
-        if (initialValue && !initialDataLoaded.current) {
+        if (Boolean(initialValue) && !initialDataLoaded.current) {
             fetchInitialData();
         }
-    }, [dispatch, initialValue]);
+    }, [dispatch, initialValue, isMulti, multiSelectInitialValue, singleSelectInitialValue]);
 
     const initialUsers = useSelector((state: GlobalState) => getUsersByIDs(state, initialValue || []));
     const selectInitialValue = initialUsers.
@@ -64,7 +86,7 @@ export function UserMultiSelector({id, className, onChange, initialValue, hasErr
 
     const userLoadingMessage = useCallback(() => formatMessage({id: 'admin.userMultiSelector.loading', defaultMessage: 'Loading users'}), [formatMessage]);
     const noUsersMessage = useCallback(() => formatMessage({id: 'admin.userMultiSelector.noUsers', defaultMessage: 'No users found'}), [formatMessage]);
-    const placeholder = formatMessage({id: 'admin.userMultiSelector.placeholder', defaultMessage: 'Start typing to search for users...'});
+    const defaultPlaceholder = formatMessage({id: 'admin.userMultiSelector.placeholder', defaultMessage: 'Start typing to search for users...'});
 
     const searchUsers = useMemo(() => debounce(async (searchTerm: string, callback) => {
         try {
@@ -89,35 +111,87 @@ export function UserMultiSelector({id, className, onChange, initialValue, hasErr
         }
     }, 200), [dispatch]);
 
-    function handleOnChange(value: MultiValue<AutocompleteOptionType<UserProfile>>) {
+    const multiSelectHandleOnChange = useCallback((value: MultiValue<AutocompleteOptionType<UserProfile>>) => {
         const selectedUserIds = value.map((option) => option.value);
-        onChange?.(selectedUserIds);
+        multiSelectOnChange?.(selectedUserIds);
+    }, [multiSelectOnChange]);
+
+    const singleSelectHandleOnChange = useCallback((value: SingleValue<AutocompleteOptionType<UserProfile>>) => {
+        const selectedUserIds = value?.value || '';
+        singleSelectOnChange?.(selectedUserIds);
+    }, [singleSelectOnChange]);
+
+    const multiSelectComponents = useMemo(() => {
+        const componentObj = {
+            ...BASE_SELECT_COMPONENTS,
+            Option: MultiUserOptionComponent,
+            MultiValue: MultiUserProfilePill,
+        };
+
+        if (showDropdownIndicator) {
+            // @ts-expect-error doing this any other way runs into TypeScript nightmares due to very complex ReactSelect types
+            delete componentObj.DropdownIndicator;
+        }
+
+        return componentObj;
+    }, [showDropdownIndicator]);
+
+    const singleSelectComponents = useMemo(() => {
+        const componentObj = {
+            ...BASE_SELECT_COMPONENTS,
+            Option: SingleUserOptionComponent,
+            SingleValue: SingleUserProfilePill,
+        };
+
+        if (showDropdownIndicator) {
+            // @ts-expect-error doing this any other way runs into TypeScript nightmares due to very complex ReactSelect types
+            delete componentObj.DropdownIndicator;
+        }
+
+        return componentObj;
+    }, [showDropdownIndicator]);
+
+    const baseProps = useMemo(() => {
+        return {
+            id,
+            inputId: `${id}_input`,
+            classNamePrefix: 'UserMultiSelector',
+            className: classNames('Input Input__focus', className, {error: hasError}),
+            isClearable: false,
+            hideSelectedOptions: true,
+            cacheOptions: true,
+            placeholder: placeholder || defaultPlaceholder,
+            loadingMessage: userLoadingMessage,
+            noOptionsMessage: noUsersMessage,
+            loadOptions: searchUsers,
+            menuPortalTarget: document.body,
+        };
+    }, [className, defaultPlaceholder, hasError, id, noUsersMessage, placeholder, searchUsers, userLoadingMessage]);
+
+    const containerClassName = classNames('UserMultiSelector', {multiSelect: isMulti, singleSelect: !isMulti});
+
+    if (isMulti) {
+        return (
+            <div className={containerClassName}>
+                <AsyncSelect
+                    {...baseProps}
+                    isMulti={true}
+                    onChange={multiSelectHandleOnChange}
+                    value={selectInitialValue}
+                    components={multiSelectComponents}
+                />
+            </div>
+        );
     }
 
     return (
-        <div className='UserMultiSelector'>
+        <div className={containerClassName}>
             <AsyncSelect
-                id={id}
-                inputId={`${id}_input`}
-                classNamePrefix='UserMultiSelector'
-                className={classNames('Input Input__focus', className, {error: hasError})}
-                isMulti={true}
-                isClearable={false}
-                hideSelectedOptions={true}
-                cacheOptions={true}
-                placeholder={placeholder}
-                loadingMessage={userLoadingMessage}
-                noOptionsMessage={noUsersMessage}
-                loadOptions={searchUsers}
-                onChange={handleOnChange}
-                value={selectInitialValue}
-                components={{
-                    LoadingIndicator,
-                    DropdownIndicator: () => null,
-                    IndicatorSeparator: () => null,
-                    Option: UserOptionComponent,
-                    MultiValue: UserProfilePill,
-                }}
+                {...baseProps}
+                isMulti={false}
+                onChange={singleSelectHandleOnChange}
+                value={selectInitialValue ? selectInitialValue[0] : null}
+                components={singleSelectComponents}
             />
         </div>
     );
diff --git a/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_option.tsx b/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_option.tsx
index 83124747dae..2ce251270b7 100644
--- a/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_option.tsx
+++ b/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_option.tsx
@@ -17,7 +17,29 @@ import type {AutocompleteOptionType} from './user_multiselector';
 
 import './user_profile_option.scss';
 
-export function UserOptionComponent(props: OptionProps<AutocompleteOptionType<UserProfile>, true>) {
+export function MultiUserOptionComponent(props: OptionProps<AutocompleteOptionType<UserProfile>, true>) {
+    const {data, innerProps} = props;
+
+    const userProfile = data.raw;
+    const userDisplayName = useSelector((state: GlobalState) => getDisplayNameByUser(state, userProfile));
+
+    return (
+        <div
+            className='UserOptionComponent'
+            {...innerProps}
+        >
+            <Avatar
+                size='xxs'
+                username={userProfile?.username}
+                url={imageURLForUser(data.value)}
+            />
+
+            {userDisplayName}
+        </div>
+    );
+}
+
+export function SingleUserOptionComponent(props: OptionProps<AutocompleteOptionType<UserProfile>, false>) {
     const {data, innerProps} = props;
 
     const userProfile = data.raw;
diff --git a/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_pill.test.tsx b/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_pill.test.tsx
index 505888dcebb..650587396eb 100644
--- a/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_pill.test.tsx
+++ b/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_pill.test.tsx
@@ -10,7 +10,7 @@ import {fireEvent, renderWithContext} from 'tests/react_testing_utils';
 import {TestHelper} from 'utils/test_helper';
 
 import type {AutocompleteOptionType} from './user_multiselector';
-import {UserProfilePill} from './user_profile_pill';
+import {MultiUserProfilePill} from './user_profile_pill';
 
 describe('components/admin_console/content_flagging/user_multiselector/UserProfilePill', () => {
     const baseProps = {
@@ -70,7 +70,7 @@ describe('components/admin_console/content_flagging/user_multiselector/UserProfi
 
     test('should render user profile pill with avatar and display name', () => {
         const {container} = renderWithContext(
-            <UserProfilePill {...baseProps}/>,
+            <MultiUserProfilePill {...baseProps}/>,
             initialState,
         );
 
@@ -79,7 +79,7 @@ describe('components/admin_console/content_flagging/user_multiselector/UserProfi
 
     test('should render with correct user display name', () => {
         const {container} = renderWithContext(
-            <UserProfilePill {...baseProps}/>,
+            <MultiUserProfilePill {...baseProps}/>,
             initialState,
         );
 
@@ -90,7 +90,7 @@ describe('components/admin_console/content_flagging/user_multiselector/UserProfi
 
     test('should render Avatar component with correct props', () => {
         const {container} = renderWithContext(
-            <UserProfilePill {...baseProps}/>,
+            <MultiUserProfilePill {...baseProps}/>,
             initialState,
         );
 
@@ -100,7 +100,7 @@ describe('components/admin_console/content_flagging/user_multiselector/UserProfi
 
     test('should render Remove component with close icon', () => {
         const {container} = renderWithContext(
-            <UserProfilePill {...baseProps}/>,
+            <MultiUserProfilePill {...baseProps}/>,
             initialState,
         );
 
@@ -118,7 +118,7 @@ describe('components/admin_console/content_flagging/user_multiselector/UserProfi
         };
 
         const {container} = renderWithContext(
-            <UserProfilePill {...propsWithClick}/>,
+            <MultiUserProfilePill {...propsWithClick}/>,
             initialState,
         );
 
@@ -143,7 +143,7 @@ describe('components/admin_console/content_flagging/user_multiselector/UserProfi
         } as unknown as MultiValueProps<AutocompleteOptionType<UserProfile>, true>;
 
         const {container} = renderWithContext(
-            <UserProfilePill {...propsWithoutUsername}/>,
+            <MultiUserProfilePill {...propsWithoutUsername}/>,
             initialState,
         );
 
@@ -165,7 +165,7 @@ describe('components/admin_console/content_flagging/user_multiselector/UserProfi
         };
 
         const {container} = renderWithContext(
-            <UserProfilePill {...baseProps}/>,
+            <MultiUserProfilePill {...baseProps}/>,
             stateWithUsernameDisplay,
         );
 
@@ -175,7 +175,7 @@ describe('components/admin_console/content_flagging/user_multiselector/UserProfi
 
     test('should apply correct CSS classes', () => {
         const {container} = renderWithContext(
-            <UserProfilePill {...baseProps}/>,
+            <MultiUserProfilePill {...baseProps}/>,
             initialState,
         );
 
diff --git a/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_pill.tsx b/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_pill.tsx
index b0e3f5e6961..d6b058e9f71 100644
--- a/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_pill.tsx
+++ b/webapp/channels/src/components/admin_console/content_flagging/user_multiselector/user_profile_pill.tsx
@@ -1,8 +1,10 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import type {JSX} from 'react';
 import React from 'react';
 import {useSelector} from 'react-redux';
+import type {SingleValueProps} from 'react-select';
 import type {MultiValueProps} from 'react-select/dist/declarations/src/components/MultiValue';
 
 import type {UserProfile} from '@mattermost/types/users';
@@ -32,9 +34,39 @@ function Remove(props: any) {
     );
 }
 
-export function UserProfilePill(props: MultiValueProps<AutocompleteOptionType<UserProfile>, true>) {
+export function MultiUserProfilePill(props: MultiValueProps<AutocompleteOptionType<UserProfile>, true>) {
     const {data, innerProps, selectProps, removeProps} = props;
 
+    return (
+        <BaseUserProfilePill
+            data={data}
+            innerProps={innerProps}
+            selectProps={selectProps}
+            removeProps={removeProps}
+        />
+    );
+}
+
+export function SingleUserProfilePill(props: SingleValueProps<AutocompleteOptionType<UserProfile>, false>) {
+    const {data, innerProps, selectProps} = props;
+
+    return (
+        <BaseUserProfilePill
+            data={data}
+            innerProps={innerProps}
+            selectProps={selectProps}
+        />
+    );
+}
+
+type Props = {
+    data: AutocompleteOptionType<UserProfile>;
+    innerProps: JSX.IntrinsicElements['div'];
+    selectProps: unknown;
+    removeProps?: JSX.IntrinsicElements['div'];
+}
+
+function BaseUserProfilePill({data, innerProps, selectProps, removeProps}: Props) {
     const userProfile = data.raw;
     const userDisplayName = useSelector((state: GlobalState) => getDisplayNameByUser(state, userProfile));
 
@@ -51,12 +83,15 @@ export function UserProfilePill(props: MultiValueProps<AutocompleteOptionType<Us
 
             {userDisplayName}
 
-            <Remove
-                data={data}
-                innerProps={innerProps}
-                selectProps={selectProps}
-                {...removeProps}
-            />
+            {
+                removeProps &&
+                <Remove
+                    data={data}
+                    innerProps={innerProps}
+                    selectProps={selectProps}
+                    {...removeProps}
+                />
+            }
         </div>
     );
 }
diff --git a/webapp/channels/src/components/channel_invite_modal/group_option/__snapshots__/group_option.test.tsx.snap b/webapp/channels/src/components/channel_invite_modal/group_option/__snapshots__/group_option.test.tsx.snap
index 5aebc108033..258367774a2 100644
--- a/webapp/channels/src/components/channel_invite_modal/group_option/__snapshots__/group_option.test.tsx.snap
+++ b/webapp/channels/src/components/channel_invite_modal/group_option/__snapshots__/group_option.test.tsx.snap
@@ -184,6 +184,13 @@ Object {
   "queryByTitle": [Function],
   "replaceStoreState": [Function],
   "rerender": [Function],
+  "store": Object {
+    "@@observable": [Function],
+    "dispatch": [Function],
+    "getState": [Function],
+    "replaceReducer": [Function],
+    "subscribe": [Function],
+  },
   "unmount": [Function],
   "updateStoreState": [Function],
 }
diff --git a/webapp/channels/src/components/channel_notifications_modal/__snapshots__/channel_notifications_modal.test.tsx.snap b/webapp/channels/src/components/channel_notifications_modal/__snapshots__/channel_notifications_modal.test.tsx.snap
deleted file mode 100644
index c8635b16c00..00000000000
--- a/webapp/channels/src/components/channel_notifications_modal/__snapshots__/channel_notifications_modal.test.tsx.snap
+++ /dev/null
@@ -1,3181 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ChannelNotificationsModal should check the options in the desktop notifications 1`] = `
-Object {
-  "asFragment": [Function],
-  "baseElement": <body
-    class="modal-open"
-    style="padding-right: 0px;"
-  >
-    <div
-      aria-hidden="true"
-    />
-    <div
-      role="none"
-    >
-      <div
-        class="fade modal-backdrop"
-      />
-      <div
-        aria-label="channelNotificationModalLabel"
-        aria-labelledby="genericModalLabel"
-        aria-modal="true"
-        class="fade modal"
-        id="channelNotificationModal"
-        role="dialog"
-        style="display: block; padding-right: 0px;"
-        tabindex="-1"
-      >
-        <div
-          class="GenericModal__location--center a11y__modal GenericModal GenericModal__compassDesign a11y__modal ChannelNotificationModal modal--overflow modal-dialog"
-        >
-          <div
-            class="modal-content"
-            role="document"
-          >
-            <div
-              class="GenericModal__wrapper GenericModal__wrapper-enter-key-press-catcher"
-            >
-              <div
-                class="modal-header"
-              >
-                <div
-                  class="GenericModal__header__text_container"
-                >
-                  <div
-                    class="GenericModal__header"
-                  >
-                    <h1
-                      class="modal-title"
-                      id="genericModalLabel"
-                    >
-                      <div
-                        class="mm-modal-header"
-                      >
-                        <h2
-                          class="mm-modal-header__title"
-                          id="mm-modal-header-channelNotificationModalLabel"
-                        >
-                          <span>
-                            Notification Preferences
-                          </span>
-                          <span
-                            class="mm-modal-header__vertical-divider"
-                          />
-                          <span
-                            class="mm-modal-header__subtitle"
-                          >
-                            channel_display_name
-                          </span>
-                        </h2>
-                      </div>
-                    </h1>
-                  </div>
-                </div>
-                <button
-                  aria-label="Close"
-                  class="close"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                  >
-                    ×
-                  </span>
-                  <span
-                    class="sr-only"
-                  >
-                    Close
-                  </span>
-                </button>
-              </div>
-              <div
-                class="modal-body"
-              >
-                <div
-                  class="GenericModal__body"
-                >
-                  <main
-                    class="ChannelNotificationModal__body"
-                  >
-                    <fieldset
-                      aria-labelledby="ChannelNotificationModal-legend"
-                    >
-                      <section
-                        class="mm-modal-generic-section"
-                      >
-                        <div
-                          class="modalSectionHeader"
-                        >
-                          <h4
-                            class="modalSectionTitle"
-                          >
-                            <legend
-                              id="ChannelNotificationModal-legend"
-                              style="all: unset;"
-                            >
-                              Mute or ignore
-                            </legend>
-                          </h4>
-                        </div>
-                        <div
-                          class="modalSectionContent"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="muteChannel"
-                                  id="mute-channel"
-                                  name="mute channel"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="mute-channel"
-                                >
-                                  Mute channel
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              Turns off notifications for this channel. You'll still see badges if you're mentioned.
-                            </p>
-                          </div>
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="ignoreMentions"
-                                  id="ignore-mentions"
-                                  name="ignore mentions"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="ignore-mentions"
-                                >
-                                  Ignore mentions for @channel, @here and @all
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              When enabled, @channel, @here and @all will not trigger mentions or mention notifications in this channel
-                            </p>
-                          </div>
-                        </div>
-                      </section>
-                    </fieldset>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Desktop Notifications
-                          <button
-                            class="ChannelNotificationModal__reset-btn"
-                            data-testid="resetToDefaultButton-desktop"
-                          >
-                            <i
-                              class="icon icon-refresh"
-                            />
-                            Reset to default
-                          </button>
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          Available on Chrome, Edge, Firefox, and the Mattermost Desktop App.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <h4
-                            class="mm-modal-generic-section-item__title"
-                            data-testid="mm-modal-generic-section-item__title"
-                          >
-                            Notify me about…
-                          </h4>
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-radio"
-                            >
-                              <legend
-                                class="hidden-label"
-                              >
-                                Notify me about…
-                              </legend>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  checked=""
-                                  data-testid="desktopNotification-all"
-                                  id="desktopNotification-all"
-                                  name="desktop"
-                                  type="radio"
-                                  value="all"
-                                />
-                                All new messages 
-                                (default)
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="desktopNotification-mention"
-                                  id="desktopNotification-mention"
-                                  name="desktop"
-                                  type="radio"
-                                  value="mention"
-                                />
-                                Mentions, direct messages, and keywords only 
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="desktopNotification-none"
-                                  id="desktopNotification-none"
-                                  name="desktop"
-                                  type="radio"
-                                  value="none"
-                                />
-                                Nothing 
-                              </label>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Mobile Notifications
-                          <button
-                            class="ChannelNotificationModal__reset-btn"
-                            data-testid="resetToDefaultButton-mobile"
-                          >
-                            <i
-                              class="icon icon-refresh"
-                            />
-                            Reset to default
-                          </button>
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          Notification alerts are pushed to your mobile device when there is activity in Mattermost.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <input
-                                checked=""
-                                class="mm-modal-generic-section-item__input-checkbox"
-                                data-testid="sameMobileSettingsDesktop"
-                                id="same-mobile-settings-as-Desktop"
-                                name="same mobile settings as Desktop"
-                                type="checkbox"
-                              />
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                                for="same-mobile-settings-as-Desktop"
-                              >
-                                Use the same notification settings as desktop
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Follow all threads in this channel
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          When enabled, all new replies in this channel will be automatically followed and will appear in your Threads view.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <input
-                                class="mm-modal-generic-section-item__input-checkbox"
-                                data-testid="autoFollowThreads"
-                                id="auto-follow-threads"
-                                name="auto follow threads"
-                                type="checkbox"
-                              />
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                                for="auto-follow-threads"
-                              >
-                                Automatically follow threads in this channel
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                  </main>
-                </div>
-              </div>
-              <div
-                class="divider modal-footer"
-              >
-                <footer
-                  class="ChannelNotificationModal__footer"
-                >
-                  
-                  <button
-                    class="btn btn-tertiary btn-md"
-                  >
-                    Cancel
-                  </button>
-                  <button
-                    class="btn btn-primary btn-md"
-                  >
-                    Save
-                  </button>
-                </footer>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div
-    aria-hidden="true"
-  />,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "replaceStoreState": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-  "updateStoreState": [Function],
-}
-`;
-
-exports[`ChannelNotificationsModal should check the options in the mobile notifications 1`] = `
-Object {
-  "asFragment": [Function],
-  "baseElement": <body
-    class="modal-open"
-    style="padding-right: 0px;"
-  >
-    <div
-      aria-hidden="true"
-    />
-    <div
-      role="none"
-    >
-      <div
-        class="fade modal-backdrop"
-      />
-      <div
-        aria-label="channelNotificationModalLabel"
-        aria-labelledby="genericModalLabel"
-        aria-modal="true"
-        class="fade modal"
-        id="channelNotificationModal"
-        role="dialog"
-        style="display: block; padding-right: 0px;"
-        tabindex="-1"
-      >
-        <div
-          class="GenericModal__location--center a11y__modal GenericModal GenericModal__compassDesign a11y__modal ChannelNotificationModal modal--overflow modal-dialog"
-        >
-          <div
-            class="modal-content"
-            role="document"
-          >
-            <div
-              class="GenericModal__wrapper GenericModal__wrapper-enter-key-press-catcher"
-            >
-              <div
-                class="modal-header"
-              >
-                <div
-                  class="GenericModal__header__text_container"
-                >
-                  <div
-                    class="GenericModal__header"
-                  >
-                    <h1
-                      class="modal-title"
-                      id="genericModalLabel"
-                    >
-                      <div
-                        class="mm-modal-header"
-                      >
-                        <h2
-                          class="mm-modal-header__title"
-                          id="mm-modal-header-channelNotificationModalLabel"
-                        >
-                          <span>
-                            Notification Preferences
-                          </span>
-                          <span
-                            class="mm-modal-header__vertical-divider"
-                          />
-                          <span
-                            class="mm-modal-header__subtitle"
-                          >
-                            channel_display_name
-                          </span>
-                        </h2>
-                      </div>
-                    </h1>
-                  </div>
-                </div>
-                <button
-                  aria-label="Close"
-                  class="close"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                  >
-                    ×
-                  </span>
-                  <span
-                    class="sr-only"
-                  >
-                    Close
-                  </span>
-                </button>
-              </div>
-              <div
-                class="modal-body"
-              >
-                <div
-                  class="GenericModal__body"
-                >
-                  <main
-                    class="ChannelNotificationModal__body"
-                  >
-                    <fieldset
-                      aria-labelledby="ChannelNotificationModal-legend"
-                    >
-                      <section
-                        class="mm-modal-generic-section"
-                      >
-                        <div
-                          class="modalSectionHeader"
-                        >
-                          <h4
-                            class="modalSectionTitle"
-                          >
-                            <legend
-                              id="ChannelNotificationModal-legend"
-                              style="all: unset;"
-                            >
-                              Mute or ignore
-                            </legend>
-                          </h4>
-                        </div>
-                        <div
-                          class="modalSectionContent"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="muteChannel"
-                                  id="mute-channel"
-                                  name="mute channel"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="mute-channel"
-                                >
-                                  Mute channel
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              Turns off notifications for this channel. You'll still see badges if you're mentioned.
-                            </p>
-                          </div>
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="ignoreMentions"
-                                  id="ignore-mentions"
-                                  name="ignore mentions"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="ignore-mentions"
-                                >
-                                  Ignore mentions for @channel, @here and @all
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              When enabled, @channel, @here and @all will not trigger mentions or mention notifications in this channel
-                            </p>
-                          </div>
-                        </div>
-                      </section>
-                    </fieldset>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Desktop Notifications
-                          <button
-                            class="ChannelNotificationModal__reset-btn"
-                            data-testid="resetToDefaultButton-desktop"
-                          >
-                            <i
-                              class="icon icon-refresh"
-                            />
-                            Reset to default
-                          </button>
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          Available on Chrome, Edge, Firefox, and the Mattermost Desktop App.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <h4
-                            class="mm-modal-generic-section-item__title"
-                            data-testid="mm-modal-generic-section-item__title"
-                          >
-                            Notify me about…
-                          </h4>
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-radio"
-                            >
-                              <legend
-                                class="hidden-label"
-                              >
-                                Notify me about…
-                              </legend>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  checked=""
-                                  data-testid="desktopNotification-all"
-                                  id="desktopNotification-all"
-                                  name="desktop"
-                                  type="radio"
-                                  value="all"
-                                />
-                                All new messages 
-                                (default)
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="desktopNotification-mention"
-                                  id="desktopNotification-mention"
-                                  name="desktop"
-                                  type="radio"
-                                  value="mention"
-                                />
-                                Mentions, direct messages, and keywords only 
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="desktopNotification-none"
-                                  id="desktopNotification-none"
-                                  name="desktop"
-                                  type="radio"
-                                  value="none"
-                                />
-                                Nothing 
-                              </label>
-                            </fieldset>
-                          </div>
-                        </div>
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <h4
-                            class="mm-modal-generic-section-item__title"
-                            data-testid="mm-modal-generic-section-item__title"
-                          >
-                            Sounds
-                          </h4>
-                          <div
-                            class="mm-modal-generic-section-item__content inline"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                              >
-                                <input
-                                  checked=""
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="desktopNotificationSoundsCheckbox"
-                                  name="desktopNotificationSoundsCheckbox"
-                                  type="checkbox"
-                                />
-                                Message notification sounds
-                              </label>
-                            </fieldset>
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-react-select"
-                            >
-                              <div
-                                class="react-select singleSelect react-select-top css-b62m3t-container"
-                                id="desktopNotificationSoundsSelect"
-                              >
-                                <span
-                                  class="css-1f43avz-a11yText-A11yText"
-                                  id="react-select-8-live-region"
-                                />
-                                <span
-                                  aria-atomic="false"
-                                  aria-live="polite"
-                                  aria-relevant="additions text"
-                                  class="css-1f43avz-a11yText-A11yText"
-                                  role="log"
-                                />
-                                <div
-                                  class="react-select__control css-13cymwt-control"
-                                >
-                                  <div
-                                    class="react-select__value-container react-select__value-container--has-value css-hlgwow"
-                                  >
-                                    <div
-                                      class="react-select__single-value css-1dimb5e-singleValue"
-                                    >
-                                      Bing
-                                    </div>
-                                    <input
-                                      aria-activedescendant=""
-                                      aria-autocomplete="list"
-                                      aria-expanded="false"
-                                      aria-haspopup="true"
-                                      aria-readonly="true"
-                                      class="css-1s80ejz-dummyInput-DummyInput"
-                                      id="desktopNotificationSoundsSelectInputId"
-                                      inputmode="none"
-                                      role="combobox"
-                                      tabindex="0"
-                                      value=""
-                                    />
-                                  </div>
-                                  <div
-                                    class="react-select__indicators css-1wy0on6"
-                                  >
-                                    <div
-                                      aria-hidden="true"
-                                      class="react-select__indicator react-select__dropdown-indicator css-1xc3v61-indicatorContainer"
-                                    >
-                                      <svg
-                                        aria-hidden="true"
-                                        class="css-tj5bde-Svg"
-                                        focusable="false"
-                                        height="20"
-                                        viewBox="0 0 20 20"
-                                        width="20"
-                                      >
-                                        <path
-                                          d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                                        />
-                                      </svg>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Mobile Notifications
-                          <button
-                            class="ChannelNotificationModal__reset-btn"
-                            data-testid="resetToDefaultButton-mobile"
-                          >
-                            <i
-                              class="icon icon-refresh"
-                            />
-                            Reset to default
-                          </button>
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          Notification alerts are pushed to your mobile device when there is activity in Mattermost.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <input
-                                class="mm-modal-generic-section-item__input-checkbox"
-                                data-testid="sameMobileSettingsDesktop"
-                                id="same-mobile-settings-as-Desktop"
-                                name="same mobile settings as Desktop"
-                                type="checkbox"
-                              />
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                                for="same-mobile-settings-as-Desktop"
-                              >
-                                Use the same notification settings as desktop
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="mm-modal-generic-section-item"
-                          data-testid="mobile-notify-me-radio-section"
-                        >
-                          <h4
-                            class="mm-modal-generic-section-item__title"
-                            data-testid="mm-modal-generic-section-item__title"
-                          >
-                            Notify me about…
-                          </h4>
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-radio"
-                            >
-                              <legend
-                                class="hidden-label"
-                              >
-                                Notify me about…
-                              </legend>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="MobileNotification-all"
-                                  id="MobileNotification-all"
-                                  name="push"
-                                  type="radio"
-                                  value="all"
-                                />
-                                All new messages 
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  checked=""
-                                  data-testid="MobileNotification-mention"
-                                  id="MobileNotification-mention"
-                                  name="push"
-                                  type="radio"
-                                  value="mention"
-                                />
-                                Mentions, direct messages, and keywords only 
-                                (default)
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="MobileNotification-none"
-                                  id="MobileNotification-none"
-                                  name="push"
-                                  type="radio"
-                                  value="none"
-                                />
-                                Nothing 
-                              </label>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Follow all threads in this channel
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          When enabled, all new replies in this channel will be automatically followed and will appear in your Threads view.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <input
-                                class="mm-modal-generic-section-item__input-checkbox"
-                                data-testid="autoFollowThreads"
-                                id="auto-follow-threads"
-                                name="auto follow threads"
-                                type="checkbox"
-                              />
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                                for="auto-follow-threads"
-                              >
-                                Automatically follow threads in this channel
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                  </main>
-                </div>
-              </div>
-              <div
-                class="divider modal-footer"
-              >
-                <footer
-                  class="ChannelNotificationModal__footer"
-                >
-                  
-                  <button
-                    class="btn btn-tertiary btn-md"
-                  >
-                    Cancel
-                  </button>
-                  <button
-                    class="btn btn-primary btn-md"
-                  >
-                    Save
-                  </button>
-                </footer>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div
-    aria-hidden="true"
-  />,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "replaceStoreState": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-  "updateStoreState": [Function],
-}
-`;
-
-exports[`ChannelNotificationsModal should not show other settings if channel is mute 1`] = `
-Object {
-  "asFragment": [Function],
-  "baseElement": <body
-    class="modal-open"
-    style="padding-right: 0px;"
-  >
-    <div
-      aria-hidden="true"
-    />
-    <div
-      role="none"
-    >
-      <div
-        class="fade modal-backdrop"
-      />
-      <div
-        aria-label="channelNotificationModalLabel"
-        aria-labelledby="genericModalLabel"
-        aria-modal="true"
-        class="fade modal"
-        id="channelNotificationModal"
-        role="dialog"
-        style="display: block; padding-right: 0px;"
-        tabindex="-1"
-      >
-        <div
-          class="GenericModal__location--center a11y__modal GenericModal GenericModal__compassDesign a11y__modal ChannelNotificationModal modal--overflow modal-dialog"
-        >
-          <div
-            class="modal-content"
-            role="document"
-          >
-            <div
-              class="GenericModal__wrapper GenericModal__wrapper-enter-key-press-catcher"
-            >
-              <div
-                class="modal-header"
-              >
-                <div
-                  class="GenericModal__header__text_container"
-                >
-                  <div
-                    class="GenericModal__header"
-                  >
-                    <h1
-                      class="modal-title"
-                      id="genericModalLabel"
-                    >
-                      <div
-                        class="mm-modal-header"
-                      >
-                        <h2
-                          class="mm-modal-header__title"
-                          id="mm-modal-header-channelNotificationModalLabel"
-                        >
-                          <span>
-                            Notification Preferences
-                          </span>
-                          <span
-                            class="mm-modal-header__vertical-divider"
-                          />
-                          <span
-                            class="mm-modal-header__subtitle"
-                          >
-                            channel_display_name
-                          </span>
-                        </h2>
-                      </div>
-                    </h1>
-                  </div>
-                </div>
-                <button
-                  aria-label="Close"
-                  class="close"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                  >
-                    ×
-                  </span>
-                  <span
-                    class="sr-only"
-                  >
-                    Close
-                  </span>
-                </button>
-              </div>
-              <div
-                class="modal-body"
-              >
-                <div
-                  class="GenericModal__body"
-                >
-                  <main
-                    class="ChannelNotificationModal__body"
-                  >
-                    <fieldset
-                      aria-labelledby="ChannelNotificationModal-legend"
-                    >
-                      <section
-                        class="mm-modal-generic-section"
-                      >
-                        <div
-                          class="modalSectionHeader"
-                        >
-                          <h4
-                            class="modalSectionTitle"
-                          >
-                            <legend
-                              id="ChannelNotificationModal-legend"
-                              style="all: unset;"
-                            >
-                              Mute or ignore
-                            </legend>
-                          </h4>
-                        </div>
-                        <div
-                          class="modalSectionContent"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="muteChannel"
-                                  id="mute-channel"
-                                  name="mute channel"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="mute-channel"
-                                >
-                                  Mute channel
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              Turns off notifications for this channel. You'll still see badges if you're mentioned.
-                            </p>
-                          </div>
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="ignoreMentions"
-                                  id="ignore-mentions"
-                                  name="ignore mentions"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="ignore-mentions"
-                                >
-                                  Ignore mentions for @channel, @here and @all
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              When enabled, @channel, @here and @all will not trigger mentions or mention notifications in this channel
-                            </p>
-                          </div>
-                        </div>
-                      </section>
-                    </fieldset>
-                    <div
-                      class="AlertBanner info AlertBanner--app"
-                      data-testid="channelNotificationsMutedBanner"
-                      id="channelNotificationsMutedBanner"
-                    >
-                      <div
-                        class="AlertBanner__icon"
-                      >
-                        <svg
-                          fill="currentColor"
-                          height="24"
-                          version="1.1"
-                          viewBox="0 0 24 24"
-                          width="24"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M22.11,21.46L2.39,1.73L1.11,3L5.83,7.72C5.29,8.73 5,9.86 5,11V17L3,19V20H18.11L20.84,22.73L22.11,21.46M7,18V11C7,10.39 7.11,9.79 7.34,9.23L16.11,18H7M10,21H14A2,2 0 0,1 12,23A2,2 0 0,1 10,21M8.29,5.09C8.82,4.75 9.4,4.5 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V15.8L17,13.8V11A5,5 0 0,0 12,6C11.22,6 10.45,6.2 9.76,6.56L8.29,5.09Z"
-                          />
-                        </svg>
-                      </div>
-                      <div
-                        class="AlertBanner__body"
-                      >
-                        <div
-                          class="AlertBanner__title"
-                        >
-                          This channel is muted
-                        </div>
-                        <div
-                          class="AlertBanner__message"
-                        >
-                          All other notification preferences for this channel are disabled
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Follow all threads in this channel
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          When enabled, all new replies in this channel will be automatically followed and will appear in your Threads view.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <input
-                                class="mm-modal-generic-section-item__input-checkbox"
-                                data-testid="autoFollowThreads"
-                                id="auto-follow-threads"
-                                name="auto follow threads"
-                                type="checkbox"
-                              />
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                                for="auto-follow-threads"
-                              >
-                                Automatically follow threads in this channel
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                  </main>
-                </div>
-              </div>
-              <div
-                class="divider modal-footer"
-              >
-                <footer
-                  class="ChannelNotificationModal__footer"
-                >
-                  
-                  <button
-                    class="btn btn-tertiary btn-md"
-                  >
-                    Cancel
-                  </button>
-                  <button
-                    class="btn btn-primary btn-md"
-                  >
-                    Save
-                  </button>
-                </footer>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div
-    aria-hidden="true"
-  />,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "replaceStoreState": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-  "updateStoreState": [Function],
-}
-`;
-
-exports[`ChannelNotificationsModal should save correctly for 'Ignore mentions for @channel, @here and @all' 1`] = `
-Object {
-  "asFragment": [Function],
-  "baseElement": <body
-    class="modal-open"
-    style="padding-right: 0px;"
-  >
-    <div
-      aria-hidden="true"
-    />
-    <div
-      role="none"
-    >
-      <div
-        class="fade modal-backdrop"
-      />
-      <div
-        aria-label="channelNotificationModalLabel"
-        aria-labelledby="genericModalLabel"
-        aria-modal="true"
-        class="fade modal"
-        id="channelNotificationModal"
-        role="dialog"
-        style="display: block; padding-right: 0px;"
-        tabindex="-1"
-      >
-        <div
-          class="GenericModal__location--center a11y__modal GenericModal GenericModal__compassDesign a11y__modal ChannelNotificationModal modal--overflow modal-dialog"
-        >
-          <div
-            class="modal-content"
-            role="document"
-          >
-            <div
-              class="GenericModal__wrapper GenericModal__wrapper-enter-key-press-catcher"
-            >
-              <div
-                class="modal-header"
-              >
-                <div
-                  class="GenericModal__header__text_container"
-                >
-                  <div
-                    class="GenericModal__header"
-                  >
-                    <h1
-                      class="modal-title"
-                      id="genericModalLabel"
-                    >
-                      <div
-                        class="mm-modal-header"
-                      >
-                        <h2
-                          class="mm-modal-header__title"
-                          id="mm-modal-header-channelNotificationModalLabel"
-                        >
-                          <span>
-                            Notification Preferences
-                          </span>
-                          <span
-                            class="mm-modal-header__vertical-divider"
-                          />
-                          <span
-                            class="mm-modal-header__subtitle"
-                          >
-                            channel_display_name
-                          </span>
-                        </h2>
-                      </div>
-                    </h1>
-                  </div>
-                </div>
-                <button
-                  aria-label="Close"
-                  class="close"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                  >
-                    ×
-                  </span>
-                  <span
-                    class="sr-only"
-                  >
-                    Close
-                  </span>
-                </button>
-              </div>
-              <div
-                class="modal-body"
-              >
-                <div
-                  class="GenericModal__body"
-                >
-                  <main
-                    class="ChannelNotificationModal__body"
-                  >
-                    <fieldset
-                      aria-labelledby="ChannelNotificationModal-legend"
-                    >
-                      <section
-                        class="mm-modal-generic-section"
-                      >
-                        <div
-                          class="modalSectionHeader"
-                        >
-                          <h4
-                            class="modalSectionTitle"
-                          >
-                            <legend
-                              id="ChannelNotificationModal-legend"
-                              style="all: unset;"
-                            >
-                              Mute or ignore
-                            </legend>
-                          </h4>
-                        </div>
-                        <div
-                          class="modalSectionContent"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="muteChannel"
-                                  id="mute-channel"
-                                  name="mute channel"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="mute-channel"
-                                >
-                                  Mute channel
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              Turns off notifications for this channel. You'll still see badges if you're mentioned.
-                            </p>
-                          </div>
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="ignoreMentions"
-                                  id="ignore-mentions"
-                                  name="ignore mentions"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="ignore-mentions"
-                                >
-                                  Ignore mentions for @channel, @here and @all
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              When enabled, @channel, @here and @all will not trigger mentions or mention notifications in this channel
-                            </p>
-                          </div>
-                        </div>
-                      </section>
-                    </fieldset>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Desktop Notifications
-                          <button
-                            class="ChannelNotificationModal__reset-btn"
-                            data-testid="resetToDefaultButton-desktop"
-                          >
-                            <i
-                              class="icon icon-refresh"
-                            />
-                            Reset to default
-                          </button>
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          Available on Chrome, Edge, Firefox, and the Mattermost Desktop App.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <h4
-                            class="mm-modal-generic-section-item__title"
-                            data-testid="mm-modal-generic-section-item__title"
-                          >
-                            Notify me about…
-                          </h4>
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-radio"
-                            >
-                              <legend
-                                class="hidden-label"
-                              >
-                                Notify me about…
-                              </legend>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  checked=""
-                                  data-testid="desktopNotification-all"
-                                  id="desktopNotification-all"
-                                  name="desktop"
-                                  type="radio"
-                                  value="all"
-                                />
-                                All new messages 
-                                (default)
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="desktopNotification-mention"
-                                  id="desktopNotification-mention"
-                                  name="desktop"
-                                  type="radio"
-                                  value="mention"
-                                />
-                                Mentions, direct messages, and keywords only 
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="desktopNotification-none"
-                                  id="desktopNotification-none"
-                                  name="desktop"
-                                  type="radio"
-                                  value="none"
-                                />
-                                Nothing 
-                              </label>
-                            </fieldset>
-                          </div>
-                        </div>
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <h4
-                            class="mm-modal-generic-section-item__title"
-                            data-testid="mm-modal-generic-section-item__title"
-                          >
-                            Sounds
-                          </h4>
-                          <div
-                            class="mm-modal-generic-section-item__content inline"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                              >
-                                <input
-                                  checked=""
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="desktopNotificationSoundsCheckbox"
-                                  name="desktopNotificationSoundsCheckbox"
-                                  type="checkbox"
-                                />
-                                Message notification sounds
-                              </label>
-                            </fieldset>
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-react-select"
-                            >
-                              <div
-                                class="react-select singleSelect react-select-top css-b62m3t-container"
-                                id="desktopNotificationSoundsSelect"
-                              >
-                                <span
-                                  class="css-1f43avz-a11yText-A11yText"
-                                  id="react-select-3-live-region"
-                                />
-                                <span
-                                  aria-atomic="false"
-                                  aria-live="polite"
-                                  aria-relevant="additions text"
-                                  class="css-1f43avz-a11yText-A11yText"
-                                  role="log"
-                                />
-                                <div
-                                  class="react-select__control css-13cymwt-control"
-                                >
-                                  <div
-                                    class="react-select__value-container react-select__value-container--has-value css-hlgwow"
-                                  >
-                                    <div
-                                      class="react-select__single-value css-1dimb5e-singleValue"
-                                    >
-                                      Bing
-                                    </div>
-                                    <input
-                                      aria-activedescendant=""
-                                      aria-autocomplete="list"
-                                      aria-expanded="false"
-                                      aria-haspopup="true"
-                                      aria-readonly="true"
-                                      class="css-1s80ejz-dummyInput-DummyInput"
-                                      id="desktopNotificationSoundsSelectInputId"
-                                      inputmode="none"
-                                      role="combobox"
-                                      tabindex="0"
-                                      value=""
-                                    />
-                                  </div>
-                                  <div
-                                    class="react-select__indicators css-1wy0on6"
-                                  >
-                                    <div
-                                      aria-hidden="true"
-                                      class="react-select__indicator react-select__dropdown-indicator css-1xc3v61-indicatorContainer"
-                                    >
-                                      <svg
-                                        aria-hidden="true"
-                                        class="css-tj5bde-Svg"
-                                        focusable="false"
-                                        height="20"
-                                        viewBox="0 0 20 20"
-                                        width="20"
-                                      >
-                                        <path
-                                          d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                                        />
-                                      </svg>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Mobile Notifications
-                          <button
-                            class="ChannelNotificationModal__reset-btn"
-                            data-testid="resetToDefaultButton-mobile"
-                          >
-                            <i
-                              class="icon icon-refresh"
-                            />
-                            Reset to default
-                          </button>
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          Notification alerts are pushed to your mobile device when there is activity in Mattermost.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <input
-                                checked=""
-                                class="mm-modal-generic-section-item__input-checkbox"
-                                data-testid="sameMobileSettingsDesktop"
-                                id="same-mobile-settings-as-Desktop"
-                                name="same mobile settings as Desktop"
-                                type="checkbox"
-                              />
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                                for="same-mobile-settings-as-Desktop"
-                              >
-                                Use the same notification settings as desktop
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Follow all threads in this channel
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          When enabled, all new replies in this channel will be automatically followed and will appear in your Threads view.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <input
-                                class="mm-modal-generic-section-item__input-checkbox"
-                                data-testid="autoFollowThreads"
-                                id="auto-follow-threads"
-                                name="auto follow threads"
-                                type="checkbox"
-                              />
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                                for="auto-follow-threads"
-                              >
-                                Automatically follow threads in this channel
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                  </main>
-                </div>
-              </div>
-              <div
-                class="divider modal-footer"
-              >
-                <footer
-                  class="ChannelNotificationModal__footer"
-                >
-                  
-                  <button
-                    class="btn btn-tertiary btn-md"
-                  >
-                    Cancel
-                  </button>
-                  <button
-                    class="btn btn-primary btn-md"
-                  >
-                    Save
-                  </button>
-                </footer>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div
-    aria-hidden="true"
-  />,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "replaceStoreState": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-  "updateStoreState": [Function],
-}
-`;
-
-exports[`ChannelNotificationsModal should save the options exactly same as Desktop for mobile if use same as desktop checkbox is checked 1`] = `
-Object {
-  "asFragment": [Function],
-  "baseElement": <body
-    class="modal-open"
-    style="padding-right: 0px;"
-  >
-    <div
-      aria-hidden="true"
-    />
-    <div
-      role="none"
-    >
-      <div
-        class="fade modal-backdrop"
-      />
-      <div
-        aria-label="channelNotificationModalLabel"
-        aria-labelledby="genericModalLabel"
-        aria-modal="true"
-        class="fade modal"
-        id="channelNotificationModal"
-        role="dialog"
-        style="display: block; padding-right: 0px;"
-        tabindex="-1"
-      >
-        <div
-          class="GenericModal__location--center a11y__modal GenericModal GenericModal__compassDesign a11y__modal ChannelNotificationModal modal--overflow modal-dialog"
-        >
-          <div
-            class="modal-content"
-            role="document"
-          >
-            <div
-              class="GenericModal__wrapper GenericModal__wrapper-enter-key-press-catcher"
-            >
-              <div
-                class="modal-header"
-              >
-                <div
-                  class="GenericModal__header__text_container"
-                >
-                  <div
-                    class="GenericModal__header"
-                  >
-                    <h1
-                      class="modal-title"
-                      id="genericModalLabel"
-                    >
-                      <div
-                        class="mm-modal-header"
-                      >
-                        <h2
-                          class="mm-modal-header__title"
-                          id="mm-modal-header-channelNotificationModalLabel"
-                        >
-                          <span>
-                            Notification Preferences
-                          </span>
-                          <span
-                            class="mm-modal-header__vertical-divider"
-                          />
-                          <span
-                            class="mm-modal-header__subtitle"
-                          >
-                            channel_display_name
-                          </span>
-                        </h2>
-                      </div>
-                    </h1>
-                  </div>
-                </div>
-                <button
-                  aria-label="Close"
-                  class="close"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                  >
-                    ×
-                  </span>
-                  <span
-                    class="sr-only"
-                  >
-                    Close
-                  </span>
-                </button>
-              </div>
-              <div
-                class="modal-body"
-              >
-                <div
-                  class="GenericModal__body"
-                >
-                  <main
-                    class="ChannelNotificationModal__body"
-                  >
-                    <fieldset
-                      aria-labelledby="ChannelNotificationModal-legend"
-                    >
-                      <section
-                        class="mm-modal-generic-section"
-                      >
-                        <div
-                          class="modalSectionHeader"
-                        >
-                          <h4
-                            class="modalSectionTitle"
-                          >
-                            <legend
-                              id="ChannelNotificationModal-legend"
-                              style="all: unset;"
-                            >
-                              Mute or ignore
-                            </legend>
-                          </h4>
-                        </div>
-                        <div
-                          class="modalSectionContent"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="muteChannel"
-                                  id="mute-channel"
-                                  name="mute channel"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="mute-channel"
-                                >
-                                  Mute channel
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              Turns off notifications for this channel. You'll still see badges if you're mentioned.
-                            </p>
-                          </div>
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="ignoreMentions"
-                                  id="ignore-mentions"
-                                  name="ignore mentions"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="ignore-mentions"
-                                >
-                                  Ignore mentions for @channel, @here and @all
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              When enabled, @channel, @here and @all will not trigger mentions or mention notifications in this channel
-                            </p>
-                          </div>
-                        </div>
-                      </section>
-                    </fieldset>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Desktop Notifications
-                          <button
-                            class="ChannelNotificationModal__reset-btn"
-                            data-testid="resetToDefaultButton-desktop"
-                          >
-                            <i
-                              class="icon icon-refresh"
-                            />
-                            Reset to default
-                          </button>
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          Available on Chrome, Edge, Firefox, and the Mattermost Desktop App.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <h4
-                            class="mm-modal-generic-section-item__title"
-                            data-testid="mm-modal-generic-section-item__title"
-                          >
-                            Notify me about…
-                          </h4>
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-radio"
-                            >
-                              <legend
-                                class="hidden-label"
-                              >
-                                Notify me about…
-                              </legend>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  checked=""
-                                  data-testid="desktopNotification-all"
-                                  id="desktopNotification-all"
-                                  name="desktop"
-                                  type="radio"
-                                  value="all"
-                                />
-                                All new messages 
-                                (default)
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="desktopNotification-mention"
-                                  id="desktopNotification-mention"
-                                  name="desktop"
-                                  type="radio"
-                                  value="mention"
-                                />
-                                Mentions, direct messages, and keywords only 
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="desktopNotification-none"
-                                  id="desktopNotification-none"
-                                  name="desktop"
-                                  type="radio"
-                                  value="none"
-                                />
-                                Nothing 
-                              </label>
-                            </fieldset>
-                          </div>
-                        </div>
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <h4
-                            class="mm-modal-generic-section-item__title"
-                            data-testid="mm-modal-generic-section-item__title"
-                          >
-                            Sounds
-                          </h4>
-                          <div
-                            class="mm-modal-generic-section-item__content inline"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                              >
-                                <input
-                                  checked=""
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="desktopNotificationSoundsCheckbox"
-                                  name="desktopNotificationSoundsCheckbox"
-                                  type="checkbox"
-                                />
-                                Message notification sounds
-                              </label>
-                            </fieldset>
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-react-select"
-                            >
-                              <div
-                                class="react-select singleSelect react-select-top css-b62m3t-container"
-                                id="desktopNotificationSoundsSelect"
-                              >
-                                <span
-                                  class="css-1f43avz-a11yText-A11yText"
-                                  id="react-select-7-live-region"
-                                />
-                                <span
-                                  aria-atomic="false"
-                                  aria-live="polite"
-                                  aria-relevant="additions text"
-                                  class="css-1f43avz-a11yText-A11yText"
-                                  role="log"
-                                />
-                                <div
-                                  class="react-select__control css-13cymwt-control"
-                                >
-                                  <div
-                                    class="react-select__value-container react-select__value-container--has-value css-hlgwow"
-                                  >
-                                    <div
-                                      class="react-select__single-value css-1dimb5e-singleValue"
-                                    >
-                                      Bing
-                                    </div>
-                                    <input
-                                      aria-activedescendant=""
-                                      aria-autocomplete="list"
-                                      aria-expanded="false"
-                                      aria-haspopup="true"
-                                      aria-readonly="true"
-                                      class="css-1s80ejz-dummyInput-DummyInput"
-                                      id="desktopNotificationSoundsSelectInputId"
-                                      inputmode="none"
-                                      role="combobox"
-                                      tabindex="0"
-                                      value=""
-                                    />
-                                  </div>
-                                  <div
-                                    class="react-select__indicators css-1wy0on6"
-                                  >
-                                    <div
-                                      aria-hidden="true"
-                                      class="react-select__indicator react-select__dropdown-indicator css-1xc3v61-indicatorContainer"
-                                    >
-                                      <svg
-                                        aria-hidden="true"
-                                        class="css-tj5bde-Svg"
-                                        focusable="false"
-                                        height="20"
-                                        viewBox="0 0 20 20"
-                                        width="20"
-                                      >
-                                        <path
-                                          d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                                        />
-                                      </svg>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Mobile Notifications
-                          <button
-                            class="ChannelNotificationModal__reset-btn"
-                            data-testid="resetToDefaultButton-mobile"
-                          >
-                            <i
-                              class="icon icon-refresh"
-                            />
-                            Reset to default
-                          </button>
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          Notification alerts are pushed to your mobile device when there is activity in Mattermost.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <input
-                                checked=""
-                                class="mm-modal-generic-section-item__input-checkbox"
-                                data-testid="sameMobileSettingsDesktop"
-                                id="same-mobile-settings-as-Desktop"
-                                name="same mobile settings as Desktop"
-                                type="checkbox"
-                              />
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                                for="same-mobile-settings-as-Desktop"
-                              >
-                                Use the same notification settings as desktop
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Follow all threads in this channel
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          When enabled, all new replies in this channel will be automatically followed and will appear in your Threads view.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <input
-                                class="mm-modal-generic-section-item__input-checkbox"
-                                data-testid="autoFollowThreads"
-                                id="auto-follow-threads"
-                                name="auto follow threads"
-                                type="checkbox"
-                              />
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                                for="auto-follow-threads"
-                              >
-                                Automatically follow threads in this channel
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                  </main>
-                </div>
-              </div>
-              <div
-                class="divider modal-footer"
-              >
-                <footer
-                  class="ChannelNotificationModal__footer"
-                >
-                  
-                  <button
-                    class="btn btn-tertiary btn-md"
-                  >
-                    Cancel
-                  </button>
-                  <button
-                    class="btn btn-primary btn-md"
-                  >
-                    Save
-                  </button>
-                </footer>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div
-    aria-hidden="true"
-  />,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "replaceStoreState": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-  "updateStoreState": [Function],
-}
-`;
-
-exports[`ChannelNotificationsModal should show not auto follow, desktop threads and mobile threads settings if collapsed reply threads is enabled 1`] = `
-Object {
-  "asFragment": [Function],
-  "baseElement": <body
-    class="modal-open"
-    style="padding-right: 0px;"
-  >
-    <div
-      aria-hidden="true"
-    />
-    <div
-      role="none"
-    >
-      <div
-        class="fade modal-backdrop"
-      />
-      <div
-        aria-label="channelNotificationModalLabel"
-        aria-labelledby="genericModalLabel"
-        aria-modal="true"
-        class="fade modal"
-        id="channelNotificationModal"
-        role="dialog"
-        style="display: block; padding-right: 0px;"
-        tabindex="-1"
-      >
-        <div
-          class="GenericModal__location--center a11y__modal GenericModal GenericModal__compassDesign a11y__modal ChannelNotificationModal modal--overflow modal-dialog"
-        >
-          <div
-            class="modal-content"
-            role="document"
-          >
-            <div
-              class="GenericModal__wrapper GenericModal__wrapper-enter-key-press-catcher"
-            >
-              <div
-                class="modal-header"
-              >
-                <div
-                  class="GenericModal__header__text_container"
-                >
-                  <div
-                    class="GenericModal__header"
-                  >
-                    <h1
-                      class="modal-title"
-                      id="genericModalLabel"
-                    >
-                      <div
-                        class="mm-modal-header"
-                      >
-                        <h2
-                          class="mm-modal-header__title"
-                          id="mm-modal-header-channelNotificationModalLabel"
-                        >
-                          <span>
-                            Notification Preferences
-                          </span>
-                          <span
-                            class="mm-modal-header__vertical-divider"
-                          />
-                          <span
-                            class="mm-modal-header__subtitle"
-                          >
-                            channel_display_name
-                          </span>
-                        </h2>
-                      </div>
-                    </h1>
-                  </div>
-                </div>
-                <button
-                  aria-label="Close"
-                  class="close"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                  >
-                    ×
-                  </span>
-                  <span
-                    class="sr-only"
-                  >
-                    Close
-                  </span>
-                </button>
-              </div>
-              <div
-                class="modal-body"
-              >
-                <div
-                  class="GenericModal__body"
-                >
-                  <main
-                    class="ChannelNotificationModal__body"
-                  >
-                    <fieldset
-                      aria-labelledby="ChannelNotificationModal-legend"
-                    >
-                      <section
-                        class="mm-modal-generic-section"
-                      >
-                        <div
-                          class="modalSectionHeader"
-                        >
-                          <h4
-                            class="modalSectionTitle"
-                          >
-                            <legend
-                              id="ChannelNotificationModal-legend"
-                              style="all: unset;"
-                            >
-                              Mute or ignore
-                            </legend>
-                          </h4>
-                        </div>
-                        <div
-                          class="modalSectionContent"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="muteChannel"
-                                  id="mute-channel"
-                                  name="mute channel"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="mute-channel"
-                                >
-                                  Mute channel
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              Turns off notifications for this channel. You'll still see badges if you're mentioned.
-                            </p>
-                          </div>
-                          <div
-                            class="mm-modal-generic-section-item"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__content"
-                              data-testid="mm-modal-generic-section-item__content"
-                            >
-                              <div
-                                class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                              >
-                                <input
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="ignoreMentions"
-                                  id="ignore-mentions"
-                                  name="ignore mentions"
-                                  type="checkbox"
-                                />
-                                <label
-                                  class="mm-modal-generic-section-item__fieldset-checkbox"
-                                  for="ignore-mentions"
-                                >
-                                  Ignore mentions for @channel, @here and @all
-                                </label>
-                              </div>
-                            </div>
-                            <p
-                              class="mm-modal-generic-section-item__description"
-                              data-testid="mm-modal-generic-section-item__description"
-                            >
-                              When enabled, @channel, @here and @all will not trigger mentions or mention notifications in this channel
-                            </p>
-                          </div>
-                        </div>
-                      </section>
-                    </fieldset>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Desktop Notifications
-                          <button
-                            class="ChannelNotificationModal__reset-btn"
-                            data-testid="resetToDefaultButton-desktop"
-                          >
-                            <i
-                              class="icon icon-refresh"
-                            />
-                            Reset to default
-                          </button>
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          Available on Chrome, Edge, Firefox, and the Mattermost Desktop App.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <h4
-                            class="mm-modal-generic-section-item__title"
-                            data-testid="mm-modal-generic-section-item__title"
-                          >
-                            Notify me about…
-                          </h4>
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-radio"
-                            >
-                              <legend
-                                class="hidden-label"
-                              >
-                                Notify me about…
-                              </legend>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  checked=""
-                                  data-testid="desktopNotification-all"
-                                  id="desktopNotification-all"
-                                  name="desktop"
-                                  type="radio"
-                                  value="all"
-                                />
-                                All new messages 
-                                (default)
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="desktopNotification-mention"
-                                  id="desktopNotification-mention"
-                                  name="desktop"
-                                  type="radio"
-                                  value="mention"
-                                />
-                                Mentions, direct messages, and keywords only 
-                              </label>
-                              <label
-                                class="mm-modal-generic-section-item__label-radio"
-                              >
-                                <input
-                                  data-testid="desktopNotification-none"
-                                  id="desktopNotification-none"
-                                  name="desktop"
-                                  type="radio"
-                                  value="none"
-                                />
-                                Nothing 
-                              </label>
-                            </fieldset>
-                          </div>
-                        </div>
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <h4
-                            class="mm-modal-generic-section-item__title"
-                            data-testid="mm-modal-generic-section-item__title"
-                          >
-                            Sounds
-                          </h4>
-                          <div
-                            class="mm-modal-generic-section-item__content inline"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                              >
-                                <input
-                                  checked=""
-                                  class="mm-modal-generic-section-item__input-checkbox"
-                                  data-testid="desktopNotificationSoundsCheckbox"
-                                  name="desktopNotificationSoundsCheckbox"
-                                  type="checkbox"
-                                />
-                                Message notification sounds
-                              </label>
-                            </fieldset>
-                            <fieldset
-                              class="mm-modal-generic-section-item__fieldset-react-select"
-                            >
-                              <div
-                                class="react-select singleSelect react-select-top css-b62m3t-container"
-                                id="desktopNotificationSoundsSelect"
-                              >
-                                <span
-                                  class="css-1f43avz-a11yText-A11yText"
-                                  id="react-select-9-live-region"
-                                />
-                                <span
-                                  aria-atomic="false"
-                                  aria-live="polite"
-                                  aria-relevant="additions text"
-                                  class="css-1f43avz-a11yText-A11yText"
-                                  role="log"
-                                />
-                                <div
-                                  class="react-select__control css-13cymwt-control"
-                                >
-                                  <div
-                                    class="react-select__value-container react-select__value-container--has-value css-hlgwow"
-                                  >
-                                    <div
-                                      class="react-select__single-value css-1dimb5e-singleValue"
-                                    >
-                                      Bing
-                                    </div>
-                                    <input
-                                      aria-activedescendant=""
-                                      aria-autocomplete="list"
-                                      aria-expanded="false"
-                                      aria-haspopup="true"
-                                      aria-readonly="true"
-                                      class="css-1s80ejz-dummyInput-DummyInput"
-                                      id="desktopNotificationSoundsSelectInputId"
-                                      inputmode="none"
-                                      role="combobox"
-                                      tabindex="0"
-                                      value=""
-                                    />
-                                  </div>
-                                  <div
-                                    class="react-select__indicators css-1wy0on6"
-                                  >
-                                    <div
-                                      aria-hidden="true"
-                                      class="react-select__indicator react-select__dropdown-indicator css-1xc3v61-indicatorContainer"
-                                    >
-                                      <svg
-                                        aria-hidden="true"
-                                        class="css-tj5bde-Svg"
-                                        focusable="false"
-                                        height="20"
-                                        viewBox="0 0 20 20"
-                                        width="20"
-                                      >
-                                        <path
-                                          d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                                        />
-                                      </svg>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                    <div
-                      class="ChannelNotificationModal__divider"
-                    />
-                    <section
-                      class="mm-modal-generic-section"
-                    >
-                      <div
-                        class="modalSectionHeader"
-                      >
-                        <h4
-                          class="modalSectionTitle"
-                        >
-                          Mobile Notifications
-                          <button
-                            class="ChannelNotificationModal__reset-btn"
-                            data-testid="resetToDefaultButton-mobile"
-                          >
-                            <i
-                              class="icon icon-refresh"
-                            />
-                            Reset to default
-                          </button>
-                        </h4>
-                        <p
-                          class="modalSectionDescription"
-                        >
-                          Notification alerts are pushed to your mobile device when there is activity in Mattermost.
-                        </p>
-                      </div>
-                      <div
-                        class="modalSectionContent"
-                      >
-                        <div
-                          class="mm-modal-generic-section-item"
-                        >
-                          <div
-                            class="mm-modal-generic-section-item__content"
-                            data-testid="mm-modal-generic-section-item__content"
-                          >
-                            <div
-                              class="mm-modal-generic-section-item__fieldset-checkbox-ctr"
-                            >
-                              <input
-                                checked=""
-                                class="mm-modal-generic-section-item__input-checkbox"
-                                data-testid="sameMobileSettingsDesktop"
-                                id="same-mobile-settings-as-Desktop"
-                                name="same mobile settings as Desktop"
-                                type="checkbox"
-                              />
-                              <label
-                                class="mm-modal-generic-section-item__fieldset-checkbox"
-                                for="same-mobile-settings-as-Desktop"
-                              >
-                                Use the same notification settings as desktop
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </section>
-                  </main>
-                </div>
-              </div>
-              <div
-                class="divider modal-footer"
-              >
-                <footer
-                  class="ChannelNotificationModal__footer"
-                >
-                  
-                  <button
-                    class="btn btn-tertiary btn-md"
-                  >
-                    Cancel
-                  </button>
-                  <button
-                    class="btn btn-primary btn-md"
-                  >
-                    Save
-                  </button>
-                </footer>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div
-    aria-hidden="true"
-  />,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "replaceStoreState": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-  "updateStoreState": [Function],
-}
-`;
diff --git a/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.test.tsx b/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.test.tsx
index d2e8b02d91f..217bf9bd642 100644
--- a/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.test.tsx
+++ b/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.test.tsx
@@ -1,7 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {screen, fireEvent, waitFor} from '@testing-library/react';
+import {act, screen, waitFor} from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import type {ChannelMembership} from '@mattermost/types/channels';
@@ -53,23 +54,25 @@ describe('ChannelNotificationsModal', () => {
     };
 
     test('should not show other settings if channel is mute', async () => {
-        const wrapper = renderWithContext(
+        renderWithContext(
             <ChannelNotificationsModal {...baseProps}/>,
         );
 
         const muteChannel = screen.getByTestId('muteChannel');
 
-        fireEvent.click(muteChannel);
+        await userEvent.click(muteChannel);
         expect(muteChannel).toBeChecked();
-        const AlertBanner = screen.queryByText('This channel is muted');
-        expect(AlertBanner).toBeVisible();
 
-        expect(screen.queryByText('Desktop Notifications')).toBeNull();
+        const alertBanner = screen.getByText('This channel is muted');
+        expect(alertBanner).toBeInTheDocument();
 
-        expect(screen.queryByText('Mobile Notifications')).toBeNull();
-        expect(screen.queryByText('Follow all threads in this channel')).not.toBeNull();
+        expect(screen.queryByText('Desktop Notifications')).not.toBeInTheDocument();
+        expect(screen.queryByText('Mobile Notifications')).not.toBeInTheDocument();
+        expect(screen.getByText('Follow all threads in this channel')).toBeInTheDocument();
 
-        fireEvent.click(screen.getByRole('button', {name: /Save/i}));
+        await act(async () => {
+            await userEvent.click(screen.getByRole('button', {name: /Save/i}));
+        });
 
         await waitFor(() =>
             expect(baseProps.actions.updateChannelNotifyProps).toHaveBeenCalledWith(
@@ -88,18 +91,25 @@ describe('ChannelNotificationsModal', () => {
                 },
             ),
         );
-        expect(wrapper).toMatchSnapshot();
     });
 
     test('should save correctly for \'Ignore mentions for @channel, @here and @all\'', async () => {
-        const wrapper = renderWithContext(
+        renderWithContext(
             <ChannelNotificationsModal {...baseProps}/>,
         );
+
         const ignoreChannel = screen.getByTestId('ignoreMentions');
-        fireEvent.click(ignoreChannel);
+        await act(async () => {
+            await userEvent.click(ignoreChannel);
+        });
         expect(ignoreChannel).toBeChecked();
 
-        fireEvent.click(screen.getByRole('button', {name: /Save/i}));
+        // Verify the checkbox label is present
+        expect(screen.getByText('Ignore mentions for @channel, @here and @all')).toBeInTheDocument();
+
+        await act(async () => {
+            await userEvent.click(screen.getByRole('button', {name: /Save/i}));
+        });
         await waitFor(() =>
             expect(baseProps.actions.updateChannelNotifyProps).toHaveBeenCalledWith(
                 'current_user_id',
@@ -117,35 +127,50 @@ describe('ChannelNotificationsModal', () => {
                 },
             ),
         );
-        expect(wrapper).toMatchSnapshot();
     });
 
     test('should check the options in the desktop notifications', async () => {
-        const wrapper = renderWithContext(
+        renderWithContext(
             <ChannelNotificationsModal {...baseProps}/>,
         );
 
-        expect(screen.queryByText('Desktop Notifications')).toBeVisible();
+        expect(screen.getByText('Desktop Notifications')).toBeInTheDocument();
 
-        const AlllabelRadio: HTMLInputElement = screen.getByTestId(
-            'desktopNotification-all',
-        );
-        fireEvent.click(AlllabelRadio);
-        expect(AlllabelRadio.checked).toEqual(true);
+        const allRadio: HTMLInputElement = screen.getByTestId('desktopNotification-all');
+        const mentionsRadio: HTMLInputElement = screen.getByTestId('desktopNotification-mention');
+        const nothingRadio: HTMLInputElement = screen.getByTestId('desktopNotification-none');
 
-        const MentionslabelRadio: HTMLInputElement = screen.getByTestId(
-            'desktopNotification-mention',
-        );
-        fireEvent.click(MentionslabelRadio);
-        expect(MentionslabelRadio.checked).toEqual(true);
+        // Verify all radio options are present
+        expect(allRadio).toBeInTheDocument();
+        expect(mentionsRadio).toBeInTheDocument();
+        expect(nothingRadio).toBeInTheDocument();
 
-        const NothinglabelRadio: HTMLInputElement = screen.getByTestId(
-            'desktopNotification-none',
-        );
-        fireEvent.click(NothinglabelRadio);
-        expect(NothinglabelRadio.checked).toEqual(true);
+        // Test clicking through the options
+        await act(async () => {
+            await userEvent.click(allRadio);
+        });
+        expect(allRadio).toBeChecked();
 
-        fireEvent.click(screen.getByRole('button', {name: /Save/i}));
+        await act(async () => {
+            await userEvent.click(mentionsRadio);
+        });
+        expect(mentionsRadio).toBeChecked();
+        expect(allRadio).not.toBeChecked();
+
+        await act(async () => {
+            await userEvent.click(nothingRadio);
+        });
+        expect(nothingRadio).toBeChecked();
+        expect(mentionsRadio).not.toBeChecked();
+
+        // Verify the labels are present
+        expect(screen.getByText(/All new messages/)).toBeInTheDocument();
+        expect(screen.getByText(/Mentions, direct messages, and keywords only/)).toBeInTheDocument();
+        expect(screen.getByText(/Nothing/)).toBeInTheDocument();
+
+        await act(async () => {
+            await userEvent.click(screen.getByRole('button', {name: /Save/i}));
+        });
         await waitFor(() =>
             expect(baseProps.actions.updateChannelNotifyProps).toHaveBeenCalledWith(
                 'current_user_id',
@@ -163,17 +188,20 @@ describe('ChannelNotificationsModal', () => {
                 },
             ),
         );
-        expect(wrapper).toMatchSnapshot();
     });
 
     test('should disable message notification sound if option is unchecked', async () => {
         renderWithContext(<ChannelNotificationsModal {...baseProps}/>);
 
         // Since the default value is checked, we will uncheck the checkbox
-        fireEvent.click(screen.getByTestId('desktopNotificationSoundsCheckbox'));
+        await act(async () => {
+            await userEvent.click(screen.getByTestId('desktopNotificationSoundsCheckbox'));
+        });
         expect(screen.getByTestId('desktopNotificationSoundsCheckbox')).not.toBeChecked();
 
-        fireEvent.click(screen.getByRole('button', {name: /Save/i}));
+        await act(async () => {
+            await userEvent.click(screen.getByRole('button', {name: /Save/i}));
+        });
         await waitFor(() => {
             expect(baseProps.actions.updateChannelNotifyProps).toHaveBeenCalledWith(
                 'current_user_id',
@@ -197,31 +225,36 @@ describe('ChannelNotificationsModal', () => {
         renderWithContext(<ChannelNotificationsModal {...baseProps}/>);
 
         // Since the default value is on, we will uncheck the checkbox
-        fireEvent.click(screen.getByTestId('desktopNotificationSoundsCheckbox'));
+        await userEvent.click(screen.getByTestId('desktopNotificationSoundsCheckbox'));
         expect(screen.getByTestId('desktopNotificationSoundsCheckbox')).not.toBeChecked();
 
         // Reset to default button is clicked
-        fireEvent.click(screen.getByTestId('resetToDefaultButton-desktop'));
+        await userEvent.click(screen.getByTestId('resetToDefaultButton-desktop'));
 
         // Verify that the checkbox is checked to default to user desktop notification sound
         expect(screen.getByTestId('desktopNotificationSoundsCheckbox')).toBeChecked();
     });
 
     test('should save the options exactly same as Desktop for mobile if use same as desktop checkbox is checked', async () => {
-        const wrapper = renderWithContext(
+        renderWithContext(
             <ChannelNotificationsModal {...baseProps}/>,
         );
 
-        expect(screen.queryByText('Desktop Notifications')).toBeVisible();
+        expect(screen.getByText('Desktop Notifications')).toBeInTheDocument();
+        expect(screen.getByText('Mobile Notifications')).toBeInTheDocument();
 
-        const sameAsDesktop: HTMLInputElement = screen.getByTestId(
-            'sameMobileSettingsDesktop',
-        );
-        expect(sameAsDesktop.checked).toEqual(true);
+        const sameAsDesktop: HTMLInputElement = screen.getByTestId('sameMobileSettingsDesktop');
+        expect(sameAsDesktop).toBeChecked();
 
-        expect(screen.queryByText('All new messages')).toBeNull();
+        // Verify the checkbox label is present
+        expect(screen.getByText('Use the same notification settings as desktop')).toBeInTheDocument();
 
-        fireEvent.click(screen.getByRole('button', {name: /Save/i}));
+        // When "same as desktop" is checked, mobile-specific options should not be visible
+        expect(screen.queryByTestId('mobile-notify-me-radio-section')).not.toBeInTheDocument();
+
+        await act(async () => {
+            await userEvent.click(screen.getByRole('button', {name: /Save/i}));
+        });
         await waitFor(() =>
             expect(baseProps.actions.updateChannelNotifyProps).toHaveBeenCalledWith(
                 'current_user_id',
@@ -239,7 +272,6 @@ describe('ChannelNotificationsModal', () => {
                 },
             ),
         );
-        expect(wrapper).toMatchSnapshot();
     });
 
     test('should check the options in the mobile notifications', async () => {
@@ -252,20 +284,42 @@ describe('ChannelNotificationsModal', () => {
                 },
             } as unknown as ChannelMembership,
         };
-        const wrapper = renderWithContext(
+        renderWithContext(
             <ChannelNotificationsModal {...props}/>,
         );
 
-        fireEvent.click(screen.getByTestId('MobileNotification-all'));
-        expect(screen.getByTestId('MobileNotification-all')).toBeChecked();
+        // First uncheck "same as desktop" to show mobile options
+        const sameAsDesktop = screen.getByTestId('sameMobileSettingsDesktop');
+        expect(sameAsDesktop).not.toBeChecked();
 
-        fireEvent.click(screen.getByTestId('MobileNotification-mention'));
-        expect(screen.getByTestId('MobileNotification-mention')).toBeChecked();
+        // Now mobile notification options should be visible
+        expect(screen.getByTestId('mobile-notify-me-radio-section')).toBeInTheDocument();
 
-        fireEvent.click(screen.getByTestId('MobileNotification-none'));
-        expect(screen.getByTestId('MobileNotification-none')).toBeChecked();
+        const allRadio = screen.getByTestId('MobileNotification-all');
+        const mentionRadio = screen.getByTestId('MobileNotification-mention');
+        const noneRadio = screen.getByTestId('MobileNotification-none');
 
-        fireEvent.click(screen.getByRole('button', {name: /Save/i}));
+        // Test clicking through the mobile notification options
+        await act(async () => {
+            await userEvent.click(allRadio);
+        });
+        expect(allRadio).toBeChecked();
+
+        await act(async () => {
+            await userEvent.click(mentionRadio);
+        });
+        expect(mentionRadio).toBeChecked();
+        expect(allRadio).not.toBeChecked();
+
+        await act(async () => {
+            await userEvent.click(noneRadio);
+        });
+        expect(noneRadio).toBeChecked();
+        expect(mentionRadio).not.toBeChecked();
+
+        await act(async () => {
+            await userEvent.click(screen.getByRole('button', {name: /Save/i}));
+        });
         await waitFor(() =>
             expect(baseProps.actions.updateChannelNotifyProps).toHaveBeenCalledWith(
                 'current_user_id',
@@ -283,21 +337,28 @@ describe('ChannelNotificationsModal', () => {
                 },
             ),
         );
-        expect(wrapper).toMatchSnapshot();
     });
 
-    test('should show not auto follow, desktop threads and mobile threads settings if collapsed reply threads is enabled', async () => {
+    test('should not show auto follow threads section if collapsed reply threads is disabled', async () => {
         const props = {
             ...baseProps,
             collapsedReplyThreads: false,
         };
-        const wrapper = renderWithContext(
+        renderWithContext(
             <ChannelNotificationsModal {...props}/>,
         );
 
-        expect(screen.queryByText('Follow all threads in this channel')).toBeNull();
+        // Auto follow threads section should not be visible when collapsed threads is disabled
+        expect(screen.queryByText('Follow all threads in this channel')).not.toBeInTheDocument();
 
-        fireEvent.click(screen.getByRole('button', {name: /Save/i}));
+        // But other sections should still be present
+        expect(screen.getByText('Desktop Notifications')).toBeInTheDocument();
+        expect(screen.getByText('Mobile Notifications')).toBeInTheDocument();
+        expect(screen.getByText('Mute or ignore')).toBeInTheDocument();
+
+        await act(async () => {
+            await userEvent.click(screen.getByRole('button', {name: /Save/i}));
+        });
 
         await waitFor(() =>
             expect(baseProps.actions.updateChannelNotifyProps).toHaveBeenCalledWith(
@@ -316,7 +377,6 @@ describe('ChannelNotificationsModal', () => {
                 },
             ),
         );
-        expect(wrapper).toMatchSnapshot();
     });
 });
 
diff --git a/webapp/channels/src/components/common/hooks/useChannel.test.ts b/webapp/channels/src/components/common/hooks/useChannel.test.ts
new file mode 100644
index 00000000000..3e19b8e964a
--- /dev/null
+++ b/webapp/channels/src/components/common/hooks/useChannel.test.ts
@@ -0,0 +1,207 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import nock from 'nock';
+import * as ReactRedux from 'react-redux';
+
+import {Client4} from 'mattermost-redux/client';
+
+import {renderHookWithContext} from 'tests/react_testing_utils';
+import {TestHelper} from 'utils/test_helper';
+
+import {useChannel} from './useChannel';
+
+describe('useChannel', () => {
+    const channel1 = TestHelper.getChannelMock({id: 'channel1'});
+    const channel2 = TestHelper.getChannelMock({id: 'channel2'});
+
+    describe('with fake dispatch', () => {
+        const dispatchMock = jest.fn();
+
+        beforeAll(() => {
+            jest.spyOn(ReactRedux, 'useDispatch').mockImplementation(() => dispatchMock);
+        });
+
+        afterAll(() => {
+            jest.restoreAllMocks();
+        });
+
+        test("should return the channel if it's already in the store", () => {
+            const {result} = renderHookWithContext(
+                () => useChannel('channel1'),
+                {
+                    entities: {
+                        channels: {
+                            channels: {
+                                channel1,
+                            },
+                        },
+                    },
+                },
+            );
+
+            expect(result.current).toBe(channel1);
+            expect(dispatchMock).not.toHaveBeenCalled();
+        });
+
+        test("should fetch the channel if it's not in the store", () => {
+            const {result} = renderHookWithContext(
+                () => useChannel('channel1'),
+            );
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+        });
+
+        test('should only attempt to fetch the channel once regardless of how many times the hook is used', () => {
+            const {result, rerender} = renderHookWithContext(
+                () => useChannel('channel1'),
+            );
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+
+            for (let i = 0; i < 10; i++) {
+                rerender();
+            }
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+        });
+
+        test('should attempt to fetch different channels if the channel ID changes', () => {
+            let channelId = 'channel1';
+            const {result, rerender} = renderHookWithContext(
+                () => useChannel(channelId),
+            );
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+
+            channelId = 'channel2';
+            rerender();
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(2);
+        });
+
+        test("should only attempt to fetch each channel once when they aren't loaded", () => {
+            let channelId = 'channel1';
+            const {result, replaceStoreState, rerender} = renderHookWithContext(
+                () => useChannel(channelId),
+            );
+
+            // Initial state without channel1 loaded
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+
+            // Simulate the response to loading channel1
+            replaceStoreState({
+                entities: {
+                    channels: {
+                        channels: {
+                            channel1,
+                        },
+                    },
+                },
+            });
+
+            expect(result.current).toBe(channel1);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+
+            // Switch to channel2
+            channelId = 'channel2';
+
+            rerender();
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(2);
+
+            // Simulate the response to loading channel2
+            replaceStoreState({
+                entities: {
+                    channels: {
+                        channels: {
+                            channel1,
+                            channel2,
+                        },
+                    },
+                },
+            });
+
+            expect(result.current).toBe(channel2);
+            expect(dispatchMock).toHaveBeenCalledTimes(2);
+
+            // Switch back to channel1 which has already been loaded
+            channelId = 'channel1';
+
+            rerender();
+
+            expect(result.current).toBe(channel1);
+            expect(dispatchMock).toHaveBeenCalledTimes(2);
+        });
+
+        test("shouldn't attempt to load anything when given an empty channel ID", () => {
+            const {result} = renderHookWithContext(
+                () => useChannel(''),
+            );
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(0);
+        });
+    });
+
+    describe('with real dispatch', () => {
+        beforeAll(() => {
+            Client4.setUrl('http://localhost:8065');
+        });
+
+        test("should only attempt to fetch each channel once when they aren't loaded", async () => {
+            const channel1Mock = nock(Client4.getBaseRoute()).
+                get(`/channels/${channel1.id}`).
+                once().
+                reply(200, channel1);
+            const channel2Mock = nock(Client4.getBaseRoute()).
+                get(`/channels/${channel2.id}`).
+                once().
+                reply(200, channel2);
+
+            let channelId = 'channel1';
+            const {result, rerender, waitForNextUpdate} = renderHookWithContext(
+                () => useChannel(channelId),
+            );
+
+            // Initial state without channel1 loaded
+            expect(result.current).toEqual(undefined);
+            expect(channel1Mock.isDone()).toBe(false);
+            expect(channel2Mock.isDone()).toBe(false);
+
+            // Wait for the response with channel1
+
+            await waitForNextUpdate();
+
+            expect(channel1Mock.isDone()).toBe(true);
+            expect(channel2Mock.isDone()).toBe(false);
+            expect(result.current).toEqual(channel1);
+
+            // Switch to channel2
+            channelId = 'channel2';
+            rerender();
+
+            expect(result.current).toEqual(undefined);
+
+            // Wait for the response with channel2
+            await waitForNextUpdate();
+
+            expect(channel1Mock.isDone()).toBe(true);
+            expect(channel2Mock.isDone()).toBe(true);
+            expect(result.current).toEqual(channel2);
+
+            // Switch back to channel1 which has already been loaded
+            channelId = 'channel1';
+            rerender();
+
+            expect(result.current).toEqual(channel1);
+        });
+    });
+});
diff --git a/webapp/channels/src/components/common/hooks/useChannel.ts b/webapp/channels/src/components/common/hooks/useChannel.ts
new file mode 100644
index 00000000000..a374869bb31
--- /dev/null
+++ b/webapp/channels/src/components/common/hooks/useChannel.ts
@@ -0,0 +1,15 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import type {Channel} from '@mattermost/types/channels';
+
+import {fetchMissingChannels} from 'mattermost-redux/actions/channels';
+import {getChannel} from 'mattermost-redux/selectors/entities/channels';
+
+import {makeUseEntity} from 'components/common/hooks/useEntity';
+
+export const useChannel = makeUseEntity<Channel>({
+    name: 'useChannel',
+    fetch: (channelId: string) => fetchMissingChannels([channelId]),
+    selector: getChannel,
+});
diff --git a/webapp/channels/src/components/common/hooks/use_team.test.ts b/webapp/channels/src/components/common/hooks/use_team.test.ts
new file mode 100644
index 00000000000..ce95cb4ed26
--- /dev/null
+++ b/webapp/channels/src/components/common/hooks/use_team.test.ts
@@ -0,0 +1,229 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import nock from 'nock';
+import * as ReactRedux from 'react-redux';
+
+import {Client4} from 'mattermost-redux/client';
+
+import {renderHookWithContext} from 'tests/react_testing_utils';
+import {TestHelper} from 'utils/test_helper';
+
+import {useTeam} from './use_team';
+
+describe('useTeam', () => {
+    const team1 = TestHelper.getTeamMock({id: 'team1'});
+    const team2 = TestHelper.getTeamMock({id: 'team2'});
+
+    describe('with fake dispatch', () => {
+        const dispatchMock = jest.fn();
+
+        beforeAll(() => {
+            jest.spyOn(ReactRedux, 'useDispatch').mockImplementation(() => dispatchMock);
+        });
+
+        afterAll(() => {
+            jest.restoreAllMocks();
+        });
+
+        test("should return the team if it's already in the store", () => {
+            const {result} = renderHookWithContext(
+                () => useTeam('team1'),
+                {
+                    entities: {
+                        teams: {
+                            teams: {
+                                team1,
+                            },
+                        },
+                    },
+                },
+            );
+
+            expect(result.current).toBe(team1);
+            expect(dispatchMock).not.toHaveBeenCalled();
+        });
+
+        test("should fetch the team if it's not in the store", () => {
+            const {result} = renderHookWithContext(
+                () => useTeam('team1'),
+            );
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+        });
+
+        test('should only attempt to fetch the team once regardless of how many times the hook is used', () => {
+            const {result, rerender} = renderHookWithContext(
+                () => useTeam('team1'),
+            );
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+
+            for (let i = 0; i < 10; i++) {
+                rerender();
+            }
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+        });
+
+        test('should attempt to fetch different teams if the team ID changes', () => {
+            let teamId = 'team1';
+            const {result, rerender} = renderHookWithContext(
+                () => useTeam(teamId),
+            );
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+
+            teamId = 'team2';
+            rerender();
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(2);
+        });
+
+        test("should only attempt to fetch each team once when they aren't loaded", () => {
+            let teamId = 'team1';
+            const {result, replaceStoreState, rerender} = renderHookWithContext(
+                () => useTeam(teamId),
+            );
+
+            // Initial state without team1 loaded
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+
+            // Simulate the response to loading team1
+            replaceStoreState({
+                entities: {
+                    teams: {
+                        teams: {
+                            team1,
+                        },
+                    },
+                },
+            });
+
+            expect(result.current).toBe(team1);
+            expect(dispatchMock).toHaveBeenCalledTimes(1);
+
+            // Switch to team2
+            teamId = 'team2';
+
+            rerender();
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(2);
+
+            // Simulate the response to loading team2
+            replaceStoreState({
+                entities: {
+                    teams: {
+                        teams: {
+                            team1,
+                            team2,
+                        },
+                    },
+                },
+            });
+
+            expect(result.current).toBe(team2);
+            expect(dispatchMock).toHaveBeenCalledTimes(2);
+
+            // Switch back to team1 which has already been loaded
+            teamId = 'team1';
+
+            rerender();
+
+            expect(result.current).toBe(team1);
+            expect(dispatchMock).toHaveBeenCalledTimes(2);
+        });
+
+        test("shouldn't attempt to load anything when given an empty team ID", () => {
+            const {result} = renderHookWithContext(
+                () => useTeam(''),
+            );
+
+            expect(result.current).toBe(undefined);
+            expect(dispatchMock).toHaveBeenCalledTimes(0);
+        });
+    });
+
+    describe('with real dispatch', () => {
+        beforeAll(() => {
+            Client4.setUrl('http://localhost:8065');
+        });
+
+        test("should fetch team when it's not loaded", async () => {
+            const teamMock = nock(Client4.getBaseRoute()).
+                get(`/teams/${team1.id}`).
+                once().
+                reply(200, team1);
+
+            const {result, waitForNextUpdate} = renderHookWithContext(
+                () => useTeam('team1'),
+            );
+
+            // Initial state without team1 loaded
+            expect(result.current).toEqual(undefined);
+            expect(teamMock.isDone()).toBe(false);
+
+            // Wait for the response with team1
+            await waitForNextUpdate();
+
+            expect(teamMock.isDone()).toBe(true);
+            expect(result.current).toEqual(team1);
+        });
+
+        test("should only attempt to fetch each team once when they aren't loaded", async () => {
+            const team1Mock = nock(Client4.getBaseRoute()).
+                get(`/teams/${team1.id}`).
+                once().
+                reply(200, team1);
+            const team2Mock = nock(Client4.getBaseRoute()).
+                get(`/teams/${team2.id}`).
+                once().
+                reply(200, team2);
+
+            let teamId = 'team1';
+            const {result, rerender, waitForNextUpdate} = renderHookWithContext(
+                () => useTeam(teamId),
+            );
+
+            // Initial state without team1 loaded
+            expect(result.current).toEqual(undefined);
+            expect(team1Mock.isDone()).toBe(false);
+            expect(team2Mock.isDone()).toBe(false);
+
+            // Wait for the response with team1
+            await waitForNextUpdate();
+
+            expect(team1Mock.isDone()).toBe(true);
+            expect(team2Mock.isDone()).toBe(false);
+            expect(result.current).toEqual(team1);
+
+            // Switch to team2
+            teamId = 'team2';
+            rerender();
+
+            expect(result.current).toEqual(undefined);
+
+            // Wait for the response with team2
+            await waitForNextUpdate();
+
+            expect(team1Mock.isDone()).toBe(true);
+            expect(team2Mock.isDone()).toBe(true);
+            expect(result.current).toEqual(team2);
+
+            // Switch back to team1 which has already been loaded
+            teamId = 'team1';
+            rerender();
+
+            expect(result.current).toEqual(team1);
+
+            // We know there's no second call because nock is set to only mock the first request for each team
+        });
+    });
+});
diff --git a/webapp/channels/src/components/common/hooks/use_team.ts b/webapp/channels/src/components/common/hooks/use_team.ts
new file mode 100644
index 00000000000..4e9912a7901
--- /dev/null
+++ b/webapp/channels/src/components/common/hooks/use_team.ts
@@ -0,0 +1,15 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import type {Team} from '@mattermost/types/teams';
+
+import {getTeam as getTeamAction} from 'mattermost-redux/actions/teams';
+import {getTeam as getTeamSelector} from 'mattermost-redux/selectors/entities/teams';
+
+import {makeUseEntity} from 'components/common/hooks/useEntity';
+
+export const useTeam = makeUseEntity<Team>({
+    name: 'useTeam',
+    fetch: getTeamAction,
+    selector: getTeamSelector,
+});
diff --git a/webapp/channels/src/components/dot_menu/__snapshots__/dot_menu.test.tsx.snap b/webapp/channels/src/components/dot_menu/__snapshots__/dot_menu.test.tsx.snap
deleted file mode 100644
index 9d6839e0d71..00000000000
--- a/webapp/channels/src/components/dot_menu/__snapshots__/dot_menu.test.tsx.snap
+++ /dev/null
@@ -1,607 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`components/dot_menu/DotMenu should match snapshot, can move 1`] = `
-Object {
-  "asFragment": [Function],
-  "baseElement": <body>
-    <div>
-      <button
-        aria-controls="CENTER_dropdown_post_id_1"
-        aria-expanded="false"
-        aria-haspopup="true"
-        aria-label="more"
-        class="post-menu__item"
-        data-testid="PostDotMenu-Button-post_id_1"
-        id="CENTER_button_post_id_1"
-      >
-        <svg
-          fill="currentColor"
-          height="16"
-          version="1.1"
-          viewBox="0 0 24 24"
-          width="16"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z"
-          />
-        </svg>
-      </button>
-    </div>
-  </body>,
-  "container": <div>
-    <button
-      aria-controls="CENTER_dropdown_post_id_1"
-      aria-expanded="false"
-      aria-haspopup="true"
-      aria-label="more"
-      class="post-menu__item"
-      data-testid="PostDotMenu-Button-post_id_1"
-      id="CENTER_button_post_id_1"
-    >
-      <svg
-        fill="currentColor"
-        height="16"
-        version="1.1"
-        viewBox="0 0 24 24"
-        width="16"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z"
-        />
-      </svg>
-    </button>
-  </div>,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "replaceStoreState": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-  "updateStoreState": [Function],
-}
-`;
-
-exports[`components/dot_menu/DotMenu should match snapshot, canDelete 1`] = `
-Object {
-  "asFragment": [Function],
-  "baseElement": <body>
-    <div>
-      <button
-        aria-controls="CENTER_dropdown_post_id_1"
-        aria-expanded="false"
-        aria-haspopup="true"
-        aria-label="more"
-        class="post-menu__item"
-        data-testid="PostDotMenu-Button-post_id_1"
-        id="CENTER_button_post_id_1"
-      >
-        <svg
-          fill="currentColor"
-          height="16"
-          version="1.1"
-          viewBox="0 0 24 24"
-          width="16"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z"
-          />
-        </svg>
-      </button>
-    </div>
-  </body>,
-  "container": <div>
-    <button
-      aria-controls="CENTER_dropdown_post_id_1"
-      aria-expanded="false"
-      aria-haspopup="true"
-      aria-label="more"
-      class="post-menu__item"
-      data-testid="PostDotMenu-Button-post_id_1"
-      id="CENTER_button_post_id_1"
-    >
-      <svg
-        fill="currentColor"
-        height="16"
-        version="1.1"
-        viewBox="0 0 24 24"
-        width="16"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z"
-        />
-      </svg>
-    </button>
-  </div>,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "replaceStoreState": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-  "updateStoreState": [Function],
-}
-`;
-
-exports[`components/dot_menu/DotMenu should match snapshot, cannot move 1`] = `
-Object {
-  "asFragment": [Function],
-  "baseElement": <body>
-    <div>
-      <button
-        aria-controls="CENTER_dropdown_post_id_1"
-        aria-expanded="false"
-        aria-haspopup="true"
-        aria-label="more"
-        class="post-menu__item"
-        data-testid="PostDotMenu-Button-post_id_1"
-        id="CENTER_button_post_id_1"
-      >
-        <svg
-          fill="currentColor"
-          height="16"
-          version="1.1"
-          viewBox="0 0 24 24"
-          width="16"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z"
-          />
-        </svg>
-      </button>
-    </div>
-  </body>,
-  "container": <div>
-    <button
-      aria-controls="CENTER_dropdown_post_id_1"
-      aria-expanded="false"
-      aria-haspopup="true"
-      aria-label="more"
-      class="post-menu__item"
-      data-testid="PostDotMenu-Button-post_id_1"
-      id="CENTER_button_post_id_1"
-    >
-      <svg
-        fill="currentColor"
-        height="16"
-        version="1.1"
-        viewBox="0 0 24 24"
-        width="16"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z"
-        />
-      </svg>
-    </button>
-  </div>,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "replaceStoreState": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-  "updateStoreState": [Function],
-}
-`;
-
-exports[`components/dot_menu/DotMenu should match snapshot, on Center 1`] = `
-<Menu
-  menu={
-    Object {
-      "aria-label": "Post extra options",
-      "id": "CENTER_dropdown_post_id_1",
-      "onKeyDown": [Function],
-      "onToggle": [Function],
-      "width": "264px",
-    }
-  }
-  menuButton={
-    Object {
-      "aria-label": "more",
-      "children": <DotsHorizontalIcon
-        size={16}
-      />,
-      "class": "post-menu__item",
-      "dataTestId": "PostDotMenu-Button-post_id_1",
-      "id": "CENTER_button_post_id_1",
-    }
-  }
-  menuButtonTooltip={
-    Object {
-      "class": "hidden-xs",
-      "text": "More",
-    }
-  }
->
-  <MenuItem
-    data-testid="reply_to_post_post_id_1"
-    id="reply_to_post_post_id_1"
-    labels={
-      <Memo(MemoizedFormattedMessage)
-        defaultMessage="Reply"
-        id="post_info.reply"
-      />
-    }
-    leadingElement={
-      <ReplyOutlineIcon
-        size={18}
-      />
-    }
-    onClick={[Function]}
-    trailingElements={
-      <ShortcutKey
-        shortcutKey="R"
-      />
-    }
-  />
-  <MenuItem
-    data-testid="forward_post_post_id_1"
-    id="forward_post_post_id_1"
-    isLabelsRowLayout={true}
-    labels={
-      <span
-        className="dot-menu__item-new-badge"
-      >
-        <Memo(MemoizedFormattedMessage)
-          defaultMessage="Forward"
-          id="forward_post_button.label"
-        />
-      </span>
-    }
-    leadingElement={
-      <ArrowRightBoldOutlineIcon
-        size={18}
-      />
-    }
-    onClick={[Function]}
-    trailingElements={
-      <ShortcutKey
-        shortcutKey="Shift + F"
-      />
-    }
-  />
-  <MenuItem
-    data-testid="follow_post_thread_post_id_1"
-    id="follow_post_thread_post_id_1"
-    labels={
-      <Memo(MemoizedFormattedMessage)
-        defaultMessage="Follow message"
-        id="threading.threadMenu.followMessage"
-      />
-    }
-    leadingElement={
-      <MessageCheckOutlineIcon
-        size={18}
-      />
-    }
-    onClick={[Function]}
-    trailingElements={
-      <ShortcutKey
-        shortcutKey="F"
-      />
-    }
-  />
-  <MenuItem
-    data-testid="unread_post_post_id_1"
-    id="unread_post_post_id_1"
-    labels={
-      <Memo(MemoizedFormattedMessage)
-        defaultMessage="Mark as Unread"
-        id="post_info.unread"
-      />
-    }
-    leadingElement={
-      <MarkAsUnreadIcon
-        size={18}
-      />
-    }
-    onClick={[Function]}
-    trailingElements={
-      <ShortcutKey
-        shortcutKey="U"
-      />
-    }
-  />
-  <Memo(PostReminderSubmenu)
-    isMilitaryTime={false}
-    post={
-      Object {
-        "channel_id": "",
-        "create_at": 0,
-        "delete_at": 0,
-        "edit_at": 0,
-        "hashtags": "",
-        "id": "post_id_1",
-        "is_pinned": false,
-        "message": "post message",
-        "metadata": Object {
-          "embeds": Array [],
-          "emojis": Array [],
-          "files": Array [],
-          "images": Object {},
-          "reactions": Array [],
-        },
-        "original_id": "",
-        "pending_post_id": "",
-        "props": Object {},
-        "reply_count": 0,
-        "root_id": "",
-        "type": "",
-        "update_at": 0,
-        "user_id": "user_id",
-      }
-    }
-    userId="user_id_1"
-  />
-  <MenuItem
-    data-testid="save_post_post_id_1"
-    id="save_post_post_id_1"
-    labels={
-      <Memo(MemoizedFormattedMessage)
-        defaultMessage="Save"
-        id="rhs_root.mobile.flag"
-      />
-    }
-    leadingElement={
-      <BookmarkOutlineIcon
-        size={18}
-      />
-    }
-    onClick={[Function]}
-    trailingElements={
-      <ShortcutKey
-        shortcutKey="S"
-      />
-    }
-  />
-  <MenuItem
-    data-testid="pin_post_post_id_1"
-    id="pin_post_post_id_1"
-    labels={
-      <Memo(MemoizedFormattedMessage)
-        defaultMessage="Pin"
-        id="post_info.pin"
-      />
-    }
-    leadingElement={
-      <PinOutlineIcon
-        size={18}
-      />
-    }
-    onClick={[Function]}
-    trailingElements={
-      <ShortcutKey
-        shortcutKey="P"
-      />
-    }
-  />
-  <MenuItem
-    id="move_thread_post_id_1"
-    labels={
-      <Memo(MemoizedFormattedMessage)
-        defaultMessage="Move Thread"
-        id="post_info.move_thread"
-      />
-    }
-    leadingElement={
-      <MessageArrowRightOutlineIcon
-        size={18}
-      />
-    }
-    onClick={[Function]}
-    trailingElements={
-      <ShortcutKey
-        shortcutKey="W"
-      />
-    }
-  />
-  <MenuItemSeparator />
-  <MenuItem
-    data-testid="permalink_post_id_1"
-    id="permalink_post_id_1"
-    labels={
-      <Memo(MemoizedFormattedMessage)
-        defaultMessage="Copy Link"
-        id="post_info.permalink"
-      />
-    }
-    leadingElement={
-      <LinkVariantIcon
-        size={18}
-      />
-    }
-    onClick={[Function]}
-    trailingElements={
-      <ShortcutKey
-        shortcutKey="K"
-      />
-    }
-  />
-  <MenuItemSeparator />
-  <MenuItem
-    data-testid="edit_post_post_id_1"
-    id="edit_post_post_id_1"
-    labels={
-      <Memo(MemoizedFormattedMessage)
-        defaultMessage="Edit"
-        id="post_info.edit"
-      />
-    }
-    leadingElement={
-      <PencilOutlineIcon
-        size={18}
-      />
-    }
-    onClick={[Function]}
-    trailingElements={
-      <ShortcutKey
-        shortcutKey="E"
-      />
-    }
-  />
-  <MenuItem
-    data-testid="copy_post_id_1"
-    id="copy_post_id_1"
-    labels={
-      <Memo(MemoizedFormattedMessage)
-        defaultMessage="Copy Text"
-        id="post_info.copy"
-      />
-    }
-    leadingElement={
-      <ContentCopyIcon
-        size={18}
-      />
-    }
-    onClick={[Function]}
-    trailingElements={
-      <ShortcutKey
-        shortcutKey="C"
-      />
-    }
-  />
-</Menu>
-`;
diff --git a/webapp/channels/src/components/dot_menu/__snapshots__/dot_menu_empty.test.tsx.snap b/webapp/channels/src/components/dot_menu/__snapshots__/dot_menu_empty.test.tsx.snap
deleted file mode 100644
index b68d3276e62..00000000000
--- a/webapp/channels/src/components/dot_menu/__snapshots__/dot_menu_empty.test.tsx.snap
+++ /dev/null
@@ -1,7 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`components/dot_menu/DotMenu returning empty ("") should match snapshot, return empty ("") on Center 1`] = `
-<ContextConsumer>
-  <Component />
-</ContextConsumer>
-`;
diff --git a/webapp/channels/src/components/dot_menu/__snapshots__/dot_menu_mobile.test.tsx.snap b/webapp/channels/src/components/dot_menu/__snapshots__/dot_menu_mobile.test.tsx.snap
deleted file mode 100644
index 9e861936eb8..00000000000
--- a/webapp/channels/src/components/dot_menu/__snapshots__/dot_menu_mobile.test.tsx.snap
+++ /dev/null
@@ -1,7 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`components/dot_menu/DotMenu on mobile view should match snapshot 1`] = `
-<ContextConsumer>
-  <Component />
-</ContextConsumer>
-`;
diff --git a/webapp/channels/src/components/dot_menu/dot_menu.test.tsx b/webapp/channels/src/components/dot_menu/dot_menu.test.tsx
index c03963a3794..6edac911fc2 100644
--- a/webapp/channels/src/components/dot_menu/dot_menu.test.tsx
+++ b/webapp/channels/src/components/dot_menu/dot_menu.test.tsx
@@ -1,21 +1,21 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import {fireEvent, screen} from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import type {ChannelType} from '@mattermost/types/channels';
 import type {Post, PostType} from '@mattermost/types/posts';
 import type {DeepPartial} from '@mattermost/types/utilities';
 
-import {shallowWithIntl} from 'tests/helpers/intl-test-helper';
-import {fireEvent, renderWithContext, screen} from 'tests/react_testing_utils';
+import {renderWithContext} from 'tests/react_testing_utils';
 import {Locations} from 'utils/constants';
 import {TestHelper} from 'utils/test_helper';
 
 import type {GlobalState} from 'types/store';
 
 import DotMenu from './dot_menu';
-import type {DotMenuClass} from './dot_menu';
 
 import DotMenuRoot from './index';
 
@@ -210,65 +210,79 @@ describe('components/dot_menu/DotMenu', () => {
         canMove: true,
     };
 
-    test('should match snapshot, on Center', () => {
+    test('should show edit menu, on Center', async () => {
         const props = {
             ...baseProps,
             canEdit: true,
         };
-        const wrapper = shallowWithIntl(
+        renderWithContext(
             <DotMenu {...props}/>,
+            initialState,
         );
 
-        expect(wrapper).toMatchSnapshot();
+        const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
+        expect(button).toBeInTheDocument();
+        expect(button).toHaveAttribute('aria-label', 'more');
 
-        const instance = wrapper.instance();
-        const setStateMock = jest.fn();
-        instance.setState = setStateMock;
-        (wrapper.instance() as DotMenuClass).handleEditDisable();
-        expect(setStateMock).toBeCalledWith({canEdit: false});
+        await userEvent.click(button);
+
+        // Check that edit menu item is present when canEdit is true
+        expect(screen.getByTestId(`edit_post_${baseProps.post.id}`)).toBeInTheDocument();
     });
 
-    test('should match snapshot, canDelete', () => {
+    test('should show delete menu, canDelete', async () => {
         const props = {
             ...baseProps,
             canEdit: true,
             canDelete: true,
         };
-        const wrapper = renderWithContext(
+        renderWithContext(
             <DotMenu {...props}/>,
             initialState,
         );
 
-        expect(wrapper).toMatchSnapshot();
+        const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
+        await userEvent.click(button);
+
+        // Check that delete menu item is present when canDelete is true
+        expect(screen.getByTestId(`delete_post_${baseProps.post.id}`)).toBeInTheDocument();
     });
 
-    test('should match snapshot, can move', () => {
+    test('should show move thread menu, can move', async () => {
         const props = {
             ...baseProps,
             canMove: true,
         };
-        const wrapper = renderWithContext(
+        renderWithContext(
             <DotMenu {...props}/>,
             initialState,
         );
 
-        expect(wrapper).toMatchSnapshot();
+        const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
+        await userEvent.click(button);
+
+        // Check that move thread menu item is present when canMove is true
+        expect(screen.getByText('Move Thread')).toBeInTheDocument();
     });
 
-    test('should match snapshot, cannot move', () => {
+    test('should not show move thread menu when canMove is false, cannot move', async () => {
         const props = {
             ...baseProps,
             canMove: false,
         };
-        const wrapper = renderWithContext(
+        renderWithContext(
             <DotMenu {...props}/>,
             initialState,
         );
 
-        expect(wrapper).toMatchSnapshot();
+        const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
+        await userEvent.click(button);
+
+        // Check that move thread menu item is not present when canMove is false
+        expect(screen.queryByText('Move Thread')).not.toBeInTheDocument();
     });
 
-    test('should show mark as unread when channel is not archived', () => {
+    test('should show mark as unread when channel is not archived', async () => {
         const props = {
             ...baseProps,
             location: Locations.CENTER,
@@ -278,12 +292,12 @@ describe('components/dot_menu/DotMenu', () => {
             initialState,
         );
         const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
-        fireEvent.click(button);
+        await userEvent.click(button);
         const menuItem = screen.getByTestId(`unread_post_${baseProps.post.id}`);
         expect(menuItem).toBeVisible();
     });
 
-    test('should not show mark as unread when channel is archived', () => {
+    test('should not show mark as unread when channel is archived', async () => {
         const props = {
             ...baseProps,
             channelIsArchived: true,
@@ -293,12 +307,12 @@ describe('components/dot_menu/DotMenu', () => {
             initialState,
         );
         const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
-        fireEvent.click(button);
+        await userEvent.click(button);
         const menuItem = screen.queryByTestId(`unread_post_${baseProps.post.id}`);
         expect(menuItem).toBeNull();
     });
 
-    test('should not show mark as unread in search', () => {
+    test('should not show mark as unread in search', async () => {
         const props = {
             ...baseProps,
             location: Locations.SEARCH,
@@ -308,7 +322,7 @@ describe('components/dot_menu/DotMenu', () => {
             initialState,
         );
         const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
-        fireEvent.click(button);
+        await userEvent.click(button);
         const menuItem = screen.queryByTestId(`unread_post_${baseProps.post.id}`);
         expect(menuItem).toBeNull();
     });
@@ -318,7 +332,7 @@ describe('components/dot_menu/DotMenu', () => {
             [true, {location: Locations.RHS_ROOT, isCollapsedThreadsEnabled: true}],
             [true, {location: Locations.RHS_COMMENT, isCollapsedThreadsEnabled: true}],
             [true, {location: Locations.CENTER, isCollapsedThreadsEnabled: true}],
-        ])('follow message/thread menu item should be shown only in RHS and center channel when CRT is enabled', (showing, caseProps) => {
+        ])('follow message/thread menu item should be shown only in RHS and center channel when CRT is enabled', async (showing, caseProps) => {
             const props = {
                 ...baseProps,
                 ...caseProps,
@@ -328,7 +342,7 @@ describe('components/dot_menu/DotMenu', () => {
                 initialState,
             );
             const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
-            fireEvent.click(button);
+            await userEvent.click(button);
             const menuItem = screen.getByTestId(`follow_post_thread_${baseProps.post.id}`);
             expect(menuItem).toBeVisible();
         });
@@ -339,7 +353,7 @@ describe('components/dot_menu/DotMenu', () => {
             [false, {location: Locations.CENTER, isCollapsedThreadsEnabled: false}],
             [false, {location: Locations.SEARCH, isCollapsedThreadsEnabled: true}],
             [false, {location: Locations.NO_WHERE, isCollapsedThreadsEnabled: true}],
-        ])('follow message/thread menu item should be shown only in RHS and center channel when CRT is enabled', (showing, caseProps) => {
+        ])('follow message/thread menu item should be shown only in RHS and center channel when CRT is enabled', async (showing, caseProps) => {
             const props = {
                 ...baseProps,
                 ...caseProps,
@@ -349,7 +363,7 @@ describe('components/dot_menu/DotMenu', () => {
                 initialState,
             );
             const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
-            fireEvent.click(button);
+            await userEvent.click(button);
             const menuItem = screen.queryByTestId(`follow_post_thread_${baseProps.post.id}`);
             expect(menuItem).toBeNull();
         });
@@ -359,7 +373,7 @@ describe('components/dot_menu/DotMenu', () => {
             ['Unfollow message', {isFollowingThread: true, threadReplyCount: 0}],
             ['Follow thread', {isFollowingThread: false, threadReplyCount: 1}],
             ['Unfollow thread', {isFollowingThread: true, threadReplyCount: 1}],
-        ])('should show correct text', (text, caseProps) => {
+        ])('should show correct text', async (text, caseProps) => {
             const props = {
                 ...baseProps,
                 ...caseProps,
@@ -370,7 +384,7 @@ describe('components/dot_menu/DotMenu', () => {
                 initialState,
             );
             const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
-            fireEvent.click(button);
+            await userEvent.click(button);
             const menuItem = screen.getByTestId(`follow_post_thread_${baseProps.post.id}`);
             expect(menuItem).toBeVisible();
             expect(menuItem).toHaveTextContent(text);
diff --git a/webapp/channels/src/components/dot_menu/dot_menu_empty.test.tsx b/webapp/channels/src/components/dot_menu/dot_menu_empty.test.tsx
index e43c78727a0..00bdfa5ead7 100644
--- a/webapp/channels/src/components/dot_menu/dot_menu_empty.test.tsx
+++ b/webapp/channels/src/components/dot_menu/dot_menu_empty.test.tsx
@@ -1,13 +1,18 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {shallow} from 'enzyme';
+import {screen} from '@testing-library/react';
 import React from 'react';
 
+import type {DeepPartial} from '@mattermost/types/utilities';
+
 import DotMenu from 'components/dot_menu/dot_menu';
 
+import {renderWithContext} from 'tests/react_testing_utils';
 import {TestHelper} from 'utils/test_helper';
 
+import type {GlobalState} from 'types/store';
+
 jest.mock('utils/utils', () => {
     return {
         localizeMessage: jest.fn().mockReturnValue(''),
@@ -23,6 +28,52 @@ jest.mock('utils/post_utils', () => {
 });
 
 describe('components/dot_menu/DotMenu returning empty ("")', () => {
+    const initialState: DeepPartial<GlobalState> = {
+        entities: {
+            general: {
+                config: {},
+            },
+            channels: {
+                myMembers: {},
+                channels: {},
+                messageCounts: {},
+            },
+            preferences: {
+                myPreferences: {},
+            },
+            users: {
+                profiles: {},
+                currentUserId: 'current_user_id',
+                profilesInChannel: {},
+            },
+            teams: {
+                currentTeamId: 'currentTeamId',
+                teams: {
+                    currentTeamId: {
+                        id: 'currentTeamId',
+                        display_name: 'test',
+                        type: 'O',
+                    },
+                },
+            },
+            posts: {
+                posts: {},
+                postsInChannel: {},
+                postsInThread: {},
+            },
+        },
+        views: {
+            browser: {
+                focused: false,
+                windowSize: 'desktopView',
+            },
+            modals: {
+                modalState: {},
+                showLaunchingWorkspace: false,
+            },
+        },
+    };
+
     test('should match snapshot, return empty ("") on Center', () => {
         const baseProps = {
             post: TestHelper.getPostMock({id: 'post_id_1'}),
@@ -63,10 +114,13 @@ describe('components/dot_menu/DotMenu returning empty ("")', () => {
             canMove: true,
         };
 
-        const wrapper = shallow(
+        renderWithContext(
             <DotMenu {...baseProps}/>,
+            initialState,
         );
 
-        expect(wrapper).toMatchSnapshot();
+        const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
+        expect(button).toBeInTheDocument();
+        expect(button).toHaveAttribute('aria-label', 'more');
     });
 });
diff --git a/webapp/channels/src/components/dot_menu/dot_menu_mobile.test.tsx b/webapp/channels/src/components/dot_menu/dot_menu_mobile.test.tsx
index 06968e9b6f5..d4738b5f3d8 100644
--- a/webapp/channels/src/components/dot_menu/dot_menu_mobile.test.tsx
+++ b/webapp/channels/src/components/dot_menu/dot_menu_mobile.test.tsx
@@ -1,13 +1,18 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {shallow} from 'enzyme';
+import {screen} from '@testing-library/react';
 import React from 'react';
 
+import type {DeepPartial} from '@mattermost/types/utilities';
+
 import DotMenu from 'components/dot_menu/dot_menu';
 
+import {renderWithContext} from 'tests/react_testing_utils';
 import {TestHelper} from 'utils/test_helper';
 
+import type {GlobalState} from 'types/store';
+
 jest.mock('utils/utils', () => {
     return {
         localizeMessage: jest.fn(),
@@ -23,6 +28,52 @@ jest.mock('utils/post_utils', () => {
 });
 
 describe('components/dot_menu/DotMenu on mobile view', () => {
+    const initialState: DeepPartial<GlobalState> = {
+        entities: {
+            general: {
+                config: {},
+            },
+            channels: {
+                myMembers: {},
+                channels: {},
+                messageCounts: {},
+            },
+            preferences: {
+                myPreferences: {},
+            },
+            users: {
+                profiles: {},
+                currentUserId: 'current_user_id',
+                profilesInChannel: {},
+            },
+            teams: {
+                currentTeamId: 'currentTeamId',
+                teams: {
+                    currentTeamId: {
+                        id: 'currentTeamId',
+                        display_name: 'test',
+                        type: 'O',
+                    },
+                },
+            },
+            posts: {
+                posts: {},
+                postsInChannel: {},
+                postsInThread: {},
+            },
+        },
+        views: {
+            browser: {
+                focused: false,
+                windowSize: 'mobileView',
+            },
+            modals: {
+                modalState: {},
+                showLaunchingWorkspace: false,
+            },
+        },
+    };
+
     test('should match snapshot', () => {
         const baseProps = {
             post: TestHelper.getPostMock({id: 'post_id_1'}),
@@ -63,10 +114,13 @@ describe('components/dot_menu/DotMenu on mobile view', () => {
             canMove: true,
         };
 
-        const wrapper = shallow(
+        renderWithContext(
             <DotMenu {...baseProps}/>,
+            initialState,
         );
 
-        expect(wrapper).toMatchSnapshot();
+        const button = screen.getByTestId(`PostDotMenu-Button-${baseProps.post.id}`);
+        expect(button).toBeInTheDocument();
+        expect(button).toHaveAttribute('aria-label', 'more');
     });
 });
diff --git a/webapp/channels/src/components/post_markdown/post_markdown.test.tsx b/webapp/channels/src/components/post_markdown/post_markdown.test.tsx
index aa9541c422b..a9888364a3a 100644
--- a/webapp/channels/src/components/post_markdown/post_markdown.test.tsx
+++ b/webapp/channels/src/components/post_markdown/post_markdown.test.tsx
@@ -9,10 +9,15 @@ import type {Post, PostType} from '@mattermost/types/posts';
 import {Posts} from 'mattermost-redux/constants';
 
 import {renderWithContext, screen} from 'tests/react_testing_utils';
+import {PostTypes} from 'utils/constants';
 import {TestHelper} from 'utils/test_helper';
 
 import PostMarkdown from './post_markdown';
 
+jest.mock('components/properties_card_view/propertyValueRenderer/post_preview_property_renderer/post_preview_property_renderer', () => {
+    return jest.fn(() => <div data-testid='post-preview-property-renderer-mock'>{'PostPreviewPropertyRenderer Mock'}</div>);
+});
+
 describe('components/PostMarkdown', () => {
     const baseProps: ComponentProps<typeof PostMarkdown> = {
         imageProps: {} as Record<string, unknown>,
@@ -283,4 +288,22 @@ describe('components/PostMarkdown', () => {
         expect(screen.queryByText('world', {exact: true})).not.toBeInTheDocument();
         expect(screen.queryByText('world!', {exact: true})).toBeInTheDocument();
     });
+
+    test('should render data spillage card', () => {
+        const dataSpillageReportPost = TestHelper.getPostMock({
+            type: PostTypes.CUSTOM_DATA_SPILLAGE_REPORT as PostType,
+            props: {
+                reported_post_id: 'reported_post_id',
+            },
+        });
+
+        const props = {
+            ...baseProps,
+            message: 'See ~test',
+            post: dataSpillageReportPost,
+        };
+        renderWithContext(<PostMarkdown {...props}/>, state);
+
+        expect(screen.queryByTestId('data-spillage-report')).toBeInTheDocument();
+    });
 });
diff --git a/webapp/channels/src/components/post_markdown/post_markdown.tsx b/webapp/channels/src/components/post_markdown/post_markdown.tsx
index c67c503651c..6cef8637c2d 100644
--- a/webapp/channels/src/components/post_markdown/post_markdown.tsx
+++ b/webapp/channels/src/components/post_markdown/post_markdown.tsx
@@ -9,7 +9,9 @@ import type {Post} from '@mattermost/types/posts';
 import {Posts} from 'mattermost-redux/constants';
 
 import Markdown from 'components/markdown';
+import DataSpillageReport from 'components/post_view/data_spillage_report/data_spillage_report';
 
+import {PostTypes} from 'utils/constants';
 import {isChannelNamesMap, type TextFormattingOptions} from 'utils/text_formatting';
 
 import {renderReminderSystemBotMessage, renderSystemMessage, renderWranglerSystemMessage} from './system_message_helpers';
@@ -45,6 +47,8 @@ export type OwnProps = {
      * Whether or not to render text emoticons (:D) as emojis
      */
     renderEmoticonsAsEmoji?: boolean;
+
+    isRHS?: boolean;
 };
 
 type Props = PropsFromRedux & OwnProps;
@@ -96,6 +100,17 @@ export default class PostMarkdown extends React.PureComponent<Props> {
             return <div>{renderedWranglerMessage}</div>;
         }
 
+        if (this.props.post && this.props.post.type === PostTypes.CUSTOM_DATA_SPILLAGE_REPORT) {
+            return (
+                <div>
+                    <DataSpillageReport
+                        post={this.props.post}
+                        isRHS={this.props.isRHS}
+                    />
+                </div>
+            );
+        }
+
         // Proxy images if we have an image proxy and the server hasn't already rewritten the this.props.post's image URLs.
         const proxyImages = !this.props.post || !this.props.post.message_source || this.props.post.message === this.props.post.message_source;
         const channelNamesMap = isChannelNamesMap(this.props.post?.props?.channel_mentions) ? this.props.post?.props?.channel_mentions : undefined;
diff --git a/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_actions/data_spillage_actions.scss b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_actions/data_spillage_actions.scss
new file mode 100644
index 00000000000..54e5ad19ed8
--- /dev/null
+++ b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_actions/data_spillage_actions.scss
@@ -0,0 +1,7 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+.DataSpillageAction {
+    display: flex;
+    gap: 4px;
+}
diff --git a/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_actions/data_spillage_actions.test.tsx b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_actions/data_spillage_actions.test.tsx
new file mode 100644
index 00000000000..9a7bb013aaa
--- /dev/null
+++ b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_actions/data_spillage_actions.test.tsx
@@ -0,0 +1,19 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {screen} from '@testing-library/react';
+import React from 'react';
+
+import {renderWithContext} from 'tests/react_testing_utils';
+
+import DataSpillageAction from './data_spillage_actions';
+
+describe('DataSpillageAction', () => {
+    test('should render both action buttons', () => {
+        renderWithContext(<DataSpillageAction/>);
+
+        expect(screen.getByTestId('data-spillage-action')).toBeInTheDocument();
+        expect(screen.getByTestId('data-spillage-action-remove-message')).toBeInTheDocument();
+        expect(screen.getByTestId('data-spillage-action-keep-message')).toBeInTheDocument();
+    });
+});
diff --git a/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_actions/data_spillage_actions.tsx b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_actions/data_spillage_actions.tsx
new file mode 100644
index 00000000000..8059fe79a18
--- /dev/null
+++ b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_actions/data_spillage_actions.tsx
@@ -0,0 +1,35 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {FormattedMessage} from 'react-intl';
+import './data_spillage_actions.scss';
+
+export default function DataSpillageAction() {
+    return (
+        <div
+            className='DataSpillageAction'
+            data-testid='data-spillage-action'
+        >
+            <button
+                className='btn btn-danger btn-sm'
+                data-testid='data-spillage-action-remove-message'
+            >
+                <FormattedMessage
+                    id='data_spillage_report.remove_message.button_text'
+                    defaultMessage='Remove message'
+                />
+            </button>
+
+            <button
+                className='btn btn-tertiary btn-sm'
+                data-testid='data-spillage-action-keep-message'
+            >
+                <FormattedMessage
+                    id='data_spillage_report.keep_message.button_text'
+                    defaultMessage='Keep message'
+                />
+            </button>
+        </div>
+    );
+}
diff --git a/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_report.scss b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_report.scss
new file mode 100644
index 00000000000..9e13d8c6305
--- /dev/null
+++ b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_report.scss
@@ -0,0 +1,33 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+.DataSpillageReport {
+    max-width: 700px;
+    border-radius: 4px;
+    background: var(--center-channel-bg, #FFF);
+    box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.08);
+
+    #rhsContainer & {
+        box-shadow: none;
+    }
+
+    &.mode_short {
+        padding: 16px 19px;
+        border: 1px solid rgba(var(--center-channel-color-rgb), 0.12);
+        border-left: 3px solid var(--error-text, #5D89EA);
+    }
+}
+
+// This is needed to make the DataSpillageReport component full width in the RHS.
+#rhsContainer  .post__body:has(.DataSpillageReport) {
+    position: relative;
+    left: -44px;
+    width: calc(100% + 44px) !important;
+    margin-top: 25px;
+}
+
+// This is needed to override the hover effect on posts in the RHS as otherwise it interferes
+// with the appearance of select options and badges and other texts in the card.
+#rhsContainer .post:not(.post--editing):not(.post--editing):has(.DataSpillageReport):hover {
+    background-color: unset;
+}
diff --git a/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_report.test.tsx b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_report.test.tsx
new file mode 100644
index 00000000000..1ef6b9f35b2
--- /dev/null
+++ b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_report.test.tsx
@@ -0,0 +1,153 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import type {Post} from '@mattermost/types/posts';
+import type {DeepPartial} from '@mattermost/types/utilities';
+
+import DataSpillageReport from 'components/post_view/data_spillage_report/data_spillage_report';
+
+import {renderWithContext, screen} from 'tests/react_testing_utils';
+import {TestHelper} from 'utils/test_helper';
+
+import type {GlobalState} from 'types/store';
+
+describe('components/post_view/data_spillage_report/DataSpillageReport', () => {
+    const reportingUser = TestHelper.getUserMock({
+        id: 'ewgposajm3fwpjbqu1t6scncia',
+        username: 'reporting_user',
+    });
+
+    const reportedPostTeam = TestHelper.getTeamMock({
+        id: 'reported_post_team_id',
+        display_name: 'Reported Post Team',
+    });
+
+    const reportedPostChannel = TestHelper.getChannelMock({
+        id: 'reported_post_channel_id',
+        display_name: 'reported-post-channel',
+        team_id: reportedPostTeam.id,
+    });
+
+    const reportedPostAuthor = TestHelper.getUserMock({
+        id: 'reported_post_author_id',
+        username: 'reported_post_author',
+    });
+
+    const reportedPost = TestHelper.getPostMock({
+        id: 'reported_post_id',
+        message: 'Hello, world!',
+        channel_id: reportedPostChannel.id,
+        user_id: reportedPostAuthor.id,
+        create_at: new Date(2025, 0, 1, 0, 1, 0, 0).getMilliseconds(),
+    });
+
+    const post: Post = TestHelper.getPostMock({
+        props: {
+            reported_post_id: reportedPost.id,
+        },
+    });
+
+    const baseState: DeepPartial<GlobalState> = {
+        entities: {
+            users: {
+                profiles: {
+                    [reportingUser.id]: reportingUser,
+                    [reportedPostAuthor.id]: reportedPostAuthor,
+                },
+            },
+            posts: {
+                posts: {
+                    [reportedPost.id]: reportedPost,
+                },
+            },
+            channels: {
+                channels: {
+                    [reportedPostChannel.id]: reportedPostChannel,
+                },
+            },
+            teams: {
+                teams: {
+                    [reportedPostTeam.id]: reportedPostTeam,
+                },
+            },
+        },
+    };
+
+    it('should render selected fields when not in RHS', async () => {
+        renderWithContext(
+            <DataSpillageReport
+                post={post}
+                isRHS={false}
+            />,
+            baseState,
+        );
+
+        // validate title
+        const title = screen.queryByTestId('property-card-title');
+        expect(title).toBeVisible();
+        expect(title).toHaveTextContent('@reporting_user flagged a message for review');
+
+        expect(screen.queryAllByTestId('property-card-row')).toHaveLength(4);
+
+        expect(screen.queryAllByTestId('select-property')).toHaveLength(2);
+
+        const statusFieldValue = screen.queryAllByTestId('select-property')[0];
+        expect(statusFieldValue).toHaveTextContent('Flag dismissed');
+
+        const reasonFieldValue = screen.queryAllByTestId('select-property')[1];
+        expect(reasonFieldValue).toHaveTextContent('Inappropriate content');
+
+        const postPreview = screen.queryByTestId('post-preview-property');
+        expect(postPreview).toBeVisible();
+        expect(postPreview).toHaveTextContent('Hello, world!');
+
+        const assignee = screen.queryByTestId('selectable-user-property');
+        expect(assignee).toBeVisible();
+
+        // actions are not visible when not in RHS
+        expect(screen.queryByTestId('data-spillage-action')).not.toBeInTheDocument();
+    });
+
+    it('should render all fields when in RHS', async () => {
+        renderWithContext(
+            <DataSpillageReport
+                post={post}
+                isRHS={true}
+            />,
+            baseState,
+        );
+
+        const flaggedBy = screen.queryAllByTestId('user-property')[0];
+        expect(flaggedBy).toBeVisible();
+        expect(flaggedBy).toHaveTextContent('reporting_user');
+
+        const comment = screen.queryByTestId('text-property');
+        expect(comment).toBeVisible();
+        expect(comment).toHaveTextContent('Please review this post for potential violations');
+
+        const channel = screen.queryByTestId('channel-property');
+        expect(channel).toBeVisible();
+        expect(channel).toHaveTextContent('reported-post-channel');
+
+        const team = screen.queryByTestId('team-property');
+        expect(team).toBeVisible();
+        expect(team).toHaveTextContent('Reported Post Team');
+
+        const postedBy = screen.queryAllByTestId('user-property')[1];
+        expect(postedBy).toBeVisible();
+        expect(postedBy).toHaveTextContent('reported_post_author');
+
+        const reportedAt = screen.queryAllByTestId('timestamp-property')[0];
+        expect(reportedAt).toBeVisible();
+
+        const postedAt = screen.queryAllByTestId('timestamp-property')[1];
+        expect(postedAt).toBeVisible();
+
+        // actions are visible when in RHS
+        expect(screen.queryByTestId('data-spillage-action')).toBeVisible();
+        expect(screen.queryByTestId('data-spillage-action-remove-message')).toBeVisible();
+        expect(screen.queryByTestId('data-spillage-action-keep-message')).toBeVisible();
+    });
+});
diff --git a/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_report.tsx b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_report.tsx
new file mode 100644
index 00000000000..50abfdf8f5f
--- /dev/null
+++ b/webapp/channels/src/components/post_view/data_spillage_report/data_spillage_report.tsx
@@ -0,0 +1,424 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React, {useEffect, useState} from 'react';
+import {useIntl} from 'react-intl';
+import {useDispatch, useSelector} from 'react-redux';
+
+import type {Post} from '@mattermost/types/posts';
+import type {
+    PropertyField,
+    PropertyValue,
+} from '@mattermost/types/properties';
+
+import {getMissingProfilesByIds} from 'mattermost-redux/actions/users';
+import {getUser} from 'mattermost-redux/selectors/entities/users';
+
+import AtMention from 'components/at_mention';
+import {useChannel} from 'components/common/hooks/useChannel';
+import {usePost} from 'components/common/hooks/usePost';
+import DataSpillageAction from 'components/post_view/data_spillage_report/data_spillage_actions/data_spillage_actions';
+import PropertiesCardView from 'components/properties_card_view/properties_card_view';
+
+import {DataSpillagePropertyNames} from 'utils/constants';
+
+import type {GlobalState} from 'types/store';
+
+import './data_spillage_report.scss';
+
+// TODO: this function will be replaced with actual data fetched from API in a later PR
+function getDummyPropertyFields(): PropertyField[] {
+    return [
+        {
+            id: 'status_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.Status,
+            type: 'select',
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+            attrs: {
+                editable: false,
+                options: [
+                    {
+                        id: 'option_pending_review',
+                        name: 'Pending review',
+                        color: 'light_gray',
+                    },
+                    {
+                        id: 'option_reviewer_assigned',
+                        name: 'Reviewer assigned',
+                        color: 'light_blue',
+                    },
+                    {
+                        id: 'option_dismissed',
+                        name: 'Flag dismissed',
+                        color: 'dark_blue',
+                    },
+                    {
+                        id: 'option_removed',
+                        name: 'Removed',
+                        color: 'dark_red',
+                    },
+                ],
+            },
+        },
+        {
+            id: 'reporting_user_id_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.FlaggedBy,
+            type: 'user',
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'reason_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.Reason,
+            type: 'select',
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'comment_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.Comment,
+            type: 'text',
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'reporting_time_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.ReportingTime,
+            type: 'text',
+            attrs: {subType: 'timestamp'},
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'reviewer_user_id_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.ReviewingUser,
+            type: 'user',
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+            attrs: {
+                editable: true,
+            },
+        },
+        {
+            id: 'actor_user_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.ActionBy,
+            type: 'user',
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'actor_comment_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.ActionComment,
+            type: 'text',
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'action_time_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.ActionTime,
+            type: 'text',
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'post_preview_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.Message,
+            type: 'text',
+            attrs: {subType: 'post'},
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'channel_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.PostedIn,
+            type: 'text',
+            attrs: {subType: 'channel'},
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'team_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.Team,
+            type: 'text',
+            attrs: {subType: 'team'},
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'post_author_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.PostedBy,
+            type: 'user',
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'post_creation_time_field_id',
+            group_id: 'content_flagging_group_id',
+            name: DataSpillagePropertyNames.PostedAt,
+            type: 'text',
+            attrs: {subType: 'timestamp'},
+            target_type: 'post',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+    ];
+}
+
+// TODO: this function will be replaced with actual data fetched from API in a later PR
+function getDummyPropertyValues(postId: string, channelId: string, teamId: string, authorId: string, postCreateAt: number): Array<PropertyValue<unknown>> {
+    return [
+        {
+            id: 'status_value_id',
+            field_id: 'status_field_id',
+            target_id: 'reported_post_id',
+            target_type: 'post',
+            group_id: 'content_flagging_group_id',
+            value: 'Flag dismissed',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'reporting_user_value_id',
+            field_id: 'reporting_user_id_field_id',
+            target_id: 'reported_post_id',
+            target_type: 'post',
+            group_id: 'content_flagging_group_id',
+            value: 'ewgposajm3fwpjbqu1t6scncia',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'reason_value_id',
+            field_id: 'reason_field_id',
+            target_id: 'reported_post_id',
+            target_type: 'post',
+            group_id: 'content_flagging_group_id',
+            value: 'Inappropriate content',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'comment_value_id',
+            field_id: 'comment_field_id',
+            target_id: 'reported_post_id',
+            target_type: 'post',
+            group_id: 'content_flagging_group_id',
+            value: 'Please review this post for potential violations.',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'reporting_time_value_id',
+            field_id: 'reporting_time_field_id',
+            target_id: 'reported_post_id',
+            target_type: 'post',
+            group_id: 'content_flagging_group_id',
+            value: new Date(2025, 0, 1, 0, 1, 0, 0).getTime(),
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'post_preview_value_id',
+            field_id: 'post_preview_field_id',
+            target_id: 'reported_post_id',
+            target_type: 'post',
+            group_id: 'content_flagging_group_id',
+            value: postId,
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'channel_value_id',
+            field_id: 'channel_field_id',
+            target_id: 'reported_post_id',
+            target_type: 'post',
+            group_id: 'content_flagging_group_id',
+            value: channelId,
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'team_value_id',
+            field_id: 'team_field_id',
+            target_id: 'reported_post_id',
+            target_type: 'post',
+            group_id: 'content_flagging_group_id',
+            value: teamId,
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'post_author_value_id',
+            field_id: 'post_author_field_id',
+            target_id: 'reported_post_id',
+            target_type: 'post',
+            group_id: 'content_flagging_group_id',
+            value: authorId,
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+        {
+            id: 'post_creation_time_value_id',
+            field_id: 'post_creation_time_field_id',
+            target_id: 'reported_post_id',
+            target_type: 'post',
+            group_id: 'content_flagging_group_id',
+            value: postCreateAt,
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+
+        // No reviewer assigned yet
+        {
+            id: 'reviewer_user_value_id',
+            field_id: 'reviewer_user_id_field_id',
+            target_id: 'reported_post_id',
+            target_type: 'post',
+            group_id: 'content_flagging_group_id',
+            value: '',
+            create_at: 0,
+            update_at: 0,
+            delete_at: 0,
+        },
+    ];
+}
+
+const fieldOrder = [
+    'status_field_id',
+    'reason_field_id',
+    'post_preview_field_id',
+    'reporting_user_id_field_id',
+    'comment_field_id',
+    'reporting_time_field_id',
+    'reviewer_user_id_field_id',
+    'actor_user_field_id',
+    'actor_comment_field_id',
+    'action_time_field_id',
+    'channel_field_id',
+    'team_field_id',
+    'post_author_field_id',
+    'post_creation_time_field_id',
+];
+
+const shortModeFieldOrder = [
+    'status_field_id',
+    'reason_field_id',
+    'post_preview_field_id',
+    'reviewer_user_id_field_id',
+];
+
+type Props = {
+    post: Post;
+    isRHS?: boolean;
+};
+
+export default function DataSpillageReport({post, isRHS}: Props) {
+    const dispatch = useDispatch();
+    const {formatMessage} = useIntl();
+
+    const [propertyFields, setPropertyFields] = useState<PropertyField[]>([]);
+    const [propertyValues, setPropertyValues] = useState<Array<PropertyValue<unknown>>>([]);
+
+    const reportedPostId = post.props.reported_post_id as string;
+    const reportedPost = usePost(reportedPostId);
+    const channel = useChannel(reportedPost?.channel_id || '');
+
+    const reportingUserFieldId = propertyFields.find((field) => field.name === DataSpillagePropertyNames.FlaggedBy);
+    const reportingUserIdValue = propertyValues.find((value) => value.field_id === reportingUserFieldId?.id);
+    const reportingUser = useSelector((state: GlobalState) => getUser(state, reportingUserIdValue ? reportingUserIdValue.value as string : ''));
+
+    useEffect(() => {
+        if (!reportingUser && reportingUserIdValue && reportedPost) {
+            dispatch(getMissingProfilesByIds([
+                reportingUserIdValue.value as string,
+                reportedPost.user_id,
+            ]));
+        }
+    }, [dispatch, reportedPost, reportingUser, reportingUserIdValue]);
+
+    useEffect(() => {
+        if (reportedPost && channel) {
+            // TODO: this function will be replaced with actual data fetched from API in a later PR
+            setPropertyFields(getDummyPropertyFields());
+            setPropertyValues(getDummyPropertyValues(reportedPostId, reportedPost.channel_id, channel.team_id, reportedPost.user_id, post.create_at));
+        }
+    }, [reportedPost, reportedPostId, channel, post.create_at]);
+
+    const title = formatMessage({
+        id: 'data_spillage_report_post.title',
+        defaultMessage: '{user} flagged a message for review',
+    }, {
+        user: (<AtMention mentionName={reportingUser?.username || ''}/>),
+    });
+
+    const mode = isRHS ? 'full' : 'short';
+
+    return (
+        <div
+            className={`DataSpillageReport mode_${mode}`}
+            data-testid='data-spillage-report'
+            onClick={(e) => e.stopPropagation()}
+        >
+            <PropertiesCardView
+                title={title}
+                propertyFields={propertyFields}
+                propertyValues={propertyValues}
+                fieldOrder={fieldOrder}
+                shortModeFieldOrder={shortModeFieldOrder}
+                actionsRow={<DataSpillageAction/>}
+                mode={mode}
+            />
+        </div>
+    );
+}
diff --git a/webapp/channels/src/components/post_view/post_message_preview/__snapshots__/post_message_preview.test.tsx.snap b/webapp/channels/src/components/post_view/post_message_preview/__snapshots__/post_message_preview.test.tsx.snap
index 07e98333528..b89203e01e1 100644
--- a/webapp/channels/src/components/post_view/post_message_preview/__snapshots__/post_message_preview.test.tsx.snap
+++ b/webapp/channels/src/components/post_view/post_message_preview/__snapshots__/post_message_preview.test.tsx.snap
@@ -20,11 +20,22 @@ exports[`PostMessagePreview direct and group messages should render preview for
           <span
             className="profile-icon"
           >
-            <Memo(Avatar)
-              className="avatar-post-preview"
-              size="sm"
-              url="/api/v4/users/user_1/image?_=0"
-              username="username1"
+            <PreviewPostAvatar
+              enablePostIconOverride={false}
+              hasImageProxy={false}
+              post={
+                Object {
+                  "id": "post_id",
+                  "message": "post message",
+                  "metadata": Object {},
+                }
+              }
+              user={
+                Object {
+                  "id": "user_1",
+                  "username": "username1",
+                }
+              }
             />
           </span>
         </div>
@@ -106,11 +117,22 @@ exports[`PostMessagePreview direct and group messages should render preview for
           <span
             className="profile-icon"
           >
-            <Memo(Avatar)
-              className="avatar-post-preview"
-              size="sm"
-              url="/api/v4/users/user_1/image?_=0"
-              username="username1"
+            <PreviewPostAvatar
+              enablePostIconOverride={false}
+              hasImageProxy={false}
+              post={
+                Object {
+                  "id": "post_id",
+                  "message": "post message",
+                  "metadata": Object {},
+                }
+              }
+              user={
+                Object {
+                  "id": "user_1",
+                  "username": "username1",
+                }
+              }
             />
           </span>
         </div>
@@ -192,11 +214,26 @@ exports[`PostMessagePreview nested previews should render file preview 1`] = `
           <span
             className="profile-icon"
           >
-            <Memo(Avatar)
-              className="avatar-post-preview"
-              size="sm"
-              url="/api/v4/users/user_1/image?_=0"
-              username="username1"
+            <PreviewPostAvatar
+              enablePostIconOverride={false}
+              hasImageProxy={false}
+              post={
+                Object {
+                  "file_ids": Array [
+                    "file_1",
+                    "file_2",
+                  ],
+                  "id": "post_id",
+                  "message": "post message",
+                  "metadata": Object {},
+                }
+              }
+              user={
+                Object {
+                  "id": "user_1",
+                  "username": "username1",
+                }
+              }
             />
           </span>
         </div>
@@ -298,11 +335,29 @@ exports[`PostMessagePreview nested previews should render opengraph preview 1`]
           <span
             className="profile-icon"
           >
-            <Memo(Avatar)
-              className="avatar-post-preview"
-              size="sm"
-              url="/api/v4/users/user_1/image?_=0"
-              username="username1"
+            <PreviewPostAvatar
+              enablePostIconOverride={false}
+              hasImageProxy={false}
+              post={
+                Object {
+                  "id": "post_id",
+                  "message": "post message",
+                  "metadata": Object {
+                    "embeds": Array [
+                      Object {
+                        "type": "opengraph",
+                        "url": "https://example.com",
+                      },
+                    ],
+                  },
+                }
+              }
+              user={
+                Object {
+                  "id": "user_1",
+                  "username": "username1",
+                }
+              }
             />
           </span>
         </div>
@@ -412,11 +467,27 @@ exports[`PostMessagePreview should not render bot icon 1`] = `
           <span
             className="profile-icon"
           >
-            <Memo(Avatar)
-              className="avatar-post-preview"
-              size="sm"
-              url="/api/v4/users/user_1/image?_=0"
-              username="username1"
+            <PreviewPostAvatar
+              enablePostIconOverride={false}
+              hasImageProxy={false}
+              post={
+                Object {
+                  "id": "post_id",
+                  "message": "post message",
+                  "metadata": Object {},
+                  "props": Object {
+                    "from_webhook": "false",
+                    "override_icon_url": "https://fakeicon.com/image.jpg",
+                    "use_user_icon": "false",
+                  },
+                }
+              }
+              user={
+                Object {
+                  "id": "user_1",
+                  "username": "username1",
+                }
+              }
             />
           </span>
         </div>
@@ -503,11 +574,27 @@ exports[`PostMessagePreview should render bot icon 1`] = `
           <span
             className="profile-icon"
           >
-            <Memo(Avatar)
-              className="avatar-post-preview"
-              size="sm"
-              url="https://fakeicon.com/image.jpg"
-              username="username1"
+            <PreviewPostAvatar
+              enablePostIconOverride={true}
+              hasImageProxy={false}
+              post={
+                Object {
+                  "id": "post_id",
+                  "message": "post message",
+                  "metadata": Object {},
+                  "props": Object {
+                    "from_webhook": "true",
+                    "override_icon_url": "https://fakeicon.com/image.jpg",
+                    "use_user_icon": false,
+                  },
+                }
+              }
+              user={
+                Object {
+                  "id": "user_1",
+                  "username": "username1",
+                }
+              }
             />
           </span>
         </div>
@@ -594,11 +681,22 @@ exports[`PostMessagePreview should render correctly 1`] = `
           <span
             className="profile-icon"
           >
-            <Memo(Avatar)
-              className="avatar-post-preview"
-              size="sm"
-              url="/api/v4/users/user_1/image?_=0"
-              username="username1"
+            <PreviewPostAvatar
+              enablePostIconOverride={false}
+              hasImageProxy={false}
+              post={
+                Object {
+                  "id": "post_id",
+                  "message": "post message",
+                  "metadata": Object {},
+                }
+              }
+              user={
+                Object {
+                  "id": "user_1",
+                  "username": "username1",
+                }
+              }
             />
           </span>
         </div>
@@ -682,11 +780,22 @@ exports[`PostMessagePreview show render without preview when preview posts becom
           <span
             className="profile-icon"
           >
-            <Memo(Avatar)
-              className="avatar-post-preview"
-              size="sm"
-              url="/api/v4/users/user_1/image?_=0"
-              username="username1"
+            <PreviewPostAvatar
+              enablePostIconOverride={false}
+              hasImageProxy={false}
+              post={
+                Object {
+                  "id": "post_id",
+                  "message": "post message",
+                  "metadata": Object {},
+                }
+              }
+              user={
+                Object {
+                  "id": "user_1",
+                  "username": "username1",
+                }
+              }
             />
           </span>
         </div>
diff --git a/webapp/channels/src/components/post_view/post_message_preview/avatar/avatar.tsx b/webapp/channels/src/components/post_view/post_message_preview/avatar/avatar.tsx
new file mode 100644
index 00000000000..ed7380d98c0
--- /dev/null
+++ b/webapp/channels/src/components/post_view/post_message_preview/avatar/avatar.tsx
@@ -0,0 +1,67 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React, {useMemo} from 'react';
+
+import type {Post} from '@mattermost/types/posts';
+import type {UserProfile} from '@mattermost/types/users';
+
+import {ensureString} from 'mattermost-redux/utils/post_utils';
+
+import MattermostLogo from 'components/widgets/icons/mattermost_logo';
+import Avatar from 'components/widgets/users/avatar';
+
+import {Constants} from 'utils/constants';
+import * as PostUtils from 'utils/post_utils';
+import {imageURLForUser} from 'utils/utils';
+
+type Props = {
+    post?: Post;
+    user: UserProfile;
+    enablePostIconOverride?: boolean;
+    hasImageProxy?: boolean;
+}
+
+export default function PreviewPostAvatar({post, user, enablePostIconOverride, hasImageProxy}: Props) {
+    const isBot = Boolean(user && user.is_bot);
+    const isSystemMessage = post ? PostUtils.isSystemMessage(post) : false;
+    const fromWebhook = post ? PostUtils.isFromWebhook(post) : false;
+    const fromAutoResponder = post ? PostUtils.fromAutoResponder(post) : false;
+
+    const src = useMemo(() => {
+        const postProps = post?.props;
+        const postIconOverrideURL = ensureString(postProps?.override_icon_url);
+        const useUserIcon = ensureString(postProps?.use_user_icon);
+
+        if (!fromAutoResponder && fromWebhook && !useUserIcon && enablePostIconOverride) {
+            if (postIconOverrideURL && postIconOverrideURL !== '') {
+                return PostUtils.getImageSrc(postIconOverrideURL, hasImageProxy);
+            }
+            return Constants.DEFAULT_WEBHOOK_LOGO;
+        }
+
+        return imageURLForUser(user?.id ?? '');
+    }, [enablePostIconOverride, fromAutoResponder, fromWebhook, hasImageProxy, post?.props, user?.id]);
+
+    let avatar = (
+        <Avatar
+            size={'sm'}
+            url={src}
+            className={'avatar-post-preview'}
+        />
+    );
+    if (isSystemMessage && !fromWebhook && !isBot) {
+        avatar = (<MattermostLogo className='icon'/>);
+    } else if (user?.id) {
+        avatar = (
+            <Avatar
+                username={user.username}
+                size={'sm'}
+                url={src}
+                className={'avatar-post-preview'}
+            />
+        );
+    }
+
+    return avatar;
+}
diff --git a/webapp/channels/src/components/post_view/post_message_preview/post_message_preview.test.tsx b/webapp/channels/src/components/post_view/post_message_preview/post_message_preview.test.tsx
index 899689e0290..06ef0371218 100644
--- a/webapp/channels/src/components/post_view/post_message_preview/post_message_preview.test.tsx
+++ b/webapp/channels/src/components/post_view/post_message_preview/post_message_preview.test.tsx
@@ -13,6 +13,10 @@ import {General} from 'mattermost-redux/constants';
 import PostMessagePreview from './post_message_preview';
 import type {Props} from './post_message_preview';
 
+jest.mock('components/properties_card_view/propertyValueRenderer/post_preview_property_renderer/post_preview_property_renderer', () => {
+    return jest.fn(() => <div data-testid='post-preview-property-renderer-mock'>{'PostPreviewPropertyRenderer Mock'}</div>);
+});
+
 describe('PostMessagePreview', () => {
     const previewPost = {
         id: 'post_id',
diff --git a/webapp/channels/src/components/post_view/post_message_preview/post_message_preview.tsx b/webapp/channels/src/components/post_view/post_message_preview/post_message_preview.tsx
index ed2094f4014..5ebeda948d3 100644
--- a/webapp/channels/src/components/post_view/post_message_preview/post_message_preview.tsx
+++ b/webapp/channels/src/components/post_view/post_message_preview/post_message_preview.tsx
@@ -17,12 +17,8 @@ import PostAttachmentOpenGraph from 'components/post_view/post_attachment_opengr
 import PostMessageView from 'components/post_view/post_message_view';
 import Timestamp from 'components/timestamp';
 import UserProfileComponent from 'components/user_profile';
-import MattermostLogo from 'components/widgets/icons/mattermost_logo';
-import Avatar from 'components/widgets/users/avatar';
 
-import {Constants} from 'utils/constants';
-import * as PostUtils from 'utils/post_utils';
-import * as Utils from 'utils/utils';
+import PreviewPostAvatar from './avatar/avatar';
 
 import PostAttachmentContainer from '../post_attachment_container/post_attachment_container';
 
@@ -53,53 +49,10 @@ const PostMessagePreview = (props: Props) => {
         }
     };
 
-    const getPostIconURL = (defaultURL: string, fromAutoResponder: boolean, fromWebhook: boolean): string => {
-        const {enablePostIconOverride, hasImageProxy, previewPost} = props;
-        const postProps = previewPost?.props;
-        const postIconOverrideURL = ensureString(postProps?.override_icon_url);
-        const useUserIcon = ensureString(postProps?.use_user_icon);
-
-        if (!fromAutoResponder && fromWebhook && !useUserIcon && enablePostIconOverride) {
-            if (postIconOverrideURL && postIconOverrideURL !== '') {
-                return PostUtils.getImageSrc(postIconOverrideURL, hasImageProxy);
-            }
-            return Constants.DEFAULT_WEBHOOK_LOGO;
-        }
-
-        return defaultURL;
-    };
-
     if (!previewPost) {
         return null;
     }
 
-    const isBot = Boolean(user && user.is_bot);
-    const isSystemMessage = PostUtils.isSystemMessage(previewPost);
-    const fromWebhook = PostUtils.isFromWebhook(previewPost);
-    const fromAutoResponder = PostUtils.fromAutoResponder(previewPost);
-    const profileSrc = Utils.imageURLForUser(user?.id ?? '');
-    const src = getPostIconURL(profileSrc, fromAutoResponder, fromWebhook);
-
-    let avatar = (
-        <Avatar
-            size={'sm'}
-            url={src}
-            className={'avatar-post-preview'}
-        />
-    );
-    if (isSystemMessage && !fromWebhook && !isBot) {
-        avatar = (<MattermostLogo className='icon'/>);
-    } else if (user?.id) {
-        avatar = (
-            <Avatar
-                username={user.username}
-                size={'sm'}
-                url={src}
-                className={'avatar-post-preview'}
-            />
-        );
-    }
-
     let fileAttachmentPreview = null;
 
     if (((previewPost.file_ids && previewPost.file_ids.length > 0) || (previewPost.filenames && previewPost.filenames.length > 0))) {
@@ -166,7 +119,15 @@ const PostMessagePreview = (props: Props) => {
                     <div className='col col__name'>
                         <div className='post__img'>
                             <span className='profile-icon'>
-                                {avatar}
+                                {
+                                    user &&
+                                    <PreviewPostAvatar
+                                        post={previewPost}
+                                        user={user}
+                                        enablePostIconOverride={props.enablePostIconOverride}
+                                        hasImageProxy={props.hasImageProxy}
+                                    />
+                                }
                             </span>
                         </div>
                     </div>
diff --git a/webapp/channels/src/components/post_view/post_message_view/__snapshots__/post_message_view.test.tsx.snap b/webapp/channels/src/components/post_view/post_message_view/__snapshots__/post_message_view.test.tsx.snap
index be1945d5061..1926a12ca75 100644
--- a/webapp/channels/src/components/post_view/post_message_view/__snapshots__/post_message_view.test.tsx.snap
+++ b/webapp/channels/src/components/post_view/post_message_view/__snapshots__/post_message_view.test.tsx.snap
@@ -18,6 +18,7 @@ exports[`components/post_view/PostAttachment should match snapshot 1`] = `
           "onImageLoaded": [Function],
         }
       }
+      isRHS={false}
       message="post message"
       options={Object {}}
       post={
@@ -54,6 +55,7 @@ exports[`components/post_view/PostAttachment should match snapshot, on Show Less
           "onImageLoaded": [Function],
         }
       }
+      isRHS={false}
       message="post message"
       options={Object {}}
       post={
@@ -90,6 +92,7 @@ exports[`components/post_view/PostAttachment should match snapshot, on Show More
           "onImageLoaded": [Function],
         }
       }
+      isRHS={false}
       message="post message"
       options={Object {}}
       post={
@@ -144,6 +147,7 @@ exports[`components/post_view/PostAttachment should match snapshot, on edited po
           "onImageLoaded": [Function],
         }
       }
+      isRHS={false}
       message="post message"
       options={Object {}}
       post={
@@ -181,6 +185,7 @@ exports[`components/post_view/PostAttachment should match snapshot, on ephemeral
           "onImageLoaded": [Function],
         }
       }
+      isRHS={false}
       message="post message"
       options={Object {}}
       post={
diff --git a/webapp/channels/src/components/post_view/post_message_view/post_message_view.test.tsx b/webapp/channels/src/components/post_view/post_message_view/post_message_view.test.tsx
index a8c3baa78cc..2e3043086da 100644
--- a/webapp/channels/src/components/post_view/post_message_view/post_message_view.test.tsx
+++ b/webapp/channels/src/components/post_view/post_message_view/post_message_view.test.tsx
@@ -11,6 +11,10 @@ import type {Theme} from 'mattermost-redux/selectors/entities/preferences';
 
 import PostMessageView from 'components/post_view/post_message_view/post_message_view';
 
+jest.mock('components/properties_card_view/propertyValueRenderer/post_preview_property_renderer/post_preview_property_renderer', () => {
+    return jest.fn(() => <div data-testid='post-preview-property-renderer-mock'>{'PostPreviewPropertyRenderer Mock'}</div>);
+});
+
 describe('components/post_view/PostAttachment', () => {
     const post = {
         id: 'post_id',
diff --git a/webapp/channels/src/components/post_view/post_message_view/post_message_view.tsx b/webapp/channels/src/components/post_view/post_message_view/post_message_view.tsx
index edaa89aaa61..2a4dc38383f 100644
--- a/webapp/channels/src/components/post_view/post_message_view/post_message_view.tsx
+++ b/webapp/channels/src/components/post_view/post_message_view/post_message_view.tsx
@@ -170,6 +170,7 @@ export default class PostMessageView extends React.PureComponent<Props, State> {
                         post={post}
                         channelId={post.channel_id}
                         showPostEditedIndicator={this.props.showPostEditedIndicator}
+                        isRHS={isRHS}
                     />
                 </div>
                 {(!isSharedChannel || this.props.sharedChannelsPluginsEnabled) && (
diff --git a/webapp/channels/src/components/properties_card_view/properties_card_view.scss b/webapp/channels/src/components/properties_card_view/properties_card_view.scss
new file mode 100644
index 00000000000..feb80cf9169
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/properties_card_view.scss
@@ -0,0 +1,49 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+.PropertyCardView {
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+
+    .PropertyCardView_title {
+        color: var(--center-channel-color, #3F4350);
+        font-size: 25px;
+        font-weight: 600;
+    }
+
+    .PropertyCardView_fields {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+
+        > .row {
+            display: flex;
+            min-height: 32px;
+            flex-direction: row;
+            align-items: start;
+            margin: 0;
+            gap: 16px;
+
+            &::before {
+                content: none;
+            }
+
+            > .field {
+                display: flex;
+                min-width: 110px;
+                max-width: 110px;
+                align-items: center;
+                color: var(--center-channel-color, #3F4350);
+                font-size: 12px;
+                font-weight: 600;
+            }
+
+            > .value {
+                display: flex;
+                min-height: 32px;
+                align-items: center;
+            }
+        }
+    }
+}
diff --git a/webapp/channels/src/components/properties_card_view/properties_card_view.tsx b/webapp/channels/src/components/properties_card_view/properties_card_view.tsx
new file mode 100644
index 00000000000..3073d4ff3e8
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/properties_card_view.tsx
@@ -0,0 +1,109 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React, {useMemo} from 'react';
+import {FormattedMessage} from 'react-intl';
+
+import type {PropertyField, PropertyValue} from '@mattermost/types/properties';
+
+import PropertyValueRenderer from './propertyValueRenderer/propertyValueRenderer';
+
+import './properties_card_view.scss';
+
+type Props = {
+    title: React.ReactNode;
+    propertyFields: PropertyField[];
+    fieldOrder: Array<PropertyField['id']>;
+    shortModeFieldOrder: Array<PropertyField['id']>;
+    propertyValues: Array<PropertyValue<unknown>>;
+    mode?: 'short' | 'full';
+    actionsRow?: React.ReactNode;
+}
+
+export default function PropertiesCardView({title, propertyFields, fieldOrder, shortModeFieldOrder, propertyValues, mode, actionsRow}: Props) {
+    const orderedRows = useMemo<Array<{field: PropertyField; value: PropertyValue<unknown>}>>(() => {
+        if (!propertyFields.length || !fieldOrder.length || !propertyValues.length) {
+            return [];
+        }
+
+        const fieldsById = propertyFields.reduce((acc, field) => {
+            acc[field.id] = field;
+            return acc;
+        }, {} as {[key: string]: PropertyField});
+
+        const valuesByFieldId = propertyValues.reduce((acc, value) => {
+            acc[value.field_id] = value;
+            return acc;
+        }, {} as {[key: string]: PropertyValue<unknown>});
+
+        const fieldOrderToUse = mode === 'short' ? shortModeFieldOrder : fieldOrder;
+        return fieldOrderToUse.map((fieldId) => {
+            const field = fieldsById[fieldId];
+            const value = valuesByFieldId[fieldId];
+
+            return {
+                field,
+                value,
+            };
+        }).filter((entry) => Boolean(entry.value));
+    }, [fieldOrder, mode, propertyFields, propertyValues, shortModeFieldOrder]);
+
+    if (orderedRows.length === 0) {
+        return null;
+    }
+
+    return (
+        <div
+            className='PropertyCardView'
+            data-testid='property-card-view'
+        >
+            <div
+                className='PropertyCardView_title'
+                data-testid='property-card-title'
+            >
+                {title}
+            </div>
+
+            <div className='PropertyCardView_fields'>
+                {
+                    orderedRows.map(({field, value}) => {
+                        return (
+                            <div
+                                key={field.id}
+                                className='row'
+                                data-testid='property-card-row'
+                            >
+                                <div className='field'>
+                                    {field.name}
+                                </div>
+
+                                <div className='value'>
+                                    <PropertyValueRenderer
+                                        field={field}
+                                        value={value}
+                                    />
+                                </div>
+                            </div>
+                        );
+                    })
+                }
+
+                {
+                    mode === 'full' && actionsRow &&
+                    <div className='row'>
+                        <div className='field'>
+                            <FormattedMessage
+                                id='property_card.actions_row.label'
+                                defaultMessage='Actions'
+                            />
+                        </div>
+
+                        <div className='value'>
+                            {actionsRow}
+                        </div>
+                    </div>
+                }
+            </div>
+        </div>
+    );
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/channel_property_renderer/channel_property_renderer.scss b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/channel_property_renderer/channel_property_renderer.scss
new file mode 100644
index 00000000000..0c5e0a09fb0
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/channel_property_renderer/channel_property_renderer.scss
@@ -0,0 +1,8 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+.ChannelPropertyRenderer {
+    display: flex;
+    flex-direction: row;
+    gap: 8px;
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/channel_property_renderer/channel_property_renderer.test.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/channel_property_renderer/channel_property_renderer.test.tsx
new file mode 100644
index 00000000000..57fcea8b43d
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/channel_property_renderer/channel_property_renderer.test.tsx
@@ -0,0 +1,100 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {screen} from '@testing-library/react';
+import React from 'react';
+
+import type {Channel} from '@mattermost/types/channels';
+import type {PropertyValue} from '@mattermost/types/properties';
+
+import {renderWithContext} from 'tests/react_testing_utils';
+import {TestHelper} from 'utils/test_helper';
+
+import ChannelPropertyRenderer from './channel_property_renderer';
+
+jest.mock('components/common/hooks/useChannel');
+
+const mockUseChannel = require('components/common/hooks/useChannel').useChannel as jest.MockedFunction<typeof import('components/common/hooks/useChannel').useChannel>;
+
+describe('ChannelPropertyRenderer', () => {
+    const mockChannel: Channel = {
+        ...TestHelper.getChannelMock({
+            id: 'channel-id-123',
+            display_name: 'Test Channel',
+            type: 'O',
+        }),
+    };
+
+    const mockValue = {
+        value: 'channel-id-123',
+    } as PropertyValue<string>;
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should render channel name and icon when channel exists', () => {
+        mockUseChannel.mockReturnValue(mockChannel);
+
+        renderWithContext(
+            <ChannelPropertyRenderer value={mockValue}/>,
+        );
+
+        expect(screen.getByTestId('channel-property')).toBeInTheDocument();
+        expect(screen.getByText('Test Channel')).toBeInTheDocument();
+        expect(mockUseChannel).toHaveBeenCalledWith('channel-id-123');
+    });
+
+    it('should render deleted channel message when channel does not exist', () => {
+        mockUseChannel.mockReturnValue(undefined);
+
+        renderWithContext(
+            <ChannelPropertyRenderer value={mockValue}/>,
+        );
+
+        expect(screen.getByTestId('channel-property')).toBeInTheDocument();
+        expect(screen.getByText(/Deleted channel ID: channel-id-123/)).toBeInTheDocument();
+        expect(mockUseChannel).toHaveBeenCalledWith('channel-id-123');
+    });
+
+    it('should render deleted channel message when channel is undefined', () => {
+        mockUseChannel.mockReturnValue(undefined);
+
+        renderWithContext(
+            <ChannelPropertyRenderer value={mockValue}/>,
+        );
+
+        expect(screen.getByTestId('channel-property')).toBeInTheDocument();
+        expect(screen.getByText(/Deleted channel ID: channel-id-123/)).toBeInTheDocument();
+    });
+
+    it('should handle different channel types', () => {
+        const privateChannel = {
+            ...mockChannel,
+            type: 'P' as const,
+            display_name: 'Private Channel',
+        };
+        mockUseChannel.mockReturnValue(privateChannel);
+
+        renderWithContext(
+            <ChannelPropertyRenderer value={mockValue}/>,
+        );
+
+        expect(screen.getByText('Private Channel')).toBeInTheDocument();
+    });
+
+    it('should handle direct message channels', () => {
+        const dmChannel = {
+            ...mockChannel,
+            type: 'D' as const,
+            display_name: 'Direct Message',
+        };
+        mockUseChannel.mockReturnValue(dmChannel);
+
+        renderWithContext(
+            <ChannelPropertyRenderer value={mockValue}/>,
+        );
+
+        expect(screen.getByText('Direct Message')).toBeInTheDocument();
+    });
+});
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/channel_property_renderer/channel_property_renderer.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/channel_property_renderer/channel_property_renderer.tsx
new file mode 100644
index 00000000000..b45a6c538e0
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/channel_property_renderer/channel_property_renderer.tsx
@@ -0,0 +1,49 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {FormattedMessage} from 'react-intl';
+
+import type {PropertyValue} from '@mattermost/types/properties';
+
+import {useChannel} from 'components/common/hooks/useChannel';
+import SidebarBaseChannelIcon from 'components/sidebar/sidebar_channel/sidebar_base_channel/sidebar_base_channel_icon';
+
+import './channel_property_renderer.scss';
+
+type Props = {
+    value: PropertyValue<unknown>;
+}
+
+export default function ChannelPropertyRenderer({value}: Props) {
+    const channelId = value.value as string;
+    const channel = useChannel(channelId);
+
+    return (
+        <div
+            className='ChannelPropertyRenderer'
+            data-testid='channel-property'
+        >
+            {
+                channel &&
+                (
+                    <>
+                        <SidebarBaseChannelIcon
+                            channelType={channel.type}
+                        />
+                        {channel.display_name}
+                    </>
+                )
+            }
+
+            {
+                !channel &&
+                <FormattedMessage
+                    id='post_card.channel_property.deleted_channel'
+                    defaultMessage='Deleted channel ID: {channelId}'
+                    values={{channelId}}
+                />
+            }
+        </div>
+    );
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/post_preview_property_renderer/post_preview_property_renderer.test.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/post_preview_property_renderer/post_preview_property_renderer.test.tsx
new file mode 100644
index 00000000000..969f03c41bd
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/post_preview_property_renderer/post_preview_property_renderer.test.tsx
@@ -0,0 +1,274 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import type {Channel} from '@mattermost/types/channels';
+import type {Post} from '@mattermost/types/posts';
+import type {PropertyValue} from '@mattermost/types/properties';
+import type {Team} from '@mattermost/types/teams';
+import type {UserProfile} from '@mattermost/types/users';
+
+import {renderWithContext} from 'tests/react_testing_utils';
+import {TestHelper} from 'utils/test_helper';
+
+import PostPreviewPropertyRenderer from './post_preview_property_renderer';
+
+jest.mock('components/common/hooks/usePost');
+jest.mock('components/common/hooks/useChannel');
+jest.mock('components/common/hooks/use_team');
+
+const mockUsePost = require('components/common/hooks/usePost').usePost as jest.MockedFunction<any>;
+const mockUseChannel = require('components/common/hooks/useChannel').useChannel as jest.MockedFunction<any>;
+const mockUseTeam = require('components/common/hooks/use_team').useTeam as jest.MockedFunction<any>;
+
+describe('PostPreviewPropertyRenderer', () => {
+    const mockUser: UserProfile = {
+        ...TestHelper.getUserMock(),
+        id: 'user-id-123',
+        username: 'testuser',
+        first_name: 'Test',
+        last_name: 'User',
+    };
+
+    const mockPost: Post = {
+        ...TestHelper.getPostMock(),
+        id: 'post-id-123',
+        channel_id: 'channel-id-123',
+        user_id: 'user-id-123',
+        message: 'Test post message',
+        create_at: 1234567890,
+    };
+
+    const mockChannel: Channel = {
+        ...TestHelper.getChannelMock(),
+        id: 'channel-id-123',
+        team_id: 'team-id-123',
+        display_name: 'Test Channel',
+        type: 'O',
+    };
+
+    const mockTeam: Team = {
+        ...TestHelper.getTeamMock(),
+        id: 'team-id-123',
+        name: 'test-team',
+        display_name: 'Test Team',
+    };
+
+    const defaultProps = {
+        value: {
+            value: 'post-id-123',
+        } as PropertyValue<string>,
+    };
+
+    const baseState = {
+        entities: {
+            users: {
+                profiles: {
+                    [mockUser.id]: mockUser,
+                },
+                currentUserId: mockUser.id,
+            },
+            posts: {
+                posts: {
+                    [mockPost.id]: mockPost,
+                },
+            },
+            channels: {
+                channels: {
+                    [mockChannel.id]: mockChannel,
+                },
+            },
+            teams: {
+                teams: {
+                    [mockTeam.id]: mockTeam,
+                },
+            },
+            general: {
+                config: {},
+            },
+            preferences: {
+                myPreferences: {},
+            },
+        },
+    };
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should render PostMessagePreview when all data is available', () => {
+        mockUsePost.mockReturnValue(mockPost);
+        mockUseChannel.mockReturnValue(mockChannel);
+        mockUseTeam.mockReturnValue(mockTeam);
+
+        const {getByTestId, getByText} = renderWithContext(
+            <PostPreviewPropertyRenderer {...defaultProps}/>,
+            baseState,
+        );
+
+        expect(getByTestId('post-preview-property')).toBeVisible();
+        expect(getByText('Test post message')).toBeVisible();
+        expect(getByText('Originally posted in ~Test Channel')).toBeVisible();
+    });
+
+    it('should return null when post is not found', () => {
+        mockUsePost.mockReturnValue(null);
+        mockUseChannel.mockReturnValue(mockChannel);
+        mockUseTeam.mockReturnValue(mockTeam);
+
+        const {container} = renderWithContext(
+            <PostPreviewPropertyRenderer {...defaultProps}/>,
+            baseState,
+        );
+
+        expect(container.firstChild).toBeNull();
+    });
+
+    it('should return null when channel is not found', () => {
+        mockUsePost.mockReturnValue(mockPost);
+        mockUseChannel.mockReturnValue(null);
+        mockUseTeam.mockReturnValue(mockTeam);
+
+        const {container} = renderWithContext(
+            <PostPreviewPropertyRenderer {...defaultProps}/>,
+            baseState,
+        );
+
+        expect(container.firstChild).toBeNull();
+    });
+
+    it('should return null when team is not found', () => {
+        mockUsePost.mockReturnValue(mockPost);
+        mockUseChannel.mockReturnValue(mockChannel);
+        mockUseTeam.mockReturnValue(null);
+
+        const {container} = renderWithContext(
+            <PostPreviewPropertyRenderer {...defaultProps}/>,
+            baseState,
+        );
+
+        expect(container.firstChild).toBeNull();
+    });
+
+    it('should handle private channel', () => {
+        const privateChannel = {
+            ...mockChannel,
+            type: 'P' as const,
+        };
+
+        mockUsePost.mockReturnValue(mockPost);
+        mockUseChannel.mockReturnValue(privateChannel);
+        mockUseTeam.mockReturnValue(mockTeam);
+
+        const {getByTestId, getByText} = renderWithContext(
+            <PostPreviewPropertyRenderer {...defaultProps}/>,
+            baseState,
+        );
+
+        expect(getByTestId('post-preview-property')).toBeVisible();
+        expect(getByText('Test post message')).toBeVisible();
+        expect(getByText('Originally posted in ~Test Channel')).toBeVisible();
+    });
+
+    it('should handle missing display names gracefully', () => {
+        const channelWithoutDisplayName = {
+            ...mockChannel,
+            display_name: '',
+        };
+
+        const teamWithoutName = {
+            ...mockTeam,
+            name: '',
+        };
+
+        mockUsePost.mockReturnValue(mockPost);
+        mockUseChannel.mockReturnValue(channelWithoutDisplayName);
+        mockUseTeam.mockReturnValue(teamWithoutName);
+
+        const {getByTestId, getByText} = renderWithContext(
+            <PostPreviewPropertyRenderer {...defaultProps}/>,
+            baseState,
+        );
+
+        expect(getByTestId('post-preview-property')).toBeVisible();
+        expect(getByText('Test post message')).toBeVisible();
+        expect(getByText('Originally posted in ~')).toBeVisible();
+    });
+
+    it('should handle post with file attachments', () => {
+        const postWithAttachments = {
+            ...mockPost,
+            message: 'Post with file attachment',
+            file_ids: ['file-id-1', 'file-id-2'],
+            metadata: {
+                files: [
+                    {
+                        id: 'file-id-1',
+                        name: 'document.pdf',
+                        extension: 'pdf',
+                        size: 1024000,
+                        mime_type: 'application/pdf',
+                    },
+                    {
+                        id: 'file-id-2',
+                        name: 'image.jpg',
+                        extension: 'jpg',
+                        size: 512000,
+                        mime_type: 'image/jpeg',
+                    },
+                ],
+            },
+        };
+
+        const stateWithFiles = {
+            ...baseState,
+            entities: {
+                ...baseState.entities,
+                posts: {
+                    posts: {
+                        [postWithAttachments.id]: postWithAttachments,
+                    },
+                },
+                files: {
+                    fileIdsByPostId: {
+                        [postWithAttachments.id]: ['file-id-1', 'file-id-2'],
+                    },
+                    files: {
+                        'file-id-1': {
+                            id: 'file-id-1',
+                            name: 'document.pdf',
+                            extension: 'pdf',
+                            size: 1024000,
+                            mime_type: 'application/pdf',
+                        },
+                        'file-id-2': {
+                            id: 'file-id-2',
+                            name: 'image.jpg',
+                            extension: 'jpg',
+                            size: 512000,
+                            mime_type: 'image/jpeg',
+                        },
+                    },
+                },
+            },
+        };
+
+        mockUsePost.mockReturnValue(postWithAttachments);
+        mockUseChannel.mockReturnValue(mockChannel);
+        mockUseTeam.mockReturnValue(mockTeam);
+
+        const {getByTestId, getByText} = renderWithContext(
+            <PostPreviewPropertyRenderer {...defaultProps}/>,
+            stateWithFiles,
+        );
+
+        expect(getByTestId('post-preview-property')).toBeVisible();
+        expect(getByText('Post with file attachment')).toBeVisible();
+        expect(getByText('Originally posted in ~Test Channel')).toBeVisible();
+
+        // Assert that file attachments are visible
+        expect(getByText('document.pdf')).toBeVisible();
+        expect(getByText('image.jpg')).toBeVisible();
+    });
+});
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/post_preview_property_renderer/post_preview_property_renderer.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/post_preview_property_renderer/post_preview_property_renderer.tsx
new file mode 100644
index 00000000000..958825712d4
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/post_preview_property_renderer/post_preview_property_renderer.tsx
@@ -0,0 +1,62 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {useIntl} from 'react-intl';
+
+import type {PostPreviewMetadata} from '@mattermost/types/posts';
+import type {PropertyValue} from '@mattermost/types/properties';
+
+import {useTeam} from 'components/common/hooks/use_team';
+import {useChannel} from 'components/common/hooks/useChannel';
+import {usePost} from 'components/common/hooks/usePost';
+import PostMessagePreview from 'components/post_view/post_message_preview';
+
+const noop = () => {};
+
+type Props = {
+    value: PropertyValue<unknown>;
+}
+
+export default function PostPreviewPropertyRenderer({value}: Props) {
+    const post = usePost(value.value as string);
+    const channel = useChannel(post?.channel_id || '');
+    const team = useTeam(channel?.team_id || '');
+
+    const {formatMessage} = useIntl();
+
+    if (!post || !channel || !team) {
+        return null;
+    }
+
+    const previewMetaData: PostPreviewMetadata = {
+        post,
+        post_id: post.id,
+        team_name: team?.name || '',
+        channel_display_name: channel?.display_name || '',
+        channel_type: channel?.type || 'O',
+        channel_id: post.channel_id,
+    };
+
+    const postPreviewFooterMessage = formatMessage({
+        id: 'forward_post_modal.preview.footer_message',
+        defaultMessage: 'Originally posted in ~{channel}',
+    },
+    {
+        channel: channel?.display_name || '',
+    });
+
+    return (
+        <div
+            className='PostPreviewPropertyRenderer'
+            data-testid='post-preview-property'
+        >
+            <PostMessagePreview
+                metadata={previewMetaData}
+                handleFileDropdownOpened={noop}
+                preventClickAction={true}
+                previewFooterMessage={postPreviewFooterMessage}
+            />
+        </div>
+    );
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/propertyValueRenderer.test.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/propertyValueRenderer.test.tsx
new file mode 100644
index 00000000000..6b914d6cfc7
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/propertyValueRenderer.test.tsx
@@ -0,0 +1,444 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {screen} from '@testing-library/react';
+import React from 'react';
+
+import type {PropertyField, PropertyValue, SelectPropertyField} from '@mattermost/types/properties';
+
+import {renderWithContext} from 'tests/react_testing_utils';
+
+import PropertyValueRenderer from './propertyValueRenderer';
+
+// Mock all child components
+jest.mock('./text_property_renderer/textPropertyRenderer', () => {
+    return function MockTextPropertyRenderer({value}: {value: PropertyValue<unknown>}) {
+        return <div data-testid='mock-text-property'>{String(value.value)}</div>;
+    };
+});
+
+jest.mock('./user_property_renderer/userPropertyRenderer', () => {
+    return function MockUserPropertyRenderer({value}: {field: PropertyField; value: PropertyValue<unknown>}) {
+        return <div data-testid='mock-user-property'>{String(value.value)}</div>;
+    };
+});
+
+jest.mock('./select_property_renderer/selectPropertyRenderer', () => {
+    return function MockSelectPropertyRenderer({value}: {field: PropertyField; value: PropertyValue<unknown>}) {
+        return <div data-testid='mock-select-property'>{String(value.value)}</div>;
+    };
+});
+
+jest.mock('./post_preview_property_renderer/post_preview_property_renderer', () => {
+    return function MockPostPreviewPropertyRenderer({value}: {value: PropertyValue<unknown>}) {
+        return <div data-testid='mock-post-preview-property'>{String(value.value)}</div>;
+    };
+});
+
+jest.mock('./channel_property_renderer/channel_property_renderer', () => {
+    return function MockChannelPropertyRenderer({value}: {value: PropertyValue<unknown>}) {
+        return <div data-testid='mock-channel-property'>{String(value.value)}</div>;
+    };
+});
+
+jest.mock('./team_property_renderer/team_property_renderer', () => {
+    return function MockTeamPropertyRenderer({value}: {value: PropertyValue<unknown>}) {
+        return <div data-testid='mock-team-property'>{String(value.value)}</div>;
+    };
+});
+
+jest.mock('./timestamp_property_renderer/timestamp_property_renderer', () => {
+    return function MockTimestampPropertyRenderer({value}: {value: PropertyValue<unknown>}) {
+        return <div data-testid='mock-timestamp-property'>{String(value.value)}</div>;
+    };
+});
+
+describe('PropertyValueRenderer', () => {
+    describe('text field type', () => {
+        it('should render TextPropertyRenderer for text subtype', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Text Field',
+                type: 'text',
+                attrs: {
+                    subType: 'text',
+                },
+            } as PropertyField;
+
+            const value = {
+                value: 'test text',
+            } as PropertyValue<string>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-text-property')).toBeInTheDocument();
+            expect(screen.getByText('test text')).toBeInTheDocument();
+        });
+
+        it('should render TextPropertyRenderer for text field without subType', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Text Field',
+                type: 'text',
+                attrs: {},
+            } as PropertyField;
+
+            const value = {
+                value: 'test text',
+            } as PropertyValue<string>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-text-property')).toBeInTheDocument();
+            expect(screen.getByText('test text')).toBeInTheDocument();
+        });
+
+        it('should render PostPreviewPropertyRenderer for post subtype', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Post Field',
+                type: 'text',
+                attrs: {
+                    subType: 'post',
+                },
+            } as PropertyField;
+
+            const value = {
+                value: 'post-id-123',
+            } as PropertyValue<string>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-post-preview-property')).toBeInTheDocument();
+            expect(screen.getByText('post-id-123')).toBeInTheDocument();
+        });
+
+        it('should render ChannelPropertyRenderer for channel subtype', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Channel Field',
+                type: 'text',
+                attrs: {
+                    subType: 'channel',
+                },
+            } as PropertyField;
+
+            const value = {
+                value: 'channel-id-123',
+            } as PropertyValue<string>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-channel-property')).toBeInTheDocument();
+            expect(screen.getByText('channel-id-123')).toBeInTheDocument();
+        });
+
+        it('should render TeamPropertyRenderer for team subtype', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Team Field',
+                type: 'text',
+                attrs: {
+                    subType: 'team',
+                },
+            } as PropertyField;
+
+            const value = {
+                value: 'team-id-123',
+            } as PropertyValue<string>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-team-property')).toBeInTheDocument();
+            expect(screen.getByText('team-id-123')).toBeInTheDocument();
+        });
+
+        it('should render TimestampPropertyRenderer for timestamp subtype', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Timestamp Field',
+                type: 'text',
+                attrs: {
+                    subType: 'timestamp',
+                },
+            } as PropertyField;
+
+            const value = {
+                value: 1642694400000,
+            } as PropertyValue<number>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-timestamp-property')).toBeInTheDocument();
+            expect(screen.getByText('1642694400000')).toBeInTheDocument();
+        });
+
+        it('should return null for unknown text subtype', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Unknown Field',
+                type: 'text',
+                attrs: {
+                    subType: 'unknown' as unknown,
+                },
+            } as PropertyField;
+
+            const value = {
+                value: 'test value',
+            } as PropertyValue<string>;
+
+            const {container} = renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(container.firstChild).toBeNull();
+        });
+    });
+
+    describe('user field type', () => {
+        it('should render UserPropertyRenderer for user field', () => {
+            const field = {
+                id: 'field-1',
+                name: 'User Field',
+                type: 'user',
+                attrs: {},
+            } as PropertyField;
+
+            const value = {
+                value: 'user-id-123',
+            } as PropertyValue<string>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-user-property')).toBeInTheDocument();
+            expect(screen.getByText('user-id-123')).toBeInTheDocument();
+        });
+    });
+
+    describe('select field type', () => {
+        it('should render SelectPropertyRenderer for select field', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Select Field',
+                type: 'select',
+                attrs: {
+                    options: [
+                        {id: 'option1', name: 'Option 1', color: 'blue'},
+                    ],
+                },
+            } as SelectPropertyField;
+
+            const value = {
+                value: 'option1',
+            } as PropertyValue<string>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-select-property')).toBeInTheDocument();
+            expect(screen.getByText('option1')).toBeInTheDocument();
+        });
+    });
+
+    describe('unsupported field types', () => {
+        it('should return null for unsupported field type', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Unsupported Field',
+                type: 'unsupported' as unknown,
+                attrs: {},
+            } as PropertyField;
+
+            const value = {
+                value: 'test value',
+            } as PropertyValue<string>;
+
+            const {container} = renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(container.firstChild).toBeNull();
+        });
+
+        it('should return null for multiselect field type', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Multiselect Field',
+                type: 'multiselect',
+                attrs: {},
+            } as PropertyField;
+
+            const value = {
+                value: ['option1', 'option2'],
+            } as PropertyValue<string[]>;
+
+            const {container} = renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(container.firstChild).toBeNull();
+        });
+
+        it('should return null for date field type', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Date Field',
+                type: 'date',
+                attrs: {},
+            } as PropertyField;
+
+            const value = {
+                value: 1642694400000,
+            } as PropertyValue<number>;
+
+            const {container} = renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(container.firstChild).toBeNull();
+        });
+    });
+
+    describe('edge cases', () => {
+        it('should handle text field without attrs', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Text Field',
+                type: 'text',
+            } as PropertyField;
+
+            const value = {
+                value: 'test text',
+            } as PropertyValue<string>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-text-property')).toBeInTheDocument();
+            expect(screen.getByText('test text')).toBeInTheDocument();
+        });
+
+        it('should handle empty string value', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Text Field',
+                type: 'text',
+                attrs: {},
+            } as PropertyField;
+
+            const value = {
+                value: '',
+            } as PropertyValue<string>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-text-property')).toBeInTheDocument();
+            expect(screen.getByTestId('mock-text-property')).toHaveTextContent('');
+        });
+
+        it('should handle null value', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Text Field',
+                type: 'text',
+                attrs: {},
+            } as PropertyField;
+            const value: PropertyValue<null> = {
+                value: null,
+            } as PropertyValue<null>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-text-property')).toBeInTheDocument();
+            expect(screen.getByText('null')).toBeInTheDocument();
+        });
+
+        it('should handle undefined value', () => {
+            const field = {
+                id: 'field-1',
+                name: 'Text Field',
+                type: 'text',
+                attrs: {},
+            } as PropertyField;
+
+            const value = {
+                value: undefined,
+            } as PropertyValue<unknown>;
+
+            renderWithContext(
+                <PropertyValueRenderer
+                    field={field}
+                    value={value}
+                />,
+            );
+
+            expect(screen.getByTestId('mock-text-property')).toBeInTheDocument();
+            expect(screen.getByText('undefined')).toBeInTheDocument();
+        });
+    });
+});
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/propertyValueRenderer.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/propertyValueRenderer.tsx
new file mode 100644
index 00000000000..6fedfee9956
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/propertyValueRenderer.tsx
@@ -0,0 +1,74 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import type {
+    PropertyField,
+    PropertyValue,
+} from '@mattermost/types/properties';
+
+import ChannelPropertyRenderer from './channel_property_renderer/channel_property_renderer';
+import PostPreviewPropertyRenderer from './post_preview_property_renderer/post_preview_property_renderer';
+import SelectPropertyRenderer from './select_property_renderer/selectPropertyRenderer';
+import TeamPropertyRenderer from './team_property_renderer/team_property_renderer';
+import TextPropertyRenderer from './text_property_renderer/textPropertyRenderer';
+import TimestampPropertyRenderer from './timestamp_property_renderer/timestamp_property_renderer';
+import UserPropertyRenderer from './user_property_renderer/userPropertyRenderer';
+
+import './property_value_renderer.scss';
+
+type Props = {
+    field: PropertyField;
+    value: PropertyValue<unknown>;
+};
+
+export default function PropertyValueRenderer({field, value}: Props) {
+    switch (field.type) {
+    case 'text':
+        return (
+            <RenderTextSubtype
+                field={field}
+                value={value}
+            />
+        );
+    case 'user':
+        return (
+            <UserPropertyRenderer
+                field={field}
+                value={value}
+            />
+        );
+    case 'select':
+        return (
+            <SelectPropertyRenderer
+                value={value}
+                field={field}
+            />
+        );
+    default:
+        return null;
+    }
+}
+
+function RenderTextSubtype({field, value}: Props) {
+    if (field.type !== 'text') {
+        return null;
+    }
+
+    const subType = field.attrs?.subType ?? 'text';
+    switch (subType) {
+    case 'text':
+        return <TextPropertyRenderer value={value}/>;
+    case 'post':
+        return <PostPreviewPropertyRenderer value={value}/>;
+    case 'channel':
+        return <ChannelPropertyRenderer value={value}/>;
+    case 'team':
+        return <TeamPropertyRenderer value={value}/>;
+    case 'timestamp':
+        return <TimestampPropertyRenderer value={value}/>;
+    default:
+        return null;
+    }
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/property_value_renderer.scss b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/property_value_renderer.scss
new file mode 100644
index 00000000000..16ef7a0813e
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/property_value_renderer.scss
@@ -0,0 +1,8 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+.field {
+    display: flex;
+    flex: 1 0 0;
+    padding: 6px 8px;
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/select_property_renderer/selectPropertyRenderer.scss b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/select_property_renderer/selectPropertyRenderer.scss
new file mode 100644
index 00000000000..fa1a9e0674a
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/select_property_renderer/selectPropertyRenderer.scss
@@ -0,0 +1,11 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+.SelectProperty {
+    display: flex;
+    align-items: center;
+    padding: 3px 12px;
+    border-radius: 4px;
+    font-weight: 600;
+    gap: 6px;
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/select_property_renderer/selectPropertyRenderer.test.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/select_property_renderer/selectPropertyRenderer.test.tsx
new file mode 100644
index 00000000000..d937401b2a3
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/select_property_renderer/selectPropertyRenderer.test.tsx
@@ -0,0 +1,197 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import type {PropertyField, PropertyValue, SelectPropertyField} from '@mattermost/types/properties';
+
+import {renderWithContext, screen} from 'tests/react_testing_utils';
+
+import SelectPropertyRenderer from './selectPropertyRenderer';
+
+describe('SelectPropertyRenderer', () => {
+    const baseField = {
+        id: 'test-field',
+        name: 'Test Field',
+        type: 'select',
+        attrs: {
+            editable: true,
+            options: [
+                {id: 'option1', name: 'option1', color: 'light_blue'},
+                {id: 'option2', name: 'option2', color: 'dark_blue'},
+                {id: 'option3', name: 'option3', color: 'dark_red'},
+                {id: 'option4', name: 'option4', color: 'light_gray'},
+            ],
+        },
+    } as SelectPropertyField;
+
+    it('should render select property with light_blue color', () => {
+        const field = baseField;
+        const value = {value: 'option1'} as PropertyValue<string>;
+
+        renderWithContext(
+            <SelectPropertyRenderer
+                field={field}
+                value={value}
+            />,
+        );
+
+        const element = screen.getByTestId('select-property');
+        expect(element).toBeInTheDocument();
+        expect(element).toHaveTextContent('option1');
+        expect(element).toHaveStyle({
+            backgroundColor: 'rgba(var(--button-bg-rgb), 0.08)',
+            color: '#FFF',
+        });
+    });
+
+    it('should render select property with dark_blue color', () => {
+        const field = baseField;
+        const value = {value: 'option2'} as PropertyValue<string>;
+
+        renderWithContext(
+            <SelectPropertyRenderer
+                field={field}
+                value={value}
+            />,
+        );
+
+        const element = screen.getByTestId('select-property');
+        expect(element).toHaveTextContent('option2');
+        expect(element).toHaveStyle({
+            backgroundColor: 'rgba(var(--sidebar-text-active-border-rgb), 0.92)',
+            color: '#FFF',
+        });
+    });
+
+    it('should render select property with dark_red color', () => {
+        const field = baseField;
+        const value = {value: 'option3'} as PropertyValue<string>;
+
+        renderWithContext(
+            <SelectPropertyRenderer
+                field={field}
+                value={value}
+            />,
+        );
+
+        const element = screen.getByTestId('select-property');
+        expect(element).toHaveTextContent('option3');
+        expect(element).toHaveStyle({
+            backgroundColor: 'var(--error-text)',
+            color: '#FFF',
+        });
+    });
+
+    it('should render select property with default light_gray color', () => {
+        const field = baseField;
+        const value = {value: 'option4'} as PropertyValue<string>;
+
+        renderWithContext(
+            <SelectPropertyRenderer
+                field={field}
+                value={value}
+            />,
+        );
+
+        const element = screen.getByTestId('select-property');
+        expect(element).toHaveTextContent('option4');
+        expect(element).toHaveStyle({
+            backgroundColor: 'rgba(var(--center-channel-color-rgb), 0.12)',
+            color: 'rgba(var(--center-channel-color-rgb), 1)',
+        });
+    });
+
+    it('should use default color when option color is not found', () => {
+        const field: SelectPropertyField = {
+            ...baseField,
+            attrs: {
+                editable: false,
+                options: [
+                    {id: 'option1', name: 'option1', color: 'unknown_color'},
+                ],
+            },
+        };
+        const value = {value: 'option1'} as PropertyValue<string>;
+
+        renderWithContext(
+            <SelectPropertyRenderer
+                field={field}
+                value={value}
+            />,
+        );
+
+        const element = screen.getByTestId('select-property');
+        expect(element).toHaveStyle({
+            backgroundColor: 'rgba(var(--center-channel-color-rgb), 0.12)',
+            color: 'rgba(var(--center-channel-color-rgb), 1)',
+        });
+    });
+
+    it('should use default color when option is not found in field options', () => {
+        const field = baseField;
+        const value = {value: 'nonexistent_option'} as PropertyValue<string>;
+
+        renderWithContext(
+            <SelectPropertyRenderer
+                field={field}
+                value={value}
+            />,
+        );
+
+        const element = screen.getByTestId('select-property');
+        expect(element).toHaveTextContent('nonexistent_option');
+        expect(element).toHaveStyle({
+            backgroundColor: 'rgba(var(--center-channel-color-rgb), 0.12)',
+            color: 'rgba(var(--center-channel-color-rgb), 1)',
+        });
+    });
+
+    it('should use default color when field has no options', () => {
+        const field: SelectPropertyField = {
+            ...baseField,
+            attrs: {
+                editable: false,
+                options: [],
+            },
+        };
+        const value = {value: 'some_value'} as PropertyValue<string>;
+
+        renderWithContext(
+            <SelectPropertyRenderer
+                field={field}
+                value={value}
+            />,
+        );
+
+        const element = screen.getByTestId('select-property');
+        expect(element).toHaveTextContent('some_value');
+        expect(element).toHaveStyle({
+            backgroundColor: 'rgba(var(--center-channel-color-rgb), 0.12)',
+            color: 'rgba(var(--center-channel-color-rgb), 1)',
+        });
+    });
+
+    it('should use default color when field attrs is undefined', () => {
+        const field = {
+            id: 'test-field',
+            name: 'Test Field',
+            type: 'select',
+        } as PropertyField;
+        const value = {value: 'some_value'} as PropertyValue<string>;
+
+        renderWithContext(
+            <SelectPropertyRenderer
+                field={field}
+                value={value}
+            />,
+        );
+
+        const element = screen.getByTestId('select-property');
+        expect(element).toHaveTextContent('some_value');
+        expect(element).toHaveStyle({
+            backgroundColor: 'rgba(var(--center-channel-color-rgb), 0.12)',
+            color: 'rgba(var(--center-channel-color-rgb), 1)',
+        });
+    });
+});
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/select_property_renderer/selectPropertyRenderer.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/select_property_renderer/selectPropertyRenderer.tsx
new file mode 100644
index 00000000000..3592e06b93b
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/select_property_renderer/selectPropertyRenderer.tsx
@@ -0,0 +1,59 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import type {PropertyField, PropertyValue, SelectPropertyField} from '@mattermost/types/properties';
+
+import './selectPropertyRenderer.scss';
+
+const DEFAULT_BACKGROUND_COLOR = 'light_gray';
+
+type Props = {
+    field: PropertyField;
+    value: PropertyValue<unknown>;
+}
+
+export default function SelectPropertyRenderer({field, value}: Props) {
+    const valueConfig = (field as SelectPropertyField).attrs?.options?.find((option) => option.name === value.value);
+    const {backgroundColor, color} = getOptionColors(valueConfig?.color || DEFAULT_BACKGROUND_COLOR);
+
+    return (
+        <div
+            className='SelectProperty'
+            data-testid='select-property'
+            style={{
+                backgroundColor,
+                color,
+            }}
+        >
+            {value.value}
+        </div>
+    );
+}
+
+function getOptionColors(colorName: string): {backgroundColor: string; color: string} {
+    switch (colorName) {
+    case 'light_blue':
+        return {
+            backgroundColor: 'rgba(var(--button-bg-rgb), 0.08)',
+            color: '#FFF',
+        };
+    case 'dark_blue':
+        return {
+            backgroundColor: 'rgba(var(--sidebar-text-active-border-rgb), 0.92)',
+            color: '#FFF',
+        };
+    case 'dark_red':
+        return {
+            backgroundColor: 'var(--error-text)',
+            color: '#FFF',
+        };
+    default:
+        // Default is light grey color
+        return {
+            backgroundColor: 'rgba(var(--center-channel-color-rgb), 0.12)',
+            color: 'rgba(var(--center-channel-color-rgb), 1)',
+        };
+    }
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/team_property_renderer/team_property_renderer.scss b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/team_property_renderer/team_property_renderer.scss
new file mode 100644
index 00000000000..a16defea85e
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/team_property_renderer/team_property_renderer.scss
@@ -0,0 +1,16 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+.TeamPropertyRenderer {
+    display: flex;
+    flex-direction: row;
+    align-items: baseline;
+    gap: 8px;
+
+    .TeamIcon {
+        width: 20px;
+        height: 20px;
+        background: var(--center-channel-color-08);
+        font-size: 12px;
+    }
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/team_property_renderer/team_property_renderer.test.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/team_property_renderer/team_property_renderer.test.tsx
new file mode 100644
index 00000000000..8431052ccba
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/team_property_renderer/team_property_renderer.test.tsx
@@ -0,0 +1,116 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {screen} from '@testing-library/react';
+import React from 'react';
+
+import type {PropertyValue} from '@mattermost/types/properties';
+import type {Team} from '@mattermost/types/teams';
+
+import {renderWithContext} from 'tests/react_testing_utils';
+import {TestHelper} from 'utils/test_helper';
+
+import TeamPropertyRenderer from './team_property_renderer';
+
+describe('TeamPropertyRenderer', () => {
+    const mockTeam: Team = TestHelper.getTeamMock({
+        id: 'team-id-123',
+        display_name: 'Test Team',
+        name: 'test-team',
+    });
+
+    const defaultProps = {
+        value: {
+            value: 'team-id-123',
+        } as PropertyValue<string>,
+    };
+
+    test('should render team name and icon when team exists', () => {
+        const state = {
+            entities: {
+                teams: {
+                    teams: {
+                        'team-id-123': mockTeam,
+                    },
+                },
+            },
+        };
+
+        renderWithContext(
+            <TeamPropertyRenderer {...defaultProps}/>,
+            state,
+        );
+
+        expect(screen.getByTestId('team-property')).toBeVisible();
+        expect(screen.getByText('Test Team')).toBeVisible();
+
+        expect(screen.queryByTestId('teamIconInitial')).toBeVisible();
+    });
+
+    test('should render deleted team message when team does not exist', () => {
+        const state = {
+            entities: {
+                teams: {
+                    teams: {},
+                },
+            },
+        };
+
+        renderWithContext(
+            <TeamPropertyRenderer {...defaultProps}/>,
+            state,
+        );
+
+        expect(screen.getByTestId('team-property')).toBeVisible();
+        expect(screen.getByText(/Deleted team ID: team-id-123/)).toBeInTheDocument();
+        expect(screen.queryByText('Test Team')).not.toBeInTheDocument();
+    });
+
+    test('should handle empty team id', () => {
+        const propsWithEmptyId = {
+            value: {
+                value: '',
+            } as PropertyValue<string>,
+        };
+
+        const state = {
+            entities: {
+                teams: {
+                    teams: {},
+                },
+            },
+        };
+
+        renderWithContext(
+            <TeamPropertyRenderer {...propsWithEmptyId}/>,
+            state,
+        );
+
+        expect(screen.getByTestId('team-property')).toBeVisible();
+        expect(screen.getByText(/Deleted team ID:/)).toBeInTheDocument();
+    });
+
+    test('should handle null team id', () => {
+        const propsWithNullId = {
+            value: {
+                value: null,
+            } as PropertyValue<null>,
+        };
+
+        const state = {
+            entities: {
+                teams: {
+                    teams: {},
+                },
+            },
+        };
+
+        renderWithContext(
+            <TeamPropertyRenderer {...propsWithNullId}/>,
+            state,
+        );
+
+        expect(screen.getByTestId('team-property')).toBeVisible();
+        expect(screen.getByText(/Deleted team ID:/)).toBeInTheDocument();
+    });
+});
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/team_property_renderer/team_property_renderer.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/team_property_renderer/team_property_renderer.tsx
new file mode 100644
index 00000000000..282793a2a5d
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/team_property_renderer/team_property_renderer.tsx
@@ -0,0 +1,55 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {FormattedMessage, useIntl} from 'react-intl';
+
+import type {PropertyValue} from '@mattermost/types/properties';
+
+import {useTeam} from 'components/common/hooks/use_team';
+import {TeamIcon} from 'components/widgets/team_icon/team_icon';
+
+import {imageURLForTeam} from 'utils/utils';
+
+import './team_property_renderer.scss';
+
+type Props = {
+    value: PropertyValue<unknown>;
+}
+
+export default function TeamPropertyRenderer({value}: Props) {
+    const intl = useIntl();
+
+    const teamId = value.value as string;
+    const team = useTeam(teamId);
+
+    return (
+        <div
+            className='TeamPropertyRenderer'
+            data-testid='team-property'
+        >
+            {
+                team &&
+                <>
+                    <TeamIcon
+                        size='xxs'
+                        content={team.display_name}
+                        intl={intl}
+                        url={imageURLForTeam(team)}
+                    />
+
+                    {team.display_name}
+                </>
+            }
+
+            {
+                !team &&
+                <FormattedMessage
+                    id='post_card.channel_property.deleted_team'
+                    defaultMessage='Deleted team ID: {teamId}'
+                    values={{teamId}}
+                />
+            }
+        </div>
+    );
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/text_property_renderer/textPropertyRenderer.test.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/text_property_renderer/textPropertyRenderer.test.tsx
new file mode 100644
index 00000000000..5a4d28e6324
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/text_property_renderer/textPropertyRenderer.test.tsx
@@ -0,0 +1,103 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {screen} from '@testing-library/react';
+import React from 'react';
+
+import type {PropertyValue} from '@mattermost/types/properties';
+
+import {renderWithContext} from 'tests/react_testing_utils';
+
+import TextPropertyRenderer from './textPropertyRenderer';
+
+describe('TextPropertyRenderer', () => {
+    const baseProps = {
+        value: {
+            value: 'Test text value',
+        } as PropertyValue<string>,
+    };
+
+    test('should render text property value', () => {
+        renderWithContext(<TextPropertyRenderer {...baseProps}/>);
+
+        const textElement = screen.getByTestId('text-property');
+        expect(textElement).toBeVisible();
+        expect(textElement).toHaveTextContent('Test text value');
+        expect(textElement).toHaveClass('TextProperty');
+    });
+
+    test('should render empty string value', () => {
+        const props = {
+            value: {
+                value: '',
+            } as PropertyValue<string>,
+        };
+
+        renderWithContext(<TextPropertyRenderer {...props}/>);
+
+        const textElement = screen.getByTestId('text-property');
+        expect(textElement).toBeVisible();
+        expect(textElement).toHaveTextContent('');
+        expect(textElement).toHaveClass('TextProperty');
+    });
+
+    test('should render numeric value as string', () => {
+        const props = {
+            value: {
+                value: 123,
+            } as PropertyValue<number>,
+        };
+
+        renderWithContext(<TextPropertyRenderer {...props}/>);
+
+        const textElement = screen.getByTestId('text-property');
+        expect(textElement).toBeVisible();
+        expect(textElement).toHaveTextContent('123');
+        expect(textElement).toHaveClass('TextProperty');
+    });
+
+    test('should render null value', () => {
+        const props = {
+            value: {
+                value: null,
+            } as PropertyValue<null>,
+        };
+
+        renderWithContext(<TextPropertyRenderer {...props}/>);
+
+        const textElement = screen.getByTestId('text-property');
+        expect(textElement).toBeVisible();
+        expect(textElement).toHaveTextContent('');
+        expect(textElement).toHaveClass('TextProperty');
+    });
+
+    test('should render undefined value', () => {
+        const props = {
+            value: {
+                value: undefined,
+            } as PropertyValue<undefined>,
+        };
+
+        renderWithContext(<TextPropertyRenderer {...props}/>);
+
+        const textElement = screen.getByTestId('text-property');
+        expect(textElement).toBeVisible();
+        expect(textElement).toHaveTextContent('');
+        expect(textElement).toHaveClass('TextProperty');
+    });
+
+    test('should render special characters', () => {
+        const props = {
+            value: {
+                value: '!@#$%^&*()_+-=[]{}|;:,.<>?',
+            } as PropertyValue<string>,
+        };
+
+        renderWithContext(<TextPropertyRenderer {...props}/>);
+
+        const textElement = screen.getByTestId('text-property');
+        expect(textElement).toBeVisible();
+        expect(textElement).toHaveTextContent('!@#$%^&*()_+-=[]{}|;:,.<>?');
+        expect(textElement).toHaveClass('TextProperty');
+    });
+});
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/text_property_renderer/textPropertyRenderer.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/text_property_renderer/textPropertyRenderer.tsx
new file mode 100644
index 00000000000..2b057651f92
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/text_property_renderer/textPropertyRenderer.tsx
@@ -0,0 +1,21 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import type {PropertyValue} from '@mattermost/types/properties';
+
+type Props = {
+    value: PropertyValue<unknown>;
+}
+
+export default function TextPropertyRenderer({value}: Props) {
+    return (
+        <span
+            className='TextProperty'
+            data-testid='text-property'
+        >
+            {value.value}
+        </span>
+    );
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/timestamp_property_renderer/timestamp_property_renderer.test.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/timestamp_property_renderer/timestamp_property_renderer.test.tsx
new file mode 100644
index 00000000000..588dfcf005c
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/timestamp_property_renderer/timestamp_property_renderer.test.tsx
@@ -0,0 +1,171 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import type {PropertyValue} from '@mattermost/types/properties';
+
+import {renderWithContext, screen} from 'tests/react_testing_utils';
+
+import TimestampPropertyRenderer from './timestamp_property_renderer';
+
+describe('TimestampPropertyRenderer', () => {
+    const mockValue = {
+        value: 1642694400000, // January 20, 2022 12:00:00 PM UTC
+    } as PropertyValue<number>;
+
+    const baseState = {
+        entities: {
+            preferences: {
+                myPreferences: {},
+            },
+            users: {
+                currentUserId: 'user-id',
+                profiles: {
+                    'user-id': {
+                        id: 'user-id',
+                        timezone: {
+                            useAutomaticTimezone: false,
+                            manualTimezone: 'UTC',
+                        },
+                    },
+                },
+            },
+        },
+    };
+
+    it('should render timestamp component with the provided value', () => {
+        renderWithContext(
+            <TimestampPropertyRenderer value={mockValue}/>,
+            baseState,
+        );
+
+        const timestampElement = screen.getByTestId('timestamp-property');
+        expect(timestampElement).toBeVisible();
+        expect(timestampElement).toHaveTextContent('Thursday, January 20, 2022 at 4:00:00 PM');
+    });
+
+    it('should handle zero timestamp value', () => {
+        const zeroValue = {
+            value: 0,
+        } as PropertyValue<number>;
+
+        renderWithContext(
+            <TimestampPropertyRenderer value={zeroValue}/>,
+            baseState,
+        );
+
+        const timestampElement = screen.getByTestId('timestamp-property');
+        expect(timestampElement).toBeVisible();
+        expect(timestampElement).toHaveTextContent('Thursday, January 1, 1970 at 12:00:00 AM');
+    });
+
+    it('should handle negative timestamp value', () => {
+        const negativeValue = {
+            value: -86400000, // One day before epoch
+        } as PropertyValue<number>;
+
+        renderWithContext(
+            <TimestampPropertyRenderer value={negativeValue}/>,
+            baseState,
+        );
+
+        const timestampElement = screen.getByTestId('timestamp-property');
+        expect(timestampElement).toBeVisible();
+        expect(timestampElement).toHaveTextContent('Wednesday, December 31, 1969 at 12:00:00 AM');
+    });
+
+    it('should handle future timestamp value', () => {
+        const futureValue = {
+            value: 2000000000000, // May 18, 2033
+        } as PropertyValue<number>;
+
+        renderWithContext(
+            <TimestampPropertyRenderer value={futureValue}/>,
+            baseState,
+        );
+
+        const timestampElement = screen.getByTestId('timestamp-property');
+        expect(timestampElement).toBeVisible();
+        expect(timestampElement).toHaveTextContent('Wednesday, May 18, 2033 at 3:33:20 AM');
+    });
+
+    it('should render in 12-hour format by default', () => {
+        const timeValue = {
+            value: 1642701600000, // January 20, 2022 2:00:00 PM UTC
+        } as PropertyValue<number>;
+
+        renderWithContext(
+            <TimestampPropertyRenderer value={timeValue}/>,
+            baseState,
+        );
+
+        const timestampElement = screen.getByTestId('timestamp-property');
+        expect(timestampElement).toBeVisible();
+        expect(timestampElement).toHaveTextContent('Thursday, January 20, 2022 at 6:00:00 PM');
+    });
+
+    it('should render in 24-hour format when military time preference is enabled', () => {
+        const timeValue = {
+            value: 1642701600000, // January 20, 2022 2:00:00 PM UTC
+        } as PropertyValue<number>;
+
+        const militaryTimeState = {
+            ...baseState,
+            entities: {
+                ...baseState.entities,
+                preferences: {
+                    myPreferences: {
+                        'display_settings--use_military_time': {
+                            category: 'display_settings',
+                            name: 'use_military_time',
+                            user_id: 'user-id',
+                            value: 'true',
+                        },
+                    },
+                },
+            },
+        };
+
+        renderWithContext(
+            <TimestampPropertyRenderer value={timeValue}/>,
+            militaryTimeState,
+        );
+
+        const timestampElement = screen.getByTestId('timestamp-property');
+        expect(timestampElement).toBeVisible();
+        expect(timestampElement).toHaveTextContent('Thursday, January 20, 2022 at 18:00:00');
+    });
+
+    it('should render in 12-hour format when military time preference is disabled', () => {
+        const timeValue = {
+            value: 1642701600000, // January 20, 2022 2:00:00 PM UTC
+        } as PropertyValue<number>;
+
+        const twelveHourState = {
+            ...baseState,
+            entities: {
+                ...baseState.entities,
+                preferences: {
+                    myPreferences: {
+                        'display_settings--use_military_time': {
+                            category: 'display_settings',
+                            name: 'use_military_time',
+                            user_id: 'user-id',
+                            value: 'false',
+                        },
+                    },
+                },
+            },
+        };
+
+        renderWithContext(
+            <TimestampPropertyRenderer value={timeValue}/>,
+            twelveHourState,
+        );
+
+        const timestampElement = screen.getByTestId('timestamp-property');
+        expect(timestampElement).toBeVisible();
+        expect(timestampElement).toHaveTextContent('Thursday, January 20, 2022 at 6:00:00 PM');
+    });
+});
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/timestamp_property_renderer/timestamp_property_renderer.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/timestamp_property_renderer/timestamp_property_renderer.tsx
new file mode 100644
index 00000000000..344e369d83a
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/timestamp_property_renderer/timestamp_property_renderer.tsx
@@ -0,0 +1,31 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React, {type ComponentProps} from 'react';
+
+import type {PropertyValue} from '@mattermost/types/properties';
+
+import Timestamp from 'components/timestamp';
+
+const getTimeFormat: ComponentProps<typeof Timestamp>['useTime'] = (_, {hour, minute, second}) => ({hour, minute, second});
+const getDateFormat: ComponentProps<typeof Timestamp>['useDate'] = {weekday: 'long', day: 'numeric', month: 'long', year: 'numeric'};
+
+type Props = {
+    value: PropertyValue<unknown>;
+}
+
+export default function TimestampPropertyRenderer({value}: Props) {
+    return (
+        <div
+            className='TimestampPropertyRenderer'
+            data-testid='timestamp-property'
+        >
+            <Timestamp
+                value={value.value as number}
+                useSemanticOutput={false}
+                useDate={getDateFormat}
+                useTime={getTimeFormat}
+            />
+        </div>
+    );
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/selectable_user_property_renderer.scss b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/selectable_user_property_renderer.scss
new file mode 100644
index 00000000000..2848918f115
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/selectable_user_property_renderer.scss
@@ -0,0 +1,60 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+.SelectableUserPropertyRenderer {
+    .UserMultiSelector {
+        .UserMultiSelector__control {
+            height: 32px;
+            min-height: unset;
+            align-items: baseline;
+            border: none !important;
+            box-shadow: none !important;
+
+            .UserMultiSelector__indicators {
+                height: 32px;
+            }
+
+            .UserMultiSelector__value-container {
+                padding: 0;
+
+
+                .SelectableUserPropertyRenderer_placeholder {
+                    display: flex;
+                    align-items: center;
+                    gap: 8px;
+
+                    i.icon.icon-account-outline {
+                        width: 24px;
+                        min-width: 24px;
+                        height: 24px;
+                        padding: 0;
+                        border-radius: 50%;
+                        margin: 0;
+                        background: rgba(var(--center-channel-color-rgb), 0.12);
+                        font-size: 12px;
+                    }
+                }
+            }
+        }
+    }
+}
+
+.UserMultiSelector__menu-portal {
+    z-index: 22 !important;
+
+    .UserMultiSelector__menu {
+        min-width: 200px;
+        max-width: 400px;
+        margin-top: 0 !important;
+
+        .UserMultiSelector__control {
+            min-height: unset;
+            max-height: 32px;
+            align-items: baseline;
+        }
+
+        .UserMultiSelector__indicators {
+            height: 32px;
+        }
+    }
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/selectable_user_property_renderer.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/selectable_user_property_renderer.tsx
new file mode 100644
index 00000000000..51835b219f0
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/selectable_user_property_renderer.tsx
@@ -0,0 +1,38 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {useIntl} from 'react-intl';
+
+import type {PropertyField} from '@mattermost/types/properties';
+
+import './selectable_user_property_renderer.scss';
+import {UserSelector} from 'components/admin_console/content_flagging/user_multiselector/user_multiselector';
+
+type Props = {
+    field: PropertyField;
+}
+
+export function SelectableUserPropertyRenderer({field}: Props) {
+    const {formatMessage} = useIntl();
+    const placeholder = (
+        <span className='SelectableUserPropertyRenderer_placeholder'>
+            <i className='icon icon-account-outline'/>
+            {formatMessage({id: 'generic.unassigned', defaultMessage: 'Unassigned'})}
+        </span>
+    );
+
+    return (
+        <div
+            className='SelectableUserPropertyRenderer'
+            data-testid='selectable-user-property'
+        >
+            <UserSelector
+                isMulti={false}
+                id={`selectable-user-property-renderer-${field.id}`}
+                placeholder={placeholder}
+                showDropdownIndicator={true}
+            />
+        </div>
+    );
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/userPropertyRenderer.test.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/userPropertyRenderer.test.tsx
new file mode 100644
index 00000000000..37fb5a07398
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/userPropertyRenderer.test.tsx
@@ -0,0 +1,129 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {screen} from '@testing-library/react';
+import React from 'react';
+
+import type {PropertyField, PropertyValue} from '@mattermost/types/properties';
+import type {UserProfile} from '@mattermost/types/users';
+import type {DeepPartial} from '@mattermost/types/utilities';
+
+import {renderWithContext} from 'tests/react_testing_utils';
+import {TestHelper} from 'utils/test_helper';
+
+import type {GlobalState} from 'types/store';
+
+import UserPropertyRenderer from './userPropertyRenderer';
+
+describe('UserPropertyRenderer', () => {
+    const mockUser: UserProfile = TestHelper.getUserMock({
+        id: 'user-id-123',
+        username: 'testuser',
+        first_name: 'Test',
+        last_name: 'User',
+        email: 'test@example.com',
+    });
+
+    const baseState: DeepPartial<GlobalState> = {
+        entities: {
+            users: {
+                profiles: {
+                    'user-id-123': mockUser,
+                },
+                profilesInChannel: {},
+                profilesNotInChannel: {},
+                profilesWithoutTeam: new Set(),
+                profilesInTeam: {},
+                profilesNotInTeam: {},
+                statuses: {},
+                myUserAccessTokens: {},
+                stats: {},
+                filteredStats: {},
+            },
+            general: {
+                config: {},
+                license: {},
+            },
+            preferences: {
+                myPreferences: {},
+            },
+            teams: {
+                currentTeamId: 'team-id',
+                teams: {},
+                myMembers: {},
+                membersInTeam: {},
+                stats: {},
+            },
+            channels: {
+                currentChannelId: 'channel-id',
+                channels: {},
+                channelsInTeam: {},
+                myMembers: {},
+                stats: {},
+                groupsAssociatedToChannel: {},
+                totalCount: 0,
+                manuallyUnread: {},
+                channelModerations: {},
+                channelMemberCountsByGroup: {},
+            },
+        },
+    };
+
+    const mockField = {
+        id: 'field-id',
+        name: 'Assignee',
+        type: 'user',
+        attrs: {},
+    } as PropertyField;
+
+    const mockValue = {
+        value: 'user-id-123',
+    } as PropertyValue<string>;
+
+    describe('when field is not editable', () => {
+        it('should render user avatar and profile component', () => {
+            const field = {...mockField, attrs: {editable: false}};
+
+            renderWithContext(
+                <UserPropertyRenderer
+                    field={field}
+                    value={mockValue}
+                />,
+                baseState,
+            );
+
+            const userProperty = screen.getByTestId('user-property');
+            expect(userProperty).toBeVisible();
+
+            const userProfile = screen.getByText('testuser');
+            expect(userProfile).toBeVisible();
+
+            expect(screen.queryByAltText('testuser profile image')).toBeVisible();
+        });
+    });
+
+    describe('when field is editable', () => {
+        it('should render selectable user property renderer', () => {
+            const editableField = {...mockField, attrs: {editable: true}};
+
+            renderWithContext(
+                <UserPropertyRenderer
+                    field={editableField}
+                    value={mockValue}
+                />,
+                baseState,
+            );
+
+            const selectableUserProperty = screen.getByTestId('selectable-user-property');
+            expect(selectableUserProperty).toBeVisible();
+
+            // Check that the placeholder text is present
+            const placeholder = screen.getByText('Unassigned');
+            expect(placeholder).toBeVisible();
+
+            // Check that the UserSelector component is rendered
+            const userSelector = screen.getByRole('combobox');
+            expect(userSelector).toBeVisible();
+        });
+    });
+});
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/userPropertyRenderer.tsx b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/userPropertyRenderer.tsx
new file mode 100644
index 00000000000..a7576eacbce
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/userPropertyRenderer.tsx
@@ -0,0 +1,52 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import type {
+    PropertyField,
+    PropertyValue,
+} from '@mattermost/types/properties';
+
+import {useUser} from 'components/common/hooks/useUser';
+import PreviewPostAvatar from 'components/post_view/post_message_preview/avatar/avatar';
+import UserProfileComponent from 'components/user_profile';
+
+import {SelectableUserPropertyRenderer} from './selectable_user_property_renderer';
+
+import './user_property_renderer.scss';
+
+type Props = {
+    field: PropertyField;
+    value: PropertyValue<unknown>;
+}
+
+export default function UserPropertyRenderer({field, value}: Props) {
+    const userId = value.value as string;
+    const user = useUser(userId);
+
+    if (field.attrs?.editable) {
+        return (
+            <SelectableUserPropertyRenderer
+                field={field}
+            />
+        );
+    }
+
+    return (
+        <div
+            className='UserPropertyRenderer'
+            data-testid='user-property'
+        >
+            {
+                user &&
+                <PreviewPostAvatar
+                    user={user}
+                />
+            }
+            <UserProfileComponent
+                userId={user?.id || ''}
+            />
+        </div>
+    );
+}
diff --git a/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/user_property_renderer.scss b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/user_property_renderer.scss
new file mode 100644
index 00000000000..4d28f3624dd
--- /dev/null
+++ b/webapp/channels/src/components/properties_card_view/propertyValueRenderer/user_property_renderer/user_property_renderer.scss
@@ -0,0 +1,8 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+.UserPropertyRenderer {
+    display: flex;
+    flex-direction: row;
+    gap: 8px;
+}
diff --git a/webapp/channels/src/components/start_trial_form_modal/__snapshots__/start_trial_form_modal.test.tsx.snap b/webapp/channels/src/components/start_trial_form_modal/__snapshots__/start_trial_form_modal.test.tsx.snap
index 7ffc943b109..92111ed2013 100644
--- a/webapp/channels/src/components/start_trial_form_modal/__snapshots__/start_trial_form_modal.test.tsx.snap
+++ b/webapp/channels/src/components/start_trial_form_modal/__snapshots__/start_trial_form_modal.test.tsx.snap
@@ -431,6 +431,13 @@ Object {
   "queryByTitle": [Function],
   "replaceStoreState": [Function],
   "rerender": [Function],
+  "store": Object {
+    "@@observable": [Function],
+    "dispatch": [Function],
+    "getState": [Function],
+    "replaceReducer": [Function],
+    "subscribe": [Function],
+  },
   "unmount": [Function],
   "updateStoreState": [Function],
 }
diff --git a/webapp/channels/src/components/user_settings/notifications/__snapshots__/user_settings_notifications.test.tsx.snap b/webapp/channels/src/components/user_settings/notifications/__snapshots__/user_settings_notifications.test.tsx.snap
index 4ed32a24702..01e17879acc 100644
--- a/webapp/channels/src/components/user_settings/notifications/__snapshots__/user_settings_notifications.test.tsx.snap
+++ b/webapp/channels/src/components/user_settings/notifications/__snapshots__/user_settings_notifications.test.tsx.snap
@@ -676,6 +676,13 @@ Object {
   "queryByTitle": [Function],
   "replaceStoreState": [Function],
   "rerender": [Function],
+  "store": Object {
+    "@@observable": [Function],
+    "dispatch": [Function],
+    "getState": [Function],
+    "replaceReducer": [Function],
+    "subscribe": [Function],
+  },
   "unmount": [Function],
   "updateStoreState": [Function],
 }
@@ -1361,6 +1368,13 @@ Object {
   "queryByTitle": [Function],
   "replaceStoreState": [Function],
   "rerender": [Function],
+  "store": Object {
+    "@@observable": [Function],
+    "dispatch": [Function],
+    "getState": [Function],
+    "replaceReducer": [Function],
+    "subscribe": [Function],
+  },
   "unmount": [Function],
   "updateStoreState": [Function],
 }
@@ -1970,6 +1984,13 @@ Object {
   "queryByTitle": [Function],
   "replaceStoreState": [Function],
   "rerender": [Function],
+  "store": Object {
+    "@@observable": [Function],
+    "dispatch": [Function],
+    "getState": [Function],
+    "replaceReducer": [Function],
+    "subscribe": [Function],
+  },
   "unmount": [Function],
   "updateStoreState": [Function],
 }
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 721bc6a92d4..2a8141749e1 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -3965,6 +3965,9 @@
   "custom_status.suggestions.recent_title": "RECENT",
   "custom_status.suggestions.title": "SUGGESTIONS",
   "custom_status.suggestions.working_from_home": "Working from home",
+  "data_spillage_report_post.title": "{user} flagged a message for review",
+  "data_spillage_report.keep_message.button_text": "Keep message",
+  "data_spillage_report.remove_message.button_text": "Remove message",
   "date_separator.today": "Today",
   "date_separator.tomorrow": "Tomorrow",
   "date_separator.yesterday": "Yesterday",
@@ -4361,6 +4364,7 @@
   "generic.okay": "Okay",
   "generic.previous": "Previous",
   "generic.submit": "Submit",
+  "generic.unassigned": "Unassigned",
   "get_app.continueToBrowser": "View in Browser",
   "get_app.dontHaveTheDesktopApp": "Don't have the Desktop App?",
   "get_app.dontHaveTheMobileApp": "Don't have the Mobile App?",
@@ -5073,6 +5077,8 @@
   "post_body.commentedOn.loadingMessage": "Loading…",
   "post_body.deleted": "(message deleted)",
   "post_body.plusMore": " plus {count, number} other {count, plural, one {file} other {files}}",
+  "post_card.channel_property.deleted_channel": "Deleted channel ID: {channelId}",
+  "post_card.channel_property.deleted_team": "Deleted team ID: {teamId}",
   "post_delete.notPosted": "Comment could not be posted",
   "post_delete.okay": "Okay",
   "post_delete.someone": "Someone deleted the message on which you tried to post a comment.",
@@ -5185,6 +5191,7 @@
   "promote_to_user_modal.desc": "This action promotes the guest {username} to a member. It will allow the user to join public channels and interact with users outside of the channels they are currently members of. Are you sure you want to promote guest {username} to member?",
   "promote_to_user_modal.promote": "Promote",
   "promote_to_user_modal.title": "Promote guest {username} to member",
+  "property_card.actions_row.label": "Actions",
   "public_private_selector.private.description": "Only invited members",
   "public_private_selector.private.title": "Private",
   "public_private_selector.public.description": "Anyone",
diff --git a/webapp/channels/src/packages/mattermost-redux/src/utils/theme_utils.ts b/webapp/channels/src/packages/mattermost-redux/src/utils/theme_utils.ts
index 75293252309..f42fb9cd4d7 100644
--- a/webapp/channels/src/packages/mattermost-redux/src/utils/theme_utils.ts
+++ b/webapp/channels/src/packages/mattermost-redux/src/utils/theme_utils.ts
@@ -172,7 +172,7 @@ export function setThemeDefaults(theme: Partial<Theme>): Theme {
 }
 
 // getContrastingSimpleColor returns a contrasting color - either black or white, depending on the luminance
-// of the supplied color. Both input and outpur colors are in hexadecimal color code.
+// of the supplied color. Both input and output colors are in hexadecimal color code.
 export function getContrastingSimpleColor(colorHexCode: string): string {
     const color = colorHexCode.startsWith('#') ? colorHexCode.slice(1) : colorHexCode;
 
diff --git a/webapp/channels/src/plugins/test/__snapshots__/post_type.test.tsx.snap b/webapp/channels/src/plugins/test/__snapshots__/post_type.test.tsx.snap
index 6c4b401d64c..e2db2e3c976 100644
--- a/webapp/channels/src/plugins/test/__snapshots__/post_type.test.tsx.snap
+++ b/webapp/channels/src/plugins/test/__snapshots__/post_type.test.tsx.snap
@@ -121,6 +121,7 @@ exports[`plugins/PostMessageView should match snapshot with no extended post typ
           "onImageLoaded": [Function],
         }
       }
+      isRHS={false}
       message="this is some text"
       options={Object {}}
       post={
diff --git a/webapp/channels/src/plugins/test/post_type.test.tsx b/webapp/channels/src/plugins/test/post_type.test.tsx
index 75cbdf5ed77..ca67305a886 100644
--- a/webapp/channels/src/plugins/test/post_type.test.tsx
+++ b/webapp/channels/src/plugins/test/post_type.test.tsx
@@ -13,6 +13,10 @@ const PostTypePlugin = () => (
     <span id='pluginId'>{'PostTypePlugin'}</span>
 );
 
+jest.mock('components/properties_card_view/propertyValueRenderer/post_preview_property_renderer/post_preview_property_renderer', () => {
+    return jest.fn(() => <div data-testid='post-preview-property-renderer-mock'>{'PostPreviewPropertyRenderer Mock'}</div>);
+});
+
 describe('plugins/PostMessageView', () => {
     const post = {type: 'testtype', message: 'this is some text', id: 'post_id'} as any;
 
diff --git a/webapp/channels/src/tests/react_testing_utils.tsx b/webapp/channels/src/tests/react_testing_utils.tsx
index 559d0b2ba8a..53d2972681c 100644
--- a/webapp/channels/src/tests/react_testing_utils.tsx
+++ b/webapp/channels/src/tests/react_testing_utils.tsx
@@ -90,6 +90,7 @@ export const renderWithContext = (
 
             results.rerender(renderState.component);
         },
+        store: testStore,
     };
 };
 
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index 58f185c336c..c4ae7b0aed9 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -858,6 +858,7 @@ export const PostTypes = {
     WRANGLER: 'system_wrangler',
     CUSTOM_CALLS: 'custom_calls',
     CUSTOM_CALLS_RECORDING: 'custom_calls_recording',
+    CUSTOM_DATA_SPILLAGE_REPORT: 'custom_spillage_report',
 };
 
 export const StatTypes = keyMirror({
@@ -1512,6 +1513,23 @@ export const ZoomSettings = {
     MAX_SCALE: 3.0,
 };
 
+export const DataSpillagePropertyNames = {
+    Status: 'Status',
+    FlaggedBy: 'Flagged by',
+    Reason: 'Reason',
+    Comment: 'Comment',
+    ReportingTime: 'Reporting Time',
+    ReviewingUser: 'Reviewing User',
+    ActionBy: 'Action By',
+    ActionComment: 'Action Comment',
+    ActionTime: 'Action Time',
+    Message: 'Message',
+    PostedIn: 'Posted in',
+    Team: 'Team',
+    PostedBy: 'Posted by',
+    PostedAt: 'Posted at',
+};
+
 export const Constants = {
     SettingsTypes,
     JobTypes,
diff --git a/webapp/platform/types/src/posts.ts b/webapp/platform/types/src/posts.ts
index fac94690d59..05df3880e6f 100644
--- a/webapp/platform/types/src/posts.ts
+++ b/webapp/platform/types/src/posts.ts
@@ -32,6 +32,7 @@ export type PostType = 'system_add_remove' |
 'system_generic' |
 'reminder' |
 'system_wrangler' |
+'custom_spillage_report' |
 '';
 
 export type PostEmbedType = 'image' | 'link' | 'message_attachment' | 'opengraph' | 'permalink';
diff --git a/webapp/platform/types/src/properties.ts b/webapp/platform/types/src/properties.ts
index 8c9bbf2cab1..05d8beacafb 100644
--- a/webapp/platform/types/src/properties.ts
+++ b/webapp/platform/types/src/properties.ts
@@ -15,7 +15,10 @@ export type PropertyField = {
     group_id: string;
     name: string;
     type: FieldType;
-    attrs?: {[key: string]: unknown};
+    attrs?: {
+        subType?: string;
+        [key: string]: unknown;
+    };
     target_id?: string;
     target_type?: string;
     create_at: number;
@@ -28,6 +31,7 @@ export type PropertyValue<T> = {
     target_id: string;
     target_type: string;
     group_id: string;
+    field_id: string;
     value: T;
     create_at: number;
     update_at: number;
@@ -63,4 +67,11 @@ export type UserPropertyField = PropertyField & {
     };
 };
 
+export type SelectPropertyField = PropertyField & {
+    attrs?: {
+        editable?: boolean;
+        options?: PropertyFieldOption[];
+    };
+}
+
 export type UserPropertyFieldPatch = Partial<Pick<UserPropertyField, 'name' | 'attrs' | 'type'>>;