Merge branch 'dev' of https://github.com/boostcampwm-2024/web33-boost…

…project into Hotfix/#252_블록에_한글_첫입력시_캐럿_튀는문제
boostcampwm-2024 · Dec 2, 2024 · bae223c · bae223c
2 parents b08914d + 5456b64
commit bae223c
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/client/src/components/sidebar/components/menuButton/MenuButton.tsx b/client/src/components/sidebar/components/menuButton/MenuButton.tsx
@@ -83,16 +83,22 @@ export const MenuButton = () => {
   };
   return (
     <>
-    <button
-      className={`${menuButtonContainer} menu_button_container`}
-      onClick={handleMenuClick}
-      data-onboarding="menu-button"
-    >
-      <button className={menuItemWrapper}>
-        <MenuIcon />
-        <p className={textBox}>{name ?? "Nocta"}</p>
+      <button
+        className={`${menuButtonContainer} menu_button_container`}
+        onClick={handleMenuClick}
+        data-onboarding="menu-button"
+      >
+        <button className={menuItemWrapper}>
+          <MenuIcon />
+          <p className={textBox}>{name ?? "Nocta"}</p>
+        </button>
+        <WorkspaceSelectModal isOpen={isOpen} userName={name} onInviteClick={openInviteModal} />
+        <InviteModal
+          isOpen={isInviteModalOpen}
+          onClose={closeInviteModal}
+          onInvite={handleInvite}
+        />
       </button>
-      <InviteModal isOpen={isInviteModalOpen} onClose={closeInviteModal} onInvite={handleInvite} />
     </>
   );
 };