Skip to content

Fix/59945 update api calls for expensify cards #59996

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

Merged
merged 9 commits into from
Apr 17, 2025
Merged

Fix/59945 update api calls for expensify cards #59996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
83c6558
fix: send domainAccountID in requests
koko57 Apr 10, 2025
1ba6972
Merge branch 'main' into fix/59945-update-api-calls-for-expensify-cards
koko57 Apr 15, 2025
0ecf5ad
Merge branch 'main' into fix/59945-update-api-calls-for-expensify-cards
koko57 Apr 16, 2025
184f984
fix: update params
koko57 Apr 16, 2025
93969f4
fix: fix deactivating cards
koko57 Apr 16, 2025
2103af4
fix: remove unused import
koko57 Apr 16, 2025
242ecb0
fix: fix rendering a proper screen for expensify card
koko57 Apr 16, 2025
2a8c4b7
fix: lint
koko57 Apr 16, 2025
bb99b6b
fix: prettier
koko57 Apr 16, 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
1 change: 0 additions & 1 deletion src/libs/API/parameters/CreateExpensifyCardParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
type CreateExpensifyCardParams = {
policyID: string | undefined;
assigneeEmail: string;
limit: number;
limitType: string;
Expand Down
2 changes: 1 addition & 1 deletion src/libs/API/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.UPDATE_WORKSPACE_APPROVAL]: Parameters.UpdateWorkspaceApprovalParams;
[WRITE_COMMANDS.REMOVE_WORKSPACE_APPROVAL]: Parameters.RemoveWorkspaceApprovalParams;
[WRITE_COMMANDS.CONFIGURE_EXPENSIFY_CARDS_FOR_POLICY]: Parameters.ConfigureExpensifyCardsForPolicyParams;
[WRITE_COMMANDS.CREATE_EXPENSIFY_CARD]: Omit<Parameters.CreateExpensifyCardParams, 'domainAccountID'>;
[WRITE_COMMANDS.CREATE_EXPENSIFY_CARD]: Parameters.CreateExpensifyCardParams;
[WRITE_COMMANDS.CREATE_ADMIN_ISSUED_VIRTUAL_CARD]: Omit<Parameters.CreateExpensifyCardParams, 'feedCountry'>;
[WRITE_COMMANDS.QUEUE_EXPENSIFY_CARD_FOR_BILLING]: Parameters.QueueExpensifyCardForBillingParams;
[WRITE_COMMANDS.ADD_DELEGATE]: Parameters.AddDelegateParams;
Expand Down
8 changes: 3 additions & 5 deletions src/libs/actions/Card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ function configureExpensifyCardsForPolicy(policyID: string, bankAccountID?: numb
});
}

