From bb07365ea5b9bf2c70649109be5157df220a5d47 Mon Sep 17 00:00:00 2001
From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com>
Date: Thu, 23 Oct 2025 10:34:16 -0500
Subject: [PATCH] await call that creates Customer in case we're upgrading from
 free (#16999)

---
 .../billing/organizations/change-plan-dialog.component.ts  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
index 9d093ec4514..c2c819ddf4d 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
@@ -842,10 +842,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       );
 
       const subscriber: BitwardenSubscriber = { type: "organization", data: this.organization };
-      await Promise.all([
-        this.subscriberBillingClient.updatePaymentMethod(subscriber, paymentMethod, null),
-        this.subscriberBillingClient.updateBillingAddress(subscriber, billingAddress),
-      ]);
+      // These need to be synchronous so one of them can create the Customer in the case we're upgrading from Free.
+      await this.subscriberBillingClient.updateBillingAddress(subscriber, billingAddress);
+      await this.subscriberBillingClient.updatePaymentMethod(subscriber, paymentMethod, null);
     }
 
     // Backfill pub/priv key if necessary