Skip to content
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

Reset-card-name-when-changing-assignee-only #56678

Merged
merged 3 commits into from
Feb 12, 2025
Merged

Reset-card-name-when-changing-assignee-only #56678

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32b9c40
reset-card-name-when-changing-assignee-only
cretadn22 Feb 11, 2025
a0e2ce4
import error
cretadn22 Feb 11, 2025
6178e06
add return
cretadn22 Feb 11, 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
44 changes: 26 additions & 18 deletions src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import useDebouncedState from '@hooks/useDebouncedState';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
import * as CardUtils from '@libs/CardUtils';
import {getDefaultCardName, getFilteredCardList, hasOnlyOneCardToAssign} from '@libs/CardUtils';
import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
import * as PolicyUtils from '@libs/PolicyUtils';
import {getHeaderMessage, getSearchValueForPhoneOrEmail, sortAlphabetically} from '@libs/OptionsListUtils';
import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
import {getWorkspaceAccountID, isDeletedPolicyEmployee} from '@libs/PolicyUtils';
import Navigation from '@navigation/Navigation';
import * as CompanyCards from '@userActions/CompanyCards';
import {setAssignCardStepAndData} from '@userActions/CompanyCards';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type * as OnyxTypes from '@src/types/onyx';
Expand All @@ -40,11 +40,11 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
const styles = useThemeStyles();
const {isOffline} = useNetwork();
const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD);
const workspaceAccountID = policy?.id ? PolicyUtils.getWorkspaceAccountID(policy.id) : CONST.DEFAULT_NUMBER_ID;
const workspaceAccountID = policy?.id ? getWorkspaceAccountID(policy.id) : CONST.DEFAULT_NUMBER_ID;

const [list] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${feed}`);
const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
const filteredCardList = CardUtils.getFilteredCardList(list, cardFeeds?.settings?.oAuthAccountDetails?.[feed]);
const filteredCardList = getFilteredCardList(list, cardFeeds?.settings?.oAuthAccountDetails?.[feed]);

const isEditing = assignCard?.isEditing;

Expand All @@ -59,26 +59,34 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
};

const submit = () => {
let nextStep: AssignCardStep = CONST.COMPANY_CARD.STEP.CARD;
if (selectedMember === assignCard?.data?.email) {
setAssignCardStepAndData({
currentStep: isEditing ? CONST.COMPANY_CARD.STEP.CONFIRMATION : nextStep,
isEditing: false,
});
return;
}

if (!selectedMember) {
setShouldShowError(true);
return;
}

let nextStep: AssignCardStep = CONST.COMPANY_CARD.STEP.CARD;
const personalDetail = PersonalDetailsUtils.getPersonalDetailByEmail(selectedMember);
const personalDetail = getPersonalDetailByEmail(selectedMember);
const memberName = personalDetail?.firstName ? personalDetail.firstName : personalDetail?.login;
const data: Partial<AssignCardData> = {
email: selectedMember,
cardName: CardUtils.getDefaultCardName(memberName),
cardName: getDefaultCardName(memberName),
};

if (CardUtils.hasOnlyOneCardToAssign(filteredCardList)) {
if (hasOnlyOneCardToAssign(filteredCardList)) {
nextStep = CONST.COMPANY_CARD.STEP.TRANSACTION_START_DATE;
data.cardNumber = Object.keys(filteredCardList).at(0);
data.encryptedCardNumber = Object.values(filteredCardList).at(0);
}

CompanyCards.setAssignCardStepAndData({
setAssignCardStepAndData({
currentStep: isEditing ? CONST.COMPANY_CARD.STEP.CONFIRMATION : nextStep,
data,
isEditing: false,
Expand All @@ -87,7 +95,7 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {

const handleBackButtonPress = () => {
if (isEditing) {
CompanyCards.setAssignCardStepAndData({
setAssignCardStepAndData({
currentStep: CONST.COMPANY_CARD.STEP.CONFIRMATION,
isEditing: false,
});
Expand All @@ -106,11 +114,11 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
}

Object.entries(policy.employeeList ?? {}).forEach(([email, policyEmployee]) => {
if (PolicyUtils.isDeletedPolicyEmployee(policyEmployee, isOffline)) {
if (isDeletedPolicyEmployee(policyEmployee, isOffline)) {
return;
}

const personalDetail = PersonalDetailsUtils.getPersonalDetailByEmail(email);
const personalDetail = getPersonalDetailByEmail(email);
membersList.push({
keyForList: email,
text: personalDetail?.displayName,
Expand All @@ -129,7 +137,7 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
});
});

membersList = OptionsListUtils.sortAlphabetically(membersList, 'text');
membersList = sortAlphabetically(membersList, 'text');

return membersList;
}, [isOffline, policy?.employeeList, selectedMember]);
Expand All @@ -144,7 +152,7 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
];
}

const searchValue = OptionsListUtils.getSearchValueForPhoneOrEmail(debouncedSearchTerm).toLowerCase();
const searchValue = getSearchValueForPhoneOrEmail(debouncedSearchTerm).toLowerCase();
const filteredOptions = membersDetails.filter((option) => !!option.text?.toLowerCase().includes(searchValue) || !!option.alternateText?.toLowerCase().includes(searchValue));

return [
Expand All @@ -159,7 +167,7 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
const headerMessage = useMemo(() => {
const searchValue = debouncedSearchTerm.trim().toLowerCase();

return OptionsListUtils.getHeaderMessage(sections[0].data.length !== 0, false, searchValue);
return getHeaderMessage(sections[0].data.length !== 0, false, searchValue);
}, [debouncedSearchTerm, sections]);

return (
Expand Down