Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
486716a
Fix initial ordering in approver selection lists
marufsharifi Jul 7, 2026
79a6914
Merge branch 'main' into fix/approver-selection-initial-order
marufsharifi Jul 9, 2026
304768c
Remove unused props and mock data in ApproverSelectionList and its tests
marufsharifi Jul 9, 2026
fcdd23d
Merge branch 'main' into fix/approver-selection-initial-order
marufsharifi Jul 10, 2026
db0050f
Fix approver selection pinned ordering on workflow navigation
marufsharifi Jul 10, 2026
e62f880
Merge branch 'main' into fix/approver-selection-initial-order
marufsharifi Jul 13, 2026
6842a2b
Merge branch 'main' into fix/approver-selection-initial-order
marufsharifi Jul 14, 2026
c48f753
Fix approver selection ordering with initial selection pattern
marufsharifi Jul 14, 2026
c642747
Merge branch 'main' into fix/approver-selection-initial-order
marufsharifi Jul 16, 2026
67d2178
Merge branch 'main' into fix/approver-selection-initial-order
marufsharifi Jul 16, 2026
df736c5
Refactor approver selection logic to capture initial selection state
marufsharifi Jul 16, 2026
64302cc
Merge branch 'main' into fix/approver-selection-initial-order
marufsharifi Jul 17, 2026
e9df345
Refactor approver selection logic to maintain initial selection order…
marufsharifi Jul 17, 2026
92af67e
Remove initiallyFocusedOptionKey from approver selection components
marufsharifi Jul 17, 2026
d47db45
Merge branch 'main' into fix/approver-selection-initial-order
marufsharifi Jul 22, 2026
d3a15fd
Merge branch 'main' into fix/approver-selection-initial-order
marufsharifi Jul 23, 2026
49a782d
Refactor approver selection logic to eliminate unnecessary state and …
marufsharifi Jul 23, 2026
779beae
Merge branch 'main' into fix/approver-selection-initial-order
marufsharifi Jul 25, 2026
49875ea
remove shouldCaptureInitialSelection prop and isLoadingApprovalWorkfl…
marufsharifi Jul 25, 2026
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
24 changes: 14 additions & 10 deletions src/components/ApproverSelectionList.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import useDebouncedState from '@hooks/useDebouncedState';
import useInitialSelection from '@hooks/useInitialSelection';
import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
Expand All @@ -7,6 +8,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
import {getSearchValueForPhoneOrEmail, sortAlphabetically} from '@libs/OptionsListUtils';
import {goBackFromInvalidPolicy, isPendingDeletePolicy, isPolicyAdmin} from '@libs/PolicyUtils';
import moveInitialSelectionToTop from '@libs/SelectionListOrderUtils';
import tokenizedSearch from '@libs/tokenizedSearch';

