Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d02a5d5
Display domains to members and admins in Workspaces tab
mhawryluk Oct 15, 2025
52b6cd9
Tiny fix
mhawryluk Oct 15, 2025
353fec8
Merge branch 'main' into feat/saml-display-domain-list
mhawryluk Oct 16, 2025
b25da55
Update section title spacing
mhawryluk Oct 16, 2025
6cccf3a
Implement workspaces empty state when domains exist
mhawryluk Oct 16, 2025
3292c7a
Remove empty line
mhawryluk Oct 16, 2025
de3ffb9
Rename admin access onyx key
mhawryluk Oct 16, 2025
e4b4774
Add translations
mhawryluk Oct 16, 2025
47d8315
Review fixes
mhawryluk Oct 16, 2025
a7deea7
Merge branch 'main' into feat/saml-display-domain-list
mhawryluk Oct 17, 2025
4fc10ff
Fix after merge
mhawryluk Oct 17, 2025
4dfca54
Review fixes
mhawryluk Oct 20, 2025
bd9cacd
Design review fixes
mhawryluk Oct 21, 2025
068c99f
Merge branch 'main' into feat/saml-display-domain-list
mhawryluk Oct 21, 2025
aea25da
Replace SelectionList with FlashList
mhawryluk Oct 21, 2025
ea7eab1
Fix domains section header translation
mhawryluk Oct 21, 2025
7d92e20
Set props for hopefully better performance
mhawryluk Oct 21, 2025
9c58d4a
Hide domains section when searching for a workspace
mhawryluk Oct 21, 2025
79cea13
Increase bottom padding
mhawryluk Oct 21, 2025
d9c5b98
Small adjustment
mhawryluk Oct 21, 2025
e47064f
Small refactor
mhawryluk Oct 21, 2025
3eb94e9
More tiny refactor
mhawryluk Oct 21, 2025
99550af
Change exit to domain icon color on hover
mhawryluk Oct 22, 2025
975e401
Replace FlashList with FlatList for now
mhawryluk Oct 22, 2025
9473379
Revert flatListRef variable name
mhawryluk Oct 22, 2025
a4535b2
Revert changes to the old SelectionList
mhawryluk Oct 22, 2025
b6835d7
Implement more review suggestions
mhawryluk Oct 23, 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
4 changes: 4 additions & 0 deletions src/ONYXKEYS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,9 @@ const ONYXKEYS = {

/** Stores the information about the state of issuing a new card */
ISSUE_NEW_EXPENSIFY_CARD: 'issueNewExpensifyCard_',

/** Used for identifying user as admin of a domain */
SHARED_NVP_PRIVATE_ADMIN_ACCESS: 'sharedNVP_private_admin_access_',
},

/** List of Form ids */
Expand Down Expand Up @@ -1081,6 +1084,7 @@ type OnyxCollectionValuesMapping = {
[ONYXKEYS.COLLECTION.LAST_SELECTED_EXPENSIFY_CARD_FEED]: OnyxTypes.FundID;
[ONYXKEYS.COLLECTION.NVP_EXPENSIFY_ON_CARD_WAITLIST]: OnyxTypes.CardOnWaitlist;
[ONYXKEYS.COLLECTION.ISSUE_NEW_EXPENSIFY_CARD]: OnyxTypes.IssueNewCard;
[ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_ADMIN_ACCESS]: boolean;
};

