fix: Change plan update banner to new alert and update seat count

codecov · Feb 26, 2025 · abfbad7 · abfbad7
1 parent 67df9ca
commit abfbad7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentOrgPlan.test.tsx b/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentOrgPlan.test.tsx
@@ -197,7 +197,7 @@ describe('CurrentOrgPlan', () => {
       })
 
       render(<CurrentOrgPlan />, { wrapper })
-      const updatedAlert = await screen.findByText('Plan successfully updated.')
+      const updatedAlert = await screen.findByText('Plan successfully updated')
       expect(updatedAlert).toBeInTheDocument()
     })
 
@@ -214,7 +214,7 @@ describe('CurrentOrgPlan', () => {
         } as z.infer<typeof AccountDetailsSchema>,
       })
       render(<CurrentOrgPlan />, { wrapper })
-      const updatedAlert = await screen.findByText('Plan successfully updated.')
+      const updatedAlert = await screen.findByText('Plan successfully updated')
       expect(updatedAlert).toBeInTheDocument()
       expect(
         screen.getByText(/with a monthly subscription for 34 seats/)
@@ -230,7 +230,7 @@ describe('CurrentOrgPlan', () => {
       expect(currentPlanCard).toBeInTheDocument()
 
       expect(
-        screen.queryByText('Plan successfully updated.')
+        screen.queryByText('Plan successfully updated')
       ).not.toBeInTheDocument()
     })
   })

diff --git a/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentOrgPlan.tsx b/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentOrgPlan.tsx
@@ -88,7 +88,7 @@ function CurrentOrgPlan() {
             <Alert variant={planUpdatedNotification.alertOption}>
               {scheduleStart && scheduledPhase?.quantity ? (
                 <>
-                  <Alert.Title>Plan successfully updated.</Alert.Title>
+                  <Alert.Title>Plan successfully updated</Alert.Title>
                   <Alert.Description>
                     The start date is {scheduleStart} with a monthly
                     subscription for {scheduledPhase.quantity} seats.

diff --git a/...age/subRoutes/CurrentOrgPlan/InfoMessageStripeCallback/InfoMessageStripeCallback.test.tsx b/...age/subRoutes/CurrentOrgPlan/InfoMessageStripeCallback/InfoMessageStripeCallback.test.tsx
@@ -38,7 +38,7 @@ describe('InfoMessageStripeCallback', () => {
       )
 
       await expect(
-        screen.getByText(/Subscription Update Successful/)
+        screen.getByText(/Plan successfully updated./)
       ).toBeInTheDocument()
     })
   })

diff --git a/...PlanPage/subRoutes/CurrentOrgPlan/InfoMessageStripeCallback/InfoMessageStripeCallback.tsx b/...PlanPage/subRoutes/CurrentOrgPlan/InfoMessageStripeCallback/InfoMessageStripeCallback.tsx
@@ -1,7 +1,7 @@
 import qs from 'qs'
 import { useLocation } from 'react-router-dom'
 
-import Message from 'old_ui/Message'
+import { Alert } from 'ui/Alert'
 
 // Stripe redirects to this page with ?success or ?cancel in the URL
 // this component takes care of rendering a message if it is successful
@@ -16,14 +16,12 @@ function InfoMessageStripeCallback({
 
   if ('success' in urlParams && !awaitingInitialPaymentMethodVerification)
     return (
-      <div className="col-start-1 col-end-13 mb-4">
-        <Message variant="success">
-          <h2 className="text-lg">Subscription Update Successful</h2>
-          <p className="text-sm">
-            Your subscription has been updated successfully. If your plan
-            details appear incorrect, please refresh the page.
-          </p>
-        </Message>
+      <div className="col-start-1 col-end-13 mb-4 sm:flex-initial md:w-2/3 lg:w-3/4">
+        <Alert variant="success">
+          <Alert.Description className="text-sm">
+            Plan successfully updated.
+          </Alert.Description>
+        </Alert>
       </div>
     )
 

diff --git a/src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/hooks/useUpgradeControls.ts b/src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/hooks/useUpgradeControls.ts
@@ -31,8 +31,12 @@ export const useUpgradeControls = () => {
         newPlan: newPlan!,
       },
       {
-        onSuccess: () => {
-          queryClient.invalidateQueries(['accountDetails'])
+        onSuccess: async () => {
+          // we want to wait here as history.push can disrupt the query invalidation
+          await Promise.all([
+            queryClient.refetchQueries({ queryKey: ['accountDetails'] }),
+            queryClient.refetchQueries({ queryKey: ['GetPlanData'] }),
+          ])
           setPlanUpdatedNotification({
             alertOption: 'success',
           })