Skip to content

Commit dffc297

Browse files
Fix TaxService.previewTaxAmountForOrganizationTrial return type (#15848)
1 parent 56a1009 commit dffc297

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ export class TrialBillingStepComponent implements OnInit, OnDestroy {
304304
this.fetchingTaxAmount = true;
305305

306306
if (!this.taxInfoComponent.validate()) {
307+
this.fetchingTaxAmount = false;
307308
return 0;
308309
}
309310

@@ -326,7 +327,7 @@ export class TrialBillingStepComponent implements OnInit, OnDestroy {
326327

327328
const response = await this.taxService.previewTaxAmountForOrganizationTrial(request);
328329
this.fetchingTaxAmount = false;
329-
return response.taxAmount;
330+
return response;
330331
};
331332

332333
get price() {

libs/common/src/billing/abstractions/tax.service.abstraction.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { PreviewIndividualInvoiceRequest } from "../models/request/preview-indiv
33
import { PreviewOrganizationInvoiceRequest } from "../models/request/preview-organization-invoice.request";
44
import { PreviewTaxAmountForOrganizationTrialRequest } from "../models/request/tax";
55
import { PreviewInvoiceResponse } from "../models/response/preview-invoice.response";
6-
import { PreviewTaxAmountResponse } from "../models/response/tax";
76

87
export abstract class TaxServiceAbstraction {
98
abstract getCountries(): CountryListItem[];
@@ -20,5 +19,5 @@ export abstract class TaxServiceAbstraction {
2019

2120
abstract previewTaxAmountForOrganizationTrial: (
2221
request: PreviewTaxAmountForOrganizationTrialRequest,
23-
) => Promise<PreviewTaxAmountResponse>;
22+
) => Promise<number>;
2423
}

libs/common/src/billing/services/tax.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { PreviewTaxAmountForOrganizationTrialRequest } from "@bitwarden/common/billing/models/request/tax";
2-
import { PreviewTaxAmountResponse } from "@bitwarden/common/billing/models/response/tax";
32

43
import { ApiService } from "../../abstractions/api.service";
54
import { TaxServiceAbstraction } from "../abstractions/tax.service.abstraction";
@@ -306,13 +305,14 @@ export class TaxService implements TaxServiceAbstraction {
306305

307306
async previewTaxAmountForOrganizationTrial(
308307
request: PreviewTaxAmountForOrganizationTrialRequest,
309-
): Promise<PreviewTaxAmountResponse> {
310-
return await this.apiService.send(
308+
): Promise<number> {
309+
const response = await this.apiService.send(
311310
"POST",
312311
"/tax/preview-amount/organization-trial",
313312
request,
314313
true,
315314
true,
316315
);
316+
return response as number;
317317
}
318318
}

0 commit comments

Comments
 (0)