bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 01:33:33 +00:00
Code Issues Releases Wiki Activity

Check FF before validating payment component (#14840)

Browse Source
This commit is contained in:
Alex Morask
2025-05-20 09:15:01 -04:00
committed by GitHub
parent 83c4438efe
commit 13c8e26003
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
View File

@@ -117,9 +117,15 @@ export class SetupComponent implements OnInit, OnDestroy {
submit = async () => { submit = async () => {
try { try {
const requireProviderPaymentMethodDuringSetup = await firstValueFrom(
this.requireProviderPaymentMethodDuringSetup$,
);
this.formGroup.markAllAsTouched(); this.formGroup.markAllAsTouched();
const paymentValid = this.paymentComponent.validate(); const paymentValid = requireProviderPaymentMethodDuringSetup
? this.paymentComponent.validate()
: true;
const taxInformationValid = this.taxInformationComponent.validate(); const taxInformationValid = this.taxInformationComponent.validate();
if (!paymentValid || !taxInformationValid || !this.formGroup.valid) { if (!paymentValid || !taxInformationValid || !this.formGroup.valid) {
@@ -146,10 +152,6 @@ export class SetupComponent implements OnInit, OnDestroy {
request.taxInfo.city = taxInformation.city; request.taxInfo.city = taxInformation.city;
request.taxInfo.state = taxInformation.state; request.taxInfo.state = taxInformation.state;
const requireProviderPaymentMethodDuringSetup = await firstValueFrom(
this.requireProviderPaymentMethodDuringSetup$,
);
if (requireProviderPaymentMethodDuringSetup) { if (requireProviderPaymentMethodDuringSetup) {
request.paymentSource = await this.paymentComponent.tokenize(); request.paymentSource = await this.paymentComponent.tokenize();
} }