From 2e8f9cc1e7666dcaacd4d329f62f355fa8cc1bca Mon Sep 17 00:00:00 2001
From: McKayla Washburn <mckayla@hey.com>
Date: Mon, 18 Nov 2024 18:12:08 +0000
Subject: [PATCH 1/5] fix: use `ExternalImage` for external auth providers

---
 .../ExternalAuthPage/ExternalAuthPageView.tsx               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
index b0f6fbf581d2a..c5d01feec6795 100644
--- a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
+++ b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
@@ -20,8 +20,8 @@ import type {
 	ListUserExternalAuthResponse,
 } from "api/typesGenerated";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
-import { Avatar } from "components/Avatar/Avatar";
 import { AvatarData } from "components/AvatarData/AvatarData";
+import { ExternalImage } from "components/ExternalImage/ExternalImage";
 import { Loader } from "components/Loader/Loader";
 import {
 	MoreMenu,
@@ -152,9 +152,9 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
 		: (link?.authenticated ?? false);
 
 	let avatar = app.display_icon ? (
-		<Avatar src={app.display_icon} variant="square" fitImage size="sm" />
+		<ExternalImage src={app.display_icon} variant="square" fitImage size="sm" />
 	) : (
-		<Avatar>{name}</Avatar>
+		<ExternalImage>{name}</ExternalImage>
 	);
 
 	// If the link is authenticated and has a refresh token, show that it will automatically

From cb4b22227a30ba825112e48ba0e70f57fcf62d25 Mon Sep 17 00:00:00 2001
From: McKayla Washburn <mckayla@hey.com>
Date: Fri, 22 Nov 2024 16:38:01 +0000
Subject: [PATCH 2/5] :)

---
 .../ExternalAuthPage/ExternalAuthPageView.tsx                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
index c5d01feec6795..c8d94ce082598 100644
--- a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
+++ b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
@@ -20,6 +20,7 @@ import type {
 	ListUserExternalAuthResponse,
 } from "api/typesGenerated";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
+import { Avatar } from "components/Avatar/Avatar";
 import { AvatarData } from "components/AvatarData/AvatarData";
 import { ExternalImage } from "components/ExternalImage/ExternalImage";
 import { Loader } from "components/Loader/Loader";
@@ -152,9 +153,9 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
 		: (link?.authenticated ?? false);
 
 	let avatar = app.display_icon ? (
-		<ExternalImage src={app.display_icon} variant="square" fitImage size="sm" />
+		<ExternalImage src={app.display_icon} size="sm" />
 	) : (
-		<ExternalImage>{name}</ExternalImage>
+		<Avatar>{name}</Avatar>
 	);
 
 	// If the link is authenticated and has a refresh token, show that it will automatically

From 440561d4b3c509f8562de1c1acb6bec88e7427c2 Mon Sep 17 00:00:00 2001
From: McKayla Washburn <mckayla@hey.com>
Date: Fri, 22 Nov 2024 18:21:35 +0000
Subject: [PATCH 3/5] I'm silly

---
 .../UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
index c8d94ce082598..b2b83ff3c17cd 100644
--- a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
+++ b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
@@ -153,7 +153,7 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
 		: (link?.authenticated ?? false);
 
 	let avatar = app.display_icon ? (
-		<ExternalImage src={app.display_icon} size="sm" />
+		<ExternalImage src={app.display_icon} />
 	) : (
 		<Avatar>{name}</Avatar>
 	);

From f8f1fb85c2532002e852c5a1847db67b3aad47cc Mon Sep 17 00:00:00 2001
From: McKayla Washburn <mckayla@hey.com>
Date: Fri, 22 Nov 2024 21:41:52 +0000
Subject: [PATCH 4/5] ok this looks good

---
 .../ExternalAuthPage/ExternalAuthPageView.tsx                | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
index b2b83ff3c17cd..e422b5834af5b 100644
--- a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
+++ b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
@@ -20,9 +20,8 @@ import type {
 	ListUserExternalAuthResponse,
 } from "api/typesGenerated";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
-import { Avatar } from "components/Avatar/Avatar";
+import { Avatar, ExternalAvatar } from "components/Avatar/Avatar";
 import { AvatarData } from "components/AvatarData/AvatarData";
-import { ExternalImage } from "components/ExternalImage/ExternalImage";
 import { Loader } from "components/Loader/Loader";
 import {
 	MoreMenu,
@@ -153,7 +152,7 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
 		: (link?.authenticated ?? false);
 
 	let avatar = app.display_icon ? (
-		<ExternalImage src={app.display_icon} />
+		<ExternalAvatar src={app.display_icon} variant="square" fitImage />
 	) : (
 		<Avatar>{name}</Avatar>
 	);

From d0673763af2f13a489238baf66119438917e76b0 Mon Sep 17 00:00:00 2001
From: McKayla Washburn <mckayla@hey.com>
Date: Fri, 22 Nov 2024 22:01:13 +0000
Subject: [PATCH 5/5] but small still

---
 .../ExternalAuthPage/ExternalAuthPageView.tsx              | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
index e422b5834af5b..cb3334a9a8bf0 100644
--- a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
+++ b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
@@ -152,7 +152,12 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
 		: (link?.authenticated ?? false);
 
 	let avatar = app.display_icon ? (
-		<ExternalAvatar src={app.display_icon} variant="square" fitImage />
+		<ExternalAvatar
+			src={app.display_icon}
+			size="sm"
+			variant="square"
+			fitImage
+		/>
 	) : (
 		<Avatar>{name}</Avatar>
 	);