Skip to content

Commit 91919a1

Browse files
authored
Merge pull request #53550 from callstack-internal/VickyStash/bugfix/52820-card-assignment
Fix card assignment flow when members are changed
2 parents b16d7c1 + 146aa7d commit 91919a1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ function WorkspaceCompanyCardPage({route}: WorkspaceCompanyCardPageProps) {
3939
const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
4040
const selectedFeed = CardUtils.getSelectedFeed(lastSelectedFeed, cardFeeds);
4141
const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${selectedFeed}`);
42-
43-
const policy = PolicyUtils.getPolicy(policyID);
42+
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
4443

4544
const filteredCardList = CardUtils.getFilteredCardList(cardsList, selectedFeed ? cardFeeds?.settings?.oAuthAccountDetails?.[selectedFeed] : undefined);
4645

@@ -76,8 +75,9 @@ function WorkspaceCompanyCardPage({route}: WorkspaceCompanyCardPageProps) {
7675
};
7776

7877
let currentStep: AssignCardStep = CONST.COMPANY_CARD.STEP.ASSIGNEE;
78+
const employeeList = Object.values(policy?.employeeList ?? {}).filter((employee) => !PolicyUtils.isDeletedPolicyEmployee(employee, isOffline));
7979

80-
if (Object.keys(policy?.employeeList ?? {}).length === 1) {
80+
if (employeeList.length === 1) {
8181
const userEmail = Object.keys(policy?.employeeList ?? {}).at(0) ?? '';
8282
data.email = userEmail;
8383
const personalDetails = PersonalDetailsUtils.getPersonalDetailByEmail(userEmail);

0 commit comments

Comments
 (0)