Skip to content

Commit b529189

Browse files
Merge pull request Expensify#76096 from nkdengineer/revert-76041-revert-75410-fix/74900
Revert "[CP Staging] Revert "Previous selection is cleared when selecting another member in Expenses From""
2 parents 152c504 + e4db0e2 commit b529189

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/components/ApproverSelectionList.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, {useMemo, useState} from 'react';
1+
import React, {useMemo} from 'react';
22
import type {SectionListData} from 'react-native';
33
import useDebouncedState from '@hooks/useDebouncedState';
44
import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
@@ -84,7 +84,7 @@ function ApproverSelectionList({
8484
const shouldShowTextInput = shouldShowTextInputProp ?? allApprovers?.length >= CONST.STANDARD_LIST_ITEM_LIMIT;
8585
const lazyIllustrations = useMemoizedLazyIllustrations(['TurtleInShell']);
8686

87-
const [selectedMembers, setSelectedMembers] = useState<SelectionListApprover[]>([]);
87+
const selectedMembers = useMemo(() => allApprovers.filter((approver) => approver.isSelected), [allApprovers]);
8888

8989
// eslint-disable-next-line rulesdir/no-negated-variables
9090
const shouldShowNotFoundView = (isEmptyObject(policy) && !isLoadingReportData) || !isPolicyAdmin(policy) || isPendingDeletePolicy(policy) || shouldShowNotFoundViewProp;
@@ -117,7 +117,6 @@ function ApproverSelectionList({
117117
? selectedMembers.filter((selectedOption) => selectedOption.login !== member.login)
118118
: [...selectedMembers, {...member, isSelected: true}];
119119
}
120-
setSelectedMembers(newSelectedApprovers);
121120
if (onSelectApprover) {
122121
onSelectApprover(newSelectedApprovers);
123122
}

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
138138
const toggleApprover = useCallback(
139139
(approvers: SelectionListApprover[]) => {
140140
const approver = approvers.at(0);
141-
if (selectedApproverEmail === approver?.login) {
141+
if (!approver?.login) {
142142
clearApprovalWorkflowApprover({approverIndex, currentApprovalWorkflow});
143143
} else {
144144
const newSelectedEmail = approver?.login ?? '';

0 commit comments

Comments
 (0)