From 8b0df6edb0fde27beecd843ce3d1fca384646a49 Mon Sep 17 00:00:00 2001
From: Calvin Yau <calvin.yau@sentry.io>
Date: Fri, 3 Jan 2025 01:46:27 -0800
Subject: [PATCH 1/2] Appless non-PAT org dropdown clarity changes

---
 .../ContextSwitcher/ContextSwitcher.test.jsx  |  8 ++++++--
 src/ui/ContextSwitcher/ContextSwitcher.tsx    | 20 ++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/ui/ContextSwitcher/ContextSwitcher.test.jsx b/src/ui/ContextSwitcher/ContextSwitcher.test.jsx
index dc7cbeffbb..4fe6fc53f7 100644
--- a/src/ui/ContextSwitcher/ContextSwitcher.test.jsx
+++ b/src/ui/ContextSwitcher/ContextSwitcher.test.jsx
@@ -290,7 +290,9 @@ describe('ContextSwitcher', () => {
         { wrapper: wrapper() }
       )
 
-      const installCopy = await screen.findByText(/Install Codecov GitHub app/)
+      const installCopy = await screen.findByText(
+        /To add another organization, install Codecov GitHub App/
+      )
       expect(installCopy).toBeInTheDocument()
       expect(installCopy).toHaveAttribute(
         'href',
@@ -761,7 +763,9 @@ describe('ContextSwitcher', () => {
         }
       )
 
-      const installCopy = await screen.findByText(/Install Codecov GitHub app/)
+      const installCopy = await screen.findByText(
+        /To add another organization, install Codecov GitHub App/
+      )
       expect(installCopy).toBeInTheDocument()
       expect(installCopy).toHaveAttribute(
         'href',
diff --git a/src/ui/ContextSwitcher/ContextSwitcher.tsx b/src/ui/ContextSwitcher/ContextSwitcher.tsx
index d022970e9b..cedcef6148 100644
--- a/src/ui/ContextSwitcher/ContextSwitcher.tsx
+++ b/src/ui/ContextSwitcher/ContextSwitcher.tsx
@@ -43,6 +43,7 @@ interface ContextItemProps {
     owner: { username: string | null } | null
     pageName: string
   }
+  currentUserUsername: string | null
   defaultOrgUsername: string | null
   setToggle: (arg: boolean) => void
   owner?: string
@@ -50,6 +51,7 @@ interface ContextItemProps {
 
 function ContextItem({
   context,
+  currentUserUsername,
   defaultOrgUsername,
   setToggle,
   owner,
@@ -77,7 +79,9 @@ function ContextItem({
       >
         <Avatar user={contextOwner} />
         <div className={cs('mx-1', { 'font-semibold': owner === orgUsername })}>
-          {orgUsername}
+          {!!orgUsername && orgUsername === currentUserUsername
+            ? `${orgUsername}'s personal organization`
+            : orgUsername || ''}
         </div>
       </Button>
     </li>
@@ -142,6 +146,8 @@ export interface Props {
   contexts: Context[]
   currentUser: {
     defaultOrgUsername: string | null
+    username: string | null
+    avatarUrl: string
   }
   activeContext: {
     avatarUrl: string
@@ -169,6 +175,7 @@ function ContextSwitcher({
   const wrapperRef = useCloseOnLooseFocus({ setToggle })
   const intersectionRef = useLoadMore({ onLoadMore })
   const defaultOrgUsername = currentUser?.defaultOrgUsername
+  const currentUserUsername = currentUser?.username
 
   const isGh = providerToName(provider) === 'Github'
   const isSelfHosted = config.IS_SELF_HOSTED
@@ -177,6 +184,7 @@ function ContextSwitcher({
   // self-hosted cannot use default "codecov" app (must set up custom one)
   const shouldShowGitHubInstallLink =
     isGh && (isSelfHosted ? isCustomGitHubApp : true)
+  const displayUsername = activeContext?.username ?? owner
 
   return (
     <div id="context-switcher" className="relative text-sm" ref={wrapperRef}>
@@ -193,7 +201,12 @@ function ContextSwitcher({
         onClick={() => setToggle((toggle) => !toggle)}
       >
         <Avatar user={activeContext} />
-        <p className="ml-1">{activeContext?.username ?? owner}</p>
+        <p className="ml-1">
+          {displayUsername}
+          {displayUsername === currentUserUsername
+            ? "'s personal organization"
+            : ''}
+        </p>
         <span
           aria-hidden="true"
           className={cs('transition-transform', {
@@ -221,12 +234,13 @@ function ContextSwitcher({
               hook="context-switcher-gh-install-link"
             >
               <Icon name="plusCircle" />
-              Install Codecov GitHub app
+              To add another organization, install Codecov GitHub App
             </A>
           </li>
         ) : null}
         {contexts.map((context) => (
           <ContextItem
+            currentUserUsername={currentUserUsername}
             defaultOrgUsername={defaultOrgUsername}
             context={context}
             key={context?.owner?.username}

From 36c4e502346f4015104944559dc3150643662d9b Mon Sep 17 00:00:00 2001
From: Calvin Yau <calvin.yau@sentry.io>
Date: Wed, 8 Jan 2025 15:57:26 -0800
Subject: [PATCH 2/2] test: Add personal organization test

---
 src/ui/ContextSwitcher/ContextSwitcher.test.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ui/ContextSwitcher/ContextSwitcher.test.jsx b/src/ui/ContextSwitcher/ContextSwitcher.test.jsx
index 4fe6fc53f7..21ad18f10a 100644
--- a/src/ui/ContextSwitcher/ContextSwitcher.test.jsx
+++ b/src/ui/ContextSwitcher/ContextSwitcher.test.jsx
@@ -218,6 +218,7 @@ describe('ContextSwitcher', () => {
           ]}
           currentUser={{
             defaultOrgUsername: 'spotify',
+            username: 'laudna',
           }}
           src="imageUrl"
           isLoading={false}
@@ -232,7 +233,9 @@ describe('ContextSwitcher', () => {
       )
       await user.click(button)
 
-      const laudnaUsers = await screen.findAllByText('laudna')
+      const laudnaUsers = await screen.findAllByText(
+        "laudna's personal organization"
+      )
       expect(laudnaUsers.length).toBe(2)
 
       const codecovOwner = await screen.findByText('codecov')