From 730e0ea56526f3ceeb82253f91fa2c047c3b293b Mon Sep 17 00:00:00 2001
From: ogzhanolguncu <ogzhan11@gmail.com>
Date: Fri, 11 Jul 2025 15:50:27 +0300
Subject: [PATCH 1/2] fix: chevron being outside of button

---
 .../app/(app)/settings/team/role-switcher.tsx | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/apps/dashboard/app/(app)/settings/team/role-switcher.tsx b/apps/dashboard/app/(app)/settings/team/role-switcher.tsx
index 8660faec2d..2336a87e4d 100644
--- a/apps/dashboard/app/(app)/settings/team/role-switcher.tsx
+++ b/apps/dashboard/app/(app)/settings/team/role-switcher.tsx
@@ -1,6 +1,10 @@
 "use client";
 
-import type { AuthenticatedUser, Membership, Organization } from "@/lib/auth/types";
+import type {
+  AuthenticatedUser,
+  Membership,
+  Organization,
+} from "@/lib/auth/types";
 import { trpc } from "@/lib/trpc/client";
 import {
   Loading,
@@ -57,26 +61,35 @@ export const RoleSwitcher = memo<RoleSwitcherProps>(
 
     if (isAdmin) {
       return (
-        <Select
-          value={role}
-          disabled={(Boolean(user) && member.id === user?.id) || updateMember.isLoading}
-          onValueChange={handleRoleUpdate}
-        >
-          <SelectTrigger className="w-[180px] max-sm:w-36">
-            {updateMember.isLoading ? <Loading /> : <SelectValue />}
-          </SelectTrigger>
-          <SelectContent>
-            <SelectGroup>
-              <SelectItem value="admin">Admin</SelectItem>
-              <SelectItem value="basic_member">Member</SelectItem>
-            </SelectGroup>
-          </SelectContent>
-        </Select>
+        <div className="w-fit">
+          <Select
+            value={role}
+            disabled={
+              (Boolean(user) && member.id === user?.id) ||
+              updateMember.isLoading
+            }
+            onValueChange={handleRoleUpdate}
+          >
+            <SelectTrigger className="w-[180px] max-sm:w-36">
+              {updateMember.isLoading ? <Loading /> : <SelectValue />}
+            </SelectTrigger>
+            <SelectContent>
+              <SelectGroup>
+                <SelectItem value="admin">Admin</SelectItem>
+                <SelectItem value="basic_member">Member</SelectItem>
+              </SelectGroup>
+            </SelectContent>
+          </Select>
+        </div>
       );
     }
 
-    return <span className="text-content">{role === "admin" ? "Admin" : "Member"}</span>;
-  },
+    return (
+      <span className="text-content">
+        {role === "admin" ? "Admin" : "Member"}
+      </span>
+    );
+  }
 );
 
 RoleSwitcher.displayName = "RoleSwitcher";

From 7ffa279f007069f12c0582ee63df068fd01cb738 Mon Sep 17 00:00:00 2001
From: ogzhanolguncu <ogzhan11@gmail.com>
Date: Fri, 11 Jul 2025 15:53:09 +0300
Subject: [PATCH 2/2] chore: fmt

---
 .../app/(app)/settings/team/role-switcher.tsx | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/apps/dashboard/app/(app)/settings/team/role-switcher.tsx b/apps/dashboard/app/(app)/settings/team/role-switcher.tsx
index 2336a87e4d..6c9b9fd69e 100644
--- a/apps/dashboard/app/(app)/settings/team/role-switcher.tsx
+++ b/apps/dashboard/app/(app)/settings/team/role-switcher.tsx
@@ -1,10 +1,6 @@
 "use client";
 
-import type {
-  AuthenticatedUser,
-  Membership,
-  Organization,
-} from "@/lib/auth/types";
+import type { AuthenticatedUser, Membership, Organization } from "@/lib/auth/types";
 import { trpc } from "@/lib/trpc/client";
 import {
   Loading,
@@ -64,10 +60,7 @@ export const RoleSwitcher = memo<RoleSwitcherProps>(
         <div className="w-fit">
           <Select
             value={role}
-            disabled={
-              (Boolean(user) && member.id === user?.id) ||
-              updateMember.isLoading
-            }
+            disabled={(Boolean(user) && member.id === user?.id) || updateMember.isLoading}
             onValueChange={handleRoleUpdate}
           >
             <SelectTrigger className="w-[180px] max-sm:w-36">
@@ -84,12 +77,8 @@ export const RoleSwitcher = memo<RoleSwitcherProps>(
       );
     }
 
-    return (
-      <span className="text-content">
-        {role === "admin" ? "Admin" : "Member"}
-      </span>
-    );
-  }
+    return <span className="text-content">{role === "admin" ? "Admin" : "Member"}</span>;
+  },
 );
 
 RoleSwitcher.displayName = "RoleSwitcher";