Skip to content

show "setting up of bank account" message when the policy has no validated account #49584

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
dangrous merged 8 commits into from
Oct 8, 2024
Merged

show "setting up of bank account" message when the policy has no validated account #49584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2e97d8e
conditional next step message based on account
c3024 Sep 23, 2024
afe450b
match with backend and compare display name also
c3024 Sep 24, 2024
ca99e30
Merge branch 'main' into add-new-message-for-setting-up-of-bank-account
c3024 Sep 24, 2024
849468a
clickToCopyText for step after approval
c3024 Sep 24, 2024
63cfef7
remove unused variable
c3024 Sep 24, 2024
dff3a34
remove extra space and fix tests
c3024 Sep 24, 2024
0f822e6
Merge branch 'main' into add-new-message-for-setting-up-of-bank-account
c3024 Oct 2, 2024
57ec6c2
add tests for validated bank account
c3024 Oct 8, 2024
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
6 changes: 3 additions & 3 deletions src/libs/NextStepUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ Onyx.connect({

function parseMessage(messages: Message[] | undefined) {
let nextStepHTML = '';

messages?.forEach((part, index) => {
const isEmail = Str.isValidEmail(part.text);
let tagType = part.type ?? 'span';
Expand Down Expand Up @@ -94,6 +93,7 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
const nextApproverDisplayName = getNextApproverDisplayName(report);

const reimburserAccountID = PolicyUtils.getReimburserAccountID(policy);
const hasValidAccount = !!policy?.achAccount?.accountNumber;
const type: ReportNextStep['type'] = 'neutral';
let optimisticNextStep: ReportNextStep | null;

Expand Down Expand Up @@ -272,10 +272,10 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
text: ' to ',
},
{
text: 'pay',
text: hasValidAccount ? 'pay' : 'finish setting up',
},
{
text: ' %expenses.',
text: hasValidAccount ? ' %expenses.' : ' a business bank account.',
},
],
};
Expand Down
95 changes: 83 additions & 12 deletions tests/unit/NextStepUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,33 @@ describe('libs/NextStepUtils', () => {
test('self review', () => {
optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS;

// Waiting for an admin to set up a bank account
optimisticNextStep.message = [
{
text: 'Waiting for ',
},
{
text: `an admin`,
},
{
text: ' to ',
},
{
text: 'finish setting up',
},
{
text: ' a business bank account.',
},
];

const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.APPROVED);

expect(result).toMatchObject(optimisticNextStep);
});

test('self review with bank account setup', () => {
optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS;

// Waiting for an admin to pay expense(s)
optimisticNextStep.message = [
{
Expand All @@ -421,9 +448,20 @@ describe('libs/NextStepUtils', () => {
},
];

const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.APPROVED);
return Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
achAccount: {
accountNumber: '123456789',
},
}).then(() => {
const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.APPROVED);

expect(result).toMatchObject(optimisticNextStep);
expect(result).toMatchObject(optimisticNextStep);

// restore to previous state
Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
achAccount: null,
});
});
});

test('another reviewer', () => {
Expand Down Expand Up @@ -536,7 +574,7 @@ describe('libs/NextStepUtils', () => {
test('payer', () => {
optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS;

// Waiting for an admin to pay expense(s).
// Waiting for an admin to set up a bank account
optimisticNextStep.message = [
{
text: 'Waiting for ',
Expand All @@ -548,10 +586,10 @@ describe('libs/NextStepUtils', () => {
text: ' to ',
},
{
text: 'pay',
text: 'finish setting up',
},
{
text: ' %expenses.',
text: ' a business bank account.',
},
];
// mock the report as approved
Expand All @@ -567,20 +605,53 @@ describe('libs/NextStepUtils', () => {
report.stateNum = originalState.stateNum;
report.statusNum = originalState.statusNum;
});
});

describe('it generates an optimistic nextStep once a report has been paid', () => {
test('paid with wallet / outside of Expensify', () => {
optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.CHECKMARK;
test('payer with bank account setup', () => {
optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS;

// Waiting for an admin to pay expense(s)
optimisticNextStep.message = [
{
text: 'No further action required!',
text: 'Waiting for ',
},
{
text: 'an admin',
},
{
text: ' to ',
},
{
text: 'pay',
},
{
text: ' %expenses.',
},
];

const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.REIMBURSED);
return Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
achAccount: {
accountNumber: '123456789',
},
}).then(() => {
const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.APPROVED);

expect(result).toMatchObject(optimisticNextStep);
expect(result).toMatchObject(optimisticNextStep);
});
});

describe('it generates an optimistic nextStep once a report has been paid', () => {
test('paid with wallet / outside of Expensify', () => {
optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.CHECKMARK;
optimisticNextStep.message = [
{
text: 'No further action required!',
},
];

const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.REIMBURSED);

expect(result).toMatchObject(optimisticNextStep);
});
});
});
});
Expand Down