3 files changed, 66 insertions, 16 deletions
diff --git a/packages/ui/src/components/bottom-bar.tsx b/packages/ui/src/components/bottom-bar.tsx
index 5489675..0710c3a 100644
--- a/packages/ui/src/components/bottom-bar.tsx
+++ b/packages/ui/src/components/bottom-bar.tsx
@@ -6,7 +6,6 @@ import { listInstalledVersions, startGame } from "@/client";
 import { cn } from "@/lib/utils";
 import { useAuthStore } from "@/models/auth";
 import { useInstanceStore } from "@/models/instance";
-import { useGameStore } from "@/stores/game-store";
 import { LoginModal } from "./login-modal";
 import { Button } from "./ui/button";
 import {
@@ -26,7 +25,6 @@ interface InstalledVersion {
 
 export function BottomBar() {
   const authStore = useAuthStore();
-  const gameStore = useGameStore();
   const instancesStore = useInstanceStore();
 
   const [isLaunched, setIsLaunched] = useState<boolean>(false);
@@ -51,24 +49,18 @@ export function BottomBar() {
       const versions = await listInstalledVersions(
         instancesStore.activeInstance.id,
       );
-
-      const installed = versions || [];
-      setInstalledVersions(installed);
+      setInstalledVersions(versions);
 
       // If no version is selected but we have installed versions, select the first one
-      if (!gameStore.selectedVersion && installed.length > 0) {
-        gameStore.setSelectedVersion(installed[0].id);
+      if (!selectedVersion && versions.length > 0) {
+        setSelectedVersion(versions[0].id);
       }
     } catch (error) {
       console.error("Failed to load installed versions:", error);
     } finally {
       setIsLoadingVersions(false);
     }
-  }, [
-    instancesStore.activeInstance,
-    gameStore.selectedVersion,
-    gameStore.setSelectedVersion,
-  ]);
+  }, [instancesStore.activeInstance, selectedVersion]);
 
   useEffect(() => {
     loadInstalledVersions();
@@ -225,6 +217,7 @@ export function BottomBar() {
             </div>
 
             <Select
+              value={selectedVersion}
               items={versionOptions}
               onValueChange={setSelectedVersion}
               disabled={isLoadingVersions}
@@ -238,7 +231,7 @@ export function BottomBar() {
                   }
                 />
               </SelectTrigger>
-              <SelectContent>
+              <SelectContent alignItemWithTrigger={false}>
                 <SelectGroup>
                   {versionOptions.map((item) => (
                     <SelectItem
diff --git a/packages/ui/src/components/sidebar.tsx b/packages/ui/src/components/sidebar.tsx
index 0147b0a..d81156f 100644
--- a/packages/ui/src/components/sidebar.tsx
+++ b/packages/ui/src/components/sidebar.tsx
@@ -49,12 +49,33 @@ function NavItem({ Icon, label, to }: NavItemProps) {
 export function Sidebar() {
   const authStore = useAuthStore();
 
+  const renderUserAvatar = () => {
+    return (
+      <div className="w-full flex flex-col items-center hover:bg-accent/90 transition-colors cursor-pointer">
+        <div className="lg:hidden">
+          <UserAvatar />
+        </div>
+        <div className="w-full hidden lg:flex bg-accent/90 p-3 flex-row space-x-3">
+          <UserAvatar />
+          <div className="">
+            <p className="text-sm font-medium text-white">
+              {authStore.account?.username}
+            </p>
+            <p className="text-xs text-zinc-400">
+              {authStore.account?.type === "microsoft" ? "Online" : "Offline"}
+            </p>
+          </div>
+        </div>
+      </div>
+    );
+  };
+
   return (
     <aside
       className={cn(
         "flex flex-col items-center lg:items-start",
         "bg-sidebar transition-all duration-300",
-        "w-20 lg:w-64 shrink-0 py-6 h-full",
+        "w-20 lg:w-64 shrink-0 pt-6 pb-6 lg:pb-3 h-full",
       )}
     >
       {/* Logo Area */}
@@ -162,9 +183,9 @@ export function Sidebar() {
         <NavItem Icon={Settings} label="Settings" to="/settings" />
       </nav>
 
-      <div className="flex-1 flex flex-col justify-end">
+      <div className="w-full lg:px-3 flex-1 flex flex-col justify-end">
         <DropdownMenu>
-          <DropdownMenuTrigger render={<UserAvatar />}>
+          <DropdownMenuTrigger render={renderUserAvatar()} className="w-full">
             Open
           </DropdownMenuTrigger>
           <DropdownMenuContent align="end" side="right" sideOffset={20}>
diff --git a/packages/ui/src/components/ui/radio-group.tsx b/packages/ui/src/components/ui/radio-group.tsx
new file mode 100644
index 0000000..d8b39dd
--- /dev/null
+++ b/packages/ui/src/components/ui/radio-group.tsx
@@ -0,0 +1,36 @@
+import { Radio as RadioPrimitive } from "@base-ui/react/radio"
+import { RadioGroup as RadioGroupPrimitive } from "@base-ui/react/radio-group"
+
+import { cn } from "@/lib/utils"
+
+function RadioGroup({ className, ...props }: RadioGroupPrimitive.Props) {
+  return (
+    <RadioGroupPrimitive
+      data-slot="radio-group"
+      className={cn("grid w-full gap-2", className)}
+      {...props}
+    />
+  )
+}
+
+function RadioGroupItem({ className, ...props }: RadioPrimitive.Root.Props) {
+  return (
+    <RadioPrimitive.Root
+      data-slot="radio-group-item"
+      className={cn(
+        "border-input dark:bg-input/30 data-checked:bg-primary data-checked:text-primary-foreground dark:data-checked:bg-primary data-checked:border-primary aria-invalid:aria-checked:border-primary aria-invalid:border-destructive focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 dark:aria-invalid:border-destructive/50 group/radio-group-item peer relative flex aspect-square size-4 shrink-0 rounded-full border outline-none after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:ring-3 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:ring-3",
+        className
+      )}
+      {...props}
+    >
+      <RadioPrimitive.Indicator
+        data-slot="radio-group-indicator"
+        className="flex size-4 items-center justify-center"
+      >
+        <span className="bg-primary-foreground absolute top-1/2 left-1/2 size-2 -translate-x-1/2 -translate-y-1/2 rounded-full" />
+      </RadioPrimitive.Indicator>
+    </RadioPrimitive.Root>
+  )
+}
+
+export { RadioGroup, RadioGroupItem }