type OnyxValuesMapping = {
Expand Down
54 changes: 54 additions & 0 deletions src/components/Domain/DomainsListRow.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import React from 'react';
import {View} from 'react-native';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import TextWithTooltip from '@components/TextWithTooltip';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';

type DomainsListRowProps = {
/** Name of the domain */
title: string;

/** Whether the row is hovered, so we can modify its style */
isHovered: boolean;

/** Whether the icon at the end of the row should be displayed */
shouldShowRightIcon: boolean;
};

function DomainsListRow({title, isHovered, shouldShowRightIcon}: DomainsListRowProps) {
const styles = useThemeStyles();
const theme = useTheme();

return (
<View style={[styles.flexRow, styles.highlightBG, styles.br3, styles.p5, styles.alignItemsCenter, styles.gap3, isHovered && styles.hoveredComponentBG]}>
<View style={[styles.flex1, styles.flexRow, styles.bgTransparent, styles.gap3, styles.alignItemsCenter]}>
<Icon
src={Expensicons.Globe}
fill={theme.icon}
additionalStyles={styles.domainIcon}
/>
<TextWithTooltip
text={title}
shouldShowTooltip
style={[styles.textStrong]}
/>
</View>

{shouldShowRightIcon && (
<View style={styles.touchableButtonImage}>
<Icon
src={Expensicons.NewWindow}
fill={isHovered ? theme.iconHovered : theme.icon}
isButtonIcon
/>
</View>
)}
</View>
);
}

DomainsListRow.displayName = 'DomainsListRow';

export default DomainsListRow;
1 change: 1 addition & 0 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ const translations = {
pinned: 'Angeheftet',
read: 'Gelesen',
copyToClipboard: 'In die Zwischenablage kopieren',
domains: 'Domänen',
},
supportalNoAccess: {
title: 'Nicht so schnell',
Expand Down
1 change: 1 addition & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,7 @@ const translations = {
pinned: 'Pinned',
read: 'Read',
copyToClipboard: 'Copy to clipboard',
domains: 'Domains',
},
supportalNoAccess: {
title: 'Not so fast',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,7 @@ const translations = {
pinned: 'Fijado',
read: 'Leído',
copyToClipboard: 'Copiar al portapapeles',
domains: 'Dominios',
},
supportalNoAccess: {
title: 'No tan rápido',
Expand Down
1 change: 1 addition & 0 deletions src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,7 @@ const translations = {
pinned: 'Épinglé',
read: 'Lu',
copyToClipboard: 'Copier dans le presse-papiers',
domains: 'Domaines',
},
supportalNoAccess: {
title: 'Pas si vite',
Expand Down
1 change: 1 addition & 0 deletions src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,7 @@ const translations = {
pinned: 'Fissato',
read: 'Letto',
copyToClipboard: 'Copia negli appunti',
domains: 'Domini',
},
supportalNoAccess: {
title: 'Non così in fretta',
Expand Down
1 change: 1 addition & 0 deletions src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,7 @@ const translations = {
pinned: '固定済み',
read: '既読',
copyToClipboard: 'クリップボードにコピー',
domains: 'ドメイン',
},
supportalNoAccess: {
title: 'ちょっと待ってください',
Expand Down
1 change: 1 addition & 0 deletions src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ const translations = {
pinned: 'Vastgezet',
read: 'Gelezen',
copyToClipboard: 'Kopiëren naar klembord',
domains: 'Domeinen',
},
supportalNoAccess: {
title: 'Niet zo snel',
Expand Down
1 change: 1 addition & 0 deletions src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,7 @@ const translations = {
pinned: 'Przypięte',
read: 'Przeczytane',
copyToClipboard: 'Skopiuj do schowka',
domains: 'Domeny',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great translation

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed

},
supportalNoAccess: {
title: 'Nie tak szybko',
Expand Down
1 change: 1 addition & 0 deletions src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ const translations = {
pinned: 'Fixado',
read: 'Lido',
copyToClipboard: 'Copiar para a área de transferência',
domains: 'Domínios',
},
supportalNoAccess: {
title: 'Não tão rápido',
Expand Down
1 change: 1 addition & 0 deletions src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,7 @@ const translations = {
pinned: '已固定',
read: '已读',
copyToClipboard: '复制到剪贴板',
domains: '域名',
},
supportalNoAccess: {
title: '慢一点',
Expand Down
Loading
Loading