Skip to content

Update completePaymentOnboarding to pass currentUserAccountID #90875

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
tgolen merged 1 commit into from
May 19, 2026
Merged

Update completePaymentOnboarding to pass currentUserAccountID #90875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions src/components/AddPaymentMethodMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type {RefObject} from 'react';
import React, {useEffect, useState} from 'react';
import type {View} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
Expand Down Expand Up @@ -65,6 +66,7 @@ function AddPaymentMethodMenu({
const [introSelected, introSelectedStatus] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
const [isSelfTourViewed = false] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
const [betas] = useOnyx(ONYXKEYS.BETAS);
const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();

// Users can choose to pay with business bank account in case of Expense reports or in case of P2P IOU report
// which then starts a bottom up flow and creates a Collect workspace where the payer is an admin and payee is an employee.
Expand All @@ -83,9 +85,9 @@ function AddPaymentMethodMenu({
return;
}

completePaymentOnboarding(CONST.PAYMENT_SELECTED.PBA, introSelected, isSelfTourViewed, betas);
completePaymentOnboarding(CONST.PAYMENT_SELECTED.PBA, introSelected, isSelfTourViewed, betas, currentUserAccountID);
onItemSelected(CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT);
}, [betas, introSelected, isLoadingIntroSelected, isPersonalOnlyOption, isVisible, onItemSelected, isSelfTourViewed]);
}, [betas, currentUserAccountID, introSelected, isLoadingIntroSelected, isPersonalOnlyOption, isVisible, onItemSelected, isSelfTourViewed]);

if (isPersonalOnlyOption) {
return null;
Expand All @@ -112,7 +114,7 @@ function AddPaymentMethodMenu({
text: translate('common.personalBankAccount'),
icon: icons.Bank,
onSelected: () => {
completePaymentOnboarding(CONST.PAYMENT_SELECTED.PBA, introSelected, isSelfTourViewed, betas);
completePaymentOnboarding(CONST.PAYMENT_SELECTED.PBA, introSelected, isSelfTourViewed, betas, currentUserAccountID);
onItemSelected(CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT);
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/KYCWall/BaseKYCWall.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ function KYCWall({
if (policyID && iouReport?.policyID) {
savePreferredPaymentMethod(iouReport.policyID, policyID, CONST.LAST_PAYMENT_METHOD.IOU, lastPaymentMethod?.[iouReport?.policyID]);
}
completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, introSelected, isSelfTourViewed, betas, adminsChatReportID, policyID);
completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, introSelected, isSelfTourViewed, betas, currentUserAccountID, adminsChatReportID, policyID);
const workspaceReportRoute = workspaceChatReportID ? ROUTES.REPORT_WITH_ID.getRoute(workspaceChatReportID) : undefined;

setNavigationActionToMicrotaskQueue(() => {
Expand Down
11 changes: 5 additions & 6 deletions src/libs/actions/IOU/PayMoneyRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import type {Participant} from '@src/types/onyx/IOU';
import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
import type {OnyxData} from '@src/types/onyx/Request';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import {getAllPersonalDetails, getAllTransactionViolations, getUserAccountID} from '.';
import {getAllPersonalDetails, getAllTransactionViolations} from '.';
import {getReportFromHoldRequestsOnyxData} from './Hold';
import {getReportPreviewAction} from './MoneyRequestBuilder';

Expand Down Expand Up @@ -696,18 +696,17 @@ function completePaymentOnboarding(
introSelected: OnyxEntry<OnyxTypes.IntroSelected>,
isSelfTourViewed: boolean | undefined,
betas: OnyxEntry<OnyxTypes.Beta[]>,
currentUserAccountID: number,
adminsChatReportID?: string,
onboardingPolicyID?: string,
) {
const deprecatedUserAccountID = getUserAccountID();

const isInviteOnboardingComplete = introSelected?.isInviteOnboardingComplete ?? false;

if (isInviteOnboardingComplete || !introSelected?.choice || !introSelected?.inviteType) {
return;
}

const personalDetailsListValues = Object.values(getPersonalDetailsForAccountIDs(deprecatedUserAccountID ? [deprecatedUserAccountID] : [], getAllPersonalDetails()));
const personalDetailsListValues = Object.values(getPersonalDetailsForAccountIDs(currentUserAccountID ? [currentUserAccountID] : [], getAllPersonalDetails()));
const personalDetails = personalDetailsListValues.at(0);

let onboardingPurpose = introSelected?.choice;
Expand Down Expand Up @@ -770,7 +769,7 @@ function payMoneyRequest(params: PayMoneyRequestFunctionParams) {
}

const paymentSelected = paymentType === CONST.IOU.PAYMENT_TYPE.VBBA ? CONST.IOU.PAYMENT_SELECTED.BBA : CONST.IOU.PAYMENT_SELECTED.PBA;
completePaymentOnboarding(paymentSelected, introSelected, isSelfTourViewed, betas);
completePaymentOnboarding(paymentSelected, introSelected, isSelfTourViewed, betas, currentUserAccountID);

const recipient = {accountID: iouReport?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID};
const {params: payMoneyRequestParams, onyxData} = getPayMoneyRequestParams({
Expand Down Expand Up @@ -854,7 +853,7 @@ function payInvoice({
});

const paymentSelected = paymentMethodType === CONST.IOU.PAYMENT_TYPE.VBBA ? CONST.IOU.PAYMENT_SELECTED.BBA : CONST.IOU.PAYMENT_SELECTED.PBA;
completePaymentOnboarding(paymentSelected, introSelected, isSelfTourViewed, betas);
completePaymentOnboarding(paymentSelected, introSelected, isSelfTourViewed, betas, currentUserAccountIDParam);

let params: PayInvoiceParams = {
reportID: invoiceReport?.reportID,
Expand Down
17 changes: 10 additions & 7 deletions tests/actions/IOUTest/PayMoneyRequestTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1856,7 +1856,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
});

it('should not call completeOnboarding when introSelected is undefined', () => {
completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, undefined, false, [CONST.BETAS.ALL]);
completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, undefined, false, [CONST.BETAS.ALL], CARLOS_ACCOUNT_ID);
expect(completeOnboardingSpy).not.toHaveBeenCalled();
});

Expand All @@ -1870,6 +1870,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
},
false,
[CONST.BETAS.ALL],
CARLOS_ACCOUNT_ID,
);
expect(completeOnboardingSpy).not.toHaveBeenCalled();
});
Expand All @@ -1882,6 +1883,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
},
false,
[CONST.BETAS.ALL],
CARLOS_ACCOUNT_ID,
);
expect(completeOnboardingSpy).not.toHaveBeenCalled();
});
Expand All @@ -1894,6 +1896,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
},
false,
[CONST.BETAS.ALL],
CARLOS_ACCOUNT_ID,
);
expect(completeOnboardingSpy).not.toHaveBeenCalled();
});
Expand All @@ -1904,7 +1907,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
inviteType: CONST.ONBOARDING_INVITE_TYPES.IOU,
companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO,
};
completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, introSelected, false, [CONST.BETAS.ALL]);
completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, introSelected, false, [CONST.BETAS.ALL], CARLOS_ACCOUNT_ID);

