From b53ae993f147be94711ac5869197ac63bab88ac6 Mon Sep 17 00:00:00 2001
From: Matt Rubens <mrubens@users.noreply.github.com>
Date: Fri, 20 Jun 2025 15:07:00 -0400
Subject: [PATCH] Display the organization image in the account view

---
 packages/cloud/src/AuthService.ts             |  1 +
 packages/types/src/cloud.ts                   |  1 +
 .../src/components/account/AccountView.tsx    | 19 ++++++++++++++-----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/cloud/src/AuthService.ts b/packages/cloud/src/AuthService.ts
index b3b2c02ecd..7baa95aa14 100644
--- a/packages/cloud/src/AuthService.ts
+++ b/packages/cloud/src/AuthService.ts
@@ -488,6 +488,7 @@ export class AuthService extends EventEmitter<AuthServiceEvents> {
 					userInfo.organizationId = organization.id
 					userInfo.organizationName = organization.name
 					userInfo.organizationRole = primaryOrgMembership.role
+					userInfo.organizationImageUrl = organization.image_url
 				}
 			}
 		} catch (error) {
diff --git a/packages/types/src/cloud.ts b/packages/types/src/cloud.ts
index fbe7a3b658..dc5ef439dc 100644
--- a/packages/types/src/cloud.ts
+++ b/packages/types/src/cloud.ts
@@ -13,6 +13,7 @@ export interface CloudUserInfo {
 	organizationId?: string
 	organizationName?: string
 	organizationRole?: string
+	organizationImageUrl?: string
 }
 
 /**
diff --git a/webview-ui/src/components/account/AccountView.tsx b/webview-ui/src/components/account/AccountView.tsx
index 04d6cb7d2b..a59ac716d7 100644
--- a/webview-ui/src/components/account/AccountView.tsx
+++ b/webview-ui/src/components/account/AccountView.tsx
@@ -41,15 +41,24 @@ export const AccountView = ({ userInfo, isAuthenticated, onDone }: AccountViewPr
 									</div>
 								)}
 							</div>
-							<h2 className="text-lg font-medium text-vscode-foreground mb-1">
+							<h2 className="text-lg font-medium text-vscode-foreground mb-0">
 								{userInfo?.name || t("account:unknownUser")}
 							</h2>
+							{userInfo?.email && (
+								<p className="text-sm text-vscode-descriptionForeground">{userInfo?.email}</p>
+							)}
 							{userInfo?.organizationName && (
-								<p className="text-sm text-vscode-descriptionForeground mb-1">
-									{userInfo.organizationName}
-								</p>
+								<div className="flex items-center gap-2 text-sm text-vscode-descriptionForeground">
+									{userInfo.organizationImageUrl && (
+										<img
+											src={userInfo.organizationImageUrl}
+											alt={userInfo.organizationName}
+											className="w-4 h-4 rounded object-cover"
+										/>
+									)}
+									<span>{userInfo.organizationName}</span>
+								</div>
 							)}
-							<p className="text-sm text-vscode-descriptionForeground">{userInfo?.email || ""}</p>
 						</div>
 					)}
 					<div className="flex flex-col gap-2 mt-4">