Revert "wip"

This reverts commit 7fc1248.

Author: panteliselef

packages/clerk-js/src/core/lazy-query-client.ts

@@ -12,7 +12,6 @@ import type {
 import { unixEpochToDate } from '@/utils/date';
 
 import { billingTotalsFromJSON } from '../../utils';
-import { lazyQueryController } from '../lazy-query-client';
 import { BillingPayer } from './BillingPayer';
 import { BaseResource, BillingPaymentSource, BillingPlan } from './internal';
 
@@ -55,11 +54,11 @@ export class BillingCheckout extends BaseResource implements BillingCheckoutReso
     return this;
   }
 
-  confirm = async (params: ConfirmCheckoutParams): Promise<this> => {
+  confirm = (params: ConfirmCheckoutParams): Promise<this> => {
     // Retry confirmation in case of a 500 error
     // This will retry up to 3 times with an increasing delay
     // It retries at 2s, 4s, 6s and 8s
-    const result = await retry(
+    return retry(
       () =>
         this._basePatch({
           path: this.payer.organizationId
@@ -86,9 +85,5 @@ export class BillingCheckout extends BaseResource implements BillingCheckoutReso
         },
       },
     );
-
-    // TODO: We can use the public bus instead.
-    lazyQueryController.invalidate({ queryKey: ['commerce-subscription'] });
-    return result;
   };
 }

packages/clerk-js/src/core/resources/BillingCheckout.ts

@@ -13,7 +13,6 @@ import type {
 import { unixEpochToDate } from '@/utils/date';
 
 import { billingMoneyAmountFromJSON } from '../../utils';
-import { lazyQueryController } from '../lazy-query-client';
 import { BaseResource, BillingPlan, DeletedObject } from './internal';
 
 export class BillingSubscription extends BaseResource implements BillingSubscriptionResource {
@@ -118,7 +117,6 @@ export class BillingSubscriptionItem extends BaseResource implements BillingSubs
       })
     )?.response as unknown as DeletedObjectJSON;
 
-    lazyQueryController.invalidate({ queryKey: ['commerce-subscription'] });
     return new DeletedObject(json);
   }
 }

packages/clerk-js/src/core/resources/BillingSubscription.ts

@@ -115,7 +115,7 @@ export const usePlansContext = () => {
     return false;
   }, [clerk, subscriberType]);
 
-  const { subscriptionItems, data: topLevelSubscription } = useSubscription();
+  const { subscriptionItems, revalidate: revalidateSubscriptions, data: topLevelSubscription } = useSubscription();
 
   // Invalidates cache but does not fetch immediately
   const { data: plans, revalidate: revalidatePlans } = usePlans({ mode: 'cache' });
@@ -127,10 +127,11 @@ export const usePlansContext = () => {
 
   const revalidateAll = useCallback(() => {
     // Revalidate the plans and subscriptions
+    void revalidateSubscriptions();
     void revalidatePlans();
     void revalidateStatements();
     void revalidatePaymentSources();
-  }, [revalidatePlans, revalidateStatements, revalidatePaymentSources]);
+  }, [revalidateSubscriptions, revalidatePlans, revalidateStatements, revalidatePaymentSources]);
 
   // should the default plan be shown as active
   const isDefaultPlanImplicitlyActiveOrUpcoming = useMemo(() => {