Skip to content

Use alphabetical order for delegates and delegators #81057

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
ShridharGoel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use alphabetical order for delegates and delegators #81057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 23 additions & 18 deletions src/components/AccountSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import {clearDelegatorErrors, connect, disconnect} from '@libs/actions/Delegate';
import {close} from '@libs/actions/Modal';
import {getLatestError} from '@libs/ErrorUtils';
import {sortAlphabetically} from '@libs/OptionsListUtils';
import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
import TextWithEmojiFragment from '@pages/inbox/report/comment/TextWithEmojiFragment';
import variables from '@styles/variables';
Expand All @@ -24,7 +25,7 @@
import Avatar from './Avatar';
import ConfirmModal from './ConfirmModal';
import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';

Check warning on line 28 in src/components/AccountSwitcher.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

'./Icon/Expensicons' import is restricted from being used by a pattern. Direct imports from Icon/Expensicons are deprecated. Please use lazy loading hooks instead. Use `useMemoizedLazyExpensifyIcons` from @hooks/useLazyAsset. See docs/LAZY_ICONS_AND_ILLUSTRATIONS.md for details

Check warning on line 28 in src/components/AccountSwitcher.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

'./Icon/Expensicons' import is restricted from being used by a pattern. Direct imports from Icon/Expensicons are deprecated. Please use lazy loading hooks instead. Use `useMemoizedLazyExpensifyIcons` from @hooks/useLazyAsset. See docs/LAZY_ICONS_AND_ILLUSTRATIONS.md for details
import type {PopoverMenuItem} from './PopoverMenu';
import PopoverMenu from './PopoverMenu';
import {PressableWithFeedback} from './Pressable';
Expand All @@ -43,7 +44,7 @@
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const styles = useThemeStyles();
const theme = useTheme();
const {translate, formatPhoneNumber} = useLocalize();
const {localeCompare, translate, formatPhoneNumber} = useLocalize();
const {isOffline} = useNetwork();
const {shouldUseNarrowLayout} = useResponsiveLayout();
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
Expand Down Expand Up @@ -153,23 +154,27 @@
];
}

const delegatorMenuItems: PopoverMenuItem[] = delegators
.filter(({email}) => email !== currentUserPersonalDetails.login)
.map(({email, role}) => {
const errorFields = account?.delegatedAccess?.errorFields ?? {};
const error = getLatestError(errorFields?.connect?.[email]);
const personalDetails = getPersonalDetailByEmail(email);
return createBaseMenuItem(personalDetails, error, {
badgeText: translate('delegate.role', {role}),
onSelected: () => {
if (isOffline) {
close(() => setShouldShowOfflineModal(true));
return;
}
connect({email, delegatedAccess: account?.delegatedAccess, credentials, session, activePolicyID});
},
});
});
const delegatorMenuItems: PopoverMenuItem[] = sortAlphabetically(
delegators
.filter(({email}) => email !== currentUserPersonalDetails.login)
.map(({email, role}) => {
const errorFields = account?.delegatedAccess?.errorFields ?? {};
const error = getLatestError(errorFields?.connect?.[email]);
const personalDetails = getPersonalDetailByEmail(email);
return createBaseMenuItem(personalDetails, error, {
badgeText: translate('delegate.role', {role}),
onSelected: () => {
if (isOffline) {
close(() => setShouldShowOfflineModal(true));
return;
}
connect({email, delegatedAccess: account?.delegatedAccess, credentials, session, activePolicyID});
},
});
}),
'text',
localeCompare,
);

return [currentUserMenuItem, ...delegatorMenuItems];
};
Expand All @@ -183,7 +188,7 @@
<>
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
<TooltipToRender {...tooltipProps}>
<PressableWithFeedback

Check failure on line 191 in src/components/AccountSwitcher.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

All Pressable components must include sentryLabel prop for Sentry tracking. Example: <PressableWithoutFeedback sentryLabel="MoreMenu-ExportFile" />

Check failure on line 191 in src/components/AccountSwitcher.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

All Pressable components must include sentryLabel prop for Sentry tracking. Example: <PressableWithoutFeedback sentryLabel="MoreMenu-ExportFile" />
accessible
accessibilityLabel={`${translate('common.profile')}, ${displayName}, ${Str.removeSMSDomain(currentUserPersonalDetails?.login ?? '')}`}
onPress={onPressSwitcher}
Expand Down
23 changes: 14 additions & 9 deletions src/pages/settings/Security/SecuritySettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {clearDelegateErrorsByField, openSecuritySettingsPage, removeDelegate} fr
import {getLatestError} from '@libs/ErrorUtils';
import getClickedTargetLocation from '@libs/getClickedTargetLocation';
import Navigation from '@libs/Navigation/Navigation';
import {sortAlphabetically} from '@libs/OptionsListUtils';
import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
import type {AnchorPosition} from '@styles/index';
import colors from '@styles/theme/colors';
Expand Down Expand Up @@ -60,7 +61,7 @@ function SecuritySettingsPage() {
const illustrations = useMemoizedLazyIllustrations(['LockClosed']);
const securitySettingsIllustration = useSecuritySettingsSectionIllustration();
const styles = useThemeStyles();
const {translate, formatPhoneNumber} = useLocalize();
const {localeCompare, translate, formatPhoneNumber} = useLocalize();
const waitForNavigate = useWaitForNavigation();
const {shouldUseNarrowLayout} = useResponsiveLayout();
const {windowWidth} = useWindowDimensions();
Expand Down Expand Up @@ -240,8 +241,8 @@ function SecuritySettingsPage() {
]);

const delegateMenuItems: MenuItemProps[] = useMemo(
() =>
delegates
() => {
const menuItems = delegates
.filter((d) => !d.optimisticAccountID)
.map(({email, role, pendingAction, pendingFields}) => {
const personalDetail = getPersonalDetailByEmail(email);
Expand Down Expand Up @@ -284,14 +285,16 @@ function SecuritySettingsPage() {
onPress,
success: selectedEmail === email,
};
}),
});
return sortAlphabetically(menuItems, 'title', localeCompare);
},
// eslint-disable-next-line react-hooks/exhaustive-deps
[delegates, translate, styles, personalDetails, errorFields, windowWidth, selectedEmail, icons.FallbackAvatar, icons.ThreeDots],
[delegates, translate, styles, personalDetails, errorFields, windowWidth, selectedEmail, icons.FallbackAvatar, icons.ThreeDots, localeCompare],
);

const delegatorMenuItems: MenuItemProps[] = useMemo(
() =>
delegators.map(({email, role}) => {
() => {
const menuItems = delegators.map(({email, role}) => {
const personalDetail = getPersonalDetailByEmail(email);
const formattedEmail = formatPhoneNumber(email);

Expand All @@ -306,9 +309,11 @@ function SecuritySettingsPage() {
wrapperStyle: [styles.sectionMenuItemTopDescription],
interactive: false,
};
}),
});
return sortAlphabetically(menuItems, 'title', localeCompare);
},
// eslint-disable-next-line react-hooks/exhaustive-deps
[delegators, styles, translate, personalDetails, icons.FallbackAvatar],
[delegators, styles, translate, personalDetails, icons.FallbackAvatar, localeCompare],
);

const delegatePopoverMenuItems: PopoverMenuItem[] = [
Expand Down
Loading