Skip to content

feat(ABAC): Add icons #6758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: feat.abac
Choose a base branch
from
Open

feat(ABAC): Add icons #6758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87aec67
Add shield icons
diegolmello Nov 4, 2025
4e6e935
Add subscription.abacAttributes
diegolmello Nov 4, 2025
b85a67e
Add stories and snapshots
diegolmello Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified android/app/src/main/assets/fonts/custom.ttf
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions app/containers/CustomIcon/mappedIcons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ export const mappedIcons = {
'google-monochromatic': 59657,
'group-by-type': 59757,
'hamburguer': 59758,
'hash-shield': 59878,
'history': 59759,
'home': 59760,
'ignore': 59740,
Expand Down Expand Up @@ -202,6 +203,7 @@ export const mappedIcons = {
'sun': 59847,
'support': 59848,
'team': 59849,
'team-shield': 59877,
'teams': 59751,
'teams-private': 59750,
'text-format': 59839,
Expand Down
2 changes: 1 addition & 1 deletion app/containers/CustomIcon/selection.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions app/containers/RoomHeader/RoomHeader.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export const Icons = () => (
<HeaderExample title={() => <RoomHeader title='busy dm' type='d' status='busy' />} />
<HeaderExample title={() => <RoomHeader title='loading dm' type='d' status='loading' />} />
<HeaderExample title={() => <RoomHeader title='offline dm' type='d' />} />
<HeaderExample title={() => <RoomHeader title='classified' type='p' abacAttributes={['Classified']} />} />
<HeaderExample title={() => <RoomHeader title='classified' type='p' abacAttributes={['Classified']} teamMain />} />
</>
);

Expand Down
8 changes: 6 additions & 2 deletions app/containers/RoomHeader/RoomHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import I18n from '../../i18n';
import sharedStyles from '../../views/Styles';
import { MarkdownPreview } from '../markdown';
import RoomTypeIcon from '../RoomTypeIcon';
import { type TUserStatus, type IOmnichannelSource } from '../../definitions';
import { type TUserStatus, type IOmnichannelSource, type ISubscription } from '../../definitions';
import { useTheme } from '../../theme';
import { useAppSelector } from '../../lib/hooks/useAppSelector';
import useStatusAccessibilityLabel from '../../lib/hooks/useStatusAccessibilityLabel';
Expand Down Expand Up @@ -80,6 +80,7 @@ interface IRoomHeader {
sourceType?: IOmnichannelSource;
disabled?: boolean;
rightButtonsWidth?: number;
abacAttributes?: ISubscription['abacAttributes'];
}

const SubTitle = React.memo(({ usersTyping, subtitle, renderFunc, scale }: TRoomHeaderSubTitle) => {
Expand Down Expand Up @@ -148,7 +149,8 @@ const Header = React.memo(
testID,
usersTyping = [],
sourceType,
disabled
disabled,
abacAttributes
}: IRoomHeader) => {
const statusAccessibilityLabel = useStatusAccessibilityLabel({
isGroupChat,
Expand Down Expand Up @@ -182,6 +184,7 @@ const Header = React.memo(
isGroupChat={isGroupChat}
status={status}
teamMain={teamMain}
abacAttributes={abacAttributes}
/>
<Text style={[styles.subtitle, { color: colors.fontSecondaryInfo }]} numberOfLines={1}>
{parentTitle}
Expand All @@ -208,6 +211,7 @@ const Header = React.memo(
status={status}
teamMain={teamMain}
sourceType={sourceType}
abacAttributes={abacAttributes}
/>
)}
<HeaderTitle title={title} tmid={tmid} prid={prid} scale={scale} testID={testID} />
Expand Down
Loading
Loading