Revert "Unify workspace dropdowns; Update layouts (#458)"

This reverts commit 4bc8448a1d.

packages/features/team-accounts/src/components/members/membership-role-selector.tsx

@@ -19,7 +19,7 @@ export function MembershipRoleSelector({
   roles: Role[];
   value: Role;
   currentUserRole?: Role;
-  onChange: (role: Role | null) => unknown;
+  onChange: (role: Role) => unknown;
   triggerClassName?: string;
 }) {
   return (
@@ -28,15 +28,7 @@ export function MembershipRoleSelector({
         className={triggerClassName}
         data-test={'role-selector-trigger'}
       >
-        <SelectValue>
-          {(value) =>
-            value ? (
-              <Trans i18nKey={`common.roles.${value}.label`} defaults={value} />
-            ) : (
-              ''
-            )
-          }
-        </SelectValue>
+        <SelectValue />
       </SelectTrigger>
 
       <SelectContent>
@@ -49,7 +41,7 @@ export function MembershipRoleSelector({
               value={role}
             >
               <span className={'text-sm capitalize'}>
-                <Trans i18nKey={`common.roles.${role}.label`} defaults={role} />
+                <Trans i18nKey={`common:roles.${role}.label`} defaults={role} />
               </span>
             </SelectItem>
           );