From e548101dd59d5f655e6468a7b91d22ffffc9bc65 Mon Sep 17 00:00:00 2001
From: SeongHwan <epaktldk0203@gmail.com>
Date: Mon, 15 Jun 2026 03:01:02 +0900
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=EC=95=8C=EB=B0=94=EC=83=9D=20?=
 =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=ED=99=88=20=EA=B7=BC=EB=AC=B4=EC=A4=91?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B0=80=EA=B2=8C=20=EC=84=B9=EC=85=98=20=EC=A0=95?=
 =?UTF-8?q?=EB=A0=AC=20=ED=95=84=ED=84=B0=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/workspace/ui/WorkingStoresList.tsx   | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/src/features/user/home/workspace/ui/WorkingStoresList.tsx b/src/features/user/home/workspace/ui/WorkingStoresList.tsx
index f8d54c19..0b8ae292 100644
--- a/src/features/user/home/workspace/ui/WorkingStoresList.tsx
+++ b/src/features/user/home/workspace/ui/WorkingStoresList.tsx
@@ -7,9 +7,6 @@ import {
 
 interface WorkingStoresListProps {
   title?: string
-  sortLabelLeft?: string
-  sortLabelRight?: string
-  selectedSort?: 'left' | 'right'
   stores: WorkingStoreItem[]
   onMoreClick?: () => void
   onJoinWorkspaceClick?: () => void
@@ -17,9 +14,6 @@ interface WorkingStoresListProps {
 
 export function WorkingStoresList({
   title = '근무중인 가게',
-  sortLabelLeft = '이름 순',
-  sortLabelRight = '근무 예정 순',
-  selectedSort = 'right',
   stores,
   onMoreClick,
   onJoinWorkspaceClick,
@@ -30,23 +24,6 @@ export function WorkingStoresList({
     <section className="w-[358px] rounded-2xl bg-white py-6">
       <div className="flex items-center justify-between px-6">
         <h3 className="typography-headline01 text-text-100">{title}</h3>
-        <div className="flex items-center gap-1">
-          <p
-            className={`typography-body02-regular ${
-              selectedSort === 'left' ? 'text-text-90' : 'text-text-50'
-            }`}
-          >
-            {sortLabelLeft}
-          </p>
-          <p className="typography-body02-regular text-text-50">|</p>
-          <p
-            className={`typography-body02-semibold ${
-              selectedSort === 'right' ? 'text-text-90' : 'text-text-50'
-            }`}
-          >
-            {sortLabelRight}
-          </p>
-        </div>
       </div>
 
       <div className="mt-4">

From 63b6abb487c80b3147bf5184621698877a59602f Mon Sep 17 00:00:00 2001
From: SeongHwan <epaktldk0203@gmail.com>
Date: Mon, 15 Jun 2026 03:06:25 +0900
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=EB=8D=94=EB=B3=B4=EA=B8=B0=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EA=B0=80=204?=
 =?UTF-8?q?=EA=B0=9C=20=EC=9D=B4=EC=83=81=EC=9D=BC=EB=95=8C=EB=A7=8C=20?=
 =?UTF-8?q?=EB=82=98=ED=83=80=EB=82=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/user/home/workspace/ui/WorkingStoresList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/user/home/workspace/ui/WorkingStoresList.tsx b/src/features/user/home/workspace/ui/WorkingStoresList.tsx
index 0b8ae292..0a6101bf 100644
--- a/src/features/user/home/workspace/ui/WorkingStoresList.tsx
+++ b/src/features/user/home/workspace/ui/WorkingStoresList.tsx
@@ -38,7 +38,7 @@ export function WorkingStoresList({
       </div>
 
       <div className="mt-6 px-6">
-        <MoreButton onClick={onMoreClick} />
+        {stores.length >= 4 && <MoreButton onClick={onMoreClick} />}
         {onJoinWorkspaceClick ? (
           <button
             type="button"

From cb9a7a72bf5979768f459d291fa46a74269e55d9 Mon Sep 17 00:00:00 2001
From: SeongHwan <epaktldk0203@gmail.com>
Date: Mon, 15 Jun 2026 03:13:55 +0900
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=EA=B7=BC=EB=AC=B4=EC=A4=91?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B0=80=EA=B2=8C=20=EC=84=B9=EC=85=98=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=95=84=EC=9D=B4=ED=85=9C=20=ED=81=B4=EB=A6=AD?=
 =?UTF-8?q?=ED=95=98=EB=A9=B4=20=EC=83=81=EC=84=B8=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=EB=A1=9C=20=EB=84=98=EC=96=B4=EA=B0=80=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/workspace/ui/WorkingStoreCard.tsx    | 20 +++++++++++++++++--
 .../home/workspace/ui/WorkingStoresList.tsx   | 12 +++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/features/user/home/workspace/ui/WorkingStoreCard.tsx b/src/features/user/home/workspace/ui/WorkingStoreCard.tsx
index 78fddde9..6f33ab49 100644
--- a/src/features/user/home/workspace/ui/WorkingStoreCard.tsx
+++ b/src/features/user/home/workspace/ui/WorkingStoreCard.tsx
@@ -2,13 +2,29 @@ import { useWorkingStoreCardViewModel } from '@/features/user/home/workspace/hoo
 import type { WorkingStoreItem } from '@/features/user/home/workspace/types/workingStore'
 interface WorkingStoreCardProps {
   store: WorkingStoreItem
+  onClick?: () => void
 }
 
-export function WorkingStoreCard({ store }: WorkingStoreCardProps) {
+export function WorkingStoreCard({ store, onClick }: WorkingStoreCardProps) {
   const { dueText, nextWorkDate } = useWorkingStoreCardViewModel(store)
 
   return (
-    <div className="flex h-[72px] items-center px-6">
+    <div
+      role={onClick ? 'button' : undefined}
+      tabIndex={onClick ? 0 : undefined}
+      className={`flex h-[72px] items-center px-6${onClick ? ' cursor-pointer' : ''}`}
+      onClick={onClick}
+      onKeyDown={
+        onClick
+          ? e => {
+              if (e.key === 'Enter' || e.key === ' ') {
+                e.preventDefault()
+                onClick()
+              }
+            }
+          : undefined
+      }
+    >
       <div className="h-12 w-12 overflow-hidden rounded-[70px] bg-bg-dark">
         {store.thumbnailUrl ? (
           <img
diff --git a/src/features/user/home/workspace/ui/WorkingStoresList.tsx b/src/features/user/home/workspace/ui/WorkingStoresList.tsx
index 0a6101bf..bb2f8344 100644
--- a/src/features/user/home/workspace/ui/WorkingStoresList.tsx
+++ b/src/features/user/home/workspace/ui/WorkingStoresList.tsx
@@ -1,3 +1,4 @@
+import { useNavigate } from 'react-router-dom'
 import { MoreButton } from '@/shared/ui/common/MoreButton'
 import {
   WorkingStoreCard,
@@ -11,13 +12,13 @@ interface WorkingStoresListProps {
   onMoreClick?: () => void
   onJoinWorkspaceClick?: () => void
 }
-
 export function WorkingStoresList({
   title = '근무중인 가게',
   stores,
   onMoreClick,
   onJoinWorkspaceClick,
 }: WorkingStoresListProps) {
+  const navigate = useNavigate()
   const { visibleStores } = useWorkingStoresListViewModel(stores)
 
   return (
@@ -29,7 +30,14 @@ export function WorkingStoresList({
       <div className="mt-4">
         {visibleStores.map((store, index) => (
           <div key={store.workspaceId}>
-            <WorkingStoreCard store={store} />
+            <WorkingStoreCard
+              store={store}
+              onClick={() =>
+                navigate(`/user/workspace/${store.workspaceId}`, {
+                  state: { businessName: store.businessName },
+                })
+              }
+            />
             {index < visibleStores.length - 1 ? (
               <div className="mx-1 h-px bg-line-1" />
             ) : null}

From ca77e50e23fcd18ef70f94cbe2fd6859744ed5d3 Mon Sep 17 00:00:00 2001
From: SeongHwan <epaktldk0203@gmail.com>
Date: Mon, 15 Jun 2026 03:25:35 +0900
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=EA=B7=BC=EB=AC=B4=EC=A4=91=EC=9D=B8?=
 =?UTF-8?q?=20=EA=B0=80=EA=B2=8C=20=EC=83=81=EC=84=B8=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EA=B7=BC=EB=AC=B4=EC=9E=90=2011=EB=AA=85=20?=
 =?UTF-8?q?=EC=9D=B4=EC=83=81=EC=9D=BC=20=EB=95=8C=EB=A7=8C=20=EB=8D=94?=
 =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=82=98=ED=83=80?=
 =?UTF-8?q?=EB=82=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/user/workspace-detail/index.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/user/workspace-detail/index.tsx b/src/pages/user/workspace-detail/index.tsx
index 327cebfb..ab1fb37d 100644
--- a/src/pages/user/workspace-detail/index.tsx
+++ b/src/pages/user/workspace-detail/index.tsx
@@ -94,10 +94,7 @@ export function WorkspaceDetailPage() {
     hasMoreManagers,
     managersTotalCount
   )
-  const showWorkersLoadMore = shouldShowInfiniteListLoadMore(
-    hasMoreWorkers,
-    workersTotalCount
-  )
+  const showWorkersLoadMore = hasMoreWorkers && workersTotalCount >= 11
 
   return (
     <>

From ec0a34f104f666d041145b45ff3dbb0ff3f9eba0 Mon Sep 17 00:00:00 2001
From: SeongHwan <epaktldk0203@gmail.com>
Date: Mon, 15 Jun 2026 04:01:14 +0900
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20WorkerListItem=20=EC=BB=B4=ED=8F=AC?=
 =?UTF-8?q?=EB=84=8C=ED=8A=B8=EC=97=90=20ActionMenu=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=20=EB=B0=8F=20=EB=8C=80=ED=83=80=EC=9A=94=EC=B2=AD=20=EC=98=B5?=
 =?UTF-8?q?=EC=85=98=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/user/workspace-detail/index.tsx | 17 +++++++++---
 src/shared/ui/home/WorkerListItem.tsx     | 33 ++++++++++++++++-------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/pages/user/workspace-detail/index.tsx b/src/pages/user/workspace-detail/index.tsx
index ab1fb37d..47956b8b 100644
--- a/src/pages/user/workspace-detail/index.tsx
+++ b/src/pages/user/workspace-detail/index.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
-import { useParams, useLocation } from 'react-router-dom'
+import { useParams, useLocation, useNavigate } from 'react-router-dom'
 import { format, parseISO } from 'date-fns'
 import { Navbar } from '@/shared/ui/common/Navbar'
 import {
@@ -10,7 +10,9 @@ import {
   useWorkspaceScheduleViewModel,
 } from '@/features/user'
 import { shouldShowInfiniteListLoadMore } from '@/shared/lib/listLoadMoreVisibility'
+import { ROUTES } from '@/shared/constants/routes'
 import { WorkerListItem } from '@/shared/ui/home/WorkerListItem'
+import SubstituteIcon from '@/assets/icons/catppuccin_changelog.svg?react'
 import { ConfirmModal } from '@/shared/ui/common/ConfirmModal'
 import { useResignWorkspaceMutation } from '@/features/user/home/workspace/hooks/mutation/useResignWorkspaceMutation'
 import CrownIcon from '@/assets/icons/home/crown-solid.svg'
@@ -24,6 +26,7 @@ function formatNextShift(isoDate: string | null | undefined) {
 }
 
 export function WorkspaceDetailPage() {
+  const navigate = useNavigate()
   const { workspaceId } = useParams<{ workspaceId: string }>()
   const { state } = useLocation()
   const id = Number(workspaceId)
@@ -141,7 +144,6 @@ export function WorkspaceDetailPage() {
                       role={manager.positionDescription || manager.positionType}
                       variant="manager"
                       imageUrl={manager.profileImageUrl}
-                      onOptions={() => {}}
                     />
                   ))}
                 </div>
@@ -191,7 +193,16 @@ export function WorkspaceDetailPage() {
                       variant="worker"
                       nextWorkDate={formatNextShift(worker.nextShiftDateTime)}
                       imageUrl={worker.profileImageUrl}
-                      onOptions={() => {}}
+                      menuItems={[
+                        {
+                          icon: <SubstituteIcon width={20} height={20} />,
+                          label: '대타 요청',
+                          onClick: () =>
+                            navigate(ROUTES.USER.SUBSTITUTE_REQUEST, {
+                              state: { workspaceId: id },
+                            }),
+                        },
+                      ]}
                     />
                   ))}
                 </div>
diff --git a/src/shared/ui/home/WorkerListItem.tsx b/src/shared/ui/home/WorkerListItem.tsx
index 4161176d..b16b8808 100644
--- a/src/shared/ui/home/WorkerListItem.tsx
+++ b/src/shared/ui/home/WorkerListItem.tsx
@@ -1,5 +1,7 @@
+import { useState } from 'react'
 import { colors } from '@/shared/lib/tokens'
 import { Avatar } from '@/shared/ui/common/Avatar'
+import { ActionMenu, type ActionMenuItem } from '@/shared/ui/common/ActionMenu'
 
 export type WorkerVariant = 'manager' | 'worker'
 
@@ -9,7 +11,7 @@ export interface WorkerListItemProps {
   variant?: WorkerVariant
   nextWorkDate?: string
   imageUrl?: string | null
-  onOptions?: () => void
+  menuItems?: ActionMenuItem[]
 }
 
 export interface WorkerListItemData extends WorkerListItemProps {
@@ -39,8 +41,9 @@ export function WorkerListItem({
   variant = 'worker',
   nextWorkDate,
   imageUrl,
-  onOptions,
+  menuItems,
 }: WorkerListItemProps) {
+  const [isMenuOpen, setIsMenuOpen] = useState(false)
   const badgeBg = variant === 'manager' ? 'bg-main-700' : 'bg-main-300'
 
   return (
@@ -73,14 +76,24 @@ export function WorkerListItem({
         </div>
       </div>
 
-      <button
-        type="button"
-        onClick={onOptions}
-        className="shrink-0 rounded cursor-pointer"
-        aria-label="더보기"
-      >
-        <EllipsisIcon />
-      </button>
+      {menuItems && menuItems.length > 0 && (
+        <div className="relative">
+          <button
+            type="button"
+            onClick={() => setIsMenuOpen(true)}
+            className="shrink-0 rounded cursor-pointer"
+            aria-label="더보기"
+          >
+            <EllipsisIcon />
+          </button>
+          <ActionMenu
+            items={menuItems}
+            isOpen={isMenuOpen}
+            onClose={() => setIsMenuOpen(false)}
+            className="right-0 top-full mt-2"
+          />
+        </div>
+      )}
     </div>
   )
 }

From 73ade4fa505795f4feaf853d0d3d8a59175717f6 Mon Sep 17 00:00:00 2001
From: SeongHwan <epaktldk0203@gmail.com>
Date: Tue, 16 Jun 2026 22:34:45 +0900
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=EB=8C=80=ED=83=80=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/user/substitute-request/index.tsx | 38 +++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/pages/user/substitute-request/index.tsx b/src/pages/user/substitute-request/index.tsx
index 0d21a8a8..b04e40e8 100644
--- a/src/pages/user/substitute-request/index.tsx
+++ b/src/pages/user/substitute-request/index.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { useMutation, useQueryClient } from '@tanstack/react-query'
 import {
   useLocation,
@@ -42,6 +42,7 @@ type SubstituteRequestLocationState = {
   direction?: SubstituteDirectionTab
   directionTab?: SubstituteDirectionTab
   receivedDto?: ReceivedSubstituteRequestDto
+  workspaceId?: number
 }
 
 function parseDirectionTab(
@@ -129,6 +130,17 @@ export function SubstituteRequestPage() {
   })
 
   const handleOpenCreate = () => {
+    const preselected = locationState?.workspaceId
+      ? workspaces.find(w => w.workspaceId === locationState.workspaceId)
+      : undefined
+    if (preselected) {
+      setCreateFlow({
+        workspaceId: preselected.workspaceId,
+        storeName: preselected.businessName,
+        session: Date.now(),
+      })
+      return
+    }
     if (workspaces.length === 1) {
       const only = workspaces[0]!
       setCreateFlow({
@@ -141,6 +153,25 @@ export function SubstituteRequestPage() {
     setStorePickerOpen(true)
   }
 
+  const autoOpenedCreateRef = useRef(false)
+  useEffect(() => {
+    if (autoOpenedCreateRef.current) return
+    if (workspacesLoading || !locationState?.workspaceId) return
+    autoOpenedCreateRef.current = true
+    handleOpenCreate()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [workspacesLoading, locationState?.workspaceId])
+
+  const clearWorkspacePreselect = () => {
+    if (!locationState?.workspaceId) return
+    const rest = { ...locationState }
+    delete rest.workspaceId
+    navigate(location.pathname + location.search, {
+      replace: true,
+      state: rest,
+    })
+  }
+
   const handleStoreConfirm = (workspaceId: number, storeName: string) => {
     setStorePickerOpen(false)
     setCreateFlow({
@@ -270,7 +301,10 @@ export function SubstituteRequestPage() {
       {createFlow != null ? (
         <SubstituteRequestModalFlow
           key={createFlow.session}
-          onClose={() => setCreateFlow(null)}
+          onClose={() => {
+            setCreateFlow(null)
+            clearWorkspacePreselect()
+          }}
           storeName={createFlow.storeName}
           initialMonth={new Date()}
           workspaceId={createFlow.workspaceId}