From 16462eca96403e18aef38f810c1c6ca6abd4bbdd Mon Sep 17 00:00:00 2001
From: Siddhant Khare <siddhant@gitpod.io>
Date: Fri, 12 Sep 2025 02:00:05 +0000
Subject: [PATCH 1/3] fix: update subscription error message and enhance
 upgrade plan details for Gitpod's transition to Ona

---
 .../components/UsageBasedBillingConfig.tsx    | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/components/dashboard/src/components/UsageBasedBillingConfig.tsx b/components/dashboard/src/components/UsageBasedBillingConfig.tsx
index c8a95a358903d8..1a3d9593b07511 100644
--- a/components/dashboard/src/components/UsageBasedBillingConfig.tsx
+++ b/components/dashboard/src/components/UsageBasedBillingConfig.tsx
@@ -94,20 +94,6 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
         refreshSubscriptionDetails(attributionId);
     }, [attributionId, refreshSubscriptionDetails]);
 
-    const handleAddPaymentMethod = useCallback(async () => {
-        if (!attributionId) {
-            return;
-        }
-
-        try {
-            createPaymentIntent.mutateAsync(attributionId);
-            setShowAddPaymentMethodModal(true);
-        } catch (e) {
-            console.error(e);
-            toast(e.message || "Oh no, there was a problem with our payment service.");
-        }
-    }, [attributionId, createPaymentIntent, toast]);
-
     // Handle stripe setup-intent or payment-intent redirect flow
     useEffect(() => {
         const params = new URLSearchParams(location.search);
@@ -318,13 +304,26 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
                             </div>
                         </div>
                         <div className="flex flex-col p-4 rounded-b-xl bg-pk-surface-secondary border-t border-gray-200 dark:border-gray-700">
-                            <div className="uppercase text-sm text-pk-content-tertiary">Upgrade Plan</div>
                             <div className="mt-1 text-xl font-semibold flex-grow text-pk-content-primary">
-                                Pay-as-you-go
+                                Gitpod is now Ona (
+                                <a
+                                    href="https://ona.com/stories/gitpod-is-now-ona"
+                                    target="_blank"
+                                    rel="noreferrer"
+                                    className="!underline hover:!no-underline !gp-link"
+                                >
+                                    learn more
+                                </a>
+                                )
                             </div>
                             <div className="mt-4 flex space-x-1 text-pk-content-tertiary">
                                 <div className="flex flex-col">
-                                    <span>{priceInformation}</span>
+                                    <span>
+                                        All you loved in Gitpod Classic and more: Parallel coding agents with full VS
+                                        Code in browser. Each runs in its own sandbox, fire off many at once and handoff
+                                        to web or desktop IDE, even start on mobile. Gitpod Classic sunsets Oct 15 -
+                                        migrate in September and get $100 Core credits.
+                                    </span>
                                 </div>
                             </div>
                             <div className="flex justify-end mt-6 space-x-2">
@@ -335,9 +334,10 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
                                         </Button>
                                     </a>
                                 )}
-                                <LoadingButton loading={createPaymentIntent.isLoading} onClick={handleAddPaymentMethod}>
-                                    Upgrade Plan
-                                </LoadingButton>
+
+                                <a href="https://app.ona.com" target="_blank" rel="noreferrer">
+                                    <Button variant="default">Try Ona ↗</Button>
+                                </a>
                             </div>
                         </div>
                     </>

From 2aff536ce1368b61c8ddfd36bbf0c9b625e3d2a4 Mon Sep 17 00:00:00 2001
From: Siddhant Khare <siddhant@gitpod.io>
Date: Fri, 12 Sep 2025 17:00:30 +0000
Subject: [PATCH 2/3] add req. line breaks

---
 .../dashboard/src/components/UsageBasedBillingConfig.tsx     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/dashboard/src/components/UsageBasedBillingConfig.tsx b/components/dashboard/src/components/UsageBasedBillingConfig.tsx
index 1a3d9593b07511..2be921d468c13a 100644
--- a/components/dashboard/src/components/UsageBasedBillingConfig.tsx
+++ b/components/dashboard/src/components/UsageBasedBillingConfig.tsx
@@ -321,8 +321,9 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
                                     <span>
                                         All you loved in Gitpod Classic and more: Parallel coding agents with full VS
                                         Code in browser. Each runs in its own sandbox, fire off many at once and handoff
-                                        to web or desktop IDE, even start on mobile. Gitpod Classic sunsets Oct 15 -
-                                        migrate in September and get $100 Core credits.
+                                        to web or desktop IDE, even start on mobile. <br />
+                                        <br /> Gitpod Classic sunsets Oct 15 - migrate in September and get $100 Core
+                                        credits.
                                     </span>
                                 </div>
                             </div>

From bbbc1727ad22dabf862040f9cfbfb98b8f92d12a Mon Sep 17 00:00:00 2001
From: Siddhant Khare <siddhant@gitpod.io>
Date: Mon, 15 Sep 2025 13:32:07 +0530
Subject: [PATCH 3/3] Fix typo in UsageBasedBillingConfig message

---
 components/dashboard/src/components/UsageBasedBillingConfig.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/dashboard/src/components/UsageBasedBillingConfig.tsx b/components/dashboard/src/components/UsageBasedBillingConfig.tsx
index 2be921d468c13a..2d601dae8d759d 100644
--- a/components/dashboard/src/components/UsageBasedBillingConfig.tsx
+++ b/components/dashboard/src/components/UsageBasedBillingConfig.tsx
@@ -322,7 +322,7 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
                                         All you loved in Gitpod Classic and more: Parallel coding agents with full VS
                                         Code in browser. Each runs in its own sandbox, fire off many at once and handoff
                                         to web or desktop IDE, even start on mobile. <br />
-                                        <br /> Gitpod Classic sunsets Oct 15 - migrate in September and get $100 Core
+                                        <br /> Gitpod Classic sunsets Oct 15 - migrate in September and get $100 in
                                         credits.
                                     </span>
                                 </div>