diff --git a/feature/teacherschedule/src/androidTest/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleScreenRobot.kt b/feature/teacherschedule/src/androidTest/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleScreenRobot.kt
index 1c8af94c..dcbea6c5 100644
--- a/feature/teacherschedule/src/androidTest/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleScreenRobot.kt
+++ b/feature/teacherschedule/src/androidTest/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleScreenRobot.kt
@@ -111,8 +111,10 @@ internal open class ScheduleScreenRobot(
         )
     }
     private val weekDateText by lazy {
+        val (weekStart, weekEnd) = scheduleViewState.weekDateText
+
         composeTestRule.onNodeWithContentDescription(
-            weekDateDescription.format(scheduleViewState.weekDateText.first, scheduleViewState.weekDateText.second),
+            weekDateDescription.format(weekStart, weekEnd),
             useUnmergedTree = true,
         )
     }
@@ -233,6 +235,7 @@ internal open class ScheduleScreenRobot(
     fun verifyScheduleTopAppBarDisplayed() {
         scheduleTopAppBar.assertExists().assertIsDisplayed()
     }
+
     fun verifyScheduleToolbarDisplayed() {
         scheduleToolbar.assertExists().assertIsDisplayed()
     }
diff --git a/feature/teacherschedule/src/main/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleScreen.kt b/feature/teacherschedule/src/main/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleScreen.kt
index c557d9bc..d576e0c9 100644
--- a/feature/teacherschedule/src/main/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleScreen.kt
+++ b/feature/teacherschedule/src/main/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleScreen.kt
@@ -445,12 +445,12 @@ fun WeekActionBar(
                 )
             }
 
-            val weekDate = uiStates.weekDateText
+            val (weekStart, weekEnd) = uiStates.weekDateText
             val weekDataDescription = stringResource(R.string.content_description_week_date).format(
-                weekDate.first,
-                weekDate.second,
+                weekStart,
+                weekEnd,
             )
-            val weekDateText = "${weekDate.first} - ${weekDate.second}"
+            val weekDateText = "$weekStart - $weekEnd"
             TextButton(
                 modifier = Modifier
                     .weight(1f)
diff --git a/feature/teacherschedule/src/main/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleViewModel.kt b/feature/teacherschedule/src/main/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleViewModel.kt
index 48bfba22..9aef8c69 100644
--- a/feature/teacherschedule/src/main/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleViewModel.kt
+++ b/feature/teacherschedule/src/main/java/com/wei/amazingtalker/feature/teacherschedule/schedule/ScheduleViewModel.kt
@@ -213,7 +213,8 @@ class ScheduleViewModel @Inject constructor(
             }
 
             is ScheduleViewAction.SelectedTab -> {
-                onTabSelected(action.date.first, action.date.second)
+                val (position, data) = action.date
+                onTabSelected(position, data)
             }
 
             ScheduleViewAction.ListScrolled -> {