diff --git a/studio/components/interfaces/Organization/BillingSettingsV2/BillingBreakdown/BillingBreakdown.tsx b/studio/components/interfaces/Organization/BillingSettingsV2/BillingBreakdown/BillingBreakdown.tsx
index 3a4ad729d1e..102279e1481 100644
--- a/studio/components/interfaces/Organization/BillingSettingsV2/BillingBreakdown/BillingBreakdown.tsx
+++ b/studio/components/interfaces/Organization/BillingSettingsV2/BillingBreakdown/BillingBreakdown.tsx
@@ -91,7 +91,7 @@ const BillingBreakdown = () => {
{}}>
{currentPlan?.id === 'free' ? 'Upgrade plan' : 'Change spend cap'}
@@ -100,8 +100,8 @@ const BillingBreakdown = () => {
>
Your project can become unresponsive or enter read only mode.{' '}
{currentPlan?.id === 'free'
- ? 'Please upgrade to the Pro plan to ensure that your project remains available.'
- : 'Please disable spend cap to ensure that your project remains available.'}
+ ? 'Please upgrade to the Pro plan to ensure that your projects remain available.'
+ : 'Please disable spend cap to ensure that your projects remain available.'}
)}
diff --git a/studio/components/interfaces/Organization/BillingSettingsV2/PaymentMethods/DeletePaymentMethodModal.tsx b/studio/components/interfaces/Organization/BillingSettingsV2/PaymentMethods/DeletePaymentMethodModal.tsx
index cc05e5f1b6b..68bc419fa7e 100644
--- a/studio/components/interfaces/Organization/BillingSettingsV2/PaymentMethods/DeletePaymentMethodModal.tsx
+++ b/studio/components/interfaces/Organization/BillingSettingsV2/PaymentMethods/DeletePaymentMethodModal.tsx
@@ -59,15 +59,8 @@ const DeletePaymentMethodModal = ({
>
-
-
- Any subscription currently charging this payment method will start charging your
- default payment method.
-
+
+ You can re-add the payment method any time.
diff --git a/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/DowngradeModal.tsx b/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/DowngradeModal.tsx
index 6ea19500782..073d71f5c03 100644
--- a/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/DowngradeModal.tsx
+++ b/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/DowngradeModal.tsx
@@ -1,4 +1,3 @@
-import InformationBox from 'components/ui/InformationBox'
import { OrgSubscription, ProjectAddon } from 'data/subscriptions/org-subscription-query'
import { PricingInformation } from 'shared-data'
import { Alert, IconAlertOctagon, IconMinusCircle, IconPauseCircle, Modal } from 'ui'
@@ -24,8 +23,8 @@ const ProjectDowngradeListItem = ({ projectAddon }: { projectAddon: ProjectAddon
{needsRestart ? (
<>
{' '}
- Project will also need to be restarted due to
- change in compute instance
+ Project will also need to be restarted due to change in
+ compute instance
>
) : (
''
@@ -55,10 +54,10 @@ const DowngradeModal = ({
- If you're already past the limits of the free plan, your project could become
+ If you're already past the limits of the free plan, your projects could become
unresponsive or enter read only mode.
@@ -79,23 +78,24 @@ const DowngradeModal = ({
Add ons from all projects under this organization will be removed.
{(subscription?.project_addons.length ?? 0) > 0 && (
-
- {subscription?.project_addons.map((project) => (
-
- ))}
-
- }
- />
+
+
+ {subscription?.project_addons.map((project) => (
+
+ ))}
+
+
)}
-
Before you downgrading to the {selectedPlan?.name} plan, consider:
+
Before you downgrade to the {selectedPlan?.name} plan, consider:
-
Your projects no longer require their respective add ons.
diff --git a/studio/components/interfaces/Organization/GeneralSettings/MigrateOrganizationBillingButton.tsx b/studio/components/interfaces/Organization/GeneralSettings/MigrateOrganizationBillingButton.tsx
index a08dbc29da0..ca259432a49 100644
--- a/studio/components/interfaces/Organization/GeneralSettings/MigrateOrganizationBillingButton.tsx
+++ b/studio/components/interfaces/Organization/GeneralSettings/MigrateOrganizationBillingButton.tsx
@@ -3,7 +3,7 @@ import { observer } from 'mobx-react-lite'
import Link from 'next/link'
import { useRouter } from 'next/router'
import { useEffect, useMemo, useState } from 'react'
-import { Alert, Button, Form, IconHelpCircle, Listbox, Loading, Modal, Toggle } from 'ui'
+import { Alert, Button, IconHelpCircle, Listbox, Loading, Modal, Toggle } from 'ui'
import { SpendCapModal } from 'components/interfaces/BillingV2'
import { useOrganizationBillingMigrationMutation } from 'data/organizations/organization-migrate-billing-mutation'
@@ -118,8 +118,7 @@ const MigrateOrganizationBillingButton = observer(() => {
Migrating to new organization-level billing combines subscriptions for all
- projects in the organization into a single subscription. This cannot be
- reversed.{' '}
+ projects in the organization into a single subscription.
@@ -139,6 +138,15 @@ const MigrateOrganizationBillingButton = observer(() => {
+
+
+
+
+ Once migrated to the new organization-level billing, you cannot go back to the
+ old project-level billing.
+
+
+