import variables from '@styles/variables';
Expand All @@ -33,7 +35,6 @@ type ApproverSelectionListPageProps = {
policy?: Policy;
isLoadingReportData?: boolean;
onBackButtonPress: () => void;
initiallyFocusedOptionKey?: string;
shouldShowNotFoundView?: boolean;
shouldShowNotFoundViewLink?: boolean;
listEmptyContentSubtitle?: string;
Expand All @@ -52,7 +53,7 @@ type ApproverSelectionListPageProps = {
};

type SelectionListApprover = ListItem & {
value?: number;
value?: number | string;
};

function ApproverSelectionList({
Expand All @@ -62,7 +63,6 @@ function ApproverSelectionList({
isLoadingReportData,
policy,
onBackButtonPress,
initiallyFocusedOptionKey,
shouldShowTextInput: shouldShowTextInputProp,
shouldShowNotFoundView: shouldShowNotFoundViewProp = false,
shouldShowNotFoundViewLink = true,
Expand Down Expand Up @@ -96,18 +96,20 @@ function ApproverSelectionList({
);

const selectedMembers = useMemo(() => allApprovers.filter((approver) => approver.isSelected), [allApprovers]);
const selectedApproverKeys = useMemo(() => selectedMembers.map((approver) => approver.value?.toString() ?? '').filter(Boolean), [selectedMembers]);
const initialSelectedApproverKeys = useInitialSelection(selectedApproverKeys, {isVisible: !shouldShowLoadingPlaceholder && allApprovers.length > 0, resetOnFocus: true});
const initiallyFocusedApproverKey = allApprovers.find((approver) => initialSelectedApproverKeys.includes(String(approver.value)))?.keyForList;
const selectionListKey = initialSelectedApproverKeys.join(',');

const shouldShowNotFoundView =
(isEmptyObject(policy) && !isLoadingReportData) || (shouldRequirePolicyAdmin && !isPolicyAdmin(policy)) || isPendingDeletePolicy(policy) || shouldShowNotFoundViewProp;

const data = useMemo(() => {
const filteredApprovers =
debouncedSearchTerm !== ''
? tokenizedSearch(allApprovers, getSearchValueForPhoneOrEmail(debouncedSearchTerm, countryCode), (option) => [option.text ?? '', option.login ?? ''])
: allApprovers;
const sortedApprovers = sortAlphabetically(allApprovers, 'text', localeCompare);
const orderedApprovers = moveInitialSelectionToTop(sortedApprovers, initialSelectedApproverKeys);

return sortAlphabetically(filteredApprovers, 'text', localeCompare);
}, [allApprovers, debouncedSearchTerm, countryCode, localeCompare]);
return tokenizedSearch(orderedApprovers, getSearchValueForPhoneOrEmail(debouncedSearchTerm, countryCode), (option) => [option.text ?? '', option.login ?? '']);
}, [allApprovers, debouncedSearchTerm, countryCode, localeCompare, initialSelectedApproverKeys]);

const shouldShowListEmptyContent = !debouncedSearchTerm && !data.length && shouldShowListEmptyContentProp;

Expand Down Expand Up @@ -172,6 +174,7 @@ function ApproverSelectionList({
/>
{subtitle}
<SelectionList
key={selectionListKey}
data={data}
onSelectRow={toggleApprover}
ListItem={InviteMemberListItem}
Expand All @@ -180,12 +183,13 @@ function ApproverSelectionList({
shouldPreventDefaultFocusOnSelectRow={!canUseTouchScreen()}
listEmptyContent={listEmptyContent}
shouldShowListEmptyContent={shouldShowListEmptyContent}
initiallyFocusedItemKey={initiallyFocusedOptionKey}
initiallyFocusedItemKey={initiallyFocusedApproverKey}
shouldShowTextInput={shouldShowTextInput}
shouldShowLoadingPlaceholder={shouldShowLoadingPlaceholder}
footerContent={footerContent}
addBottomSafeAreaPadding
shouldUpdateFocusedIndex={shouldUpdateFocusedIndex}
disableMaintainingScrollPosition
showScrollIndicator
isRowMultilineSupported
/>
Expand Down
4 changes: 2 additions & 2 deletions src/libs/SelectionListOrderUtils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import CONST from '@src/CONST';

function moveInitialSelectionToTop<T extends {value: string}>(items: T[], initialSelectedValues: string[]): T[] {
function moveInitialSelectionToTop<T extends {value?: number | string}>(items: T[], initialSelectedValues: string[]): T[] {
if (initialSelectedValues.length === 0 || items.length < CONST.STANDARD_LIST_ITEM_LIMIT) {
return items;
}
Expand All @@ -10,7 +10,7 @@ function moveInitialSelectionToTop<T extends {value: string}>(items: T[], initia
const remaining: T[] = [];

for (const item of items) {
if (selectedValues.has(item.value)) {
if (item.value !== undefined && selectedValues.has(String(item.value))) {
selected.push(item);
continue;
}
Expand Down
1 change: 0 additions & 1 deletion src/pages/ReportAddApproverPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ function ReportAddApproverPage({report, isLoadingReportData, policy}: ReportAddA
subtitle={<Text style={[styles.ph5, styles.pb3]}>{translate('iou.changeApprover.addApprover.subtitle')}</Text>}
isLoadingReportData={isLoadingReportData}
policy={policy}
initiallyFocusedOptionKey={selectedApproverEmail}
shouldShowNotFoundViewLink={false}
shouldShowNotFoundView={shouldShowNotFoundView}
allApprovers={allApprovers}
Expand Down
1 change: 0 additions & 1 deletion src/pages/Search/SearchAddApproverPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ function SearchAddApproverPage() {
}
isLoadingReportData={false}
policy={allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${selectedReports.at(0)?.policyID}`]}
initiallyFocusedOptionKey={selectedApproverEmail}
shouldShowNotFoundViewLink={false}
shouldShowNotFoundView={false}
allApprovers={allApprovers}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ function WorkspaceInviteMessageApproverPage({policy, personalDetails, isLoadingR
keyForList: email,
isSelected: selectedApprover === email,
login: email,
value: email,
icons: [{source: avatar ?? icons.FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: displayName, id: accountID}],
rightElement: (
<MemberRightIcon
Expand Down Expand Up @@ -124,7 +125,6 @@ function WorkspaceInviteMessageApproverPage({policy, personalDetails, isLoadingR
policy={policy}
isLoadingReportData={isLoadingReportData}
onBackButtonPress={goBack}
initiallyFocusedOptionKey={selectedApprover}
allApprovers={allApprovers}
onSelectApprover={handleOnSelectApprover}
shouldRequirePolicyAdmin={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import {Str} from 'expensify-common';
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
import React, {useCallback, useEffect, useMemo, useRef} from 'react';

type DynamicWorkspaceWorkflowsApprovalsExpensesFromPageProps = WithPolicyAndFullscreenLoadingProps &
PlatformStackScreenProps<WorkspaceSplitNavigatorParamList, typeof SCREENS.WORKSPACE.DYNAMIC_WORKFLOWS_APPROVALS_EXPENSES_FROM>;
Expand All @@ -67,7 +67,6 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
const personalDetailLogins = useMemo(() => Object.fromEntries(Object.entries(personalDetails ?? {}).map(([id, details]) => [id, details?.login])), [personalDetails]);

const isLoadingApprovalWorkflow = isLoadingOnyxValue(approvalWorkflowResults);
const [selectedMembers, setSelectedMembers] = useState<SelectionListApprover[]>([]);
const canWriteApprovals = canMemberWrite(policy, currentUserLogin, CONST.POLICY.POLICY_FEATURE.WORKFLOWS_APPROVALS);
// Set true when nextStep navigates to the invite-message page so the cleanup
// effect below knows to leave the draft intact for that page to consume.
Expand Down Expand Up @@ -119,73 +118,69 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
return map;
})();

useEffect(() => {
const selectedMembers = ((): SelectionListApprover[] => {
if (!approvalWorkflow?.members) {
return;
return [];
}

// Intentional: derives the selected-members list from the approval workflow data.
// This effect synchronizes local component state with the Onyx-sourced workflow when it changes.
// eslint-disable-next-line react-hooks/set-state-in-effect
setSelectedMembers(
approvalWorkflow.members
.filter((member) => {
const isPolicyMember = !!policy?.employeeList?.[normalizeLogin(member.email)];
// Keep policy members. For non-policy members, only keep if they're
// in the invite draft (meaning an invite flow is actively in progress).
// This mirrors the card flow's handleBackButtonPress cleanup pattern.
return isPolicyMember || invitedEmailsToAccountIDsDraft?.[member.email] != null;
})
.map((member) => {
let accountID = Number(policyMemberEmailsToAccountIDs[normalizeLogin(member.email)] ?? '');
const isPolicyMember = !!policy?.employeeList?.[normalizeLogin(member.email)];

const personalDetail = getPersonalDetailByEmail(member.email);

// Fall back when getMemberAccountIDsForWorkspace can't resolve an accountID — for
// example a freshly invited user whose personal details haven't fully synced yet
// (the helper requires personalDetail.login). Without a real accountID,
// ReportActionAvatars renders the FallbackAvatar instead of the default avatar
// assigned to that account.
if (!accountID) {
const draftAccountID = invitedEmailsToAccountIDsDraft?.[member.email];
if (personalDetail?.accountID) {
accountID = personalDetail.accountID;
} else if (draftAccountID) {
accountID = draftAccountID;
}
return approvalWorkflow.members
.filter((member) => {
const isPolicyMember = !!policy?.employeeList?.[normalizeLogin(member.email)];
// Keep policy members. For non-policy members, only keep if they're
// in the invite draft (meaning an invite flow is actively in progress).
// This mirrors the card flow's handleBackButtonPress cleanup pattern.
return isPolicyMember || invitedEmailsToAccountIDsDraft?.[member.email] != null;
})
.map((member) => {
let accountID = Number(policyMemberEmailsToAccountIDs[normalizeLogin(member.email)] ?? '');
const isPolicyMember = !!policy?.employeeList?.[normalizeLogin(member.email)];

const personalDetail = getPersonalDetailByEmail(member.email);

// Fall back when getMemberAccountIDsForWorkspace can't resolve an accountID — for
// example a freshly invited user whose personal details haven't fully synced yet
// (the helper requires personalDetail.login). Without a real accountID,
// ReportActionAvatars renders the FallbackAvatar instead of the default avatar
// assigned to that account.
if (!accountID) {
const draftAccountID = invitedEmailsToAccountIDsDraft?.[member.email];
if (personalDetail?.accountID) {
accountID = personalDetail.accountID;
} else if (draftAccountID) {
accountID = draftAccountID;
}
}

const login = personalDetailLogins?.[accountID] ?? member.email;
const displayName = member.displayName ?? personalDetail?.displayName ?? member.email;
const avatar = member.avatar ?? personalDetail?.avatar;

return {
text: Str.removeSMSDomain(displayName),
alternateText: member.email,
keyForList: member.email,
isSelected: true,
login: member.email,
icons: [
{
source: avatar ?? icons.FallbackAvatar,
type: CONST.ICON_TYPE_AVATAR,
name: Str.removeSMSDomain(displayName),
id: accountID,
},
],
// Only show right element for policy members
rightElement: isPolicyMember ? (
<MemberRightIcon
role={policy?.employeeList?.[normalizeLogin(member.email)]?.role}
owner={policy?.owner}
login={login}
/>
) : undefined,
};
}),
);
}, [approvalWorkflow?.members, icons.FallbackAvatar, invitedEmailsToAccountIDsDraft, personalDetailLogins, policy?.employeeList, policy?.owner, policyMemberEmailsToAccountIDs]);
const login = personalDetailLogins?.[accountID] ?? member.email;
const displayName = member.displayName ?? personalDetail?.displayName ?? member.email;
const avatar = member.avatar ?? personalDetail?.avatar;

return {
text: Str.removeSMSDomain(displayName),
alternateText: member.email,
keyForList: member.email,
isSelected: true,
login: member.email,
value: member.email,
icons: [
{
source: avatar ?? icons.FallbackAvatar,
type: CONST.ICON_TYPE_AVATAR,
name: Str.removeSMSDomain(displayName),
id: accountID,
},
],
// Only show right element for policy members
rightElement: isPolicyMember ? (
<MemberRightIcon
role={policy?.employeeList?.[normalizeLogin(member.email)]?.role}
owner={policy?.owner}
login={login}
/>
) : undefined,
};
});
})();

const workflowApprovers = approvalWorkflow?.approvers;

Expand Down Expand Up @@ -220,6 +215,7 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
keyForList: member.email,
isSelected: false,
login: member.email,
value: member.email,
icons: [
{
source: member.avatar ?? icons.FallbackAvatar,
Expand Down Expand Up @@ -258,6 +254,7 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
keyForList: userToInvite.login ?? '',
isSelected: false,
login: userToInvite.login ?? '',
value: userToInvite.login ?? '',
icons: userToInvite.icons ?? [],
});
}
Expand All @@ -273,6 +270,7 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
keyForList: option.login ?? '',
isSelected: false,
login: option.login ?? '',
value: option.login ?? '',
icons: option.icons ?? [],
});
}
Expand Down Expand Up @@ -447,10 +445,10 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
const applySelection = (nextMembers: SelectionListApprover[]) => {
// Persist non-policy members to the invite draft AND to approvalWorkflow.members
// so they survive re-renders triggered by Onyx updates (e.g. personalDetails
// changes from search results). The effect that syncs selectedMembers from
// approvalWorkflow.members filters non-policy members unless they're in the
// invite draft, so both stores must stay in sync to avoid dropping the locally
// selected new member.
// changes from search results). selectedMembers is derived from
// approvalWorkflow.members and only keeps non-policy members that are also in the
// invite draft, so both stores must stay in sync to avoid dropping the newly
// selected member.
const nextDraft: Record<string, number> = {};
const workflowMembers: Member[] = [];
for (const member of nextMembers) {
Expand All @@ -471,7 +469,6 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
}
setWorkspaceInviteMembersDraft(route.params.policyID, nextDraft);
setApprovalWorkflowMembers(workflowMembers);
setSelectedMembers(nextMembers);
};

// Only show warning when creating a new workflow and a member is being added (not removed)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
keyForList: email,
isSelected: visibleSelectedApproverEmail === email,
login: email,
value: email,
icons: [{source: avatar ?? icons.FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: displayName, id: accountID}],
rightElement: (
<MemberRightIcon
Expand Down Expand Up @@ -247,7 +248,6 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
subtitle={subtitle}
isLoadingReportData={isLoadingReportData}
policy={policy}
initiallyFocusedOptionKey={visibleSelectedApproverEmail}
shouldShowNotFoundView={shouldShowNotFoundView}
shouldShowNotFoundViewLink
allApprovers={allApprovers}
Expand Down
Loading
Loading