function issueExpensifyCard(policyID: string | undefined, feedCountry: string, validateCode: string, data?: IssueNewCardData) {
function issueExpensifyCard(domainAccountID: number, policyID: string | undefined, feedCountry: string, validateCode: string, data?: IssueNewCardData) {
if (!data) {
return;
}
Expand Down Expand Up @@ -800,12 +800,12 @@ function issueExpensifyCard(policyID: string | undefined, feedCountry: string, v
];

const parameters = {
policyID,
assigneeEmail,
limit,
limitType,
cardTitle,
validateCode,
domainAccountID,
};

if (cardType === CONST.EXPENSIFY_CARD.CARD_TYPE.PHYSICAL) {
Expand All @@ -821,12 +821,10 @@ function issueExpensifyCard(policyID: string | undefined, feedCountry: string, v
return;
}

const domainAccountID = PolicyUtils.getWorkspaceAccountID(policyID);

// eslint-disable-next-line rulesdir/no-multiple-api-calls
API.write(
WRITE_COMMANDS.CREATE_ADMIN_ISSUED_VIRTUAL_CARD,
{...parameters, domainAccountID},
{...parameters},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coming from: #61051. We should pass policyID here

{
optimisticData,
successData,
Expand Down
11 changes: 6 additions & 5 deletions src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
import {filterInactiveCards, getTranslationKeyForLimitType, maskCard} from '@libs/CardUtils';
import {convertToDisplayString} from '@libs/CurrencyUtils';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
Expand All @@ -44,7 +43,6 @@ type WorkspaceExpensifyCardDetailsPageProps = PlatformStackScreenProps<

function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetailsPageProps) {
const {policyID, cardID, backTo} = route.params;
const workspaceAccountID = useWorkspaceAccountID(policyID);
const defaultFundID = useDefaultFundID(policyID);

const [isDeactivateModalVisible, setIsDeactivateModalVisible] = useState(false);
Expand All @@ -55,8 +53,11 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
const {isSmallScreenWidth} = useResponsiveLayout();
const styles = useThemeStyles();

const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
const [cardsList, cardsListResult] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${defaultFundID}_${CONST.EXPENSIFY_CARD.BANK}`, {selector: filterInactiveCards});
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: false});
const [cardsList, cardsListResult] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${defaultFundID}_${CONST.EXPENSIFY_CARD.BANK}`, {
selector: filterInactiveCards,
canBeMissing: true,
});

const isWorkspaceCardRhp = route.name === SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS;
const card = cardsList?.[cardID];
Expand All @@ -79,7 +80,7 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
setIsDeactivateModalVisible(false);
Navigation.goBack();
InteractionManager.runAfterInteractions(() => {
deactivateCardAction(workspaceAccountID, card);
deactivateCardAction(defaultFundID, card);
});
};

Expand Down
8 changes: 4 additions & 4 deletions src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ function WorkspaceExpensifyCardPage({route}: WorkspaceExpensifyCardPageProps) {
const theme = useTheme();
const defaultFundID = useDefaultFundID(policyID);

const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`);
const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${defaultFundID}_${CONST.EXPENSIFY_CARD.BANK}`, {selector: filterInactiveCards});
const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`, {canBeMissing: true});
const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${defaultFundID}_${CONST.EXPENSIFY_CARD.BANK}`, {selector: filterInactiveCards, canBeMissing: true});

const fetchExpensifyCards = useCallback(() => {
openPolicyExpensifyCardsPage(policyID, defaultFundID);
Expand All @@ -40,7 +40,7 @@ function WorkspaceExpensifyCardPage({route}: WorkspaceExpensifyCardPageProps) {
const isLoading = !isOffline && (!cardSettings || cardSettings.isLoading);

const renderContent = () => {
if (!!isLoading && !paymentBankAccountID && !defaultFundID) {
if (!!isLoading && !paymentBankAccountID) {
return (
<ActivityIndicator
size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
Expand All @@ -49,7 +49,7 @@ function WorkspaceExpensifyCardPage({route}: WorkspaceExpensifyCardPageProps) {
/>
);
}
if (!!paymentBankAccountID || defaultFundID) {
if (paymentBankAccountID) {
return (
<WorkspaceExpensifyCardListPage
cardsList={cardsList}
Expand Down
10 changes: 6 additions & 4 deletions src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import ValidateCodeActionModal from '@components/ValidateCodeActionModal';
import useBeforeRemove from '@hooks/useBeforeRemove';
import useDefaultFundID from '@hooks/useDefaultFundID';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
Expand Down Expand Up @@ -36,14 +37,15 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();
const {isOffline} = useNetwork();
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const [issueNewCard] = useOnyx(`${ONYXKEYS.COLLECTION.ISSUE_NEW_EXPENSIFY_CARD}${policyID}`);
const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE);
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
const [issueNewCard] = useOnyx(`${ONYXKEYS.COLLECTION.ISSUE_NEW_EXPENSIFY_CARD}${policyID}`, {canBeMissing: true});
const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE, {canBeMissing: true});
const validateError = getLatestErrorMessageField(issueNewCard);
const [isValidateCodeActionModalVisible, setIsValidateCodeActionModalVisible] = useState(false);
const data = issueNewCard?.data;
const isSuccessful = issueNewCard?.isSuccessful;
const validateCodeSent = validateCodeAction?.validateCodeSent;
const defaultFundID = useDefaultFundID(policyID);

const submitButton = useRef<View>(null);

Expand All @@ -63,7 +65,7 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
}, [backTo, policyID, isSuccessful]);

const submit = (validateCode: string) => {
issueExpensifyCard(policyID, CONST.COUNTRY.US, validateCode, data);
issueExpensifyCard(defaultFundID, policyID, CONST.COUNTRY.US, validateCode, data);
};

const errorMessage = getLatestErrorMessage(issueNewCard);
Expand Down