From 15dbabdf016672250ed4120f0550d8100fdb6863 Mon Sep 17 00:00:00 2001
From: Siddhant Khare <siddhant@gitpod.io>
Date: Sat, 23 Sep 2023 19:15:23 +0000
Subject: [PATCH 1/2] Retrieve & Copy Org Id in Org settings

---
 components/dashboard/src/teams/TeamSettings.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/components/dashboard/src/teams/TeamSettings.tsx b/components/dashboard/src/teams/TeamSettings.tsx
index e139e341f6ba34..1b1f6c228e0823 100644
--- a/components/dashboard/src/teams/TeamSettings.tsx
+++ b/components/dashboard/src/teams/TeamSettings.tsx
@@ -24,6 +24,7 @@ import { OrgSettingsPage } from "./OrgSettingsPage";
 import { useDefaultWorkspaceImageQuery } from "../data/workspaces/default-workspace-image-query";
 import Modal, { ModalBody, ModalFooter, ModalHeader } from "../components/Modal";
 import { InputField } from "../components/forms/InputField";
+import { InputWithCopy } from "../components/InputWithCopy";
 import { ReactComponent as Stack } from "../icons/Stack.svg";
 
 export default function TeamSettingsPage() {
@@ -204,6 +205,12 @@ function OrgSettingsForm(props: { org?: OrganizationInfo }) {
                 // handleUpdateTeamSettings({ defaultWorkspaceImage });
             }}
         >
+            {props.org && (
+                <InputField label="Organization ID">
+                    <InputWithCopy value={props.org.id} tip="Copy Org ID" />
+                </InputField>
+            )}
+
             <Heading2 className="pt-12">Collaboration & Sharing</Heading2>
 
             {updateTeamSettings.isError && (

From 02422f490094cf47c6f9d00f52f6ec59c3389664 Mon Sep 17 00:00:00 2001
From: Siddhant Khare <siddhant@gitpod.io>
Date: Mon, 25 Sep 2023 12:15:59 +0530
Subject: [PATCH 2/2] tip text fix

Co-authored-by: George Tsiolis <tsiolis.g@gmail.com>
---
 components/dashboard/src/teams/TeamSettings.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/dashboard/src/teams/TeamSettings.tsx b/components/dashboard/src/teams/TeamSettings.tsx
index 1b1f6c228e0823..f67711a39f916e 100644
--- a/components/dashboard/src/teams/TeamSettings.tsx
+++ b/components/dashboard/src/teams/TeamSettings.tsx
@@ -207,7 +207,7 @@ function OrgSettingsForm(props: { org?: OrganizationInfo }) {
         >
             {props.org && (
                 <InputField label="Organization ID">
-                    <InputWithCopy value={props.org.id} tip="Copy Org ID" />
+                    <InputWithCopy value={props.org.id} tip="Copy Organization ID" />
                 </InputField>
             )}