expect(completeOnboardingSpy).toHaveBeenCalledWith(
expect.objectContaining({
Expand All @@ -1924,7 +1927,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
inviteType: CONST.ONBOARDING_INVITE_TYPES.INVOICE,
companySize: CONST.ONBOARDING_COMPANY_SIZE.SMALL,
};
completePaymentOnboarding(CONST.PAYMENT_SELECTED.PBA, introSelected, false, [CONST.BETAS.ALL]);
completePaymentOnboarding(CONST.PAYMENT_SELECTED.PBA, introSelected, false, [CONST.BETAS.ALL], CARLOS_ACCOUNT_ID);

expect(completeOnboardingSpy).toHaveBeenCalledWith(
expect.objectContaining({
Expand All @@ -1943,7 +1946,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
choice: CONST.ONBOARDING_CHOICES.MANAGE_TEAM,
inviteType: CONST.ONBOARDING_INVITE_TYPES.INVOICE,
};
completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, introSelected, false, [CONST.BETAS.ALL]);
completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, introSelected, false, [CONST.BETAS.ALL], CARLOS_ACCOUNT_ID);

expect(completeOnboardingSpy).toHaveBeenCalledWith(
expect.objectContaining({
Expand All @@ -1959,7 +1962,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
choice: CONST.ONBOARDING_CHOICES.SUBMIT,
inviteType: CONST.ONBOARDING_INVITE_TYPES.IOU,
};
completePaymentOnboarding(CONST.PAYMENT_SELECTED.PBA, introSelected, false, [CONST.BETAS.ALL]);
completePaymentOnboarding(CONST.PAYMENT_SELECTED.PBA, introSelected, false, [CONST.BETAS.ALL], CARLOS_ACCOUNT_ID);

expect(completeOnboardingSpy).toHaveBeenCalledWith(
expect.objectContaining({
Expand All @@ -1976,7 +1979,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
inviteType: CONST.ONBOARDING_INVITE_TYPES.CHAT,
companySize: CONST.ONBOARDING_COMPANY_SIZE.MEDIUM,
};
completePaymentOnboarding(CONST.PAYMENT_SELECTED.PBA, introSelected, false, [CONST.BETAS.ALL], 'adminsChatReport123', 'policyID456');
completePaymentOnboarding(CONST.PAYMENT_SELECTED.PBA, introSelected, false, [CONST.BETAS.ALL], CARLOS_ACCOUNT_ID, 'adminsChatReport123', 'policyID456');

expect(completeOnboardingSpy).toHaveBeenCalledWith(
expect.objectContaining({
Expand All @@ -1995,7 +1998,7 @@ describe('actions/IOU/PayMoneyRequest', () => {
inviteType: CONST.ONBOARDING_INVITE_TYPES.IOU,
companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO,
};
completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, introSelected, true, [CONST.BETAS.ALL]);
completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, introSelected, true, [CONST.BETAS.ALL], CARLOS_ACCOUNT_ID);

expect(completeOnboardingSpy).toHaveBeenCalledWith(
expect.objectContaining({
Expand Down
Loading