From 35f9ccdf5cefc9068936868bc561995fe4c531d7 Mon Sep 17 00:00:00 2001
From: Joshen Lim <joshenlimek@gmail.com>
Date: Wed, 29 Mar 2023 01:49:14 +0800
Subject: [PATCH 1/3] Show exact app version in db upgrade modal

---
 .../ProjectUpgradeAlert/ProjectUpgradeAlert.tsx       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert/ProjectUpgradeAlert.tsx b/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert/ProjectUpgradeAlert.tsx
index 559e60eaafa..c20ced8f37f 100644
--- a/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert/ProjectUpgradeAlert.tsx
+++ b/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert/ProjectUpgradeAlert.tsx
@@ -32,6 +32,8 @@ const ProjectUpgradeAlert: FC<Props> = ({}) => {
   const currentPgVersion = (data?.current_app_version ?? '').split('supabase-postgres-')[1]
   const latestPgVersion = (data?.latest_app_version ?? '').split('supabase-postgres-')[1]
 
+  console.log(data)
+
   const initialValues = { version: data?.target_upgrade_versions?.[0]?.postgres_version ?? 0 }
 
   const onConfirmUpgrade = async (values: any, { setSubmitting }: any) => {
@@ -79,6 +81,10 @@ const ProjectUpgradeAlert: FC<Props> = ({}) => {
       >
         <Form id={formId} initialValues={initialValues} onSubmit={onConfirmUpgrade}>
           {({ values, isSubmitting }: { values: any; isSubmitting: boolean }) => {
+            const selectedVersion = (data?.target_upgrade_versions ?? []).find(
+              (x) => x.postgres_version === values.version
+            )
+
             return (
               <>
                 <div className="py-6">
@@ -130,7 +136,10 @@ const ProjectUpgradeAlert: FC<Props> = ({}) => {
                         id="version"
                         name="version"
                         label="Select the version of Postgres to upgrade to"
-                        descriptionText={`Postgres will be upgraded from ${currentPgVersion} to ${values.version}`}
+                        descriptionText={`Postgres will be upgraded from ${currentPgVersion} to ${
+                          selectedVersion?.app_version?.split('supabase-postgres-')[1] ??
+                          values.version
+                        }`}
                       >
                         {data?.target_upgrade_versions.map((version) => (
                           <Listbox.Option

From 7df295bc3f66285949c2adceb09c9f76e56f7499 Mon Sep 17 00:00:00 2001
From: Joshen Lim <joshenlimek@gmail.com>
Date: Wed, 29 Mar 2023 01:52:35 +0800
Subject: [PATCH 2/3] Remove logs

---
 .../Infrastructure/ProjectUpgradeAlert/ProjectUpgradeAlert.tsx  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert/ProjectUpgradeAlert.tsx b/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert/ProjectUpgradeAlert.tsx
index c20ced8f37f..453770469a2 100644
--- a/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert/ProjectUpgradeAlert.tsx
+++ b/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert/ProjectUpgradeAlert.tsx
@@ -32,8 +32,6 @@ const ProjectUpgradeAlert: FC<Props> = ({}) => {
   const currentPgVersion = (data?.current_app_version ?? '').split('supabase-postgres-')[1]
   const latestPgVersion = (data?.latest_app_version ?? '').split('supabase-postgres-')[1]
 
-  console.log(data)
-
   const initialValues = { version: data?.target_upgrade_versions?.[0]?.postgres_version ?? 0 }
 
   const onConfirmUpgrade = async (values: any, { setSubmitting }: any) => {

From 9d11fd94d6d1682231e3be90988a3074684e553f Mon Sep 17 00:00:00 2001
From: Joshen Lim <joshenlimek@gmail.com>
Date: Wed, 29 Mar 2023 12:15:18 +0800
Subject: [PATCH 3/3] Remove ALPHA label for webhooks

---
 studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts b/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts
index 8ea9c65ca30..a84b0c0af8b 100644
--- a/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts
+++ b/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts
@@ -59,7 +59,6 @@ export const generateDatabaseMenu = (project?: Project): ProductMenuGroup[] => {
                 key: 'wrappers',
                 url: `/project/${ref}/database/wrappers`,
                 items: [],
-                label: 'ALPHA',
               },
             ]
           : []),