diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index 1b7cae7d..9846d3e5 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AppInsightsSettings">
+    <option name="selectedTabId" value="Firebase Crashlytics" />
     <option name="tabSettings">
       <map>
         <entry key="Android Vitals">
@@ -23,9 +24,9 @@
               <option name="connection">
                 <ConnectionSetting>
                   <option name="appId" value="com.texthip.thip" />
-                  <option name="mobileSdkAppId" value="1:353417813537:android:69029c2bc957df7fab4d60" />
-                  <option name="projectId" value="thip-3a698" />
-                  <option name="projectNumber" value="353417813537" />
+                  <option name="mobileSdkAppId" value="1:211189590640:android:f1d3ad964277af1098a2b5" />
+                  <option name="projectId" value="thip-9fdc6" />
+                  <option name="projectNumber" value="211189590640" />
                 </ConnectionSetting>
               </option>
               <option name="signal" value="SIGNAL_UNSPECIFIED" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8d113e29..8ffa2ccb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,8 +28,8 @@ android {
         applicationId = "com.texthip.thip"
         minSdk = 29
         targetSdk = 35
-        versionCode = 7
-        versionName = "1.2.1"
+        versionCode = 11
+        versionName = "1.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -103,6 +103,7 @@ dependencies {
     implementation(libs.foundation)
     implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.datastore.preferences)
+    implementation(libs.firebase.messaging)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -138,6 +139,9 @@ dependencies {
     implementation("androidx.credentials:credentials:1.2.2")
     implementation("androidx.credentials:credentials-play-services-auth:1.2.2")
 
+    // Firebase analytics
+    implementation(platform("com.google.firebase:firebase-bom:34.3.0"))
+    implementation("com.google.firebase:firebase-analytics")
 }
 
 kapt {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2fe2f65a..5ba490a5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"
+        tools:ignore="AdvertisingIdPolicy" />
 
     <application
         android:name=".ThipApplication"
@@ -21,6 +24,16 @@
             android:name="com.kakao.sdk.AppKey"
             android:value="${NATIVE_APP_KEY}" />
 
+        <!-- FCM 기본 설정 -->
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@mipmap/ic_launcher" />
+            
+        <!-- FCM 기본 클릭 액션 설정 -->
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="thip_notifications" />
+
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">
@@ -38,14 +51,23 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
+            android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize"
             android:label="@string/app_name"
             android:theme="@style/Theme.Thip">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <service
+            android:name=".service.MyFirebaseMessagingService"
+            android:exported="false"
+            android:directBootAware="true">
+            <intent-filter android:priority="1000">
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
     </application>
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/MainActivity.kt b/app/src/main/java/com/texthip/thip/MainActivity.kt
index 4e86f830..c543ebfe 100644
--- a/app/src/main/java/com/texthip/thip/MainActivity.kt
+++ b/app/src/main/java/com/texthip/thip/MainActivity.kt
@@ -1,19 +1,34 @@
 package com.texthip.thip
 
+import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import com.google.firebase.Firebase
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.analytics.analytics
+import com.google.firebase.analytics.logEvent
 import com.texthip.thip.data.manager.AuthStateManager
 import com.texthip.thip.data.manager.TokenManager
 import com.texthip.thip.ui.navigator.navigations.authNavigation
 import com.texthip.thip.ui.navigator.routes.CommonRoutes
 import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.utils.permission.NotificationPermissionUtils
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import javax.inject.Inject
@@ -22,24 +37,136 @@ import javax.inject.Inject
 class MainActivity : ComponentActivity() {
     @Inject
     lateinit var tokenManager: TokenManager
+
     @Inject
     lateinit var authStateManager: AuthStateManager
 
+    private val notificationPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) {}
+
+    private var notificationData by mutableStateOf<NotificationData?>(null)
+
+    data class NotificationData(
+        val notificationId: String?,
+        val fromNotification: Boolean
+    )
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+
+        // 앱 시작 시 알림 권한 요청
+        requestNotificationPermissionIfNeeded()
+
+        // 푸시 알림에서 온 데이터 처리
+        handleNotificationIntent(intent)
+
         setContent {
             ThipTheme {
-                RootNavHost(authStateManager)
+                RootNavHost(
+                    authStateManager = authStateManager,
+                    notificationData = notificationData
+                )
             }
         }
 //        getKakaoKeyHash(this)
     }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+
+        // 새로운 Intent가 들어올 때 (백그라운드에서 알림 클릭 시)
+        handleNotificationIntent(intent)
+    }
+
+    private fun handleNotificationIntent(intent: Intent) {
+        Log.d("MainActivity", "Handling notification intent with extras: ${intent.extras?.keySet()}")
+        
+        val customNotificationId = intent.getStringExtra("notification_id")
+        val customFromNotification = intent.getBooleanExtra("from_notification", false)
+
+        // FCM 백그라운드 알림에서 온 데이터 확인 (시스템이 자동 생성한 알림의 경우)
+        val fcmNotificationId = intent.getStringExtra("gcm.notification.data.notificationId")
+            ?: intent.getStringExtra("notificationId")
+
+        var newNotificationData: NotificationData? = null
+
+        // 커스텀 알림에서 온 경우 (포그라운드에서 생성된 알림)
+        if (customFromNotification && customNotificationId != null) {
+            Log.d("MainActivity", "Processing custom notification: $customNotificationId")
+            newNotificationData = NotificationData(customNotificationId, customFromNotification)
+            
+            // Intent extras 완전 제거
+            cleanupNotificationExtras(intent, listOf("notification_id", "from_notification"))
+        }
+        // FCM 백그라운드 시스템 알림에서 온 경우
+        else if (fcmNotificationId != null) {
+            Log.d("MainActivity", "Processing FCM notification: $fcmNotificationId")
+            newNotificationData = NotificationData(fcmNotificationId, true)
+            
+            // Intent extras 완전 제거
+            cleanupNotificationExtras(intent, listOf(
+                "gcm.notification.data.notificationId", 
+                "notificationId"
+            ))
+        }
+
+        // 새로운 알림 데이터가 있고, 기존 데이터와 다른 경우에만 업데이트
+        if (newNotificationData != null && newNotificationData != notificationData) {
+            Log.d("MainActivity", "Setting new notification data: ${newNotificationData.notificationId}")
+            notificationData = newNotificationData
+        } else if (newNotificationData != null) {
+            Log.d("MainActivity", "Notification data unchanged, skipping update")
+        }
+    }
+
+    private fun cleanupNotificationExtras(intent: Intent, keys: List<String>) {
+        keys.forEach { key ->
+            try {
+                intent.removeExtra(key)
+                Log.v("MainActivity", "Removed extra: $key")
+            } catch (e: Exception) {
+                Log.w("MainActivity", "Failed to remove extra: $key", e)
+            }
+        }
+        
+        // Intent 플래그도 정리
+        intent.replaceExtras(intent.extras)
+    }
+
+    private fun requestNotificationPermissionIfNeeded() {
+        if (NotificationPermissionUtils.shouldRequestNotificationPermission(this)) {
+            notificationPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS)
+        }
+    }
 }
 
 @Composable
-fun RootNavHost(authStateManager: AuthStateManager) {
+fun RootNavHost(
+    authStateManager: AuthStateManager,
+    notificationData: MainActivity.NotificationData? = null
+) {
     val navController = rememberNavController()
+    val firebaseAnalytics = Firebase.analytics
+
+    DisposableEffect(navController) {
+        val listener = NavController.OnDestinationChangedListener { _, destination, _ ->
+            // 목적지의 route가 null이 아닐 경우에만 이벤트를 로깅
+            destination.route?.let { route ->
+                firebaseAnalytics.logEvent(FirebaseAnalytics.Event.SCREEN_VIEW) {
+                    param(FirebaseAnalytics.Param.SCREEN_NAME, route)
+                    param(FirebaseAnalytics.Param.SCREEN_CLASS, route)
+                }
+                Log.d("GA_Tracker", "Screen viewed: $route")
+            }
+        }
+        navController.addOnDestinationChangedListener(listener)
+
+        onDispose {
+            navController.removeOnDestinationChangedListener(listener)
+        }
+    }
 
     LaunchedEffect(Unit) {
         authStateManager.tokenExpiredEvent.collectLatest {
@@ -48,10 +175,15 @@ fun RootNavHost(authStateManager: AuthStateManager) {
             }
         }
     }
-    
+
+
     NavHost(
         navController = navController,
-        startDestination = CommonRoutes.Splash
+        startDestination = CommonRoutes.Splash,
+        enterTransition = { EnterTransition.None },
+        exitTransition = { ExitTransition.None },
+        popEnterTransition = { EnterTransition.None },
+        popExitTransition = { ExitTransition.None }
     ) {
         // --- 인증 관련 화면들 ---
         authNavigation(
@@ -87,7 +219,8 @@ fun RootNavHost(authStateManager: AuthStateManager) {
                             inclusive = true
                         }
                     }
-                }
+                },
+                notificationData = notificationData
             )
         }
     }
diff --git a/app/src/main/java/com/texthip/thip/MainScreen.kt b/app/src/main/java/com/texthip/thip/MainScreen.kt
index 1b4ef1dd..d0239481 100644
--- a/app/src/main/java/com/texthip/thip/MainScreen.kt
+++ b/app/src/main/java/com/texthip/thip/MainScreen.kt
@@ -3,28 +3,94 @@ package com.texthip.thip
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
+import android.util.Log
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import com.texthip.thip.data.repository.NotificationRepository
 import com.texthip.thip.ui.navigator.BottomNavigationBar
 import com.texthip.thip.ui.navigator.MainNavHost
 import com.texthip.thip.ui.navigator.extensions.isMainTabRoute
+import com.texthip.thip.ui.navigator.extensions.navigateFromNotification
 import com.texthip.thip.ui.navigator.routes.MainTabRoutes
+import dagger.hilt.EntryPoint
+import dagger.hilt.InstallIn
+import dagger.hilt.android.EntryPointAccessors
+import dagger.hilt.components.SingletonComponent
+
+@EntryPoint
+@InstallIn(SingletonComponent::class)
+interface MainScreenEntryPoint {
+    fun notificationRepository(): NotificationRepository
+}
 
 @Composable
 fun MainScreen(
-    onNavigateToLogin: () -> Unit
+    onNavigateToLogin: () -> Unit,
+    notificationData: MainActivity.NotificationData? = null
 ) {
     val navController = rememberNavController()
     val navBackStackEntry by navController.currentBackStackEntryAsState()
     val currentDestination = navBackStackEntry?.destination
     var feedReselectionTrigger by remember { mutableStateOf(0) }
+    val context = LocalContext.current
+    
+    // 처리된 알림 ID 추적
+    var processedNotificationId by remember { mutableStateOf<String?>(null) }
+
+    // 푸시 알림에서 온 경우 알림 읽기 API 호출 및 네비게이션
+    LaunchedEffect(notificationData?.notificationId, notificationData?.fromNotification) {
+        val data = notificationData
+        
+        // 중복 처리 방지
+        if (data?.notificationId == processedNotificationId) {
+            return@LaunchedEffect
+        }
+        
+        data?.let { notificationData ->
+            if (notificationData.fromNotification && notificationData.notificationId != null) {
+                try {
+                    val entryPoint = EntryPointAccessors.fromApplication(
+                        context.applicationContext,
+                        MainScreenEntryPoint::class.java
+                    )
+                    val notificationRepository = entryPoint.notificationRepository()
+
+                    val notificationId = try {
+                        notificationData.notificationId.toInt()
+                    } catch (e: NumberFormatException) {
+                        Log.e("MainScreen", "Invalid notification ID format: ${notificationData.notificationId}", e)
+                        return@LaunchedEffect
+                    }
+
+                    val result = notificationRepository.checkNotification(notificationId)
+                    
+                    result.onSuccess { response ->
+                        if (response != null) {
+                            navController.navigateFromNotification(response)
+                            notificationRepository.onNotificationReceived()
+                            processedNotificationId = notificationData.notificationId
+                        } else {
+                            Log.w("MainScreen", "Notification check returned null response")
+                        }
+                    }.onFailure { exception ->
+                        Log.e("MainScreen", "Failed to check notification: ${notificationData.notificationId}", exception)
+                    }
+                    
+                } catch (e: Exception) {
+                    Log.e("MainScreen", "Unexpected error processing notification: ${notificationData.notificationId}", e)
+                }
+            }
+        }
+    }
 
     val showBottomBar = currentDestination?.isMainTabRoute() ?: true
 
@@ -38,6 +104,7 @@ fun MainScreen(
                             MainTabRoutes.Feed -> {
                                 feedReselectionTrigger += 1
                             }
+
                             else -> {
                                 // 다른 탭들은 향후 확장 가능
                             }
diff --git a/app/src/main/java/com/texthip/thip/ThipApplication.kt b/app/src/main/java/com/texthip/thip/ThipApplication.kt
index 58da5b7b..b27e7032 100644
--- a/app/src/main/java/com/texthip/thip/ThipApplication.kt
+++ b/app/src/main/java/com/texthip/thip/ThipApplication.kt
@@ -8,7 +8,7 @@ import javax.inject.Inject
 
 
 @HiltAndroidApp
-class ThipApplication : Application(){
+class ThipApplication : Application() {
     @Inject
     lateinit var tokenManager: TokenManager
 
@@ -18,7 +18,7 @@ class ThipApplication : Application(){
         // 카카오 SDK 초기화
         try {
             KakaoSdk.init(this, BuildConfig.NATIVE_APP_KEY)
-        }catch (e: Exception){
+        } catch (e: Exception) {
             e.printStackTrace()
         }
     }
diff --git a/app/src/main/java/com/texthip/thip/data/di/ServiceModule.kt b/app/src/main/java/com/texthip/thip/data/di/ServiceModule.kt
index 4d8b0fe8..eba74fd8 100644
--- a/app/src/main/java/com/texthip/thip/data/di/ServiceModule.kt
+++ b/app/src/main/java/com/texthip/thip/data/di/ServiceModule.kt
@@ -7,6 +7,7 @@ import com.texthip.thip.data.service.CommentsService
 import com.texthip.thip.data.service.FeedService
 import com.texthip.thip.data.service.RoomsService
 import com.texthip.thip.data.service.UserService
+import com.texthip.thip.data.service.NotificationService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -56,4 +57,9 @@ object ServiceModule {
     @Singleton
     fun provideFeedService(retrofit: Retrofit): FeedService =
         retrofit.create(FeedService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideNotificationService(retrofit: Retrofit): NotificationService =
+        retrofit.create(NotificationService::class.java)
 }
diff --git a/app/src/main/java/com/texthip/thip/data/manager/FcmTokenManager.kt b/app/src/main/java/com/texthip/thip/data/manager/FcmTokenManager.kt
new file mode 100644
index 00000000..58afb36b
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/manager/FcmTokenManager.kt
@@ -0,0 +1,104 @@
+package com.texthip.thip.data.manager
+
+import android.content.Context
+import android.util.Log
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import com.google.firebase.messaging.FirebaseMessaging
+import com.texthip.thip.data.repository.NotificationRepository
+import com.texthip.thip.utils.auth.getAppScopeDeviceId
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FcmTokenManager @Inject constructor(
+    private val dataStore: DataStore<Preferences>,
+    private val notificationRepository: NotificationRepository,
+    @param:ApplicationContext private val context: Context
+) {
+
+    companion object {
+        private val FCM_TOKEN_KEY = stringPreferencesKey("fcm_token")
+    }
+
+    suspend fun handleNewToken(newToken: String) {
+        val storedToken = getFcmTokenOnce()
+
+        if (storedToken != newToken) {
+            Log.d("FCM", "Token updated")
+
+            saveFcmToken(newToken)
+            sendTokenToServer(newToken)
+        }
+    }
+
+    suspend fun sendCurrentTokenIfExists() {
+        val storedFcmToken = getFcmTokenOnce()
+
+        if (storedFcmToken != null) {
+            sendTokenToServer(storedFcmToken)
+        } else {
+            // 저장된 토큰이 없으면 Firebase에서 직접 가져와서 저장하고 전송
+            try {
+                val token = fetchCurrentToken()
+                saveFcmToken(token)
+                sendTokenToServer(token)
+            } catch (e: Exception) {
+                Log.e("FCM", "Failed to fetch and send current token", e)
+            }
+        }
+    }
+
+    private suspend fun fetchCurrentToken(): String = suspendCancellableCoroutine { continuation ->
+        try {
+            FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
+                when {
+                    task.isSuccessful -> {
+                        val token = task.result
+                        if (token != null) {
+                            continuation.resume(token)
+                        } else {
+                            continuation.resumeWithException(IllegalStateException("FCM token is null"))
+                        }
+                    }
+                    else -> {
+                        val exception = task.exception ?: Exception("Unknown error fetching FCM token")
+                        Log.w("FCM", "Failed to fetch token", exception)
+                        continuation.resumeWithException(exception)
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            Log.e("FCM", "Error fetching FCM token", e)
+            continuation.resumeWithException(e)
+        }
+    }
+
+    // FCM 토큰 로컬 저장 관리
+    private suspend fun saveFcmToken(token: String) {
+        dataStore.edit { prefs -> prefs[FCM_TOKEN_KEY] = token }
+    }
+
+    private suspend fun getFcmTokenOnce(): String? {
+        return dataStore.data.map { prefs -> prefs[FCM_TOKEN_KEY] }.first()
+    }
+
+    private suspend fun sendTokenToServer(token: String) {
+        val deviceId = context.getAppScopeDeviceId()
+        notificationRepository.registerFcmToken(deviceId, token)
+            .onSuccess {
+                Log.d("FCM", "Token sent successfully")
+            }
+            .onFailure { exception ->
+                Log.e("FCM", "Failed to send token", exception)
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/manager/Genre.kt b/app/src/main/java/com/texthip/thip/data/manager/Genre.kt
index 817cb49a..43fd51c7 100644
--- a/app/src/main/java/com/texthip/thip/data/manager/Genre.kt
+++ b/app/src/main/java/com/texthip/thip/data/manager/Genre.kt
@@ -1,8 +1,6 @@
 package com.texthip.thip.data.manager
 
-/**
- * 도서 장르를 나타내는 enum class
- */
+
 enum class Genre(
     val displayKey: String,
     val apiCategory: String,
diff --git a/app/src/main/java/com/texthip/thip/data/manager/TokenManager.kt b/app/src/main/java/com/texthip/thip/data/manager/TokenManager.kt
index db370f35..44b061f0 100644
--- a/app/src/main/java/com/texthip/thip/data/manager/TokenManager.kt
+++ b/app/src/main/java/com/texthip/thip/data/manager/TokenManager.kt
@@ -18,7 +18,7 @@ class TokenManager @Inject constructor(
     companion object {
         private val APP_TOKEN_KEY = stringPreferencesKey("app_token") // 정식 액세스토큰
         private val TEMP_TOKEN_KEY = stringPreferencesKey("temp_token") // 임시 토큰
-        private val REFRESH_TOKEN_KEY = stringPreferencesKey("refresh_token")
+        //private val REFRESH_TOKEN_KEY = stringPreferencesKey("refresh_token")
     }
 
     // ====== 정식 토큰 ======
@@ -54,13 +54,13 @@ class TokenManager @Inject constructor(
     }
 
     // ====== Refresh 토큰 (추후 확장용) ======
-    suspend fun saveRefreshToken(token: String) {
+    /*suspend fun saveRefreshToken(token: String) {
         dataStore.edit { prefs -> prefs[REFRESH_TOKEN_KEY] = token }
     }
 
     suspend fun getRefreshTokenOnce(): String? {
         return dataStore.data.map { prefs -> prefs[REFRESH_TOKEN_KEY] }.first()
-    }
+    }*/
 
     suspend fun clearTokens() {
         dataStore.edit { prefs -> prefs.clear() }
diff --git a/app/src/main/java/com/texthip/thip/data/model/notification/request/FcmTokenDeleteRequest.kt b/app/src/main/java/com/texthip/thip/data/model/notification/request/FcmTokenDeleteRequest.kt
new file mode 100644
index 00000000..9cd3b244
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/notification/request/FcmTokenDeleteRequest.kt
@@ -0,0 +1,8 @@
+package com.texthip.thip.data.model.notification.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FcmTokenDeleteRequest(
+    val deviceId: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/model/notification/request/FcmTokenRequest.kt b/app/src/main/java/com/texthip/thip/data/model/notification/request/FcmTokenRequest.kt
new file mode 100644
index 00000000..613ce547
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/notification/request/FcmTokenRequest.kt
@@ -0,0 +1,10 @@
+package com.texthip.thip.data.model.notification.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FcmTokenRequest(
+    val deviceId: String,
+    val fcmToken: String,
+    val platformType: String = "ANDROID"
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/model/notification/request/NotificationCheckRequest.kt b/app/src/main/java/com/texthip/thip/data/model/notification/request/NotificationCheckRequest.kt
new file mode 100644
index 00000000..d22e02f0
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/notification/request/NotificationCheckRequest.kt
@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.notification.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NotificationCheckRequest(
+    @SerialName("notificationId") val notificationId: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/model/notification/request/NotificationEnabledRequest.kt b/app/src/main/java/com/texthip/thip/data/model/notification/request/NotificationEnabledRequest.kt
new file mode 100644
index 00000000..dc380295
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/notification/request/NotificationEnabledRequest.kt
@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.notification.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NotificationEnabledRequest(
+    val enable: Boolean,
+    val deviceId: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationCheckResponse.kt b/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationCheckResponse.kt
new file mode 100644
index 00000000..fd6c546b
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationCheckResponse.kt
@@ -0,0 +1,29 @@
+package com.texthip.thip.data.model.notification.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonElement
+
+@Serializable
+data class NotificationCheckResponse(
+    @SerialName("route") val route: NotificationRoute,
+    @SerialName("params") val params: Map<String, JsonElement>
+)
+
+@Serializable
+enum class NotificationRoute {
+    @SerialName("FEED_USER")
+    FEED_USER,
+
+    @SerialName("FEED_DETAIL")
+    FEED_DETAIL,
+
+    @SerialName("ROOM_MAIN")
+    ROOM_MAIN,
+
+    @SerialName("ROOM_DETAIL")
+    ROOM_DETAIL,
+
+    @SerialName("ROOM_POST_DETAIL")
+    ROOM_POST_DETAIL
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationEnabledResponse.kt b/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationEnabledResponse.kt
new file mode 100644
index 00000000..2627133d
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationEnabledResponse.kt
@@ -0,0 +1,8 @@
+package com.texthip.thip.data.model.notification.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NotificationEnabledResponse(
+    val isEnabled: Boolean
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationExistsUncheckedResponse.kt b/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationExistsUncheckedResponse.kt
new file mode 100644
index 00000000..095b90f2
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationExistsUncheckedResponse.kt
@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.notification.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NotificationExistsUncheckedResponse(
+    @SerialName("exists") val exists: Boolean
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationListResponse.kt b/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationListResponse.kt
new file mode 100644
index 00000000..b4133a98
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/notification/response/NotificationListResponse.kt
@@ -0,0 +1,21 @@
+package com.texthip.thip.data.model.notification.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NotificationListResponse(
+    @SerialName("notifications") val notifications: List<NotificationResponse>,
+    @SerialName("nextCursor") val nextCursor: String?,
+    @SerialName("isLast") val isLast: Boolean
+)
+
+@Serializable
+data class NotificationResponse(
+    @SerialName("notificationId") val notificationId: Int,
+    @SerialName("title") val title: String,
+    @SerialName("content") val content: String,
+    @SerialName("isChecked") val isChecked: Boolean,
+    @SerialName("notificationType") val notificationType: String,
+    @SerialName("postDate") val postDate: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/model/rooms/response/JoinedRoomListResponse.kt b/app/src/main/java/com/texthip/thip/data/model/rooms/response/JoinedRoomListResponse.kt
index 84d6615f..03d299ea 100644
--- a/app/src/main/java/com/texthip/thip/data/model/rooms/response/JoinedRoomListResponse.kt
+++ b/app/src/main/java/com/texthip/thip/data/model/rooms/response/JoinedRoomListResponse.kt
@@ -18,6 +18,7 @@ data class JoinedRoomResponse(
     @SerialName("bookImageUrl") val bookImageUrl: String?,
     @SerialName("roomTitle") val roomTitle: String,
     @SerialName("memberCount") val memberCount: Int,
-    @SerialName("userPercentage") val userPercentage: Int
+    @SerialName("userPercentage") val userPercentage: Int,
+    @SerialName("deadlineDate") val deadlineDate: String? = null,
 )
 
diff --git a/app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomMainResponse.kt b/app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomMainResponse.kt
index a49b4d53..cb95dab3 100644
--- a/app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomMainResponse.kt
+++ b/app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomMainResponse.kt
@@ -17,5 +17,6 @@ data class RoomMainResponse(
 @Serializable
 data class RoomMainList(
     @SerialName("deadlineRoomList") val deadlineRoomList: List<RoomMainResponse> = emptyList(),
-    @SerialName("popularRoomList") val popularRoomList: List<RoomMainResponse> = emptyList()
+    @SerialName("popularRoomList") val popularRoomList: List<RoomMainResponse> = emptyList(),
+    @SerialName("recentRoomList") val recentRoomList: List<RoomMainResponse> = emptyList()
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsAiReviewResponse.kt b/app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsAiReviewResponse.kt
new file mode 100644
index 00000000..db35700e
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsAiReviewResponse.kt
@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.rooms.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RoomsAiReviewResponse(
+    val content: String,
+    val count: Int
+)
diff --git a/app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsAiUsageResponse.kt b/app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsAiUsageResponse.kt
new file mode 100644
index 00000000..0c34c553
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsAiUsageResponse.kt
@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.rooms.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RoomsAiUsageResponse(
+    val recordReviewCount: Int,
+    val recordCount: Int
+)
diff --git a/app/src/main/java/com/texthip/thip/data/repository/BookRepository.kt b/app/src/main/java/com/texthip/thip/data/repository/BookRepository.kt
index b4fb7072..2111476e 100644
--- a/app/src/main/java/com/texthip/thip/data/repository/BookRepository.kt
+++ b/app/src/main/java/com/texthip/thip/data/repository/BookRepository.kt
@@ -19,11 +19,15 @@ class BookRepository @Inject constructor(
 ) {
 
     /** 저장된 책 또는 모임 책 목록 조회 */
-    suspend fun getBooks(type: String, cursor: String? = null): Result<BookListResponse?> = runCatching {
-        bookService.getBooks(type, cursor)
-            .handleBaseResponse()
-            .getOrThrow()
-    }
+    suspend fun getBooks(
+        type: String,
+        cursor: String? = null
+    ): Result<BookListResponse?> =
+        runCatching {
+            bookService.getBooks(type, cursor)
+                .handleBaseResponse()
+                .getOrThrow()
+        }
 
     /** 책 검색 */
     suspend fun searchBooks(
@@ -37,21 +41,27 @@ class BookRepository @Inject constructor(
     }
 
     /** 인기 책 조회 */
-    suspend fun getMostSearchedBooks(): Result<MostSearchedBooksResponse?> = runCatching {
+    suspend fun getMostSearchedBooks(
+    ): Result<MostSearchedBooksResponse?> = runCatching {
         bookService.getMostSearchedBooks()
             .handleBaseResponse()
             .getOrThrow()
     }
 
     /** 책 상세 조회 */
-    suspend fun getBookDetail(isbn: String): Result<BookDetailResponse?> = runCatching {
+    suspend fun getBookDetail(
+        isbn: String
+    ): Result<BookDetailResponse?> = runCatching {
         bookService.getBookDetail(isbn)
             .handleBaseResponse()
             .getOrThrow()
     }
 
     /** 책 저장/저장취소 */
-    suspend fun saveBook(isbn: String, type: Boolean): Result<BookSaveResponse?> = runCatching {
+    suspend fun saveBook(
+        isbn: String,
+        type: Boolean
+    ): Result<BookSaveResponse?> = runCatching {
         bookService.saveBook(isbn, BookSaveRequest(type))
             .handleBaseResponse()
             .getOrThrow()
@@ -67,7 +77,9 @@ class BookRepository @Inject constructor(
             .getOrThrow()
     }
 
-    suspend fun getSavedBooks(cursor: String? = null): Result<BookUserSaveResponse?> = runCatching {
+    suspend fun getSavedBooks(
+        cursor: String? = null
+    ): Result<BookUserSaveResponse?> = runCatching {
         bookService.getSavedBooks(cursor)
             .handleBaseResponse()
             .getOrThrow()
diff --git a/app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt b/app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt
index 93e2d12d..f3a85937 100644
--- a/app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt
+++ b/app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt
@@ -9,6 +9,8 @@ import com.texthip.thip.data.model.feed.request.UpdateFeedRequest
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
 import kotlinx.coroutines.withContext
 import com.texthip.thip.data.model.feed.response.AllFeedResponse
 import com.texthip.thip.data.model.feed.response.CreateFeedResponse
@@ -33,6 +35,9 @@ class FeedRepository @Inject constructor(
     private val feedService: FeedService,
     private val imageUploadHelper: ImageUploadHelper
 ) {
+    companion object {
+        private const val MAX_CONCURRENT_UPLOADS = 3 // 동시 업로드 제한
+    }
     private val _feedStateUpdateResult = MutableSharedFlow<FeedStateUpdateResult>()
     val feedStateUpdateResult: Flow<FeedStateUpdateResult> = _feedStateUpdateResult.asSharedFlow()
 
@@ -85,45 +90,56 @@ class FeedRepository @Inject constructor(
     }
 
     /** 이미지들을 S3에 업로드하고 CloudFront URL 목록 반환 */
-    private suspend fun uploadImagesToS3(imageUris: List<Uri>): List<String> = withContext(Dispatchers.IO) {
-        val validImagePairs = imageUris.map { uri ->
-            async { 
-                imageUploadHelper.getImageMetadata(uri)?.let { metadata ->
-                    uri to metadata
+    private suspend fun uploadImagesToS3(
+        imageUris: List<Uri>
+    ): List<String> =
+        withContext(Dispatchers.IO) {
+            val validImagePairs = imageUris.map { uri ->
+                async {
+                    imageUploadHelper.getImageMetadata(uri)?.let { metadata ->
+                        uri to metadata
+                    }
                 }
-            }
-        }.awaitAll().filterNotNull()
-
-        if (validImagePairs.isEmpty()) return@withContext emptyList()
+            }.awaitAll().filterNotNull()
 
-        val presignedUrlRequest = validImagePairs.map { it.second }
-        
-        val presignedResponse = feedService.getPresignedUrls(presignedUrlRequest)
-            .handleBaseResponse()
-            .getOrThrow() ?: throw Exception("Failed to get presigned URLs")
-
-        // 개수 검증
-        if (validImagePairs.size != presignedResponse.presignedUrls.size) {
-            throw Exception("Presigned URL count mismatch: expected ${validImagePairs.size}, got ${presignedResponse.presignedUrls.size}")
-        }
+            if (validImagePairs.isEmpty()) return@withContext emptyList()
 
-        val uploadedImageUrls = mutableListOf<String>()
+            val presignedUrlRequest = validImagePairs.map { it.second }
 
-        validImagePairs.forEachIndexed { index, (uri, _) ->
-            val presignedInfo = presignedResponse.presignedUrls[index]
+            val presignedResponse = feedService.getPresignedUrls(presignedUrlRequest)
+                .handleBaseResponse()
+                .getOrThrow() ?: throw Exception("Failed to get presigned URLs")
 
-            imageUploadHelper.uploadImageToS3(
-                uri = uri,
-                presignedUrl = presignedInfo.presignedUrl
-            ).onSuccess {
-                uploadedImageUrls.add(presignedInfo.fileUrl)
-            }.onFailure { exception ->
-                throw Exception("Failed to upload image ${index + 1}: ${exception.message}")
+            // 개수 검증
+            if (validImagePairs.size != presignedResponse.presignedUrls.size) {
+                throw Exception("개수가 올바르지 않습니다: expected ${validImagePairs.size}, got ${presignedResponse.presignedUrls.size}")
             }
-        }
 
-        uploadedImageUrls
-    }
+            // 세마포어를 사용한 제한 병렬 업로드
+            val semaphore = Semaphore(MAX_CONCURRENT_UPLOADS)
+            
+            validImagePairs.mapIndexed { index, (uri, _) ->
+                async {
+                    semaphore.withPermit {
+                        val presignedInfo = presignedResponse.presignedUrls[index]
+                        
+                        imageUploadHelper.uploadImageToS3(
+                            uri = uri,
+                            presignedUrl = presignedInfo.presignedUrl
+                        ).fold(
+                            onSuccess = { 
+                                index to presignedInfo.fileUrl // 인덱스와 URL을 함께 반환
+                            },
+                            onFailure = { exception ->
+                                throw Exception("Failed to upload image ${index + 1}: ${exception.message}")
+                            }
+                        )
+                    }
+                }
+            }.awaitAll()
+                .sortedBy { it.first } // 원래 순서대로 정렬
+                .map { it.second } // URL만 추출
+        }
 
 
     /** 전체 피드 목록 조회 */
@@ -134,7 +150,9 @@ class FeedRepository @Inject constructor(
     }
 
     /** 내 피드 목록 조회 */
-    suspend fun getMyFeeds(cursor: String? = null): Result<MyFeedResponse?> = runCatching {
+    suspend fun getMyFeeds(
+        cursor: String? = null
+    ): Result<MyFeedResponse?> = runCatching {
         feedService.getMyFeeds(cursor)
             .handleBaseResponse()
             .getOrThrow()
@@ -159,7 +177,9 @@ class FeedRepository @Inject constructor(
     }
 
     /** 피드 상세 조회 */
-    suspend fun getFeedDetail(feedId: Long): Result<FeedDetailResponse?> = runCatching {
+    suspend fun getFeedDetail(
+        feedId: Long
+    ): Result<FeedDetailResponse?> = runCatching {
         feedService.getFeedDetail(feedId)
             .handleBaseResponse()
             .getOrThrow()
@@ -186,7 +206,9 @@ class FeedRepository @Inject constructor(
     }
 
 
-    suspend fun getFeedUsersInfo(userId: Long) = runCatching {
+    suspend fun getFeedUsersInfo(
+        userId: Long
+    ) = runCatching {
         feedService.getFeedUsersInfo(userId)
             .handleBaseResponse()
             .getOrThrow()
diff --git a/app/src/main/java/com/texthip/thip/data/repository/NotificationRepository.kt b/app/src/main/java/com/texthip/thip/data/repository/NotificationRepository.kt
new file mode 100644
index 00000000..f2dbe95a
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/repository/NotificationRepository.kt
@@ -0,0 +1,119 @@
+package com.texthip.thip.data.repository
+
+import android.content.Context
+import com.texthip.thip.data.model.base.handleBaseResponse
+import com.texthip.thip.data.model.notification.request.FcmTokenRequest
+import com.texthip.thip.data.model.notification.request.FcmTokenDeleteRequest
+import com.texthip.thip.data.model.notification.request.NotificationEnabledRequest
+import com.texthip.thip.data.model.notification.request.NotificationCheckRequest
+import com.texthip.thip.data.model.notification.response.NotificationEnabledResponse
+import com.texthip.thip.data.model.notification.response.NotificationListResponse
+import com.texthip.thip.data.model.notification.response.NotificationCheckResponse
+import com.texthip.thip.data.model.notification.response.NotificationExistsUncheckedResponse
+import com.texthip.thip.data.service.NotificationService
+import com.texthip.thip.utils.auth.getAppScopeDeviceId
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NotificationRepository @Inject constructor(
+    private val notificationService: NotificationService,
+    @param:ApplicationContext private val context: Context
+) {
+    private val _notificationUpdateFlow = MutableSharedFlow<Int>(
+        replay = 0,
+        extraBufferCapacity = 64,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val notificationUpdateFlow: SharedFlow<Int> = _notificationUpdateFlow.asSharedFlow()
+
+    private val _notificationRefreshFlow = MutableSharedFlow<Unit>(
+        replay = 0,
+        extraBufferCapacity = 64,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val notificationRefreshFlow: SharedFlow<Unit> = _notificationRefreshFlow.asSharedFlow()
+    suspend fun registerFcmToken(
+        deviceId: String,
+        fcmToken: String
+    ): Result<Unit?> {
+        return runCatching {
+            val request = FcmTokenRequest(
+                deviceId = deviceId,
+                fcmToken = fcmToken,
+                platformType = "ANDROID"
+            )
+            val response = notificationService.registerFcmToken(request)
+            response.handleBaseResponse().getOrNull()
+        }
+    }
+
+    suspend fun getNotificationEnableState(): Result<NotificationEnabledResponse?> {
+        return runCatching {
+            val deviceId = context.getAppScopeDeviceId()
+            val response = notificationService.getNotificationEnableState(deviceId)
+            response.handleBaseResponse().getOrNull()
+        }
+    }
+
+    suspend fun updateNotificationEnabled(enabled: Boolean): Result<NotificationEnabledResponse?> {
+        return runCatching {
+            val deviceId = context.getAppScopeDeviceId()
+            val request = NotificationEnabledRequest(
+                enable = enabled,
+                deviceId = deviceId
+            )
+            val response = notificationService.updateNotificationEnabled(request)
+            response.handleBaseResponse().getOrNull()
+        }
+    }
+
+    suspend fun deleteFcmToken(): Result<Unit?> {
+        return runCatching {
+            val deviceId = context.getAppScopeDeviceId()
+            val request = FcmTokenDeleteRequest(deviceId = deviceId)
+            val response = notificationService.deleteFcmToken(request)
+            response.handleBaseResponse().getOrNull()
+        }
+    }
+
+    suspend fun getNotifications(
+        cursor: String? = null,
+        type: String? = null
+    ): Result<NotificationListResponse?> {
+        return runCatching {
+            val response = notificationService.getNotifications(cursor, type)
+            response.handleBaseResponse().getOrNull()
+        }
+    }
+
+    suspend fun checkNotification(notificationId: Int): Result<NotificationCheckResponse?> {
+        return runCatching {
+            val request = NotificationCheckRequest(notificationId = notificationId)
+            val response = notificationService.checkNotification(request)
+            val result = response.handleBaseResponse().getOrNull()
+
+            // 알림 읽기 성공 시 다른 ViewModel들에게 알림 (비차단 emit)
+            if (result != null) {
+                _notificationUpdateFlow.tryEmit(notificationId)
+            }
+            result
+        }
+    }
+
+    fun onNotificationReceived() {
+        _notificationRefreshFlow.tryEmit(Unit)
+    }
+
+    suspend fun existsUncheckedNotifications(): Result<NotificationExistsUncheckedResponse?> {
+        return runCatching {
+            val response = notificationService.existsUncheckedNotifications()
+            response.handleBaseResponse().getOrNull()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/repository/RecentSearchRepository.kt b/app/src/main/java/com/texthip/thip/data/repository/RecentSearchRepository.kt
index 1b8e7067..3cc32ded 100644
--- a/app/src/main/java/com/texthip/thip/data/repository/RecentSearchRepository.kt
+++ b/app/src/main/java/com/texthip/thip/data/repository/RecentSearchRepository.kt
@@ -12,14 +12,18 @@ class RecentSearchRepository @Inject constructor(
 ) {
 
     /** 최근 검색어 조회 */
-    suspend fun getRecentSearches(type: String): Result<RecentSearchResponse?> = runCatching {
+    suspend fun getRecentSearches(
+        type: String
+    ): Result<RecentSearchResponse?> = runCatching {
         recentSearchService.getRecentSearches(type)
             .handleBaseResponse()
             .getOrThrow()
     }
 
     /** 최근 검색어 삭제 */
-    suspend fun deleteRecentSearch(recentSearchId: Int): Result<Unit> = runCatching {
+    suspend fun deleteRecentSearch(
+        recentSearchId: Int
+    ): Result<Unit> = runCatching {
         recentSearchService.deleteRecentSearch(recentSearchId)
             .handleBaseResponse()
             .getOrThrow()
diff --git a/app/src/main/java/com/texthip/thip/data/repository/RoomsRepository.kt b/app/src/main/java/com/texthip/thip/data/repository/RoomsRepository.kt
index 9fb33aae..2e338d39 100644
--- a/app/src/main/java/com/texthip/thip/data/repository/RoomsRepository.kt
+++ b/app/src/main/java/com/texthip/thip/data/repository/RoomsRepository.kt
@@ -44,7 +44,9 @@ class RoomsRepository @Inject constructor(
     }
 
     /** 내가 참여 중인 모임방 목록 조회 */
-    suspend fun getMyJoinedRooms(cursor: String? = null): Result<JoinedRoomListResponse?> = runCatching {
+    suspend fun getMyJoinedRooms(
+        cursor: String? = null
+    ): Result<JoinedRoomListResponse?> = runCatching {
         val response = roomsService.getJoinedRooms(cursor)
             .handleBaseResponse()
             .getOrThrow()
@@ -55,8 +57,10 @@ class RoomsRepository @Inject constructor(
         response
     }
 
-    /** 카테고리별 모임방 섹션 조회 (마감임박/인기) */
-    suspend fun getRoomSections(genre: Genre? = null): Result<RoomMainList?> = runCatching {
+    /** 카테고리별 모임방 섹션 조회 (마감임박/인기/최근 생성) */
+    suspend fun getRoomSections(
+        genre: Genre? = null
+    ): Result<RoomMainList?> = runCatching {
         val selectedGenre = genre ?: genreManager.getDefaultGenre()
         val apiCategory = genreManager.mapGenreToApiCategory(selectedGenre)
 
@@ -76,14 +80,18 @@ class RoomsRepository @Inject constructor(
     }
 
     /** 모집중인 모임방 상세 정보 조회 */
-    suspend fun getRoomRecruiting(roomId: Int): Result<RoomRecruitingResponse?> = runCatching {
+    suspend fun getRoomRecruiting(
+        roomId: Int
+    ): Result<RoomRecruitingResponse?> = runCatching {
         roomsService.getRoomRecruiting(roomId)
             .handleBaseResponse()
             .getOrThrow()
     }
 
     /** 새 모임방 생성 */
-    suspend fun createRoom(request: CreateRoomRequest): Result<Int> = runCatching {
+    suspend fun createRoom(
+        request: CreateRoomRequest
+    ): Result<Int> = runCatching {
         val response = roomsService.createRoom(request)
             .handleBaseResponse()
             .getOrThrow()
@@ -92,7 +100,10 @@ class RoomsRepository @Inject constructor(
     }
 
     /** 모임방 참여 또는 취소 */
-    suspend fun joinOrCancelRoom(roomId: Int, type: String): Result<String> = runCatching {
+    suspend fun joinOrCancelRoom(
+        roomId: Int,
+        type: String
+    ): Result<String> = runCatching {
         val request = RoomJoinRequest(type = type)
         val response = roomsService.joinOrCancelRoom(roomId, request)
             .handleBaseResponse()
@@ -116,7 +127,9 @@ class RoomsRepository @Inject constructor(
     }
 
     /** 모집 마감 */
-    suspend fun closeRoom(roomId: Int): Result<RoomCloseResponse> = runCatching {
+    suspend fun closeRoom(
+        roomId: Int
+    ): Result<RoomCloseResponse> = runCatching {
         val response = roomsService.closeRoom(roomId)
             .handleBaseResponse()
             .getOrThrow()
@@ -128,11 +141,12 @@ class RoomsRepository @Inject constructor(
     suspend fun searchRooms(
         keyword: String,
         category: String,
+        isAllCategory: Boolean = false,
         sort: String = "deadline",
         isFinalized: Boolean = false,
         cursor: String? = null
     ): Result<RoomsSearchResponse?> = runCatching {
-        roomsService.searchRooms(keyword, category, sort, isFinalized, cursor)
+        roomsService.searchRooms(keyword, category, isAllCategory, sort, isFinalized, cursor)
             .handleBaseResponse()
             .getOrThrow()
     }
@@ -346,4 +360,20 @@ class RoomsRepository @Inject constructor(
             )
         ).handleBaseResponse().getOrThrow()
     }
+
+    suspend fun getRoomsAiUsage(
+        roomId: Int,
+    ) = runCatching {
+        roomsService.getRoomsAiUsage(
+            roomId = roomId,
+        ).handleBaseResponse().getOrThrow()
+    }
+
+    suspend fun postRoomsAiReview(
+        roomId: Int,
+    ) = runCatching {
+        roomsService.postRoomsAiReview(
+            roomId = roomId,
+        ).handleBaseResponse().getOrThrow()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/repository/UserRepository.kt b/app/src/main/java/com/texthip/thip/data/repository/UserRepository.kt
index dc7dfe02..60a32c84 100644
--- a/app/src/main/java/com/texthip/thip/data/repository/UserRepository.kt
+++ b/app/src/main/java/com/texthip/thip/data/repository/UserRepository.kt
@@ -63,11 +63,14 @@ class UserRepository @Inject constructor(
             .getOrThrow()
     }
 
-    suspend fun checkNickname(nickname: String): Result<NicknameResponse?> = runCatching {
+    suspend fun checkNickname(
+        nickname: String
+    ): Result<NicknameResponse?> = runCatching {
         userService.checkNickname(NicknameRequest(nickname))
             .handleBaseResponse()
             .getOrThrow()
     }
+
     suspend fun getAliasChoices(): Result<AliasChoiceResponse?> = runCatching {
         userService.getAliasChoices()
             .handleBaseResponse()
@@ -83,13 +86,10 @@ class UserRepository @Inject constructor(
             .handleBaseResponse()
             .getOrThrow()
     }
-/*
-    suspend fun updateProfile(request: ProfileUpdateRequest): Result<Unit?> = runCatching {
-        userService.updateProfile(request)
-            .handleBaseResponse()
-            .getOrThrow()
-    }*/
-    suspend fun updateProfile(request: ProfileUpdateRequest): Result<Unit?> {
+
+    suspend fun updateProfile(
+        request: ProfileUpdateRequest
+    ): Result<Unit?> {
         return try {
             val response = userService.updateProfile(request)
             response.handleBaseResponse().getOrThrow()
@@ -112,7 +112,9 @@ class UserRepository @Inject constructor(
     }
 
 
-    suspend fun signup(request: SignupRequest): Result<SignupResponse?> {
+    suspend fun signup(
+        request: SignupRequest
+    ): Result<SignupResponse?> {
         Log.d("SignupDebug", "UserRepository.signup() 호출됨. 요청 닉네임: ${request.nickname}")
 
         val tempToken = tokenManager.getTempTokenOnce()
diff --git a/app/src/main/java/com/texthip/thip/data/service/NotificationService.kt b/app/src/main/java/com/texthip/thip/data/service/NotificationService.kt
new file mode 100644
index 00000000..87875e2f
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/service/NotificationService.kt
@@ -0,0 +1,53 @@
+package com.texthip.thip.data.service
+
+import com.texthip.thip.data.model.notification.request.FcmTokenRequest
+import com.texthip.thip.data.model.notification.request.FcmTokenDeleteRequest
+import com.texthip.thip.data.model.notification.request.NotificationEnabledRequest
+import com.texthip.thip.data.model.notification.request.NotificationCheckRequest
+import com.texthip.thip.data.model.notification.response.NotificationEnabledResponse
+import com.texthip.thip.data.model.notification.response.NotificationListResponse
+import com.texthip.thip.data.model.notification.response.NotificationCheckResponse
+import com.texthip.thip.data.model.notification.response.NotificationExistsUncheckedResponse
+import com.texthip.thip.data.model.base.BaseResponse
+import retrofit2.http.Body
+import retrofit2.http.DELETE
+import retrofit2.http.GET
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+import retrofit2.http.Query
+
+interface NotificationService {
+    @POST("notifications/fcm-tokens")
+    suspend fun registerFcmToken(
+        @Body request: FcmTokenRequest
+    ): BaseResponse<Unit>
+
+    @GET("users/notification-settings")
+    suspend fun getNotificationEnableState(
+        @Query("deviceId") deviceId: String
+    ): BaseResponse<NotificationEnabledResponse>
+
+    @PATCH("notifications/enable-state")
+    suspend fun updateNotificationEnabled(
+        @Body request: NotificationEnabledRequest
+    ): BaseResponse<NotificationEnabledResponse>
+
+    @DELETE("notifications/fcm-tokens")
+    suspend fun deleteFcmToken(
+        @Body request: FcmTokenDeleteRequest
+    ): BaseResponse<Unit>
+
+    @GET("notifications")
+    suspend fun getNotifications(
+        @Query("cursor") cursor: String? = null,
+        @Query("type") type: String? = null
+    ): BaseResponse<NotificationListResponse>
+
+    @POST("notifications/check")
+    suspend fun checkNotification(
+        @Body request: NotificationCheckRequest
+    ): BaseResponse<NotificationCheckResponse>
+
+    @GET("notifications/exists-unchecked")
+    suspend fun existsUncheckedNotifications(): BaseResponse<NotificationExistsUncheckedResponse>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/service/RoomsService.kt b/app/src/main/java/com/texthip/thip/data/service/RoomsService.kt
index f43d1f7d..0f6e2485 100644
--- a/app/src/main/java/com/texthip/thip/data/service/RoomsService.kt
+++ b/app/src/main/java/com/texthip/thip/data/service/RoomsService.kt
@@ -19,6 +19,8 @@ import com.texthip.thip.data.model.rooms.response.RoomJoinResponse
 import com.texthip.thip.data.model.rooms.response.RoomMainList
 import com.texthip.thip.data.model.rooms.response.RoomRecruitingResponse
 import com.texthip.thip.data.model.rooms.response.RoomSecretRoomResponse
+import com.texthip.thip.data.model.rooms.response.RoomsAiReviewResponse
+import com.texthip.thip.data.model.rooms.response.RoomsAiUsageResponse
 import com.texthip.thip.data.model.rooms.response.RoomsBookPageResponse
 import com.texthip.thip.data.model.rooms.response.RoomsCreateDailyGreetingResponse
 import com.texthip.thip.data.model.rooms.response.RoomsCreateVoteResponse
@@ -52,7 +54,7 @@ interface RoomsService {
         @Query("cursor") cursor: String? = null
     ): BaseResponse<JoinedRoomListResponse>
 
-    /** 카테고리별 모임방 목록 조회 (마감임박/인기) */
+    /** 카테고리별 모임방 목록 조회 (마감임박/인기/최근 생성) */
     @GET("rooms")
     suspend fun getRooms(
         @Query("category") category: String = "문학"
@@ -100,6 +102,7 @@ interface RoomsService {
     suspend fun searchRooms(
         @Query("keyword") keyword: String,
         @Query("category") category: String,
+        @Query("isAllCategory") isAllCategory: Boolean = false,
         @Query("sort") sort: String = "deadline",
         @Query("isFinalized") isFinalized: Boolean = false,
         @Query("cursor") cursor: String? = null
@@ -108,7 +111,7 @@ interface RoomsService {
 
 
     /** 기록장 API들 */
-    @GET("rooms/{roomId}/playing")
+    @GET("rooms/{roomId}")
     suspend fun getRoomsPlaying(
         @Path("roomId") roomId: Int
     ): BaseResponse<RoomsPlayingResponse>
@@ -214,4 +217,14 @@ interface RoomsService {
         @Path("voteId") voteId: Int,
         @Body request: RoomsPatchVoteRequest
     ): BaseResponse<RoomsPatchVoteResponse>
+
+    @GET("rooms/{roomId}/users/ai-usage")
+    suspend fun getRoomsAiUsage(
+        @Path("roomId") roomId: Int
+    ): BaseResponse<RoomsAiUsageResponse>
+
+    @POST("rooms/{roomId}/record/ai-review")
+    suspend fun postRoomsAiReview(
+        @Path("roomId") roomId: Int
+    ): BaseResponse<RoomsAiReviewResponse>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/service/MyFirebaseMessagingService.kt b/app/src/main/java/com/texthip/thip/service/MyFirebaseMessagingService.kt
new file mode 100644
index 00000000..b7ecfa29
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/service/MyFirebaseMessagingService.kt
@@ -0,0 +1,125 @@
+package com.texthip.thip.service
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Intent
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+import com.texthip.thip.MainActivity
+import com.texthip.thip.R
+import com.texthip.thip.data.manager.FcmTokenManager
+import com.texthip.thip.data.repository.NotificationRepository
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class MyFirebaseMessagingService : FirebaseMessagingService() {
+    @Inject
+    lateinit var fcmTokenManager: FcmTokenManager
+
+    @Inject
+    lateinit var notificationRepository: NotificationRepository
+
+    companion object {
+        private const val TAG = "FCM"
+        private const val CHANNEL_ID = "thip_notifications"
+        private const val CHANNEL_NAME = "THIP 알림"
+        private const val CHANNEL_DESCRIPTION = "THIP 앱의 푸시 알림"
+    }
+
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        super.onMessageReceived(remoteMessage)
+
+
+        // 푸시 알림 도착 시 알림 상태 새로고침 (비차단 방식)
+        try {
+            notificationRepository.onNotificationReceived()
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to trigger notification refresh", e)
+        }
+
+        // Data payload 처리
+        val dataPayload = remoteMessage.data
+        if (dataPayload.isNotEmpty()) {
+            Log.d(TAG, "Message data payload: $dataPayload")
+        }
+
+        val title = remoteMessage.notification?.title ?: "THIP"
+        val body = remoteMessage.notification?.body ?: "새로운 알림이 있습니다"
+
+        Log.d(TAG, "App is in foreground, showing custom notification: title=$title, body=$body")
+        showNotification(title, body, dataPayload)
+    }
+
+    override fun onNewToken(token: String) {
+        super.onNewToken(token)
+        Log.d(TAG, "Refreshed token: $token")
+
+        // FCM 토큰 관리자를 통해 처리
+        CoroutineScope(Dispatchers.IO).launch {
+            fcmTokenManager.handleNewToken(token)
+        }
+    }
+
+    private fun showNotification(
+        title: String?,
+        messageBody: String?,
+        dataPayload: Map<String, String>
+    ) {
+        val intent = Intent(this, MainActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            // FCM 데이터를 Intent에 추가
+            dataPayload["notificationId"]?.let { notificationId ->
+                putExtra("notification_id", notificationId)
+                putExtra("from_notification", true)
+            }
+        }
+
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            System.currentTimeMillis().toInt(), // 고유한 requestCode 사용
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        createNotificationChannel()
+
+        val notificationBuilder = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setSmallIcon(R.mipmap.ic_launcher)
+            .setContentTitle(title ?: "THIP")
+            .setContentText(messageBody)
+            .setAutoCancel(true)
+            .setContentIntent(pendingIntent)
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setCategory(NotificationCompat.CATEGORY_MESSAGE)
+            .setDefaults(NotificationCompat.DEFAULT_ALL)
+            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+
+        val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        val notificationId =
+            dataPayload["notificationId"]?.toIntOrNull() ?: System.currentTimeMillis().toInt()
+        notificationManager.notify(notificationId, notificationBuilder.build())
+    }
+
+    private fun createNotificationChannel() {
+        val channel = NotificationChannel(
+            CHANNEL_ID,
+            CHANNEL_NAME,
+            NotificationManager.IMPORTANCE_HIGH
+        ).apply {
+            description = CHANNEL_DESCRIPTION
+            enableVibration(true)
+            setShowBadge(true)
+            enableLights(true)
+        }
+
+        val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.createNotificationChannel(channel)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/common/alarmpage/component/AlarmFilterRow.kt b/app/src/main/java/com/texthip/thip/ui/common/alarmpage/component/AlarmFilterRow.kt
index f70659bc..542b6db7 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/alarmpage/component/AlarmFilterRow.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/alarmpage/component/AlarmFilterRow.kt
@@ -24,11 +24,13 @@ fun AlarmFilterRow(
         OptionChipButton(
             text = stringResource(R.string.alarm_feed),
             isFilled = true,
+            isSelected = selectedStates[0],
             onClick = { onToggle(0) }
         )
         OptionChipButton(
             text = stringResource(R.string.alarm_group),
             isFilled = true,
+            isSelected = selectedStates[1],
             onClick = { onToggle(1) }
         )
     }
diff --git a/app/src/main/java/com/texthip/thip/ui/common/alarmpage/mock/NotificationType.kt b/app/src/main/java/com/texthip/thip/ui/common/alarmpage/mock/NotificationType.kt
new file mode 100644
index 00000000..1a1f755e
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/common/alarmpage/mock/NotificationType.kt
@@ -0,0 +1,7 @@
+package com.texthip.thip.ui.common.alarmpage.mock
+
+enum class NotificationType(val value: String) {
+    FEED_AND_ROOM("feedAndRoom"),
+    FEED("feed"),
+    ROOM("room")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/common/alarmpage/screen/AlarmScreen.kt b/app/src/main/java/com/texthip/thip/ui/common/alarmpage/screen/AlarmScreen.kt
index 3044e2e5..f2d76254 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/alarmpage/screen/AlarmScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/alarmpage/screen/AlarmScreen.kt
@@ -9,39 +9,96 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import com.texthip.thip.R
+import com.texthip.thip.data.model.notification.response.NotificationCheckResponse
+import com.texthip.thip.data.model.notification.response.NotificationResponse
 import com.texthip.thip.ui.common.alarmpage.component.AlarmFilterRow
-import com.texthip.thip.ui.common.alarmpage.mock.AlarmItem
 import com.texthip.thip.ui.common.alarmpage.component.CardAlarm
+import com.texthip.thip.ui.common.alarmpage.mock.NotificationType
+import com.texthip.thip.ui.common.alarmpage.viewmodel.AlarmUiState
+import com.texthip.thip.ui.common.alarmpage.viewmodel.AlarmViewModel
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AlarmScreen(
-    alarmItems: List<AlarmItem>, 
-    onCardClick: (AlarmItem) -> Unit = {},  // 나중에 서버랑 연동할 때 사용
-    onNavigateBack: () -> Unit = {}
+    onNavigateBack: () -> Unit = {},
+    onNotificationNavigation: (NotificationCheckResponse) -> Unit = {},
+    viewModel: AlarmViewModel = hiltViewModel()
 ) {
-    var selectedStates by remember { mutableStateOf(booleanArrayOf(false, false)) }
-    var alarms by remember { mutableStateOf(alarmItems) }
+    val uiState by viewModel.uiState.collectAsState()
 
-    val filteredList = when {
-        selectedStates[0] && !selectedStates[1] -> alarms.filter { it.badgeText == stringResource(R.string.alarm_feed) }
-        !selectedStates[0] && selectedStates[1] -> alarms.filter { it.badgeText == stringResource(R.string.alarm_group) }
-        else -> alarms
+    LaunchedEffect(key1 = Unit) {
+        viewModel.refreshData()
+    }
+
+    AlarmContent(
+        uiState = uiState,
+        onNavigateBack = onNavigateBack,
+        onRefresh = { viewModel.refreshData() },
+        onLoadMore = { viewModel.loadMoreNotifications() },
+        onChangeNotificationType = { viewModel.changeNotificationType(it) },
+        onNotificationClick = { notificationId ->
+            viewModel.checkNotification(notificationId) { response ->
+                onNotificationNavigation(response)
+            }
+        }
+    )
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AlarmContent(
+    uiState: AlarmUiState,
+    onNavigateBack: () -> Unit = {},
+    onRefresh: () -> Unit = {},
+    onLoadMore: () -> Unit = {},
+    onChangeNotificationType: (NotificationType) -> Unit = {},
+    onNotificationClick: (Int) -> Unit = {}
+) {
+    val listState = rememberLazyListState()
+
+    // 무한 스크롤 로직
+    val shouldLoadMore by remember(uiState.canLoadMore, uiState.isLoadingMore) {
+        derivedStateOf {
+            val lastVisibleIndex = listState.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0
+            val totalItems = listState.layoutInfo.totalItemsCount
+            uiState.canLoadMore && !uiState.isLoadingMore && totalItems > 0 && lastVisibleIndex >= totalItems - 3
+        }
+    }
+
+    LaunchedEffect(shouldLoadMore) {
+        if (shouldLoadMore) {
+            onLoadMore()
+        }
+    }
+
+    // 필터 상태 매핑
+    val selectedStates = remember(uiState.currentNotificationType) {
+        when (uiState.currentNotificationType) {
+            NotificationType.FEED -> booleanArrayOf(true, false)
+            NotificationType.ROOM -> booleanArrayOf(false, true)
+            else -> booleanArrayOf(false, false) // FEED_AND_ROOM
+        }
     }
 
     Column(
@@ -52,49 +109,79 @@ fun AlarmScreen(
             title = stringResource(R.string.alarm_string),
             onLeftClick = onNavigateBack,
         )
-        Column(
-            Modifier
-                .fillMaxSize()
-                .padding(horizontal = 20.dp)
+
+        PullToRefreshBox(
+            isRefreshing = uiState.isLoading,
+            onRefresh = onRefresh,
+            modifier = Modifier.fillMaxSize()
         ) {
-            Spacer(modifier = Modifier.height(20.dp))
-            AlarmFilterRow(
-                selectedStates = selectedStates, onToggle = { idx ->
-                    selectedStates = selectedStates.copyOf().also { it[idx] = !it[idx] }
-                })
-            Spacer(modifier = Modifier.height(20.dp))
-
-            if (filteredList.isEmpty()) {
-
-                Column(
-                    modifier = Modifier.fillMaxSize(),
-                    verticalArrangement = Arrangement.Center,
-                    horizontalAlignment = Alignment.CenterHorizontally
-                ) {
-                    Text(
-                        text = stringResource(R.string.alarm_notification_comment),
-                        style = typography.smalltitle_sb600_s18_h24,
-                        color = colors.White
-                    )
-                }
-            } else {
-                LazyColumn(
-                    verticalArrangement = Arrangement.spacedBy(20.dp),
-                    contentPadding = PaddingValues(bottom = 20.dp),
-                    modifier = Modifier.fillMaxSize()
-                ) {
-                    items(filteredList, key = { it.id }) { alarm ->
-                        CardAlarm(
-                            badgeText = alarm.badgeText,
-                            title = alarm.title,
-                            message = alarm.message,
-                            timeAgo = alarm.timeAgo,
-                            isRead = alarm.isRead,
-                            onClick = {
-                                alarms = alarms.map {
-                                    if (it.id == alarm.id) it.copy(isRead = true) else it
+            Column(
+                Modifier
+                    .fillMaxSize()
+                    .padding(horizontal = 20.dp)
+            ) {
+                Spacer(modifier = Modifier.height(20.dp))
+                AlarmFilterRow(
+                    selectedStates = selectedStates,
+                    onToggle = { idx ->
+                        val newNotificationType = when {
+                            // 피드 버튼을 눌렀을 때
+                            idx == 0 -> {
+                                if (selectedStates[0]) {
+                                    // 이미 선택된 상태면 전체로 변경
+                                    NotificationType.FEED_AND_ROOM
+                                } else {
+                                    // 선택되지 않은 상태면 피드만
+                                    NotificationType.FEED
+                                }
+                            }
+                            // 모임 버튼을 눌렀을 때  
+                            idx == 1 -> {
+                                if (selectedStates[1]) {
+                                    NotificationType.FEED_AND_ROOM
+                                } else {
+                                    NotificationType.ROOM
+                                }
+                            }
+
+                            else -> NotificationType.FEED_AND_ROOM
+                        }
+                        onChangeNotificationType(newNotificationType)
+                    }
+                )
+                Spacer(modifier = Modifier.height(20.dp))
+
+                if (uiState.notifications.isNotEmpty()) {
+                    LazyColumn(
+                        state = listState,
+                        verticalArrangement = Arrangement.spacedBy(20.dp),
+                        contentPadding = PaddingValues(bottom = 20.dp),
+                        modifier = Modifier.fillMaxSize()
+                    ) {
+                        items(uiState.notifications, key = { it.notificationId }) { notification ->
+                            CardAlarm(
+                                badgeText = notification.notificationType,
+                                title = removeBracketPrefix(notification.title),
+                                message = notification.content,
+                                timeAgo = notification.postDate,
+                                isRead = notification.isChecked,
+                                onClick = {
+                                    onNotificationClick(notification.notificationId)
                                 }
-                            })
+                            )
+                        }
+                    }
+                } else if (!uiState.isLoading) {
+                    Column(
+                        modifier = Modifier.fillMaxSize(),
+                        verticalArrangement = Arrangement.Center,
+                        horizontalAlignment = Alignment.CenterHorizontally
+                    ) {
+                        Text(
+                            text = stringResource(R.string.alarm_notification_comment),
+                            style = typography.smalltitle_sb600_s18_h24,
+                            color = colors.White
+                        )
                     }
                 }
             }
@@ -102,17 +189,46 @@ fun AlarmScreen(
     }
 }
 
+private fun removeBracketPrefix(title: String): String {
+    return title.replace(Regex("^\\[.*?\\]\\s*"), "").trim()
+}
+
 
 @Preview(showBackground = true)
 @Composable
 fun AlarmScreenPreview() {
     ThipTheme {
-        AlarmScreen(
-            alarmItems = listOf(
-                AlarmItem(1, "피드", "내 글을 좋아합니다.", "user123님이 내 글에 좋아요를 눌렀어요.", "2", false),
-                AlarmItem(2, "모임", "같이 읽기를 시작했어요!", "모임방에서 20분 동안 같이 읽기가 시작되었어요!", "7", false),
-                AlarmItem(3, "피드", "내 글에 댓글이 달렸어요.", "user1: 진짜 공감합니다!", "2025.01.12", true),
-                AlarmItem(4, "모임", "투표가 시작되었어요!", "투표지를 먼저 열람합니다.", "17", false)
+        AlarmContent(
+            uiState = AlarmUiState(
+                notifications = listOf(
+                    NotificationResponse(
+                        notificationId = 1,
+                        title = "[피드] 내 글을 좋아합니다.",
+                        content = "user123님이 내 글에 좋아요를 눌렀어요.",
+                        isChecked = false,
+                        notificationType = "피드",
+                        postDate = "2시간 전"
+                    ),
+                    NotificationResponse(
+                        notificationId = 2,
+                        title = "[모임] 같이 읽기를 시작했어요!",
+                        content = "모임방에서 20분 동안 같이 읽기가 시작되었어요!",
+                        isChecked = false,
+                        notificationType = "모임",
+                        postDate = "7시간 전"
+                    ),
+                    NotificationResponse(
+                        notificationId = 3,
+                        title = "[모임] 투표가 시작되었어요!",
+                        content = "투표지를 먼저 열람합니다.",
+                        isChecked = true,
+                        notificationType = "모임",
+                        postDate = "17시간 전"
+                    )
+                ),
+                currentNotificationType = NotificationType.FEED_AND_ROOM,
+                isLoading = false,
+                hasMore = true
             )
         )
     }
@@ -122,8 +238,11 @@ fun AlarmScreenPreview() {
 @Composable
 fun AlarmScreenEmptyPreview() {
     ThipTheme {
-        AlarmScreen(
-            alarmItems = emptyList()
+        AlarmContent(
+            uiState = AlarmUiState(
+                notifications = emptyList(),
+                isLoading = false
+            )
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/common/alarmpage/viewmodel/AlarmUiState.kt b/app/src/main/java/com/texthip/thip/ui/common/alarmpage/viewmodel/AlarmUiState.kt
new file mode 100644
index 00000000..22ed4624
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/common/alarmpage/viewmodel/AlarmUiState.kt
@@ -0,0 +1,16 @@
+package com.texthip.thip.ui.common.alarmpage.viewmodel
+
+import com.texthip.thip.data.model.notification.response.NotificationResponse
+import com.texthip.thip.ui.common.alarmpage.mock.NotificationType
+
+data class AlarmUiState(
+    val notifications: List<NotificationResponse> = emptyList(),
+    val currentNotificationType: NotificationType = NotificationType.FEED_AND_ROOM,
+    val isLoading: Boolean = false,
+    val isLoadingMore: Boolean = false,
+    val hasMore: Boolean = true,
+    val error: String? = null,
+    val hasUnreadNotifications: Boolean = false  // API에서 가져온 읽지 않은 알림 존재 여부
+) {
+    val canLoadMore: Boolean get() = !isLoading && !isLoadingMore && hasMore
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/common/alarmpage/viewmodel/AlarmViewModel.kt b/app/src/main/java/com/texthip/thip/ui/common/alarmpage/viewmodel/AlarmViewModel.kt
index efa44466..dc75f35c 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/alarmpage/viewmodel/AlarmViewModel.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/alarmpage/viewmodel/AlarmViewModel.kt
@@ -1,27 +1,183 @@
 package com.texthip.thip.ui.common.alarmpage.viewmodel
 
 import androidx.lifecycle.ViewModel
-import com.texthip.thip.ui.common.alarmpage.mock.AlarmItem
+import androidx.lifecycle.viewModelScope
+import com.texthip.thip.data.repository.NotificationRepository
+import com.texthip.thip.data.model.notification.response.NotificationCheckResponse
+import com.texthip.thip.ui.common.alarmpage.mock.NotificationType
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
 
-class AlarmViewModel : ViewModel() {
-    private val _alarmItems = MutableStateFlow<List<AlarmItem>>(emptyList())
-    val alarmItems: StateFlow<List<AlarmItem>> = _alarmItems.asStateFlow()
+@HiltViewModel
+class AlarmViewModel @Inject constructor(
+    private val repository: NotificationRepository
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow(AlarmUiState())
+    val uiState: StateFlow<AlarmUiState> = _uiState.asStateFlow()
+
+    private var nextCursor: String? = null
+    private var isLastPage = false
+    private var isLoadingData = false
+    private var loadJob: Job? = null
+
+    private fun updateState(update: (AlarmUiState) -> AlarmUiState) {
+        _uiState.value = update(_uiState.value)
+    }
 
-    // 알림 더미 데이터
     init {
-        _alarmItems.value = listOf(
-            AlarmItem(1, "피드", "내 글을 좋아합니다.", "user123님이 내 글에 좋아요를 눌렀어요.", "2시간 전", false),
-            AlarmItem(2, "모임", "같이 읽기를 시작했어요!", "모임방에서 20분 동안 같이 읽기가 시작되었어요!", "7시간 전", false),
-            AlarmItem(4, "모임", "투표가 시작되었어요!", "투표지를 먼저 열람합니다.", "17시간 전", false),
-            AlarmItem(5, "피드", "팔로워가 새 글을 올렸어요.", "user456님이 새 리뷰를 작성했습니다.", "1일 전", true),
-            AlarmItem(6, "모임", "새로운 모임방 초대", "호르몬 체인지 완독하는 방에 초대되었습니다.", "2일 전", false)
-        )
+        checkUnreadNotifications()
+
+        // Repository의 알림 업데이트 이벤트 구독
+        viewModelScope.launch {
+            repository.notificationUpdateFlow.collect { notificationId ->
+                updateNotificationAsRead(notificationId)
+                checkUnreadNotifications()
+            }
+        }
+
+        // 푸시 알림 도착 시 아이콘 상태만 갱신
+        viewModelScope.launch {
+            repository.notificationRefreshFlow.collect {
+                checkUnreadNotifications()
+            }
+        }
+    }
+
+    fun loadNotifications(reset: Boolean = false) {
+        // reset 시 기존 작업 취소
+        if (reset) {
+            loadJob?.cancel()
+            loadJob = null
+        }
+
+        // 중복 로드 방지 (reset이 아닌 경우에만)
+        if (isLoadingData && !reset) return
+        if (isLastPage && !reset) return
+
+        // launch 전에 isLoadingData 선반영 (플리커 방지)
+        isLoadingData = true
+
+        // UI 상태 즉시 반영
+        if (reset) {
+            updateState {
+                it.copy(
+                    isLoading = true,
+                    notifications = emptyList(),
+                    hasMore = true
+                )
+            }
+            nextCursor = null
+            isLastPage = false
+        } else {
+            updateState { it.copy(isLoadingMore = true) }
+        }
+
+        // 하나의 loadJob에 작업 바인딩
+        val currentJob = viewModelScope.launch {
+            try {
+                val type =
+                    if (uiState.value.currentNotificationType == NotificationType.FEED_AND_ROOM) {
+                        null
+                    } else {
+                        uiState.value.currentNotificationType.value
+                    }
+
+                repository.getNotifications(nextCursor, type)
+                    .onSuccess { notificationListResponse ->
+                        notificationListResponse?.let { response ->
+                            val currentList =
+                                if (reset) emptyList() else uiState.value.notifications
+                            updateState {
+                                it.copy(
+                                    notifications = currentList + response.notifications,
+                                    error = null,
+                                    hasMore = !response.isLast
+                                )
+                            }
+                            nextCursor = response.nextCursor
+                            isLastPage = response.isLast
+                        } ?: run {
+                            updateState { it.copy(hasMore = false) }
+                            isLastPage = true
+                        }
+                    }
+                    .onFailure { exception ->
+                        updateState { it.copy(error = exception.message) }
+                    }
+            } finally {
+                if (loadJob == coroutineContext[Job]) {
+                    isLoadingData = false
+                    updateState { it.copy(isLoading = false, isLoadingMore = false) }
+                    loadJob = null
+                }
+            }
+        }
+        loadJob = currentJob
+    }
+
+    fun loadMoreNotifications() {
+        loadNotifications(reset = false)
+    }
+
+    fun refreshData() {
+        loadNotifications(reset = true)
+        checkUnreadNotifications()
+    }
+
+    fun changeNotificationType(notificationType: NotificationType) {
+        if (notificationType != uiState.value.currentNotificationType) {
+            updateState { it.copy(currentNotificationType = notificationType) }
+            loadNotifications(reset = true)
+        }
+    }
+
+    fun checkNotification(notificationId: Int, onNavigate: (NotificationCheckResponse) -> Unit) {
+        viewModelScope.launch {
+            repository.checkNotification(notificationId)
+                .onSuccess { response ->
+                    response?.let {
+                        // 로컬 상태에서 해당 알림을 읽음으로 표시
+                        updateNotificationAsRead(notificationId)
+                        onNavigate(it)
+                    }
+                }
+                .onFailure { exception ->
+                    updateState { it.copy(error = exception.message) }
+                }
+        }
+    }
+
+    private fun updateNotificationAsRead(notificationId: Int) {
+        val updatedNotifications = uiState.value.notifications.map { notification ->
+            if (notification.notificationId == notificationId) {
+                notification.copy(isChecked = true)
+            } else {
+                notification
+            }
+        }
+        updateState { it.copy(notifications = updatedNotifications) }
     }
 
-    fun onCardClick(item: AlarmItem) {
-        // TODO: 알림 카드 클릭 처리
+    fun checkUnreadNotifications() {
+        viewModelScope.launch {
+            repository.existsUncheckedNotifications()
+                .onSuccess { response ->
+                    response?.let {
+                        updateState { state ->
+                            state.copy(hasUnreadNotifications = it.exists)
+                        }
+                    }
+                }
+                .onFailure { exception ->
+                    // 에러 발생 시 기존 상태 유지 (로그만 남김)
+                    updateState { it.copy(error = exception.message) }
+                }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoom.kt b/app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoom.kt
index 081eeba3..4acf934d 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoom.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoom.kt
@@ -45,6 +45,7 @@ fun CardItemRoom(
     imageUrl: String? = null,
     hasBorder: Boolean = false,
     isSecret: Boolean? = null,
+    isExpired: Boolean = false,
     onClick: () -> Unit = {}
 ) {
     Card(
@@ -161,19 +162,21 @@ fun CardItemRoom(
                             }
                         }
                     }
-                    endDate?.let {
-                        Spacer(modifier = Modifier.height(5.dp))
+                    if (!isExpired) {
+                        endDate?.let {
+                            Spacer(modifier = Modifier.height(5.dp))
 
-                        Text(
-                            text = endDate
-                                    + if (isRecruiting) stringResource(
-                                R.string.card_item_end
-                            ) else stringResource(R.string.card_item_finish),
+                            Text(
+                                text = endDate
+                                        + if (isRecruiting) stringResource(
+                                    R.string.card_item_end
+                                ) else stringResource(R.string.card_item_finish),
 
-                            color = if (isRecruiting) colors.Red else colors.Grey01,
-                            style = typography.menu_sb600_s12_h20,
-                            maxLines = 1
-                        )
+                                color = if (isRecruiting) colors.Red else colors.Grey01,
+                                style = typography.menu_sb600_s12_h20,
+                                maxLines = 1
+                            )
+                        }
                     }
                 }
             }
diff --git a/app/src/main/java/com/texthip/thip/ui/common/forms/SearchBookTextField.kt b/app/src/main/java/com/texthip/thip/ui/common/forms/SearchBookTextField.kt
index 066ada9d..de7d16ea 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/forms/SearchBookTextField.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/forms/SearchBookTextField.kt
@@ -40,6 +40,7 @@ fun SearchBookTextField(
     modifier: Modifier = Modifier,
     text: String,
     hint: String,
+    backgroundColor: Color = colors.DarkGrey,
     onValueChange: (String) -> Unit,
     onSearch: (String) -> Unit = {}
 ) {
@@ -53,7 +54,7 @@ fun SearchBookTextField(
             .fillMaxWidth()
             .height(40.dp)
             .clip(shape)
-            .background(colors.DarkGrey),
+            .background(backgroundColor),
         contentAlignment = Alignment.CenterStart
     ) {
         Row(
diff --git a/app/src/main/java/com/texthip/thip/ui/common/topappbar/LogoTopAppBar.kt b/app/src/main/java/com/texthip/thip/ui/common/topappbar/LogoTopAppBar.kt
index 14fcd678..821d534e 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/topappbar/LogoTopAppBar.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/topappbar/LogoTopAppBar.kt
@@ -24,7 +24,7 @@ import com.texthip.thip.ui.theme.ThipTheme.colors
 @Composable
 fun LogoTopAppBar(
     modifier: Modifier = Modifier,
-    leftIcon: Painter,
+    leftIcon: Painter? = null,
     hasNotification: Boolean,
     onLeftClick: () -> Unit = {},
     onRightClick: () -> Unit = {}
@@ -56,12 +56,14 @@ fun LogoTopAppBar(
             horizontalArrangement = Arrangement.spacedBy(20.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Icon(
-                painter = leftIcon,
-                contentDescription = "Left Icon",
-                tint = Color.Unspecified,
-                modifier = Modifier.clickable { onLeftClick() }
-            )
+            leftIcon?.let {
+                Icon(
+                    painter = it,
+                    contentDescription = "Left Icon",
+                    tint = Color.Unspecified,
+                    modifier = Modifier.clickable { onLeftClick() }
+                )
+            }
             Icon(
                 painter = rightIcon,
                 contentDescription = "Right Icon",
diff --git a/app/src/main/java/com/texthip/thip/ui/feed/component/FeedSubscribelistBar.kt b/app/src/main/java/com/texthip/thip/ui/feed/component/FeedSubscribelistBar.kt
index eeb3a7f5..4607be3a 100644
--- a/app/src/main/java/com/texthip/thip/ui/feed/component/FeedSubscribelistBar.kt
+++ b/app/src/main/java/com/texthip/thip/ui/feed/component/FeedSubscribelistBar.kt
@@ -36,6 +36,7 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 @Composable
 fun FeedSubscribeBarlist(
     modifier: Modifier = Modifier,
+    followerNum: Int = 0,
     followerProfileImageUrls: List<String>,
     onClick: () -> Unit
 ) {
@@ -59,7 +60,8 @@ fun FeedSubscribeBarlist(
                         color = colors.White
                     )
                 ) {
-                    append(stringResource(R.string.thip_num, followerProfileImageUrls.size))                }
+                    append(stringResource(R.string.thip_num, followerNum))
+                }
                 withStyle(
                     style = SpanStyle(
                         color = colors.Grey
diff --git a/app/src/main/java/com/texthip/thip/ui/feed/component/MySubscribelistBar.kt b/app/src/main/java/com/texthip/thip/ui/feed/component/MySubscribelistBar.kt
index 8037a1b9..2a30dac7 100644
--- a/app/src/main/java/com/texthip/thip/ui/feed/component/MySubscribelistBar.kt
+++ b/app/src/main/java/com/texthip/thip/ui/feed/component/MySubscribelistBar.kt
@@ -131,20 +131,25 @@ fun MySubscribeBarlist(
 }
 
 @Composable
-private fun EmptyMySubscriptionBar() {
+fun EmptyMySubscriptionBar(
+    modifier: Modifier = Modifier,
+    text: String = stringResource(R.string.find_thip_mate),
+    onClick: () -> Unit = {}
+) {
     Box(
-        modifier = Modifier
+        modifier = modifier
+            .padding(top = 8.dp)
             .fillMaxWidth()
             .height(42.dp)
             .clip(RoundedCornerShape(12.dp))
             .background(colors.DarkGrey02)
-            .clickable { }
+            .clickable { onClick() }
     ) {
         Text(
             modifier = Modifier
                 .align(Alignment.CenterStart)
                 .padding(start = 12.dp),
-            text = stringResource(R.string.find_thip_mate),
+            text = text,
             color = colors.White,
             style = typography.view_m500_s12_h20
         )
diff --git a/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedMyScreen.kt b/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedMyScreen.kt
index eda45f2f..ce0a2a1e 100644
--- a/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedMyScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedMyScreen.kt
@@ -121,8 +121,8 @@ fun FeedMyContent(
                         Spacer(modifier = Modifier.height(16.dp))
                         FeedSubscribeBarlist(
                             modifier = Modifier.padding(horizontal = 20.dp),
-                            followerProfileImageUrls = userInfo.latestFollowerProfileImageUrls
-                                ?: emptyList(),
+                            followerNum = userInfo.followerCount,
+                            followerProfileImageUrls = userInfo.latestFollowerProfileImageUrls,
                             onClick = { onNavigateToSubscriptionList(userInfo.creatorId) }
                         )
                         Spacer(modifier = Modifier.height(40.dp))
diff --git a/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedOthersScreen.kt b/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedOthersScreen.kt
index 3de4b5e0..0ae8ae32 100644
--- a/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedOthersScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedOthersScreen.kt
@@ -133,6 +133,7 @@ fun FeedOthersContent(
                         Spacer(modifier = Modifier.height(16.dp))
                         FeedSubscribeBarlist(
                             modifier = Modifier.padding(horizontal = 20.dp),
+                            followerNum = userInfo.followerCount,
                             followerProfileImageUrls = userInfo.latestFollowerProfileImageUrls,
                             onClick = { onNavigateToSubscriptionList(userInfo.creatorId) }
                         )
diff --git a/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedScreen.kt b/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedScreen.kt
index d55debb8..488868cf 100644
--- a/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/feed/screen/FeedScreen.kt
@@ -43,10 +43,10 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
 import com.texthip.thip.R
 import com.texthip.thip.data.model.feed.response.AllFeedItem
 import com.texthip.thip.data.model.users.response.RecentWriterList
+import com.texthip.thip.ui.common.alarmpage.viewmodel.AlarmViewModel
 import com.texthip.thip.ui.common.buttons.FloatingButton
 import com.texthip.thip.ui.common.header.AuthorHeader
 import com.texthip.thip.ui.common.header.HeaderMenuBarTab
@@ -66,7 +66,6 @@ import com.texthip.thip.utils.color.hexToColor
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun FeedScreen(
@@ -85,8 +84,10 @@ fun FeedScreen(
     onRefreshConsumed: () -> Unit = {},
     navController: NavHostController,
     feedViewModel: FeedViewModel = hiltViewModel(),
+    alarmViewModel: AlarmViewModel = hiltViewModel()
 ) {
     val feedUiState by feedViewModel.uiState.collectAsState()
+    val alarmUiState by alarmViewModel.uiState.collectAsState()
     val scope = rememberCoroutineScope()
     var showProgressBar by remember { mutableStateOf(false) }
     val progress = remember { Animatable(0f) }
@@ -154,7 +155,8 @@ fun FeedScreen(
         val hasUpdatedFeedData =
             navController.currentBackStackEntry?.savedStateHandle?.get<Long>("updated_feed_id") != null
         val fromProfile =
-            navController.currentBackStackEntry?.savedStateHandle?.get<Boolean>("from_profile") ?: false
+            navController.currentBackStackEntry?.savedStateHandle?.get<Boolean>("from_profile")
+                ?: false
 
         if (!hasUpdatedFeedData && !fromProfile) {
             // 일반적인 경우: 전체 새로고침 + 스크롤 상단 이동
@@ -177,7 +179,7 @@ fun FeedScreen(
             isUserTabChange = false
         }
     }
-    
+
     // 같은 탭 재클릭 시 스크롤 상단 이동 처리
     LaunchedEffect(shouldScrollToTop) {
         if (shouldScrollToTop) {
@@ -185,7 +187,7 @@ fun FeedScreen(
             shouldScrollToTop = false
         }
     }
-    
+
     // 중복된 로직 제거 - 기존 bottomNavReselected 방식만 사용
 
     LaunchedEffect(resultFeedId) {
@@ -217,11 +219,12 @@ fun FeedScreen(
             }
         }
     }
-    
+
     // 바텀 네비게이션 탭 재선택 처리 (직접 상태 전달 방식)
     LaunchedEffect(onFeedTabReselected) {
         if (onFeedTabReselected > 0) {
             feedViewModel.refreshOnBottomNavReselect()
+            alarmViewModel.checkUnreadNotifications()
             currentListState.scrollToItem(0)
         }
     }
@@ -256,6 +259,7 @@ fun FeedScreen(
 
     FeedContent(
         feedUiState = feedUiState,
+        hasUnreadNotifications = alarmUiState.hasUnreadNotifications,
         showProgressBar = showProgressBar,
         progress = progress.value,
         currentListState = currentListState,
@@ -282,14 +286,18 @@ fun FeedScreen(
         },
         onChangeFeedLike = feedViewModel::changeFeedLike,
         onChangeFeedSave = feedViewModel::changeFeedSave,
-        onPullToRefresh = feedViewModel::pullToRefresh
+        onPullToRefresh = {
+            feedViewModel.pullToRefresh()
+            alarmViewModel.checkUnreadNotifications()
+        }
     )
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun FeedContent(
-    feedUiState: com.texthip.thip.ui.feed.viewmodel.FeedUiState,
+    feedUiState: FeedUiState,
+    hasUnreadNotifications: Boolean,
     showProgressBar: Boolean,
     progress: Float,
     currentListState: LazyListState,
@@ -331,7 +339,7 @@ private fun FeedContent(
             ) {
                 LogoTopAppBar(
                     leftIcon = painterResource(R.drawable.ic_plusfriend),
-                    hasNotification = false,
+                    hasNotification = hasUnreadNotifications,
                     onLeftClick = onNavigateToSearchPeople,
                     onRightClick = onNavigateToNotification,
                 )
@@ -659,6 +667,7 @@ private fun FeedContentPreview() {
                     )
                 )
             ),
+            hasUnreadNotifications = false,
             showProgressBar = false,
             progress = 0f,
             currentListState = LazyListState(),
diff --git a/app/src/main/java/com/texthip/thip/ui/group/done/mock/MyRoomCardData.kt b/app/src/main/java/com/texthip/thip/ui/group/done/mock/MyRoomCardData.kt
deleted file mode 100644
index c42f61be..00000000
--- a/app/src/main/java/com/texthip/thip/ui/group/done/mock/MyRoomCardData.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.texthip.thip.ui.group.done.mock
-
-import com.texthip.thip.ui.group.myroom.mock.RoomType
-
-data class MyRoomCardData(
-    val roomId: Int,
-    val bookImageUrl: String?,
-    val roomName: String,
-    val recruitCount: Int,
-    val memberCount: Int,
-    val endDate: String,
-    val type: String
-)
-
-data class MyRoomsPaginationResult(
-    val data: List<MyRoomCardData>,
-    val nextCursor: String?,
-    val isLast: Boolean
-)
-
-// 타입 기반 모집 상태 확인 함수
-fun MyRoomCardData.isRecruitingByType(): Boolean {
-    return when (type) {
-        RoomType.RECRUITING.value -> true
-        RoomType.PLAYING_AND_RECRUITING.value -> false
-        RoomType.PLAYING.value -> false
-        RoomType.EXPIRED.value -> false
-        else -> false
-    }
-}
-
-fun MyRoomCardData.getEndDateInDays(): Int {
-    return when {
-        endDate.contains("일 뒤") -> {
-            endDate.replace("일 뒤", "").trim().toIntOrNull() ?: 0
-        }
-        else -> 0
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/group/done/screen/GroupDoneScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/done/screen/GroupDoneScreen.kt
deleted file mode 100644
index 25ff4f69..00000000
--- a/app/src/main/java/com/texthip/thip/ui/group/done/screen/GroupDoneScreen.kt
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.texthip.thip.ui.group.done.screen
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Text
-import androidx.compose.material3.pulltorefresh.PullToRefreshBox
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import com.texthip.thip.R
-import com.texthip.thip.data.model.rooms.response.MyRoomResponse
-import com.texthip.thip.ui.common.cards.CardItemRoom
-import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
-import com.texthip.thip.ui.group.done.viewmodel.GroupDoneUiState
-import com.texthip.thip.ui.group.done.viewmodel.GroupDoneViewModel
-import com.texthip.thip.ui.theme.ThipTheme
-import com.texthip.thip.ui.theme.ThipTheme.colors
-import com.texthip.thip.ui.theme.ThipTheme.typography
-import com.texthip.thip.utils.rooms.RoomUtils
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun GroupDoneScreen(
-    onNavigateBack: () -> Unit = {},
-    viewModel: GroupDoneViewModel = hiltViewModel()
-) {
-    val uiState by viewModel.uiState.collectAsState()
-
-    GroupDoneContent(
-        uiState = uiState,
-        onNavigateBack = onNavigateBack,
-        onRefresh = { viewModel.refreshData() },
-        onLoadMore = { viewModel.loadMoreExpiredRooms() }
-    )
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun GroupDoneContent(
-    uiState: GroupDoneUiState,
-    onNavigateBack: () -> Unit = {},
-    onRefresh: () -> Unit = {},
-    onLoadMore: () -> Unit = {}
-) {
-    val listState = rememberLazyListState()
-
-    // 무한 스크롤을 위한 로직
-    val shouldLoadMore by remember(uiState.canLoadMore, uiState.isLoadingMore) {
-        derivedStateOf {
-            val lastVisibleIndex = listState.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0
-            val totalItems = listState.layoutInfo.totalItemsCount
-            uiState.canLoadMore && !uiState.isLoadingMore && totalItems > 0 && lastVisibleIndex >= totalItems - 3
-        }
-    }
-
-    LaunchedEffect(shouldLoadMore) {
-        if (shouldLoadMore) {
-            onLoadMore()
-        }
-    }
-
-    Column(
-        Modifier.fillMaxSize()
-    ) {
-        DefaultTopAppBar(
-            title = stringResource(R.string.group_done_title),
-            onLeftClick = onNavigateBack,
-        )
-        
-        PullToRefreshBox(
-            isRefreshing = uiState.isLoading,
-            onRefresh = onRefresh,
-            modifier = Modifier.fillMaxSize()
-        ) {
-            Column(
-                Modifier
-                    .background(colors.Black)
-                    .fillMaxSize()
-                    .padding(horizontal = 20.dp)
-            ) {
-                LazyColumn(
-                    state = listState,
-                    verticalArrangement = Arrangement.spacedBy(20.dp),
-                    contentPadding = PaddingValues(bottom = 20.dp),
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(top = 16.dp)
-                ) {
-                    item {
-                        Text(
-                            text = stringResource(R.string.group_done_user_comment, uiState.userName),
-                            color = colors.White,
-                            style = typography.menu_r400_s14_h24
-                        )
-                    }
-
-                    items(uiState.expiredRooms) { room ->
-                        CardItemRoom(
-                            title = room.roomName,
-                            imageUrl = room.bookImageUrl,
-                            participants = room.memberCount,
-                            maxParticipants = room.recruitCount, // 모집 인원 수 사용
-                            isRecruiting = RoomUtils.isRecruitingByType(room.type),
-                            isSecret = !room.isPublic,
-                            onClick = { /* 완료된 모임방은 클릭 불가 */ }
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-
-
-@Preview
-@Composable
-fun GroupDoneScreenPreview() {
-    ThipTheme {
-        GroupDoneContent(
-            uiState = GroupDoneUiState(
-                userName = "김독서",
-                expiredRooms = listOf(
-                    MyRoomResponse(
-                        roomId = 1,
-                        roomName = "🌙 미드나이트 라이브러리 함께읽기",
-                        bookImageUrl = "https://picsum.photos/300/400?1",
-                        memberCount = 18,
-                        recruitCount = 20,
-                        endDate = "2025-01-31",
-                        type = "EXPIRED",
-                        isPublic = true
-                    ),
-                    MyRoomResponse(
-                        roomId = 2,
-                        roomName = "📚 현대문학 깊이읽기 모임",
-                        bookImageUrl = "https://picsum.photos/300/400?2",
-                        memberCount = 12,
-                        recruitCount = 15,
-                        endDate = "2024-12-28",
-                        type = "EXPIRED",
-                        isPublic = false
-                    ),
-                    MyRoomResponse(
-                        roomId = 3,
-                        roomName = "🔬 과학책으로 세상보기",
-                        bookImageUrl = "https://picsum.photos/300/400?3",
-                        memberCount = 25,
-                        recruitCount = 30,
-                        endDate = "2024-12-15",
-                        type = "EXPIRED",
-                        isPublic = true
-                    ),
-                    MyRoomResponse(
-                        roomId = 4,
-                        roomName = "✨ 철학 고전 탐구하기",
-                        bookImageUrl = "https://picsum.photos/300/400?4",
-                        memberCount = 10,
-                        recruitCount = 12,
-                        endDate = "2024-11-20",
-                        type = "EXPIRED",
-                        isPublic = true
-                    ),
-                    MyRoomResponse(
-                        roomId = 5,
-                        roomName = "🎨 예술과 문학의 만남",
-                        bookImageUrl = "https://picsum.photos/300/400?5",
-                        memberCount = 16,
-                        recruitCount = 20,
-                        endDate = "2024-10-31",
-                        type = "EXPIRED",
-                        isPublic = false
-                    )
-                ),
-                isLoading = false,
-                hasMore = true
-            )
-        )
-    }
-}
-
diff --git a/app/src/main/java/com/texthip/thip/ui/group/done/viewmodel/GroupDoneUiState.kt b/app/src/main/java/com/texthip/thip/ui/group/done/viewmodel/GroupDoneUiState.kt
deleted file mode 100644
index df299ec1..00000000
--- a/app/src/main/java/com/texthip/thip/ui/group/done/viewmodel/GroupDoneUiState.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.texthip.thip.ui.group.done.viewmodel
-
-import com.texthip.thip.data.model.rooms.response.MyRoomResponse
-
-data class GroupDoneUiState(
-    val expiredRooms: List<MyRoomResponse> = emptyList(),
-    val isLoading: Boolean = false,
-    val isLoadingMore: Boolean = false,
-    val hasMore: Boolean = true,
-    val userName: String = "",
-    val error: String? = null
-) {
-    val hasContent: Boolean get() = expiredRooms.isNotEmpty()
-    val canLoadMore: Boolean get() = !isLoading && !isLoadingMore && hasMore
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/group/done/viewmodel/GroupDoneViewModel.kt b/app/src/main/java/com/texthip/thip/ui/group/done/viewmodel/GroupDoneViewModel.kt
deleted file mode 100644
index f6cc44ac..00000000
--- a/app/src/main/java/com/texthip/thip/ui/group/done/viewmodel/GroupDoneViewModel.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.texthip.thip.ui.group.done.viewmodel
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.texthip.thip.data.repository.RoomsRepository
-import com.texthip.thip.ui.group.myroom.mock.RoomType
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-class GroupDoneViewModel @Inject constructor(
-    private val repository: RoomsRepository
-) : ViewModel() {
-
-    private val _uiState = MutableStateFlow(GroupDoneUiState())
-    val uiState: StateFlow<GroupDoneUiState> = _uiState.asStateFlow()
-    
-    private var nextCursor: String? = null
-    private var isLastPage = false
-    private var isLoadingMore = false
-    private var isInitialLoading = false
-    
-    private fun updateState(update: (GroupDoneUiState) -> GroupDoneUiState) {
-        _uiState.value = update(_uiState.value)
-    }
-
-    init {
-        loadInitialData()
-    }
-
-    private fun loadInitialData() {
-        loadUserName()
-        loadExpiredRooms(reset = true)
-    }
-    
-    private fun loadUserName() {
-        viewModelScope.launch {
-            repository.getUserName()
-                .onSuccess { name ->
-                    updateState { it.copy(userName = name) }
-                }
-        }
-    }
-
-    fun loadExpiredRooms(reset: Boolean = false) {
-        // 중복 호출 방지
-        if (reset) {
-            if (isInitialLoading) return
-            isInitialLoading = true
-        } else {
-            if (isLoadingMore || isLastPage) return
-            isLoadingMore = true
-        }
-        
-        viewModelScope.launch {
-            try {
-                if (reset) {
-                    updateState { it.copy(isLoading = true, expiredRooms = emptyList(), hasMore = true) }
-                    nextCursor = null
-                    isLastPage = false
-                }
-
-                repository.getMyRoomsByType(RoomType.EXPIRED.value, nextCursor)
-                    .onSuccess { myRoomListResponse ->
-                        myRoomListResponse?.let { response ->
-                            val currentList = if (reset) emptyList() else uiState.value.expiredRooms
-                            updateState { 
-                                it.copy(
-                                    expiredRooms = currentList + response.roomList,
-                                    error = null,
-                                    isLoadingMore = false,
-                                    hasMore = !response.isLast
-                                )
-                            }
-                            nextCursor = response.nextCursor
-                            isLastPage = response.isLast
-                        } ?: run {
-                            // null 응답 시 더 이상 로드할 수 없음을 명시
-                            updateState { it.copy(hasMore = false, isLoadingMore = false) }
-                            isLastPage = true
-                        }
-                    }
-                    .onFailure { exception ->
-                        updateState { it.copy(error = exception.message) }
-                    }
-            } finally {
-                if (reset) {
-                    updateState { it.copy(isLoading = false) }
-                    isInitialLoading = false
-                } else {
-                    updateState { it.copy(isLoadingMore = false) }
-                    isLoadingMore = false
-                }
-            }
-        }
-    }
-    
-    fun loadMoreExpiredRooms() {
-        loadExpiredRooms(reset = false)
-    }
-    
-    fun refreshData() {
-        loadExpiredRooms(reset = true)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/group/makeroom/component/GroupBookSearchBottomSheet.kt b/app/src/main/java/com/texthip/thip/ui/group/makeroom/component/GroupBookSearchBottomSheet.kt
index 730951e9..d6d14f5b 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/makeroom/component/GroupBookSearchBottomSheet.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/makeroom/component/GroupBookSearchBottomSheet.kt
@@ -82,6 +82,7 @@ fun GroupBookSearchBottomSheet(
                 SearchBookTextField(
                     hint = stringResource(R.string.group_book_search_hint),
                     text = searchText,
+                    backgroundColor = ThipTheme.colors.DarkGrey02,
                     onValueChange = {
                         searchText = it
                         onSearch(it)
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupDeadlineRoomSection.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupDeadlineRoomSection.kt
index 26d46fea..fb048e93 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupDeadlineRoomSection.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupDeadlineRoomSection.kt
@@ -68,7 +68,7 @@ fun GroupRoomDeadlineSection(
             // Genre enum을 현지화된 문자열로 변환
             val genreStrings = Genre.entries.toDisplayStrings()
 
-            // 마감 임박 방 목록과 인기 방 목록을 섹션으로 구성
+            // 마감 임박 방 목록, 인기 방 목록, 최신 생성 모임방을 섹션으로 구성
             val roomSections = listOf(
                 Pair(
                     stringResource(R.string.room_section_deadline),
@@ -77,12 +77,18 @@ fun GroupRoomDeadlineSection(
                 Pair(
                     stringResource(R.string.room_section_popular),
                     roomMainList?.popularRoomList ?: emptyList()
-                )
+                ),
+                Pair(
+                    stringResource(R.string.room_section_recent),
+                    roomMainList?.recentRoomList ?: emptyList()
+                ),
             )
 
+            val actualPageCount = roomSections.size
+
             val effectivePagerState = rememberPagerState(
-                initialPage = 0,
-                pageCount = { roomSections.size }
+                initialPage = 2,
+                pageCount = { Int.MAX_VALUE }
             )
 
             HorizontalPager(
@@ -91,7 +97,8 @@ fun GroupRoomDeadlineSection(
                 pageSpacing = pageSpacing,
                 modifier = Modifier.fillMaxWidth()
             ) { page ->
-                val (sectionTitle, rooms) = roomSections[page]
+                val actualPage = page % actualPageCount
+                val (sectionTitle, rooms) = roomSections[actualPage]
 
                 val isCurrent = effectivePagerState.currentPage == page
                 val scale = if (isCurrent) 1f else 0.94f
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupMainCard.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupMainCard.kt
index 35924a31..a29ac977 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupMainCard.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupMainCard.kt
@@ -105,7 +105,7 @@ fun GroupMainCard(
                         )
                         Spacer(Modifier.width(2.dp))
 
-                        Row (
+                        Row(
                             verticalAlignment = Alignment.CenterVertically
                         ) {
                             Text(
@@ -122,23 +122,39 @@ fun GroupMainCard(
                     }
                     Spacer(Modifier.height(16.dp))
                     // 닉네임 + 진행도
-                    Row(verticalAlignment = Alignment.Bottom) {
-                        Text(
-                            text = stringResource(R.string.group_progress, userName),
-                            color = colors.Grey02,
-                            style = typography.view_m500_s14
-                        )
-                        Spacer(Modifier.width(4.dp))
-                        Text(
-                            text = "${data.userPercentage}",
-                            color = colors.Purple,
-                            style = typography.smalltitle_sb600_s16_h20
-                        )
-                        Text(
-                            text = "%",
-                            color = colors.Purple,
-                            style = typography.menu_sb600_s12,
-                        )
+                    if (data.deadlineDate == null) {
+                        Row(verticalAlignment = Alignment.Bottom) {
+                            Text(
+                                text = stringResource(R.string.group_progress, userName),
+                                color = colors.Grey02,
+                                style = typography.view_m500_s14
+                            )
+                            Spacer(Modifier.width(4.dp))
+                            Text(
+                                text = "${data.userPercentage}",
+                                color = colors.Purple,
+                                style = typography.smalltitle_sb600_s16_h20
+                            )
+                            Text(
+                                text = "%",
+                                color = colors.Purple,
+                                style = typography.menu_sb600_s12,
+                            )
+                        }
+                    } else {
+                        Row(verticalAlignment = Alignment.Bottom) {
+                            Text(
+                                text = stringResource(R.string.until_start),
+                                color = colors.Grey02,
+                                style = typography.view_m500_s14
+                            )
+                            Spacer(Modifier.width(4.dp))
+                            Text(
+                                text = data.deadlineDate,
+                                color = colors.Purple,
+                                style = typography.smalltitle_sb600_s16_h20
+                            )
+                        }
                     }
                     Spacer(Modifier.height(10.dp))
 
@@ -153,7 +169,10 @@ fun GroupMainCard(
                             modifier = Modifier
                                 .fillMaxWidth(fraction = percentage / 100f)
                                 .fillMaxHeight()
-                                .background(color = colors.Purple, shape = RoundedCornerShape(12.dp))
+                                .background(
+                                    color = colors.Purple,
+                                    shape = RoundedCornerShape(12.dp)
+                                )
                         )
                     }
                     Spacer(Modifier.height(2.dp))
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupMyRoomFilterRow.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupMyRoomFilterRow.kt
index 33166c67..a114b43f 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupMyRoomFilterRow.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupMyRoomFilterRow.kt
@@ -34,6 +34,12 @@ fun GroupMyRoomFilterRow(
             isSelected = selectedStates[1],
             onClick = { onToggle(1) }
         )
+        OptionChipButton(
+            text = stringResource(R.string.finish),
+            isFilled = true,
+            isSelected = selectedStates[2],
+            onClick = { onToggle(2) }
+        )
     }
 }
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/mock/RoomType.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/mock/RoomType.kt
index fe71e4f1..06188785 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/mock/RoomType.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/myroom/mock/RoomType.kt
@@ -1,7 +1,7 @@
 package com.texthip.thip.ui.group.myroom.mock
 
 enum class RoomType(val value: String) {
-    PLAYING_AND_RECRUITING("playingAndRecruiting"),
+    ALL("playingAndRecruiting"),
     RECRUITING("recruiting"),
     PLAYING("playing"),
     EXPIRED("expired")
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupMyScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupMyScreen.kt
index 26022136..01298d87 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupMyScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupMyScreen.kt
@@ -92,9 +92,10 @@ fun GroupMyContent(
     // Filter 상태를 
     val selectedStates = remember(uiState.currentRoomType) {
         when (uiState.currentRoomType) {
-            RoomType.PLAYING -> booleanArrayOf(true, false)
-            RoomType.RECRUITING -> booleanArrayOf(false, true)
-            else -> booleanArrayOf(false, false) // playingAndRecruiting
+            RoomType.PLAYING -> booleanArrayOf(true, false, false) // 진행중
+            RoomType.RECRUITING -> booleanArrayOf(false, true, false) // 모집중
+            RoomType.EXPIRED -> booleanArrayOf(false, false, true) // 완료
+            else -> booleanArrayOf(false, false, false) // 전체(아무것도 선택 안함)
         }
     }
 
@@ -123,27 +124,34 @@ fun GroupMyContent(
                 GroupMyRoomFilterRow(
                     selectedStates = selectedStates,
                     onToggle = { idx ->
-                        val newRoomType = when {
+                        val newRoomType = when(idx) {
                             // 진행중 버튼을 눌렀을 때
-                            idx == 0 -> {
+                            0 -> {
                                 if (selectedStates[0]) {
                                     // 이미 선택된 상태면 전체로 변경
-                                    RoomType.PLAYING_AND_RECRUITING
+                                    RoomType.ALL
                                 } else {
                                     // 선택되지 않은 상태면 진행중만
                                     RoomType.PLAYING
                                 }
                             }
                             // 모집중 버튼을 눌렀을 때  
-                            idx == 1 -> {
+                            1 -> {
                                 if (selectedStates[1]) {
-                                    RoomType.PLAYING_AND_RECRUITING
+                                    RoomType.ALL
                                 } else {
                                     RoomType.RECRUITING
                                 }
                             }
-
-                            else -> RoomType.PLAYING_AND_RECRUITING
+                            // 완료 버튼을 눌렀을 때
+                            2 -> {
+                                if (selectedStates[2]) {
+                                    RoomType.ALL
+                                } else {
+                                    RoomType.EXPIRED
+                                }
+                            }
+                            else -> RoomType.ALL
                         }
                         onChangeRoomType(newRoomType)
                     }
@@ -167,6 +175,7 @@ fun GroupMyContent(
                                 endDate = room.endDate,
                                 imageUrl = room.bookImageUrl,
                                 isSecret = !room.isPublic,
+                                isExpired = (room.type == RoomType.EXPIRED.value),
                                 onClick = { onCardClick(room) }
                             )
                         }
@@ -265,7 +274,7 @@ fun GroupMyScreenPreview() {
                         isPublic = false
                     )
                 ),
-                currentRoomType = RoomType.PLAYING_AND_RECRUITING,
+                currentRoomType = RoomType.ALL,
                 isLoading = false,
                 hasMore = true
             )
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/viewmodel/GroupMyUiState.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/viewmodel/GroupMyUiState.kt
index d48e308f..3228da72 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/viewmodel/GroupMyUiState.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/myroom/viewmodel/GroupMyUiState.kt
@@ -5,7 +5,7 @@ import com.texthip.thip.ui.group.myroom.mock.RoomType
 
 data class GroupMyUiState(
     val myRooms: List<MyRoomResponse> = emptyList(),
-    val currentRoomType: RoomType = RoomType.PLAYING_AND_RECRUITING,
+    val currentRoomType: RoomType = RoomType.ALL,
     val isLoading: Boolean = false,
     val isLoadingMore: Boolean = false,
     val hasMore: Boolean = true,
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt
index 9a2659b1..13ad1e0a 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt
@@ -51,6 +51,7 @@ import com.texthip.thip.utils.rooms.advancedImePadding
 @Composable
 fun CommentBottomSheet(
     uiState: CommentsUiState,
+    isExpired: Boolean = false,
     onDismiss: () -> Unit,
     onProfileClick: (userId: Long) -> Unit = {},
     onShowToast: (String) -> Unit = {},
@@ -122,6 +123,7 @@ fun CommentBottomSheet(
                         } else {
                             CommentLazyList(
                                 listState = listState,
+                                isExpired = isExpired,
                                 commentList = uiState.comments,
                                 isLoadingMore = uiState.isLoadingMore,
                                 isLastPage = uiState.isLast,
@@ -137,37 +139,40 @@ fun CommentBottomSheet(
                                     selectedCommentForMenu = comment
                                 },
                                 onReplyLongPress = { reply -> selectedReplyForMenu = reply },
-                                onProfileClick = onProfileClick
+                                onProfileClick = onProfileClick,
+                                onShowToast = onShowToast
                             )
                         }
                     }
                 }
 
-                CommentTextField(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .focusRequester(focusRequester),
-                    hint = stringResource(R.string.reply_to),
-                    input = inputText,
-                    onInputChange = { inputText = it },
-                    onSendClick = {
-                        viewModel.onEvent(
-                            CommentsEvent.CreateComment(
-                                content = inputText,
-                                parentId = replyingToCommentId
+                if (!isExpired) {
+                    CommentTextField(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .focusRequester(focusRequester),
+                        hint = stringResource(R.string.reply_to),
+                        input = inputText,
+                        onInputChange = { inputText = it },
+                        onSendClick = {
+                            viewModel.onEvent(
+                                CommentsEvent.CreateComment(
+                                    content = inputText,
+                                    parentId = replyingToCommentId
+                                )
                             )
-                        )
-                        inputText = ""
-                        replyingToCommentId = null
-                        replyingToNickname = null
-                        focusManager.clearFocus()
-                    },
-                    replyTo = replyingToNickname,
-                    onCancelReply = {
-                        replyingToCommentId = null
-                        replyingToNickname = null
-                    }
-                )
+                            inputText = ""
+                            replyingToCommentId = null
+                            replyingToNickname = null
+                            focusManager.clearFocus()
+                        },
+                        replyTo = replyingToNickname,
+                        onCancelReply = {
+                            replyingToCommentId = null
+                            replyingToNickname = null
+                        }
+                    )
+                }
             }
         }
     }
@@ -224,6 +229,7 @@ fun CommentBottomSheet(
 @Composable
 private fun CommentLazyList(
     listState: LazyListState,
+    isExpired: Boolean = false,
     commentList: List<CommentList>,
     isLoadingMore: Boolean,
     isLastPage: Boolean,
@@ -232,7 +238,8 @@ private fun CommentLazyList(
     onEvent: (CommentsEvent) -> Unit,
     onCommentLongPress: (CommentList) -> Unit,
     onReplyLongPress: (ReplyList) -> Unit,
-    onProfileClick: (userId: Long) -> Unit
+    onProfileClick: (userId: Long) -> Unit,
+    onShowToast: (String) -> Unit
 ) {
     val isScrolledToEnd by remember {
         derivedStateOf {
@@ -263,11 +270,13 @@ private fun CommentLazyList(
         ) { comment ->
             CommentSection(
                 commentItem = comment,
+                isExpired = isExpired,
                 onReplyClick = onReplyClick,
                 onEvent = onEvent,
                 onCommentLongPress = onCommentLongPress,
                 onReplyLongPress = onReplyLongPress,
-                onProfileClick = onProfileClick
+                onProfileClick = onProfileClick,
+                onShowToast = onShowToast
             )
         }
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentSection.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentSection.kt
index 12a38e08..0fd853e3 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentSection.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentSection.kt
@@ -8,8 +8,10 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.texthip.thip.R
 import com.texthip.thip.data.model.comments.response.CommentList
 import com.texthip.thip.data.model.comments.response.ReplyList
 import com.texthip.thip.ui.group.note.viewmodel.CommentsEvent
@@ -18,12 +20,16 @@ import com.texthip.thip.ui.theme.ThipTheme
 @Composable
 fun CommentSection(
     commentItem: CommentList,
+    isExpired: Boolean = false,
     onReplyClick: (commentId: Int, nickname: String?) -> Unit,
     onEvent: (CommentsEvent) -> Unit = { _ -> },
     onCommentLongPress: (CommentList) -> Unit = { _ -> },
     onReplyLongPress: (ReplyList) -> Unit = { _ -> },
     onProfileClick: (userId: Long) -> Unit = {},
+    onShowToast: (String) -> Unit = {}
 ) {
+    val expiredRoomMessage = stringResource(R.string.expired_room_read_only_message)
+
     Box {
         Column(
             modifier = Modifier
@@ -35,20 +41,30 @@ fun CommentSection(
             CommentItem(
                 data = commentItem,
                 onReplyClick = {
-                    // commentId가 null이 아닐 때만 답글 달기 가능
-                    // todo: 수정 가능
-                    commentItem.commentId?.let { id ->
-                        onReplyClick(id, commentItem.creatorNickname)
+                    if (isExpired) {
+                        onShowToast(expiredRoomMessage)
+                    } else {
+                        commentItem.commentId?.let { id ->
+                            onReplyClick(id, commentItem.creatorNickname)
+                        }
                     }
                 },
                 onLikeClick = {
-                    // commentId가 null이 아닐 때만 좋아요 가능
-                    // todo: 수정 가능
-                    commentItem.commentId?.let { id ->
-                        onEvent(CommentsEvent.LikeComment(id))
+                    if (isExpired) {
+                        onShowToast(expiredRoomMessage)
+                    } else {
+                        commentItem.commentId?.let { id ->
+                            onEvent(CommentsEvent.LikeComment(id))
+                        }
+                    }
+                },
+                onLongPress = {
+                    if (isExpired) {
+                        onShowToast(expiredRoomMessage)
+                    } else {
+                        onCommentLongPress(commentItem)
                     }
                 },
-                onLongPress = { onCommentLongPress(commentItem) },
 
                 onProfileClick = {
                     commentItem.creatorId?.let { id -> onProfileClick(id) }
@@ -59,14 +75,28 @@ fun CommentSection(
                 ReplyItem(
                     data = reply,
                     onReplyClick = {
-                        commentItem.commentId?.let { parentId ->
-                            onReplyClick(parentId, reply.creatorNickname)
+                        if (isExpired) {
+                            onShowToast(expiredRoomMessage)
+                        } else {
+                            commentItem.commentId?.let { parentId ->
+                                onReplyClick(parentId, reply.creatorNickname)
+                            }
                         }
                     },
                     onLikeClick = {
-                        onEvent(CommentsEvent.LikeReply(reply.commentId))
+                        if (isExpired) {
+                            onShowToast(expiredRoomMessage)
+                        } else {
+                            onEvent(CommentsEvent.LikeReply(reply.commentId))
+                        }
+                    },
+                    onLongPress = {
+                        if (isExpired) {
+                            onShowToast(expiredRoomMessage)
+                        } else {
+                            onReplyLongPress(reply)
+                        }
                     },
-                    onLongPress = { onReplyLongPress(reply) },
                     onProfileClick = { onProfileClick(reply.creatorId) }
                 )
             }
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteAiScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteAiScreen.kt
new file mode 100644
index 00000000..db6a067f
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteAiScreen.kt
@@ -0,0 +1,268 @@
+package com.texthip.thip.ui.group.note.screen
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.blur
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.texthip.thip.R
+import com.texthip.thip.ui.common.modal.DialogPopup
+import com.texthip.thip.ui.common.modal.ToastWithDate
+import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
+import com.texthip.thip.ui.group.note.viewmodel.GroupNoteAiUiState
+import com.texthip.thip.ui.group.note.viewmodel.GroupNoteAiViewModel
+import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+import kotlinx.coroutines.delay
+
+@Composable
+fun GroupNoteAiScreen(
+    roomId: Int,
+    onBackClick: () -> Unit,
+    viewModel: GroupNoteAiViewModel = hiltViewModel()
+) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val clipboardManager = LocalClipboardManager.current
+
+    var showToast by remember { mutableStateOf(false) }
+    var showExitDialog by remember { mutableStateOf(false) }
+
+    LaunchedEffect(key1 = roomId) {
+        viewModel.generateAiReview(roomId)
+    }
+
+    LaunchedEffect(showToast) {
+        if (showToast) {
+            delay(3000L)
+            showToast = false
+        }
+    }
+
+    GroupNoteAiContent(
+        uiState = uiState,
+        showToast = showToast,
+        showExitDialog = showExitDialog,
+        onBackClick = { showExitDialog = true },
+        onCopyClick = { text ->
+            clipboardManager.setText(AnnotatedString(text))
+            showToast = true
+        },
+        onConfirmExit = onBackClick,
+        onDismissExitDialog = { showExitDialog = false }
+    )
+}
+
+@Composable
+fun GroupNoteAiContent(
+    uiState: GroupNoteAiUiState,
+    showToast: Boolean = false,
+    showExitDialog: Boolean = false,
+    onBackClick: () -> Unit,
+    onCopyClick: (String) -> Unit,
+    onConfirmExit: () -> Unit,
+    onDismissExitDialog: () -> Unit
+) {
+    val isOverlayVisible = showExitDialog
+
+    Box(modifier = Modifier.fillMaxSize()) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .then(if (isOverlayVisible) Modifier.blur(5.dp) else Modifier)
+        ) {
+            DefaultTopAppBar(
+                title = stringResource(R.string.ai_book_review_title),
+                onLeftClick = onBackClick
+            )
+
+            Box(modifier = Modifier.fillMaxSize()) {
+                if (uiState.isLoading) {
+                    // 로딩 중
+                    Column(
+                        modifier = Modifier.fillMaxSize(),
+                        verticalArrangement = Arrangement.Center,
+                        horizontalAlignment = Alignment.CenterHorizontally
+                    ) {
+                        CircularProgressIndicator()
+                        Spacer(modifier = Modifier.height(20.dp))
+                        Text(
+                            text = stringResource(R.string.ai_review_loading),
+                            style = typography.smalltitle_sb600_s18_h24,
+                            color = colors.White,
+                            textAlign = TextAlign.Center
+                        )
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = stringResource(R.string.ai_review_loading_subtext),
+                            style = typography.copy_r400_s14,
+                            color = colors.Grey,
+                            textAlign = TextAlign.Center
+                        )
+                    }
+                } else if (uiState.aiReviewText != null) {
+                    // 로딩 완료
+                    Column(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .verticalScroll(rememberScrollState())
+                            .padding(start = 26.dp, end = 26.dp, top = 10.dp, bottom = 50.dp)
+                    ) {
+                        Row(
+                            verticalAlignment = Alignment.CenterVertically,
+                            horizontalArrangement = Arrangement.spacedBy(4.dp)
+                        ) {
+                            Icon(
+                                painter = painterResource(R.drawable.ic_information),
+                                contentDescription = "Done Icon",
+                                tint = Color.Unspecified,
+                                modifier = Modifier.align(Alignment.CenterVertically)
+                            )
+
+                            Text(
+                                text = stringResource(R.string.ai_review_done_info),
+                                style = typography.info_r400_s12,
+                                color = colors.Grey01
+                            )
+                        }
+                        Spacer(modifier = Modifier.height(10.dp))
+                        Text(
+                            text = uiState.aiReviewText,
+                            style = typography.feedcopy_r400_s14_h20,
+                            color = colors.White
+                        )
+                        Spacer(modifier = Modifier.height(24.dp))
+                    }
+
+                    Box(
+                        modifier = Modifier
+                            .align(Alignment.BottomCenter)
+                            .fillMaxWidth()
+                            .height(50.dp)
+                            .background(colors.Purple)
+                            .clickable { onCopyClick(uiState.aiReviewText) },
+                        contentAlignment = Alignment.Center
+                    ) {
+                        Text(
+                            text = stringResource(R.string.copy_to_clipboard),
+                            style = typography.smalltitle_sb600_s18_h24,
+                            color = colors.White
+                        )
+                    }
+                } else if (uiState.error != null) {
+                    Column(
+                        modifier = Modifier.fillMaxSize().padding(16.dp),
+                        verticalArrangement = Arrangement.Center,
+                        horizontalAlignment = Alignment.CenterHorizontally
+                    ) {
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = uiState.error,
+                            style = typography.copy_r400_s14,
+                            color = colors.Grey,
+                            textAlign = TextAlign.Center
+                        )
+                    }
+                }
+            }
+        }
+
+        if (showExitDialog) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize(),
+                contentAlignment = Alignment.Center
+            ) {
+                DialogPopup(
+                    title = stringResource(R.string.ai_review_dialog_title),
+                    description = stringResource(R.string.ai_review_exit_dialog_description),
+                    onConfirm = onConfirmExit,
+                    onCancel = onDismissExitDialog
+                )
+            }
+        }
+
+        AnimatedVisibility(
+            visible = showToast,
+            enter = slideInVertically(
+                initialOffsetY = { -it },
+                animationSpec = tween(durationMillis = 2000)
+            ),
+            exit = slideOutVertically(
+                targetOffsetY = { -it },
+                animationSpec = tween(durationMillis = 2000)
+            ),
+            modifier = Modifier
+                .align(Alignment.TopCenter)
+                .padding(horizontal = 20.dp, vertical = 16.dp)
+                .zIndex(2f)
+        ) {
+            ToastWithDate(
+                message = stringResource(R.string.copy_to_clipboard_done)
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun GroupNoteAiScreenLoadingPreview() {
+    ThipTheme {
+        GroupNoteAiContent(
+            uiState = GroupNoteAiUiState(isLoading = true),
+            onBackClick = {},
+            onCopyClick = {},
+            onConfirmExit = {},
+            onDismissExitDialog = {}
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun GroupNoteAiScreenDonePreview() {
+    ThipTheme {
+        GroupNoteAiContent(
+            uiState = GroupNoteAiUiState(isLoading = false, aiReviewText = "레이 커즈와일의 마침내 특이점이 시작된다는 읽는 내내 머릿속이 폭발하는 느낌이었다. 인공지능, 나노기술, 생명공학이 동시에 발전해서 결국 인간의 지능과 기계를 융합하는 시대가 온다는 주장인데, 솔직히 처음엔 SF소설 같은 이야기로 느껴졌다."),
+            onBackClick = {},
+            onCopyClick = {},
+            onConfirmExit = {},
+            onDismissExitDialog = {}
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
index 20440fa1..534aa29f 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
@@ -1,5 +1,6 @@
 package com.texthip.thip.ui.group.note.screen
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.LinearEasing
@@ -53,6 +54,7 @@ import com.texthip.thip.ui.common.header.HeaderMenuBarTab
 import com.texthip.thip.ui.common.modal.DialogPopup
 import com.texthip.thip.ui.common.modal.ToastWithDate
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
+import com.texthip.thip.ui.feed.viewmodel.FeedViewModel
 import com.texthip.thip.ui.group.note.component.CommentBottomSheet
 import com.texthip.thip.ui.group.note.component.FilterHeaderSection
 import com.texthip.thip.ui.group.note.component.TextCommentCard
@@ -74,6 +76,7 @@ import kotlinx.coroutines.launch
 @Composable
 fun GroupNoteScreen(
     roomId: Int,
+    isExpired: Boolean = false,
     onBackClick: () -> Unit = {},
     onCreateNoteClick: (recentPage: Int, totalPage: Int, isOverviewPossible: Boolean) -> Unit,
     onCreateVoteClick: (recentPage: Int, totalPage: Int, isOverviewPossible: Boolean) -> Unit,
@@ -81,15 +84,31 @@ fun GroupNoteScreen(
     onEditNoteClick: (post: PostList) -> Unit = {},
     onEditVoteClick: (post: PostList) -> Unit = {},
     onNavigateToUserProfile: (userId: Long) -> Unit = {},
+    onNavigateToMyProfile: () -> Unit = {},
+    onNavigateToAiReview: () -> Unit = {},
     resultTabIndex: Int? = null,
     onResultConsumed: () -> Unit = {},
     initialPage: Int? = null,
     initialIsOverview: Boolean? = null,
+    initialPostId: Int? = null,
+    openComments: Boolean = false,
     viewModel: GroupNoteViewModel = hiltViewModel()
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val scope = rememberCoroutineScope()
 
+    // FeedViewModel을 통해 현재 사용자 정보 가져오기
+    val feedViewModel: FeedViewModel = hiltViewModel()
+    val feedUiState by feedViewModel.uiState.collectAsStateWithLifecycle()
+    val currentUserId = feedUiState.myFeedInfo?.creatorId
+
+    // 내 피드 정보가 없으면 로드
+    LaunchedEffect(Unit) {
+        if (feedUiState.myFeedInfo == null) {
+            feedViewModel.onTabSelected(1)
+        }
+    }
+
     var showProgressBar by remember { mutableStateOf(false) }
     val progress = remember { Animatable(0f) }
     var progressJob by remember { mutableStateOf<Job?>(null) }
@@ -127,7 +146,7 @@ fun GroupNoteScreen(
     LaunchedEffect(key1 = roomId) {
         // 기록 생성 후 돌아온 경우가 아닐 때 (처음 진입 시) 초기화
         if (resultTabIndex == null) {
-            viewModel.initialize(roomId, initialPage, initialIsOverview)
+            viewModel.initialize(roomId, initialPage, initialIsOverview, initialPostId)
         }
     }
 
@@ -144,6 +163,7 @@ fun GroupNoteScreen(
     GroupNoteContent(
         uiState = uiState,
         onEvent = viewModel::onEvent,
+        isExpired = isExpired,
         onBackClick = onBackClick,
         onCreateNoteClick = {
             uiState.let { s ->
@@ -157,15 +177,27 @@ fun GroupNoteScreen(
         },
         onEditNoteClick = onEditNoteClick,
         onEditVoteClick = onEditVoteClick,
-        onNavigateToUserProfile = onNavigateToUserProfile,
+        onNavigateToUserProfile = { userId ->
+            // 현재 사용자 ID와 비교하여 적절한 네비게이션 수행
+            if (currentUserId != null && currentUserId == userId) {
+                // 내 프로필로 이동
+                onNavigateToMyProfile()
+            } else {
+                // 다른 사용자 프로필로 이동
+                onNavigateToUserProfile(userId)
+            }
+        },
+        onNavigateToAiReview = onNavigateToAiReview,
         showProgressBar = showProgressBar,
-        progress = progress.value
+        progress = progress.value,
+        openComments = openComments
     )
 }
 
 @Composable
 fun GroupNoteContent(
     uiState: GroupNoteUiState,
+    isExpired: Boolean = false,
     onEvent: (GroupNoteEvent) -> Unit,
     onBackClick: () -> Unit,
     onCreateNoteClick: () -> Unit,
@@ -173,8 +205,10 @@ fun GroupNoteContent(
     onEditNoteClick: (post: PostList) -> Unit,
     onEditVoteClick: (post: PostList) -> Unit,
     onNavigateToUserProfile: (userId: Long) -> Unit,
+    onNavigateToAiReview: () -> Unit,
     showProgressBar: Boolean,
-    progress: Float
+    progress: Float,
+    openComments: Boolean = false
 ) {
     var isCommentBottomSheetVisible by remember { mutableStateOf(false) }
     var selectedPostForComment by remember { mutableStateOf<PostList?>(null) }
@@ -183,17 +217,37 @@ fun GroupNoteContent(
     var isPinDialogVisible by remember { mutableStateOf(false) }
     var postToPin by remember { mutableStateOf<PostList?>(null) }
     var showToast by remember { mutableStateOf(false) }
+    var showAiReviewDialog by remember { mutableStateOf(false) }
+    val scope = rememberCoroutineScope()
     val isOverlayVisible =
-        isCommentBottomSheetVisible || selectedPostForMenu != null || isPinDialogVisible || showDeleteDialog
+        isCommentBottomSheetVisible || selectedPostForMenu != null || isPinDialogVisible || showDeleteDialog || showAiReviewDialog
     var postToDelete by remember { mutableStateOf<PostList?>(null) }
 
     var toastMessage by remember { mutableStateOf("") }
     var isErrorToast by remember { mutableStateOf(false) }
     val context = LocalContext.current
 
+    val expiredRoomMessage = stringResource(R.string.expired_room_read_only_message)
+
     val commentsViewModel: CommentsViewModel = hiltViewModel()
     val commentsUiState by commentsViewModel.uiState.collectAsStateWithLifecycle()
 
+    BackHandler(enabled = isOverlayVisible) {
+        if (isCommentBottomSheetVisible) {
+            isCommentBottomSheetVisible = false
+            selectedPostForComment = null
+            onEvent(GroupNoteEvent.RefreshPosts)
+        } else if (selectedPostForMenu != null) {
+            selectedPostForMenu = null
+        } else if (showDeleteDialog) {
+            showDeleteDialog = false
+            postToDelete = null
+        } else if (isPinDialogVisible) {
+            isPinDialogVisible = false
+            postToPin = null
+        }
+    }
+
     LaunchedEffect(showToast) {
         if (showToast) {
             delay(3000)
@@ -225,6 +279,52 @@ fun GroupNoteContent(
         }
     }
 
+    // 특정 포스트로 스크롤
+    LaunchedEffect(uiState.scrollToPostId, uiState.posts, uiState.isLoading) {
+        val scrollToPostId = uiState.scrollToPostId
+
+        if (scrollToPostId != null && uiState.posts.isNotEmpty() && !uiState.isLoading) {
+            val targetIndex = uiState.posts.indexOfFirst { it.postId == scrollToPostId }
+
+            if (targetIndex != -1) {
+                val targetPost = uiState.posts[targetIndex]
+
+                // 헤더 아이템들을 고려한 실제 인덱스 계산
+                val actualIndex = if (uiState.selectedTabIndex == 0) {
+                    targetIndex + 2 // 정보 텍스트 + 프로그레스바 아이템
+                } else {
+                    targetIndex + 1 // 프로그레스바 아이템만
+                }
+
+                // LazyColumn이 완전히 구성될 때까지 잠시 대기
+                kotlinx.coroutines.delay(100)
+
+                try {
+                    listState.animateScrollToItem(actualIndex)
+
+                    // openComments가 true이면 댓글 버텀시트를 자동으로 열기
+                    if (openComments) {
+                        kotlinx.coroutines.delay(200) // 스크롤 완료 후 잠시 대기
+                        selectedPostForComment = targetPost
+                        isCommentBottomSheetVisible = true
+                    }
+                } catch (e: Exception) {
+                    // 애니메이션이 실패하면 일반 스크롤 시도
+                    listState.scrollToItem(actualIndex)
+
+                    // openComments가 true이면 댓글 버텀시트를 자동으로 열기
+                    if (openComments) {
+                        kotlinx.coroutines.delay(200) // 스크롤 완료 후 잠시 대기
+                        selectedPostForComment = targetPost
+                        isCommentBottomSheetVisible = true
+                    }
+                }
+
+                onEvent(GroupNoteEvent.ClearScrollTarget)
+            }
+        }
+    }
+
     Box(
         if (isOverlayVisible) {
             Modifier
@@ -366,6 +466,11 @@ fun GroupNoteContent(
                                 Modifier
                             }
 
+                            val showExpiredToast = {
+                                toastMessage = expiredRoomMessage
+                                showToast = true
+                            }
+
                             when (post.postType) {
                                 "RECORD" -> TextCommentCard(
                                     data = post,
@@ -374,13 +479,19 @@ fun GroupNoteContent(
                                         selectedPostForComment = post
                                         isCommentBottomSheetVisible = true
                                     },
-                                    onLongPress = { selectedPostForMenu = post },
+                                    onLongPress = {
+                                        if (isExpired) showExpiredToast() else {
+                                            selectedPostForMenu = post
+                                        }
+                                    },
                                     onPinClick = {
                                         postToPin = post
                                         isPinDialogVisible = true
                                     },
                                     onLikeClick = { postId, postType ->
-                                        onEvent(GroupNoteEvent.OnLikeRecord(postId, postType))
+                                        if (isExpired) showExpiredToast() else {
+                                            onEvent(GroupNoteEvent.OnLikeRecord(postId, postType))
+                                        }
                                     },
                                     onProfileClick = { onNavigateToUserProfile(post.userId) }
                                 )
@@ -392,12 +503,18 @@ fun GroupNoteContent(
                                         selectedPostForComment = post
                                         isCommentBottomSheetVisible = true
                                     },
-                                    onLongPress = { selectedPostForMenu = post },
+                                    onLongPress = {
+                                        if (isExpired) showExpiredToast() else {
+                                            selectedPostForMenu = post
+                                        }
+                                    },
                                     onVote = { postId, voteItemId, type ->
                                         onEvent(GroupNoteEvent.OnVote(postId, voteItemId, type))
                                     },
                                     onLikeClick = { postId, postType ->
-                                        onEvent(GroupNoteEvent.OnLikeRecord(postId, postType))
+                                        if (isExpired) showExpiredToast() else {
+                                            onEvent(GroupNoteEvent.OnLikeRecord(postId, postType))
+                                        }
                                     },
                                     onProfileClick = { onNavigateToUserProfile(post.userId) }
                                 )
@@ -468,20 +585,32 @@ fun GroupNoteContent(
                 }
             }
 
-            ExpandableFloatingButton(
-                menuItems = listOf(
-                    FabMenuItem(
-                        icon = painterResource(R.drawable.ic_write),
-                        text = stringResource(R.string.write_record),
-                        onClick = onCreateNoteClick
-                    ),
-                    FabMenuItem(
-                        icon = painterResource(R.drawable.ic_vote),
-                        text = stringResource(R.string.create_vote),
-                        onClick = onCreateVoteClick
+            if (!isExpired) {
+                ExpandableFloatingButton(
+                    menuItems = listOf(
+                        FabMenuItem(
+                            icon = painterResource(R.drawable.ic_write),
+                            text = stringResource(R.string.write_record),
+                            onClick = onCreateNoteClick
+                        ),
+                        FabMenuItem(
+                            icon = painterResource(R.drawable.ic_vote),
+                            text = stringResource(R.string.create_vote),
+                            onClick = onCreateVoteClick
+                        ),
+                        FabMenuItem(
+                            icon = painterResource(R.drawable.ic_ai_book_review),
+                            text = stringResource(R.string.create_ai_book_review),
+                            onClick = {
+                                scope.launch {
+                                    onEvent(GroupNoteEvent.CheckAiUsage)
+                                    showAiReviewDialog = true
+                                }
+                            }
+                        )
                     )
                 )
-            )
+            }
         }
     }
 
@@ -498,6 +627,7 @@ fun GroupNoteContent(
         CommentBottomSheet(
             viewModel = commentsViewModel,
             uiState = commentsUiState,
+            isExpired = isExpired,
             onDismiss = {
                 isCommentBottomSheetVisible = false
                 selectedPostForComment = null
@@ -609,6 +739,30 @@ fun GroupNoteContent(
         }
     }
 
+    if (showAiReviewDialog) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            DialogPopup(
+                title = stringResource(R.string.ai_review_dialog_title),
+                description = stringResource(
+                    R.string.ai_review_dialog_description,
+                    uiState.recordCount,
+                    5
+                ),
+                onConfirm = {
+                    onNavigateToAiReview()
+                    showAiReviewDialog = false
+                },
+                onCancel = {
+                    showAiReviewDialog = false
+                }
+            )
+        }
+    }
+
     AnimatedVisibility(
         modifier = Modifier
             .padding(horizontal = 20.dp, vertical = 16.dp),
@@ -624,7 +778,7 @@ fun GroupNoteContent(
     ) {
         ToastWithDate(
             message = toastMessage,
-            color = if (isErrorToast) colors.Red else colors.DarkGrey
+            color = if (isErrorToast) colors.Red else colors.White
         )
     }
 }
@@ -671,7 +825,8 @@ private fun GroupNoteScreenPreview() {
             progress = 0.5f,
             onNavigateToUserProfile = {},
             onEditNoteClick = {},
-            onEditVoteClick = {}
+            onEditVoteClick = {},
+            onNavigateToAiReview = {}
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/viewmodel/GroupNoteAiViewModel.kt b/app/src/main/java/com/texthip/thip/ui/group/note/viewmodel/GroupNoteAiViewModel.kt
new file mode 100644
index 00000000..623eae20
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/viewmodel/GroupNoteAiViewModel.kt
@@ -0,0 +1,76 @@
+package com.texthip.thip.ui.group.note.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.texthip.thip.data.model.base.BaseResponse
+import com.texthip.thip.data.repository.RoomsRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.serialization.json.Json
+import retrofit2.HttpException
+import java.io.IOException
+import javax.inject.Inject
+
+data class GroupNoteAiUiState(
+    val isLoading: Boolean = true,
+    val aiReviewText: String? = null,
+    val error: String? = null
+)
+
+@HiltViewModel
+class GroupNoteAiViewModel @Inject constructor(
+    private val repository: RoomsRepository
+) : ViewModel() {
+    private val _uiState = MutableStateFlow(GroupNoteAiUiState())
+    val uiState: StateFlow<GroupNoteAiUiState> = _uiState.asStateFlow()
+
+    private val json = Json { ignoreUnknownKeys = true }
+
+    fun generateAiReview(roomId: Int) {
+        if (!_uiState.value.isLoading && _uiState.value.aiReviewText != null) return
+
+        viewModelScope.launch {
+            _uiState.update { it.copy(isLoading = true, error = null) }
+
+            repository.postRoomsAiReview(roomId)
+                .onSuccess { response ->
+                    _uiState.update {
+                        it.copy(
+                            isLoading = false,
+                            aiReviewText = response?.content
+                        )
+                    }
+                }
+                .onFailure { throwable ->
+                    val errorMessage = when (throwable) {
+                        is HttpException -> {
+                            val errorBody = throwable.response()?.errorBody()?.string()
+                            if (errorBody != null) {
+                                try {
+                                    val errorResponse = json.decodeFromString<BaseResponse<Unit>>(errorBody)
+                                    errorResponse.message
+                                } catch (e: Exception) {
+                                    throwable.message()
+                                }
+                            } else {
+                                throwable.message()
+                            }
+                        }
+                        is IOException -> "네트워크 연결을 확인해주세요."
+                        else -> throwable.message ?: "알 수 없는 오류가 발생했습니다."
+                    }
+
+                    _uiState.update {
+                        it.copy(
+                            isLoading = false,
+                            error = errorMessage
+                        )
+                    }
+                }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/viewmodel/GroupNoteViewModel.kt b/app/src/main/java/com/texthip/thip/ui/group/note/viewmodel/GroupNoteViewModel.kt
index bf2cc03a..13a8ab4a 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/viewmodel/GroupNoteViewModel.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/viewmodel/GroupNoteViewModel.kt
@@ -1,6 +1,5 @@
 package com.texthip.thip.ui.group.note.viewmodel
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.texthip.thip.data.model.rooms.request.RoomsPostsRequestParams
@@ -31,6 +30,8 @@ data class GroupNoteUiState(
     val recentBookPage: Int = 0,
     val totalBookPage: Int = 0,
     val isOverviewPossible: Boolean = false,
+    val recordReviewCount: Int = 0,
+    val recordCount: Int = 0,
 
     // 필터 및 탭 상태
     val selectedTabIndex: Int = 0,
@@ -39,7 +40,10 @@ data class GroupNoteUiState(
     val pageEnd: String = "",
     val isOverview: Boolean = false,
     val isPageFilter: Boolean = false,
-    val totalEnabled: Boolean = false
+    val totalEnabled: Boolean = false,
+
+    // 스크롤 관련 상태
+    val scrollToPostId: Int? = null
 )
 
 sealed interface GroupNoteSideEffect {
@@ -62,6 +66,8 @@ sealed interface GroupNoteEvent {
     data class OnLikeRecord(val postId: Int, val postType: String) : GroupNoteEvent
     data class OnPinRecord(val recordId: Int, val content: String) : GroupNoteEvent
     data object RefreshPosts : GroupNoteEvent
+    data object ClearScrollTarget : GroupNoteEvent
+    data object CheckAiUsage : GroupNoteEvent
 }
 
 
@@ -82,7 +88,8 @@ class GroupNoteViewModel @Inject constructor(
     fun initialize(
         roomId: Int,
         initialPage: Int? = null,
-        initialIsOverview: Boolean? = null
+        initialIsOverview: Boolean? = null,
+        initialPostId: Int? = null
     ) {
         this.roomId = roomId
 
@@ -97,6 +104,12 @@ class GroupNoteViewModel @Inject constructor(
             }
         }
 
+        if (initialPostId != null) {
+            _uiState.update {
+                it.copy(scrollToPostId = initialPostId)
+            }
+        }
+
         refreshAllData()
     }
 
@@ -120,11 +133,31 @@ class GroupNoteViewModel @Inject constructor(
         }
     }
 
+    private fun loadAiUsageInfo() {
+        viewModelScope.launch {
+            roomsRepository.getRoomsAiUsage(roomId)
+                .onSuccess { usageResponse ->
+                    _uiState.update {
+                        it.copy(
+                            recordReviewCount = usageResponse?.recordReviewCount ?: 0,
+                            recordCount = usageResponse?.recordCount ?: 0
+                        )
+                    }
+                }
+                .onFailure { throwable ->
+                    _uiState.update { it.copy(error = throwable.message) }
+                }
+        }
+    }
+
     private fun refreshAllData() {
         viewModelScope.launch {
-            val postsJob = async { loadPosts(isRefresh = true) }
-            val bookPageJob = async { loadBookPageInfo() }
-            awaitAll(postsJob, bookPageJob)
+            val jobs = listOf(
+                async { loadPosts(isRefresh = true) },
+                async { loadBookPageInfo() },
+                async { loadAiUsageInfo() }
+            )
+            jobs.awaitAll()
         }
     }
 
@@ -168,8 +201,11 @@ class GroupNoteViewModel @Inject constructor(
             is GroupNoteEvent.OnLikeRecord -> likeRecord(event.postId, event.postType)
             is GroupNoteEvent.RefreshPosts -> loadPosts(isRefresh = true)
             is GroupNoteEvent.OnPinRecord -> pinRecord(event.recordId, event.content)
-            else -> {
-                Log.w("GroupNoteViewModel", "Unhandled event received: $event")
+            GroupNoteEvent.ClearScrollTarget -> {
+                _uiState.update { it.copy(scrollToPostId = null) }
+            }
+            GroupNoteEvent.CheckAiUsage -> {
+                loadAiUsageInfo()
             }
         }
     }
@@ -217,7 +253,8 @@ class GroupNoteViewModel @Inject constructor(
                 roomPostType = postType
             )
                 .onFailure {
-                    val rollbackPosts = currentPosts.toMutableList().apply { this[postIndex] = oldPost }
+                    val rollbackPosts =
+                        currentPosts.toMutableList().apply { this[postIndex] = oldPost }
                     _uiState.update { it.copy(posts = rollbackPosts) }
                 }
         }
@@ -275,7 +312,8 @@ class GroupNoteViewModel @Inject constructor(
 
                     // 기존 순서는 유지하고 내용만 업데이트
                     val updatedVoteItems = postToUpdate.voteItems.map { originalItem ->
-                        val newItem = serverVoteItems.find { it.voteItemId == originalItem.voteItemId }
+                        val newItem =
+                            serverVoteItems.find { it.voteItemId == originalItem.voteItemId }
                         newItem ?: originalItem
                     }
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
index bca30a8c..77b2082d 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
@@ -59,6 +59,7 @@ import kotlinx.coroutines.flow.collectLatest
 @Composable
 fun GroupRoomChatScreen(
     onBackClick: () -> Unit,
+    isExpired: Boolean,
     viewModel: GroupRoomChatViewModel = hiltViewModel()
 ) {
     var inputText by remember { mutableStateOf("") }
@@ -73,6 +74,7 @@ fun GroupRoomChatScreen(
 
     val dailyGreetingLimitMessage = stringResource(R.string.group_room_chat_max)
     val deleteSuccessMessage = stringResource(R.string.group_room_chat_delete_success)
+    val expiredRoomMessage = stringResource(R.string.expired_room_read_only_message)
 
     LaunchedEffect(key1 = Unit) {
         viewModel.eventFlow.collectLatest { event ->
@@ -83,10 +85,12 @@ fun GroupRoomChatScreen(
                             toastMessage = dailyGreetingLimitMessage
                             toastColor = colorRed
                         }
+
                         ToastType.FIRST_WRITE -> {
                             toastMessage = dailyGreetingLimitMessage
                             toastColor = colorWhite
                         }
+
                         ToastType.DELETE_GREETING_SUCCESS -> {
                             toastMessage = deleteSuccessMessage
                             toastColor = colorWhite
@@ -94,9 +98,11 @@ fun GroupRoomChatScreen(
                     }
                     showToast = true
                 }
+
                 is GroupRoomChatEvent.ShowErrorToast -> {
                     Toast.makeText(context, event.message, Toast.LENGTH_SHORT).show()
                 }
+
                 else -> Unit
             }
         }
@@ -121,7 +127,13 @@ fun GroupRoomChatScreen(
         onNavigateBack = onBackClick,
         showToast = showToast,
         toastMessage = toastMessage,
-        toastColor = toastColor
+        toastColor = toastColor,
+        isExpired = isExpired,
+        onShowExpiredRoomToast = {
+            toastMessage = expiredRoomMessage
+            toastColor = colorWhite
+            showToast = true
+        }
     )
 }
 
@@ -136,6 +148,8 @@ fun GroupRoomChatContent(
     showToast: Boolean,
     toastMessage: String,
     toastColor: Color,
+    isExpired: Boolean = false,
+    onShowExpiredRoomToast: () -> Unit = {}
 ) {
     var isBottomSheetVisible by remember { mutableStateOf(false) }
     var selectedMessage by remember { mutableStateOf<TodayCommentList?>(null) }
@@ -258,8 +272,12 @@ fun GroupRoomChatContent(
                             CardCommentGroup(
                                 data = message,
                                 onMenuClick = {
-                                    selectedMessage = message
-                                    isBottomSheetVisible = true
+                                    if (isExpired) {
+                                        onShowExpiredRoomToast()
+                                    } else {
+                                        selectedMessage = message
+                                        isBottomSheetVisible = true
+                                    }
                                 }
                             )
                         }
@@ -267,12 +285,14 @@ fun GroupRoomChatContent(
                 }
             }
 
-            CommentTextField(
-                input = inputText,
-                hint = stringResource(R.string.group_room_chat_hint),
-                onInputChange = onInputTextChanged,
-                onSendClick = onSendClick
-            )
+            if (!isExpired) {
+                CommentTextField(
+                    input = inputText,
+                    hint = stringResource(R.string.group_room_chat_hint),
+                    onInputChange = onInputTextChanged,
+                    onSendClick = onSendClick
+                )
+            }
         }
 
         AnimatedVisibility(
diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomScreen.kt
index bbeb0d64..09395c6d 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomScreen.kt
@@ -59,6 +59,7 @@ import kotlinx.coroutines.flow.collectLatest
 @Composable
 fun GroupRoomScreen(
     roomId: Int,
+    isExpired: Boolean = false,
     onBackClick: () -> Unit = {},
     onNavigateToMates: () -> Unit = {},
     onNavigateToChat: () -> Unit = {},
@@ -96,6 +97,7 @@ fun GroupRoomScreen(
             // 성공 시, 실제 데이터를 화면에 표시
             GroupRoomContent(
                 roomDetails = state.roomsPlaying,
+                isExpired = isExpired,
                 onBackClick = onBackClick,
                 onNavigateToMates = onNavigateToMates,
                 onNavigateToChat = onNavigateToChat,
@@ -109,7 +111,7 @@ fun GroupRoomScreen(
 
         is GroupRoomUiState.Error -> {
             Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                Text(text = state.message, color = colors.White) // TODO: 에러 메시지 스타일링
+                Text(text = state.message, color = colors.White)
             }
         }
     }
@@ -119,6 +121,7 @@ fun GroupRoomScreen(
 @Composable
 fun GroupRoomContent(
     roomDetails: RoomsPlayingResponse,
+    isExpired: Boolean = false,
     onBackClick: () -> Unit = {},
     onNavigateToMates: () -> Unit = {},
     onNavigateToChat: () -> Unit = {},
@@ -228,7 +231,8 @@ fun GroupRoomContent(
 
         GradationTopAppBar(
             onLeftClick = onBackClick,
-            isRightIconVisible = true,
+//            isRightIconVisible = true,
+            isRightIconVisible = !isExpired || !isOwner, // TODO: 방 삭제 기능 추가 시 변경
             onRightClick = { isBottomSheetVisible = true },
         )
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/screen/GroupScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/screen/GroupScreen.kt
index 307074b7..fc0661f5 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/screen/GroupScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/screen/GroupScreen.kt
@@ -23,6 +23,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
@@ -31,9 +32,11 @@ import com.texthip.thip.R
 import com.texthip.thip.data.model.rooms.response.JoinedRoomResponse
 import com.texthip.thip.data.model.rooms.response.RoomMainList
 import com.texthip.thip.data.model.rooms.response.RoomMainResponse
+import com.texthip.thip.ui.common.alarmpage.viewmodel.AlarmViewModel
 import com.texthip.thip.ui.common.buttons.FloatingButton
 import com.texthip.thip.ui.common.modal.ToastWithDate
 import com.texthip.thip.ui.common.topappbar.LogoTopAppBar
+import com.texthip.thip.ui.feed.component.EmptyMySubscriptionBar
 import com.texthip.thip.ui.group.myroom.component.GroupMySectionHeader
 import com.texthip.thip.ui.group.myroom.component.GroupPager
 import com.texthip.thip.ui.group.myroom.component.GroupRoomDeadlineSection
@@ -48,33 +51,40 @@ import kotlinx.coroutines.delay
 @Composable
 fun GroupScreen(
     onNavigateToMakeRoom: () -> Unit = {},
-    onNavigateToGroupDone: () -> Unit = {}, // 완료된 화면으로 이동
     onNavigateToAlarm: () -> Unit = {}, // 알림 화면으로 이동
     onNavigateToGroupSearch: () -> Unit = {},   // 검색 화면으로 이동
     onNavigateToGroupMy: () -> Unit = {},   // 내 모임방 화면으로 이동
     onNavigateToGroupRecruit: (Int) -> Unit = {},   // 모집 중인 모임방 화면으로 이동
     onNavigateToGroupRoom: (Int) -> Unit = {},  // 기록장 화면으로 이동
-    viewModel: GroupViewModel = hiltViewModel()
+    onNavigateToGroupSearchAllRooms: () -> Unit = {},
+    viewModel: GroupViewModel = hiltViewModel(),
+    alarmViewModel: AlarmViewModel = hiltViewModel()
 ) {
     // 화면 재진입 시 데이터 새로고침
     LaunchedEffect(Unit) {
         viewModel.resetToInitialState()
+        alarmViewModel.checkUnreadNotifications()
     }
     val uiState by viewModel.uiState.collectAsState()
+    val alarmUiState by alarmViewModel.uiState.collectAsState()
 
     GroupContent(
         uiState = uiState,
+        hasUnreadNotifications = alarmUiState.hasUnreadNotifications,
         onNavigateToMakeRoom = onNavigateToMakeRoom,
-        onNavigateToGroupDone = onNavigateToGroupDone,
         onNavigateToAlarm = onNavigateToAlarm,
         onNavigateToGroupSearch = onNavigateToGroupSearch,
         onNavigateToGroupMy = onNavigateToGroupMy,
         onNavigateToGroupRecruit = onNavigateToGroupRecruit,
         onNavigateToGroupRoom = onNavigateToGroupRoom,
-        onRefreshGroupData = { viewModel.refreshGroupData() },
+        onNavigateToGroupSearchAllRooms = onNavigateToGroupSearchAllRooms,
+        onRefreshGroupData = {
+            viewModel.refreshGroupData()
+            alarmViewModel.checkUnreadNotifications()
+        },
         onCardVisible = { cardIndex -> viewModel.loadMoreGroups() },
         onSelectGenre = { genreIndex -> viewModel.selectGenre(genreIndex) },
-        onHideToast = { viewModel.hideToast() }
+        onHideToast = { viewModel.hideToast() },
     )
 }
 
@@ -82,20 +92,21 @@ fun GroupScreen(
 @Composable
 fun GroupContent(
     uiState: GroupUiState,
+    hasUnreadNotifications: Boolean = false,
     onNavigateToMakeRoom: () -> Unit = {},
-    onNavigateToGroupDone: () -> Unit = {},
     onNavigateToAlarm: () -> Unit = {},
     onNavigateToGroupSearch: () -> Unit = {},
     onNavigateToGroupMy: () -> Unit = {},
     onNavigateToGroupRecruit: (Int) -> Unit = {},
     onNavigateToGroupRoom: (Int) -> Unit = {},
+    onNavigateToGroupSearchAllRooms: () -> Unit = {},
     onRefreshGroupData: () -> Unit = {},
     onCardVisible: (Int) -> Unit = {},
     onSelectGenre: (Int) -> Unit = {},
     onHideToast: () -> Unit = {}
 ) {
     val scrollState = rememberScrollState()
-    
+
     // 탭 전환 시 스크롤을 맨 위로 초기화
     LaunchedEffect(Unit) {
         scrollState.scrollTo(0)
@@ -117,7 +128,7 @@ fun GroupContent(
 
                 // 검색창
                 GroupSearchTextField(
-                    modifier = Modifier.padding(top = 72.dp, bottom = 32.dp),
+                    modifier = Modifier.padding(top = 75.dp, bottom = 32.dp),
                     onClick = onNavigateToGroupSearch
                 )
 
@@ -131,7 +142,13 @@ fun GroupContent(
                     groupCards = uiState.myJoinedRooms,
                     userName = uiState.userName,
                     onCardClick = { joinedRoom ->
-                        onNavigateToGroupRoom(joinedRoom.roomId)
+                        if (joinedRoom.deadlineDate == null) {
+                            // 시작 후
+                            onNavigateToGroupRoom(joinedRoom.roomId)
+                        } else {
+                            // 시작 전
+                            onNavigateToGroupRecruit(joinedRoom.roomId)
+                        }
                     },
                     onCardVisible = onCardVisible
                 )
@@ -145,6 +162,14 @@ fun GroupContent(
                         .background(color = colors.DarkGrey02)
                 )
 
+                EmptyMySubscriptionBar(
+                    modifier = Modifier.padding(horizontal = 30.dp),
+                    text = stringResource(R.string.look_around_all_rooms),
+                    onClick = onNavigateToGroupSearchAllRooms
+                )
+
+                Spacer(Modifier.height(32.dp))
+
                 // 마감 임박한 독서 모임방
                 GroupRoomDeadlineSection(
                     roomMainList = uiState.roomMainList,
@@ -161,9 +186,7 @@ fun GroupContent(
 
         // 상단바
         LogoTopAppBar(
-            leftIcon = painterResource(R.drawable.ic_done),
-            hasNotification = false,
-            onLeftClick = onNavigateToGroupDone,
+            hasNotification = hasUnreadNotifications,
             onRightClick = onNavigateToAlarm
         )
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
index ae35bbe6..37038469 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
@@ -45,14 +45,35 @@ fun GroupFilteredSearchResult(
     onRoomClick: (SearchRoomItem) -> Unit = {},
     canLoadMore: Boolean = false,
     isLoadingMore: Boolean = false,
-    onLoadMore: () -> Unit = {}
+    onLoadMore: () -> Unit = {},
 ) {
+    val allChipText = stringResource(id = R.string.all)
+    val chipList = remember(genres) { listOf(allChipText) + genres }
+
+    val finalSelectedIndex = if (selectedGenreIndex != -1) {
+        // 특정 장르가 선택되었다면, '전체' 칩 때문에 +1 된 인덱스를 사용
+        selectedGenreIndex + 1
+    } else {
+        // 특정 장르가 선택되지 않았다면, '전체' 칩(인덱스 0)을 선택
+        0
+    }
+
+
     Column {
         GenreChipRow(
             modifier = Modifier.width(12.dp),
-            genres = genres,
-            selectedIndex = selectedGenreIndex,
-            onSelect = onGenreSelect
+            genres = chipList,
+            selectedIndex = finalSelectedIndex,
+            onSelect = { newIndex ->
+                when (newIndex) {
+                    // 칩 선택이 해제된 경우 (동일 칩 재클릭)
+                    -1 -> onGenreSelect(-1)
+                    // '전체' 칩이 선택된 경우 -> 장르 필터 해제
+                    0 -> onGenreSelect(-1)
+                    // 특정 장르가 선택된 경우 -> 원래 인덱스로 변환하여 전달
+                    else -> onGenreSelect(newIndex - 1)
+                }
+            }
         )
         Spacer(modifier = Modifier.height(20.dp))
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
index d23b3c46..9524b41c 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
@@ -1,20 +1,27 @@
 package com.texthip.thip.ui.group.search.component
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -28,7 +35,8 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 fun GroupRecentSearch(
     recentSearches: List<String>,
     onSearchClick: (String) -> Unit,
-    onRemove: (String) -> Unit
+    onRemove: (String) -> Unit,
+    onViewAllRoomsClick: () -> Unit = {}
 ) {
     Column {
         Text(
@@ -58,6 +66,30 @@ fun GroupRecentSearch(
                 }
             }
         }
+
+        Spacer(modifier = Modifier.height(30.dp))
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable {
+                    onViewAllRoomsClick()
+                },
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            Text(
+                text = stringResource(R.string.look_around_all_rooms_title),
+                color = colors.White,
+                style = typography.smalltitle_sb600_s18_h24
+            )
+
+            Icon(
+                painter = painterResource(R.drawable.ic_chevron),
+                contentDescription = null,
+                tint = Color.Unspecified
+            )
+        }
     }
 }
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
index 1822d574..41f00d0b 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
@@ -28,10 +28,10 @@ import com.texthip.thip.data.model.rooms.response.SearchRoomItem
 import com.texthip.thip.ui.common.buttons.FilterButton
 import com.texthip.thip.ui.common.forms.SearchBookTextField
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
-import com.texthip.thip.ui.group.search.component.GroupRecentSearch
 import com.texthip.thip.ui.group.search.component.GroupEmptyResult
 import com.texthip.thip.ui.group.search.component.GroupFilteredSearchResult
 import com.texthip.thip.ui.group.search.component.GroupLiveSearchResult
+import com.texthip.thip.ui.group.search.component.GroupRecentSearch
 import com.texthip.thip.ui.group.search.viewmodel.GroupSearchUiState
 import com.texthip.thip.ui.group.search.viewmodel.GroupSearchViewModel
 import com.texthip.thip.ui.theme.ThipTheme
@@ -56,7 +56,8 @@ fun GroupSearchScreen(
         onDeleteRecentSearch = viewModel::deleteRecentSearchByKeyword,
         onLoadMoreRooms = viewModel::loadMoreRooms,
         onUpdateSelectedGenre = viewModel::updateSelectedGenre,
-        onUpdateSortType = viewModel::updateSortType
+        onUpdateSortType = viewModel::updateSortType,
+        onViewAllRooms = viewModel::onViewAllRooms
     )
 }
 
@@ -71,7 +72,8 @@ private fun GroupSearchContent(
     onDeleteRecentSearch: (String) -> Unit = {},
     onLoadMoreRooms: () -> Unit = {},
     onUpdateSelectedGenre: (Genre?) -> Unit = {},
-    onUpdateSortType: (String) -> Unit = {}
+    onUpdateSortType: (String) -> Unit = {},
+    onViewAllRooms: () -> Unit = {}
 ) {
     val focusRequester = remember { FocusRequester() }
     val focusManager = LocalFocusManager.current
@@ -142,7 +144,8 @@ private fun GroupSearchContent(
                                     onUpdateSearchQuery(keyword)
                                     onSearchButtonClick()
                                 },
-                                onRemove = onDeleteRecentSearch
+                                onRemove = onDeleteRecentSearch,
+                                onViewAllRoomsClick = onViewAllRooms
                             )
                         }
                     }
@@ -164,7 +167,7 @@ private fun GroupSearchContent(
                         }
                     }
 
-                    uiState.isCompleteSearching -> {
+                    uiState.isCompleteSearching || uiState.isAllCategory -> {
                         GroupFilteredSearchResult(
                             genres = genreDisplayNames,
                             selectedGenreIndex = selectedGenreIndex,
@@ -173,15 +176,9 @@ private fun GroupSearchContent(
                                     uiState.genres.indexOf(uiState.selectedGenre)
                                 } else -1
 
-                                val selectedGenre = if (index == currentSelectedIndex) {
-                                    // 같은 장르를 다시 터치하면 선택 해제
-                                    null
-                                } else if (index >= 0 && index < uiState.genres.size) {
-                                    // 새로운 장르 선택
-                                    uiState.genres[index]
-                                } else {
-                                    null
-                                }
+                                val selectedGenre = if (index == currentSelectedIndex) null
+                                else if (index >= 0 && index < uiState.genres.size) uiState.genres[index]
+                                else null
                                 onUpdateSelectedGenre(selectedGenre)
                             },
                             resultCount = uiState.searchResults.size,
@@ -189,18 +186,18 @@ private fun GroupSearchContent(
                             onRoomClick = { room -> onRoomClick(room.roomId) },
                             canLoadMore = uiState.canLoadMore,
                             isLoadingMore = uiState.isLoadingMore,
-                            onLoadMore = onLoadMoreRooms
+                            onLoadMore = onLoadMoreRooms,
                         )
                     }
                 }
             }
         }
 
-        if (uiState.isCompleteSearching) {
+        if (uiState.isCompleteSearching || uiState.isAllCategory) {
             FilterButton(
                 modifier = Modifier
                     .align(Alignment.TopEnd)
-                    .padding(top = 196.dp, end = 20.dp),
+                    .padding(top = 174.dp, end = 20.dp),
                 selectedOption = sortOptions[selectedSortOptionIndex],
                 options = sortOptions,
                 onOptionSelected = { selected ->
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/viewmodel/GroupSearchViewModel.kt b/app/src/main/java/com/texthip/thip/ui/group/search/viewmodel/GroupSearchViewModel.kt
index 95966920..10c22c9f 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/viewmodel/GroupSearchViewModel.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/viewmodel/GroupSearchViewModel.kt
@@ -24,6 +24,7 @@ data class GroupSearchUiState(
     val isInitial: Boolean = true,
     val isLiveSearching: Boolean = false,
     val isCompleteSearching: Boolean = false,
+    val isAllCategory: Boolean = false,
 
     // 검색 결과 및 데이터
     val searchResults: List<SearchRoomItem> = emptyList(),
@@ -49,7 +50,7 @@ data class GroupSearchUiState(
 ) {
     val hasResults: Boolean get() = searchResults.isNotEmpty()
     val canLoadMore: Boolean get() = hasMore && !isSearching && !isLoadingMore
-    val showEmptyState: Boolean get() = searchQuery.isNotBlank() && searchResults.isEmpty() && !isSearching
+    val showEmptyState: Boolean get() = (isCompleteSearching || isAllCategory) && searchResults.isEmpty() && !isSearching
 }
 
 @HiltViewModel
@@ -108,7 +109,8 @@ class GroupSearchViewModel @Inject constructor(
                 it.copy(
                     isInitial = false,
                     isLiveSearching = true,
-                    isCompleteSearching = false
+                    isCompleteSearching = false,
+                    isAllCategory = false
                 )
             }
             searchJob = viewModelScope.launch {
@@ -121,16 +123,21 @@ class GroupSearchViewModel @Inject constructor(
     }
 
     fun onSearchButtonClick() {
-        val query = uiState.value.searchQuery
-        if (query.isNotEmpty()) {  // 공백도 검색 가능 (빈 문자열만 제외)
-            searchJob?.cancel()
-            loadMoreJob?.cancel()
+        val query = uiState.value.searchQuery.trim()
+        searchJob?.cancel()
+        loadMoreJob?.cancel()
 
+        // 검색어가 비어있으면 '전체 모임방' 검색 실행
+        if (query.isEmpty()) {
+            onViewAllRooms()
+        } else {
+            // 검색어가 있으면 기존 검색 로직 실행
             updateState {
                 it.copy(
                     isInitial = false,
                     isLiveSearching = false,
-                    isCompleteSearching = true
+                    isCompleteSearching = true,
+                    isAllCategory = false
                 )
             }
             viewModelScope.launch {
@@ -140,10 +147,25 @@ class GroupSearchViewModel @Inject constructor(
         }
     }
 
+    fun onViewAllRooms() {
+        searchJob?.cancel()
+        loadMoreJob?.cancel()
+        updateState {
+            it.copy(
+                searchQuery = "",
+                isInitial = false,
+                isLiveSearching = false,
+                isCompleteSearching = false,
+                isAllCategory = true
+            )
+        }
+        performSearchWithCurrentQuery()
+    }
+
     fun updateSelectedGenre(genre: Genre?) {
         updateState { it.copy(selectedGenre = genre) }
         // 필터 변경 시 새로운 검색 수행 (공백도 허용)
-        if (uiState.value.searchQuery.isNotEmpty() && !uiState.value.isInitial) {
+        if (uiState.value.isCompleteSearching || uiState.value.isAllCategory) {
             performSearchWithCurrentQuery()
         }
     }
@@ -151,26 +173,28 @@ class GroupSearchViewModel @Inject constructor(
     fun updateSortType(sort: String) {
         updateState { it.copy(selectedSort = sort) }
         // 정렬 변경 시 새로운 검색 수행 (공백도 허용)
-        if (uiState.value.searchQuery.isNotEmpty() && !uiState.value.isInitial) {
+        if (uiState.value.isCompleteSearching || uiState.value.isAllCategory) {
             performSearchWithCurrentQuery()
         }
     }
 
     private fun performSearchWithCurrentQuery() {
-        val currentState = uiState.value
-        if (currentState.searchQuery.isNotEmpty()) {  // 공백도 허용
-            searchJob?.cancel()
-            loadMoreJob?.cancel()
+        searchJob?.cancel()
+        loadMoreJob?.cancel()
 
-            searchJob = viewModelScope.launch {
-                performSearch(currentState.searchQuery, isLiveSearch = currentState.isLiveSearching)
-            }
+        searchJob = viewModelScope.launch {
+            val currentState = uiState.value
+            performSearch(
+                query = currentState.searchQuery,
+                isLiveSearch = currentState.isLiveSearching,
+                isFinalized = !currentState.isLiveSearching || currentState.isAllCategory
+            )
         }
     }
 
     fun loadMoreRooms() {
         val currentState = uiState.value
-        if (currentState.canLoadMore && currentState.searchQuery.isNotEmpty()) {  // 공백도 허용
+        if (currentState.canLoadMore) {
             loadMoreJob?.cancel()
             loadMoreJob = viewModelScope.launch {
                 performLoadMore()
@@ -178,13 +202,9 @@ class GroupSearchViewModel @Inject constructor(
         }
     }
 
-    private suspend fun performSearch(query: String, isLiveSearch: Boolean) {
-        val currentState = uiState.value
+    private suspend fun performSearch(query: String, isLiveSearch: Boolean, isFinalized: Boolean = !isLiveSearch) {
         updateState {
             it.copy(
-                isInitial = false,
-                isLiveSearching = isLiveSearch,
-                isCompleteSearching = !isLiveSearch,
                 isSearching = true,
                 error = null,
                 searchResults = emptyList(),
@@ -193,12 +213,15 @@ class GroupSearchViewModel @Inject constructor(
             )
         }
 
+        val currentState = uiState.value
         val category = currentState.selectedGenre?.apiCategory ?: ""
+
         roomsRepository.searchRooms(
             keyword = query,
             category = category,
+            isAllCategory = currentState.isAllCategory,
             sort = currentState.selectedSort,
-            isFinalized = !isLiveSearch,
+            isFinalized = isFinalized,
             cursor = null
         )
             .onSuccess { response ->
@@ -248,8 +271,9 @@ class GroupSearchViewModel @Inject constructor(
         roomsRepository.searchRooms(
             keyword = currentState.searchQuery,
             category = category,
+            isAllCategory = currentState.isAllCategory,
             sort = currentState.selectedSort,
-            isFinalized = true,
+            isFinalized = currentState.isCompleteSearching || currentState.isAllCategory,
             cursor = currentState.nextCursor
         )
             .onSuccess { response ->
diff --git a/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageLeavethipScreen.kt b/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageLeavethipScreen.kt
index e5d621c2..9af26080 100644
--- a/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageLeavethipScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageLeavethipScreen.kt
@@ -104,25 +104,28 @@ fun DeleteAccountScreen(
                     Text(
                         text = buildAnnotatedString {
                             append(stringResource(R.string.leave_thip_notice_1) + " ")
+                            withStyle(style = SpanStyle(color = Red)) {
+                                append(stringResource(R.string.leave_thip_notice_1_2))
+                            }
+                            append(stringResource(R.string.leave_thip_notice_1_3))
                             withStyle(style = SpanStyle(color = Red)) {
                                 append(stringResource(R.string.leave_thip_notice_2))
                             }
-                            append(" ")
                             append(stringResource(R.string.leave_thip_notice_3))
                         },
-                        style = typography.copy_r400_s14,
+                        style = typography.feedcopy_r400_s14_h20,
                         color = colors.White
                     )
                     Spacer(modifier = Modifier.height(20.dp))
                     Text(
                         text = stringResource(R.string.leave_thip_notice_4),
-                        style = typography.copy_r400_s14,
+                        style = typography.feedcopy_r400_s14_h20,
                         color = colors.White
                     )
                     Spacer(modifier = Modifier.height(20.dp))
                     Text(
                         text = stringResource(R.string.leave_thip_notice_5),
-                        style = typography.copy_r400_s14,
+                        style = typography.feedcopy_r400_s14_h20,
                         color = colors.White
                     )
                 }
diff --git a/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageNotificationEditScreen.kt b/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageNotificationEditScreen.kt
index 10a75645..956f0ad2 100644
--- a/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageNotificationEditScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageNotificationEditScreen.kt
@@ -1,5 +1,7 @@
 package com.texthip.thip.ui.mypage.screen
 
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.slideInVertically
@@ -16,10 +18,13 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -30,17 +35,44 @@ import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.ToggleSwitchButton
 import com.texthip.thip.ui.common.modal.ToastWithDate
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
-import com.texthip.thip.ui.common.topappbar.InputTopAppBar
+import com.texthip.thip.ui.mypage.viewmodel.MypageNotificationEditUiState
+import com.texthip.thip.ui.mypage.viewmodel.MypageNotificationEditViewModel
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
+import com.texthip.thip.utils.permission.NotificationPermissionUtils
 import kotlinx.coroutines.delay
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
 
 @Composable
-fun NotificationScreen(
-    onNavigateBack: () -> Unit
+fun MyPageNotificationEditScreen(
+    onNavigateBack: () -> Unit,
+    viewModel: MypageNotificationEditViewModel = hiltViewModel()
 ) {
-    var isChecked by rememberSaveable { mutableStateOf(true) }
+    val context = LocalContext.current
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     var toastMessage by rememberSaveable { mutableStateOf<String?>(null) }
+    var toastDateTime by rememberSaveable { mutableStateOf("") }
+
+    // 알림 권한 요청 런처
+    val notificationPermissionLauncher = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.RequestPermission(),
+        onResult = { isGranted ->
+            if (isGranted) {
+                // 권한이 허용되면 알림 활성화
+                viewModel.onNotificationToggle(true)
+                toastMessage = "push_on"
+                val dateFormat = SimpleDateFormat("yyyy년 M월 d일 H시 m분", Locale.KOREAN)
+                toastDateTime = dateFormat.format(Date())
+            } else {
+                // 권한이 거부되면 토스트 메시지 표시
+                toastMessage = "permission_denied"
+                val dateFormat = SimpleDateFormat("yyyy년 M월 d일 H시 m분", Locale.KOREAN)
+                toastDateTime = dateFormat.format(Date())
+            }
+        }
+    )
 
     LaunchedEffect(toastMessage) {
         if (toastMessage != null) {
@@ -48,6 +80,44 @@ fun NotificationScreen(
             toastMessage = null
         }
     }
+
+    MyPageNotificationEditContent(
+        uiState = uiState,
+        toastMessage = toastMessage,
+        toastDateTime = toastDateTime,
+        onNavigateBack = onNavigateBack,
+        onNotificationToggle = { enabled ->
+            if (enabled) {
+                // 알림을 켜려고 할 때 권한 확인
+                if (NotificationPermissionUtils.shouldRequestNotificationPermission(context)) {
+                    // 권한이 필요하면 권한 요청
+                    notificationPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS)
+                } else {
+                    // 권한이 이미 있거나 필요없으면 바로 설정 변경
+                    viewModel.onNotificationToggle(enabled)
+                    toastMessage = "push_on"
+                    val dateFormat = SimpleDateFormat("yyyy년 M월 d일 H시 m분", Locale.KOREAN)
+                    toastDateTime = dateFormat.format(Date())
+                }
+            } else {
+                // 알림을 끄는 경우는 권한 체크 없이 바로 설정 변경
+                viewModel.onNotificationToggle(enabled)
+                toastMessage = "push_off"
+                val dateFormat = SimpleDateFormat("yyyy년 M월 d일 H시 m분", Locale.KOREAN)
+                toastDateTime = dateFormat.format(Date())
+            }
+        }
+    )
+}
+
+@Composable
+fun MyPageNotificationEditContent(
+    uiState: MypageNotificationEditUiState,
+    toastMessage: String?,
+    toastDateTime: String,
+    onNavigateBack: () -> Unit,
+    onNotificationToggle: (Boolean) -> Unit
+) {
     Box(modifier = Modifier.fillMaxSize()) {
         AnimatedVisibility(
             visible = toastMessage != null,
@@ -66,10 +136,13 @@ fun NotificationScreen(
         ) {
             toastMessage?.let { message ->
                 ToastWithDate(
-                    message = stringResource(
-                        if (message == "push_on") R.string.push_on else R.string.push_off
-                    ),
-                    date = "2025년 6월 29일 22시 30분",
+                    message = when (message) {
+                        "push_on" -> stringResource(R.string.push_on)
+                        "push_off" -> stringResource(R.string.push_off)
+                        "permission_denied" -> stringResource(R.string.notification_permission_required)
+                        else -> stringResource(R.string.push_off)
+                    },
+                    date = toastDateTime,
                     modifier = Modifier.fillMaxWidth()
                 )
             }
@@ -109,25 +182,28 @@ fun NotificationScreen(
                             .weight(1f)
                     )
                     ToggleSwitchButton(
-                        isChecked = isChecked,
-                        onToggleChange = {
-                            isChecked = it
-                            toastMessage = if (it) "push_on" else "push_off"
-                        }
+                        isChecked = uiState.isNotificationEnabled,
+                        onToggleChange = onNotificationToggle
                     )
                 }
-
             }
-
-
         }
     }
 }
 
 @Preview
 @Composable
-private fun NotificationScreenPrev() {
-    NotificationScreen(
-        onNavigateBack = {}
+private fun MypageNotificationEditContentPrev() {
+    MyPageNotificationEditContent(
+        uiState = MypageNotificationEditUiState(
+            isNotificationEnabled = true,
+            isLoading = false,
+            isUpdating = false,
+            errorMessage = null
+        ),
+        toastMessage = null,
+        toastDateTime = "",
+        onNavigateBack = {},
+        onNotificationToggle = {}
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/mypage/viewmodel/DeleteAccountViewModel.kt b/app/src/main/java/com/texthip/thip/ui/mypage/viewmodel/DeleteAccountViewModel.kt
index ca342618..55d55512 100644
--- a/app/src/main/java/com/texthip/thip/ui/mypage/viewmodel/DeleteAccountViewModel.kt
+++ b/app/src/main/java/com/texthip/thip/ui/mypage/viewmodel/DeleteAccountViewModel.kt
@@ -9,11 +9,15 @@ import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.kakao.sdk.user.UserApiClient
 import com.texthip.thip.data.manager.TokenManager
 import com.texthip.thip.data.repository.UserRepository
+import com.texthip.thip.data.repository.NotificationRepository
+import com.texthip.thip.utils.auth.clearAppScopeDeviceData
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
 import javax.inject.Inject
 
 data class DeleteAccountUiState(
@@ -25,7 +29,8 @@ data class DeleteAccountUiState(
 @HiltViewModel
 class DeleteAccountViewModel @Inject constructor(
     private val userRepository: UserRepository,
-    private val tokenManager: TokenManager
+    private val tokenManager: TokenManager,
+    private val notificationRepository: NotificationRepository
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(DeleteAccountUiState())
@@ -34,37 +39,75 @@ class DeleteAccountViewModel @Inject constructor(
     fun deleteAccount(context: Context) {
         viewModelScope.launch {
             _uiState.update { it.copy(isLoading = true, errorMessage = null) }
-            
-            // 1. 서버에 회원탈퇴 요청
-            userRepository.deleteAccount()
-                .onSuccess {
-                    // 2. 서버 요청 성공 후 토큰 삭제
-                    tokenManager.clearTokens()
-                    
-                    // 3. 카카오 SDK에서 연결 끊기
-                    UserApiClient.instance.unlink { error ->
-                        if (error != null) {
-                            Log.e("DeleteAccountViewModel", "카카오 연결 끊기 실패", error)
-                        } else {
-                            Log.d("DeleteAccountViewModel", "카카오 연결 끊기 성공")
-                        }
+
+            runCatching {
+                // 1. FCM 토큰 삭제 (실패해도 계속 진행)
+                notificationRepository.deleteFcmToken()
+                    .onFailure { exception ->
+                        Log.w("DeleteAccountViewModel", "FCM 토큰 삭제 실패 (계속 진행)", exception)
                     }
-                    
-                    // 4. 구글 SDK에서 로그아웃
-                    val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN).build()
-                    GoogleSignIn.getClient(context, gso).signOut()
-                    
-                    _uiState.update { it.copy(isLoading = false, isDeleteCompleted = true) }
-                }
-                .onFailure { exception ->
-                    Log.e("DeleteAccountViewModel", "회원탈퇴 실패", exception)
-                    _uiState.update { 
-                        it.copy(
-                            isLoading = false, 
-                            errorMessage = exception.message ?: "회원탈퇴에 실패했습니다."
-                        ) 
+
+                // 2. 회원 탈퇴 요청
+                userRepository.deleteAccount()
+                    .onSuccess {
+                        // 3. 로컬 데이터 정리 (동기화 보장)
+                        performLocalDataCleanup(context)
+                        
+                        _uiState.update { it.copy(isLoading = false, isDeleteCompleted = true) }
+                    }
+                    .onFailure { exception ->
+                        Log.e("DeleteAccountViewModel", "서버 회원탈퇴 요청 실패", exception)
+                        throw exception
                     }
+            }.onFailure { exception ->
+                Log.e("DeleteAccountViewModel", "회원탈퇴 실패", exception)
+                _uiState.update {
+                    it.copy(
+                        isLoading = false,
+                        errorMessage = exception.message ?: "회원탈퇴에 실패했습니다."
+                    )
                 }
+            }
+        }
+    }
+
+    private suspend fun performLocalDataCleanup(context: Context) {
+        runCatching {
+            // 1. 토큰과 디바이스 데이터 정리
+            tokenManager.clearTokens()
+            context.clearAppScopeDeviceData()
+
+            // 2. 카카오 SDK 연결 끊기 (동기화 보장)
+            runCatching {
+                unlinkKakaoAccount()
+                Log.d("DeleteAccountViewModel", "카카오 연결 끊기 성공")
+            }.onFailure { e ->
+                Log.e("DeleteAccountViewModel", "카카오 연결 끊기 실패", e)
+            }
+
+            // 3. 구글 SDK 로그아웃
+            runCatching {
+                val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN).build()
+                GoogleSignIn.getClient(context, gso).signOut()
+                Log.d("DeleteAccountViewModel", "구글 로그아웃 성공")
+            }.onFailure { e ->
+                Log.e("DeleteAccountViewModel", "구글 로그아웃 실패", e)
+            }
+
+            Log.i("DeleteAccountViewModel", "로컬 데이터 정리 완료")
+        }.onFailure { e ->
+            Log.e("DeleteAccountViewModel", "로컬 데이터 정리 중 오류", e)
+        }
+    }
+
+    private suspend fun unlinkKakaoAccount() = suspendCancellableCoroutine<Unit> { continuation ->
+        UserApiClient.instance.unlink { error ->
+            if (error != null) {
+                continuation.resume(Unit) // 실패해도 정상적으로 완료 처리
+                Log.w("DeleteAccountViewModel", "카카오 연결 해제 실패하지만 계속 진행", error)
+            } else {
+                continuation.resume(Unit)
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/mypage/viewmodel/MypageNotificationEditViewModel.kt b/app/src/main/java/com/texthip/thip/ui/mypage/viewmodel/MypageNotificationEditViewModel.kt
new file mode 100644
index 00000000..ddcca977
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/mypage/viewmodel/MypageNotificationEditViewModel.kt
@@ -0,0 +1,104 @@
+package com.texthip.thip.ui.mypage.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.texthip.thip.data.repository.NotificationRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+data class MypageNotificationEditUiState(
+    val isLoading: Boolean = true,
+    val isNotificationEnabled: Boolean = true,
+    val isUpdating: Boolean = false,
+    val errorMessage: String? = null
+)
+
+@HiltViewModel
+class MypageNotificationEditViewModel @Inject constructor(
+    private val notificationRepository: NotificationRepository
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow(MypageNotificationEditUiState())
+    val uiState = _uiState.asStateFlow()
+
+    init {
+        fetchNotificationEnableState()
+    }
+
+    private fun updateState(update: (MypageNotificationEditUiState) -> MypageNotificationEditUiState) {
+        _uiState.value = update(_uiState.value)
+    }
+
+    fun fetchNotificationEnableState() {
+        viewModelScope.launch {
+            updateState { it.copy(isLoading = true) }
+            notificationRepository.getNotificationEnableState()
+                .onSuccess { data ->
+                    data?.let {
+                        updateState {
+                            it.copy(
+                                isLoading = false,
+                                isNotificationEnabled = data.isEnabled,
+                                errorMessage = null
+                            )
+                        }
+                    } ?: run {
+                        updateState { 
+                            it.copy(
+                                isLoading = false,
+                                errorMessage = "알림 설정 정보를 가져올 수 없습니다."
+                            )
+                        }
+                    }
+                }
+                .onFailure { exception ->
+                    updateState { 
+                        it.copy(
+                            isLoading = false, 
+                            errorMessage = exception.message
+                        )
+                    }
+                }
+        }
+    }
+
+    fun onNotificationToggle(enabled: Boolean) {
+        viewModelScope.launch {
+            // 즉시 UI 업데이트 (낙관적 업데이트)
+            updateState { it.copy(isNotificationEnabled = enabled, isUpdating = true) }
+            
+            notificationRepository.updateNotificationEnabled(enabled)
+                .onSuccess { data ->
+                    data?.let {
+                        updateState {
+                            it.copy(
+                                isUpdating = false,
+                                isNotificationEnabled = data.isEnabled,
+                                errorMessage = null
+                            )
+                        }
+                    } ?: run {
+                        updateState {
+                            it.copy(
+                                isUpdating = false,
+                                errorMessage = "알림 설정을 업데이트할 수 없습니다."
+                            )
+                        }
+                    }
+                }
+                .onFailure { exception ->
+                    // 실패 시 이전 상태로 롤백
+                    updateState {
+                        it.copy(
+                            isUpdating = false,
+                            isNotificationEnabled = !enabled,
+                            errorMessage = exception.message
+                        )
+                    }
+                }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/navigator/MainNavHost.kt b/app/src/main/java/com/texthip/thip/ui/navigator/MainNavHost.kt
index b06889ac..9b0acdbb 100644
--- a/app/src/main/java/com/texthip/thip/ui/navigator/MainNavHost.kt
+++ b/app/src/main/java/com/texthip/thip/ui/navigator/MainNavHost.kt
@@ -1,5 +1,7 @@
 package com.texthip.thip.ui.navigator
 
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
@@ -19,7 +21,11 @@ fun MainNavHost(
 ) {
     NavHost(
         navController = navController,
-        startDestination = MainTabRoutes.Feed
+        startDestination = MainTabRoutes.Feed,
+        enterTransition = { EnterTransition.None },
+        exitTransition = { ExitTransition.None },
+        popEnterTransition = { EnterTransition.None },
+        popExitTransition = { ExitTransition.None }
     ) {
         feedNavigation(
             navController = navController,
diff --git a/app/src/main/java/com/texthip/thip/ui/navigator/extensions/GroupNavigationExtensions.kt b/app/src/main/java/com/texthip/thip/ui/navigator/extensions/GroupNavigationExtensions.kt
index 7b764299..8febe92e 100644
--- a/app/src/main/java/com/texthip/thip/ui/navigator/extensions/GroupNavigationExtensions.kt
+++ b/app/src/main/java/com/texthip/thip/ui/navigator/extensions/GroupNavigationExtensions.kt
@@ -23,22 +23,19 @@ fun NavHostController.navigateToGroupMakeRoomWithBook(
     imageUrl: String,
     author: String
 ) {
-    navigate(GroupRoutes.MakeRoomWithBook(
-        isbn = isbn,
-        title = title,
-        imageUrl = imageUrl,
-        author = author
-    ))
-}
-
-// 완료된 모임방 목록으로 이동
-fun NavHostController.navigateToGroupDone() {
-    navigate(GroupRoutes.Done)
+    navigate(
+        GroupRoutes.MakeRoomWithBook(
+            isbn = isbn,
+            title = title,
+            imageUrl = imageUrl,
+            author = author
+        )
+    )
 }
 
 // 모임방 검색 화면으로 이동
-fun NavHostController.navigateToGroupSearch() {
-    navigate(GroupRoutes.Search)
+fun NavHostController.navigateToGroupSearch(viewAll: Boolean = false) {
+    navigate(GroupRoutes.Search(viewAll = viewAll))
 }
 
 // 내 모임방 화면으로 이동
@@ -71,8 +68,8 @@ fun NavHostController.navigateToRecommendedGroupRecruit(roomId: Int) {
 }
 
 // 진행중인 모임방 화면으로 이동
-fun NavHostController.navigateToGroupRoom(roomId: Int) {
-    navigate(GroupRoutes.Room(roomId))
+fun NavHostController.navigateToGroupRoom(roomId: Int, isExpired: Boolean = false) {
+    navigate(GroupRoutes.Room(roomId, isExpired))
 }
 
 // 독서메이트 화면으로 이동
@@ -81,17 +78,28 @@ fun NavHostController.navigateToGroupRoomMates(roomId: Int) {
 }
 
 // 오늘의 한마디 회면으로 이동
-fun NavHostController.navigateToGroupRoomChat(roomId: Int) {
-    navigate(GroupRoutes.RoomChat(roomId))
+fun NavHostController.navigateToGroupRoomChat(roomId: Int, isExpired: Boolean = false) {
+    navigate(GroupRoutes.RoomChat(roomId, isExpired))
 }
 
 // 기록장 화면으로 이동
 fun NavHostController.navigateToGroupNote(
     roomId: Int,
     page: Int? = null,
-    isOverview: Boolean? = null
+    isOverview: Boolean? = null,
+    isExpired: Boolean = false,
+    postId: Int? = null
 ) {
-    navigate(GroupRoutes.Note(roomId = roomId, page = page, isOverview = isOverview))
+    navigate(
+        GroupRoutes.Note(
+            roomId = roomId,
+            page = page,
+            openComments = false,
+            isExpired = isExpired,
+            postId = postId,
+            isOverview = isOverview
+        )
+    )
 }
 
 // 기록 생성 화면으로 이동
@@ -144,4 +152,9 @@ fun NavHostController.navigateToGroupVoteCreate(
             options = options
         )
     )
+}
+
+// AI 독후감 생성 화면으로 이동
+fun NavHostController.navigateToGroupNoteAi(roomId: Int) {
+    navigate(GroupRoutes.NoteAi(roomId = roomId))
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/navigator/extensions/NotificationNavigationExtensions.kt b/app/src/main/java/com/texthip/thip/ui/navigator/extensions/NotificationNavigationExtensions.kt
new file mode 100644
index 00000000..a29fd862
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/navigator/extensions/NotificationNavigationExtensions.kt
@@ -0,0 +1,66 @@
+package com.texthip.thip.ui.navigator.extensions
+
+import android.util.Log
+import androidx.navigation.NavController
+import com.texthip.thip.data.model.notification.response.NotificationCheckResponse
+import com.texthip.thip.data.model.notification.response.NotificationRoute
+import com.texthip.thip.ui.navigator.routes.FeedRoutes
+import com.texthip.thip.ui.navigator.routes.GroupRoutes
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.contentOrNull
+
+private fun JsonElement.toStringOrNull(): String? {
+    return (this as? JsonPrimitive)?.contentOrNull
+}
+
+fun NavController.navigateFromNotification(response: NotificationCheckResponse) {
+    val params = response.params
+
+    try {
+        when (response.route) {
+            NotificationRoute.FEED_USER -> {
+                val userId = params["userId"]?.toStringOrNull()?.toLongOrNull()
+                if (userId != null) {
+                    navigate(FeedRoutes.Others(userId))
+                }
+            }
+
+            NotificationRoute.FEED_DETAIL -> {
+                val feedId = params["feedId"]?.toStringOrNull()?.toLongOrNull()
+                if (feedId != null) {
+                    navigate(FeedRoutes.Comment(feedId))
+                }
+            }
+
+            NotificationRoute.ROOM_MAIN -> {
+                val roomId = params["roomId"]?.toStringOrNull()?.toIntOrNull()
+                if (roomId != null) {
+                    navigate(GroupRoutes.Room(roomId))
+                }
+            }
+
+            NotificationRoute.ROOM_DETAIL -> {
+                val roomId = params["roomId"]?.toStringOrNull()?.toIntOrNull()
+                if (roomId != null) {
+                    navigate(GroupRoutes.Recruit(roomId))
+                }
+            }
+
+            NotificationRoute.ROOM_POST_DETAIL -> {
+                val roomId = params["roomId"]?.toStringOrNull()?.toIntOrNull()
+                val page = params["page"]?.toStringOrNull()?.toIntOrNull()
+                val postId = params["postId"]?.toStringOrNull()?.toIntOrNull()
+                val postType = params["postType"]?.toStringOrNull()
+                val openComments =
+                    params["openComments"]?.toStringOrNull()?.toBooleanStrictOrNull() ?: false
+
+                if (roomId != null && page != null) {
+                    navigate(GroupRoutes.Note(roomId, page, openComments, false, postId))
+                }
+            }
+        }
+    } catch (e: Exception) {
+        Log.e("NotificationNav", "Navigation failed", e)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/navigator/navigations/CommonNavigation.kt b/app/src/main/java/com/texthip/thip/ui/navigator/navigations/CommonNavigation.kt
index 734373c7..7885bf5e 100644
--- a/app/src/main/java/com/texthip/thip/ui/navigator/navigations/CommonNavigation.kt
+++ b/app/src/main/java/com/texthip/thip/ui/navigator/navigations/CommonNavigation.kt
@@ -1,14 +1,11 @@
 package com.texthip.thip.ui.navigator.navigations
 
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import com.texthip.thip.ui.common.alarmpage.screen.AlarmScreen
-import com.texthip.thip.ui.common.alarmpage.viewmodel.AlarmViewModel
 import com.texthip.thip.ui.common.screen.RegisterBookScreen
+import com.texthip.thip.ui.navigator.extensions.navigateFromNotification
 import com.texthip.thip.ui.navigator.routes.CommonRoutes
 
 // Common 관련 네비게이션
@@ -18,16 +15,14 @@ fun NavGraphBuilder.commonNavigation(
 ) {
     // Alarm 화면
     composable<CommonRoutes.Alarm> {
-        val alarmViewModel: AlarmViewModel = viewModel()
-        val alarmItems by alarmViewModel.alarmItems.collectAsState()
-        
         AlarmScreen(
-            alarmItems = alarmItems,
-            onCardClick = { alarmViewModel.onCardClick(it) },
-            onNavigateBack = navigateBack
+            onNavigateBack = navigateBack,
+            onNotificationNavigation = { response ->
+                navController.navigateFromNotification(response)
+            }
         )
     }
-    
+
     // 책 요청 화면
     composable<CommonRoutes.RegisterBook> {
         RegisterBookScreen(
diff --git a/app/src/main/java/com/texthip/thip/ui/navigator/navigations/GroupNavigation.kt b/app/src/main/java/com/texthip/thip/ui/navigator/navigations/GroupNavigation.kt
index 70e30efb..5fd21db9 100644
--- a/app/src/main/java/com/texthip/thip/ui/navigator/navigations/GroupNavigation.kt
+++ b/app/src/main/java/com/texthip/thip/ui/navigator/navigations/GroupNavigation.kt
@@ -10,12 +10,12 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
 import com.texthip.thip.ui.feed.viewmodel.FeedViewModel
-import com.texthip.thip.ui.group.done.screen.GroupDoneScreen
 import com.texthip.thip.ui.group.makeroom.screen.GroupMakeRoomScreen
 import com.texthip.thip.ui.group.makeroom.viewmodel.GroupMakeRoomViewModel
 import com.texthip.thip.ui.group.myroom.mock.RoomType
 import com.texthip.thip.ui.group.myroom.screen.GroupMyScreen
 import com.texthip.thip.ui.group.myroom.viewmodel.GroupMyViewModel
+import com.texthip.thip.ui.group.note.screen.GroupNoteAiScreen
 import com.texthip.thip.ui.group.note.screen.GroupNoteCreateScreen
 import com.texthip.thip.ui.group.note.screen.GroupNoteScreen
 import com.texthip.thip.ui.group.note.screen.GroupVoteCreateScreen
@@ -28,14 +28,15 @@ import com.texthip.thip.ui.group.room.screen.GroupRoomUnlockScreen
 import com.texthip.thip.ui.group.room.viewmodel.GroupRoomRecruitViewModel
 import com.texthip.thip.ui.group.screen.GroupScreen
 import com.texthip.thip.ui.group.search.screen.GroupSearchScreen
+import com.texthip.thip.ui.group.search.viewmodel.GroupSearchViewModel
 import com.texthip.thip.ui.group.viewmodel.GroupViewModel
 import com.texthip.thip.ui.navigator.extensions.navigateToAlarm
 import com.texthip.thip.ui.navigator.extensions.navigateToBookDetail
 import com.texthip.thip.ui.navigator.extensions.navigateToFeedWrite
-import com.texthip.thip.ui.navigator.extensions.navigateToGroupDone
 import com.texthip.thip.ui.navigator.extensions.navigateToGroupMakeRoom
 import com.texthip.thip.ui.navigator.extensions.navigateToGroupMy
 import com.texthip.thip.ui.navigator.extensions.navigateToGroupNote
+import com.texthip.thip.ui.navigator.extensions.navigateToGroupNoteAi
 import com.texthip.thip.ui.navigator.extensions.navigateToGroupNoteCreate
 import com.texthip.thip.ui.navigator.extensions.navigateToGroupRecruit
 import com.texthip.thip.ui.navigator.extensions.navigateToGroupRoom
@@ -75,14 +76,11 @@ fun NavGraphBuilder.groupNavigation(
             onNavigateToMakeRoom = {
                 navController.navigateToGroupMakeRoom()
             },
-            onNavigateToGroupDone = {
-                navController.navigateToGroupDone()
-            },
             onNavigateToAlarm = {
                 navController.navigateToAlarm()
             },
             onNavigateToGroupSearch = {
-                navController.navigateToGroupSearch()
+                navController.navigateToGroupSearch(viewAll = false)
             },
             onNavigateToGroupMy = {
                 navController.navigateToGroupMy()
@@ -92,6 +90,9 @@ fun NavGraphBuilder.groupNavigation(
             },
             onNavigateToGroupRoom = { roomId ->
                 navController.navigateToGroupRoom(roomId)
+            },
+            onNavigateToGroupSearchAllRooms = {
+                navController.navigateToGroupSearch(viewAll = true)
             }
         )
     }
@@ -141,15 +142,6 @@ fun NavGraphBuilder.groupNavigation(
         )
     }
 
-    // Group Done 화면
-    composable<GroupRoutes.Done> {
-        GroupDoneScreen(
-            onNavigateBack = {
-                navigateBack()
-            }
-        )
-    }
-
     // Group My 화면
     composable<GroupRoutes.My> {
         val groupMyViewModel: GroupMyViewModel = hiltViewModel()
@@ -158,10 +150,12 @@ fun NavGraphBuilder.groupNavigation(
             viewModel = groupMyViewModel,
             onCardClick = { room ->
                 val isRecruiting = room.type == RoomType.RECRUITING.value
+                val isExpired = (room.type == RoomType.EXPIRED.value)
+
                 if (isRecruiting) {
                     navController.navigateToGroupRecruit(room.roomId)
                 } else {
-                    navController.navigateToGroupRoom(room.roomId)
+                    navController.navigateToGroupRoom(room.roomId, isExpired = isExpired)
                 }
             },
             onNavigateBack = {
@@ -171,14 +165,25 @@ fun NavGraphBuilder.groupNavigation(
     }
 
     // Group Search 화면
-    composable<GroupRoutes.Search> {
+    composable<GroupRoutes.Search> { backStackEntry ->
+        val route = backStackEntry.toRoute<GroupRoutes.Search>()
+        val viewModel: GroupSearchViewModel = hiltViewModel()
+
+        // [추가] 화면 진입 시 viewAll 플래그를 확인하고 ViewModel의 함수를 호출
+        LaunchedEffect(Unit) {
+            if (route.viewAll) {
+                viewModel.onViewAllRooms()
+            }
+        }
+
         GroupSearchScreen(
             onNavigateBack = {
                 navigateBack()
             },
             onRoomClick = { roomId ->
                 navController.navigateToGroupRecruit(roomId)
-            }
+            },
+            viewModel = viewModel
         )
     }
 
@@ -256,9 +261,11 @@ fun NavGraphBuilder.groupNavigation(
     composable<GroupRoutes.Room> { backStackEntry ->
         val route = backStackEntry.toRoute<GroupRoutes.Room>()
         val roomId = route.roomId
+        val isExpired = route.isExpired
 
         GroupRoomScreen(
             roomId = roomId,
+            isExpired = isExpired,
             onBackClick = {
                 navigateBack()
             },
@@ -266,10 +273,10 @@ fun NavGraphBuilder.groupNavigation(
                 navController.navigateToGroupRoomMates(roomId)
             },
             onNavigateToChat = {
-                navController.navigateToGroupRoomChat(roomId)
+                navController.navigateToGroupRoomChat(roomId, isExpired)
             },
             onNavigateToNote = { page, isOverview ->
-                navController.navigateToGroupNote(roomId, page, isOverview)
+                navController.navigateToGroupNote(roomId, page, isOverview, isExpired)
             },
             onNavigateToBookDetail = { isbn ->
                 navController.navigateToBookDetail(isbn)
@@ -282,7 +289,8 @@ fun NavGraphBuilder.groupNavigation(
         val route = backStackEntry.toRoute<GroupRoutes.RoomMates>()
         val roomId = route.roomId
 
-        val feedViewModel: FeedViewModel = hiltViewModel(navController.getBackStackEntry(MainTabRoutes.Group))
+        val feedViewModel: FeedViewModel =
+            hiltViewModel(navController.getBackStackEntry(MainTabRoutes.Group))
         val feedUiState by feedViewModel.uiState.collectAsState()
         val myUserId = feedUiState.myFeedInfo?.creatorId
 
@@ -307,9 +315,12 @@ fun NavGraphBuilder.groupNavigation(
         )
     }
 
-    composable<GroupRoutes.RoomChat> {
+    composable<GroupRoutes.RoomChat> { backStackEntry ->
+        val route = backStackEntry.toRoute<GroupRoutes.RoomChat>()
+
         GroupRoomChatScreen(
             onBackClick = { navigateBack() },
+            isExpired = route.isExpired
         )
     }
 
@@ -318,27 +329,23 @@ fun NavGraphBuilder.groupNavigation(
         val route = backStackEntry.toRoute<GroupRoutes.Note>()
         val roomId = route.roomId
         val page = route.page
+        val openComments = route.openComments
         val isOverview = route.isOverview
+        val isExpired = route.isExpired
+        val postId = route.postId
 
         val result = backStackEntry.savedStateHandle.get<Int>("selected_tab_index")
 
         val viewModel: GroupNoteViewModel = hiltViewModel(backStackEntry)
 
-        val feedViewModel: FeedViewModel = hiltViewModel(navController.getBackStackEntry(MainTabRoutes.Group))
-        val feedUiState by feedViewModel.uiState.collectAsState()
-        val myUserId = feedUiState.myFeedInfo?.creatorId
-
-        LaunchedEffect(Unit) {
-            if (feedUiState.myFeedInfo == null) {
-                feedViewModel.onTabSelected(1)
-            }
-        }
-
         GroupNoteScreen(
             roomId = roomId,
             resultTabIndex = result,
             initialPage = page,
             initialIsOverview = isOverview,
+            isExpired = isExpired,
+            initialPostId = postId,
+            openComments = openComments,
             onResultConsumed = {
                 backStackEntry.savedStateHandle.remove<Int>("selected_tab_index")
             },
@@ -397,11 +404,13 @@ fun NavGraphBuilder.groupNavigation(
                 )
             },
             onNavigateToUserProfile = { userId ->
-                if (myUserId != null && myUserId == userId) {
-                    navController.navigate(FeedRoutes.My)
-                } else {
-                    navController.navigate(FeedRoutes.Others(userId))
-                }
+                navController.navigate(FeedRoutes.Others(userId))
+            },
+            onNavigateToMyProfile = {
+                navController.navigate(FeedRoutes.My)
+            },
+            onNavigateToAiReview = {
+                navController.navigateToGroupNoteAi(roomId)
             },
             viewModel = viewModel
         )
@@ -457,4 +466,13 @@ fun NavGraphBuilder.groupNavigation(
             }
         )
     }
+
+    // AI 독후감 스크린
+    composable<GroupRoutes.NoteAi> { backStackEntry ->
+        val route = backStackEntry.toRoute<GroupRoutes.NoteAi>()
+        GroupNoteAiScreen(
+            roomId = route.roomId,
+            onBackClick = { navigateBack() }
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/navigator/navigations/MyPageNavigation.kt b/app/src/main/java/com/texthip/thip/ui/navigator/navigations/MyPageNavigation.kt
index 879b9505..e022b7ef 100644
--- a/app/src/main/java/com/texthip/thip/ui/navigator/navigations/MyPageNavigation.kt
+++ b/app/src/main/java/com/texthip/thip/ui/navigator/navigations/MyPageNavigation.kt
@@ -5,10 +5,10 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
 import com.texthip.thip.ui.mypage.screen.DeleteAccountScreen
 import com.texthip.thip.ui.mypage.screen.EditProfileScreen
+import com.texthip.thip.ui.mypage.screen.MyPageNotificationEditScreen
 import com.texthip.thip.ui.mypage.screen.MyPageScreen
 import com.texthip.thip.ui.mypage.screen.MypageCustomerServiceScreen
 import com.texthip.thip.ui.mypage.screen.MypageSaveScreen
-import com.texthip.thip.ui.mypage.screen.NotificationScreen
 import com.texthip.thip.ui.navigator.extensions.navigateToBookDetail
 import com.texthip.thip.ui.navigator.extensions.navigateToCustomerService
 import com.texthip.thip.ui.navigator.extensions.navigateToEditProfile
@@ -53,7 +53,7 @@ fun NavGraphBuilder.myPageNavigation(
         )
     }
     composable<MyPageRoutes.NotificationEdit> {
-        NotificationScreen(
+        MyPageNotificationEditScreen(
             onNavigateBack = { navController.popBackStack() }
         )
     }
diff --git a/app/src/main/java/com/texthip/thip/ui/navigator/routes/GroupRoutes.kt b/app/src/main/java/com/texthip/thip/ui/navigator/routes/GroupRoutes.kt
index 100d84e3..6e9b6c78 100644
--- a/app/src/main/java/com/texthip/thip/ui/navigator/routes/GroupRoutes.kt
+++ b/app/src/main/java/com/texthip/thip/ui/navigator/routes/GroupRoutes.kt
@@ -14,12 +14,9 @@ sealed class GroupRoutes : Routes() {
         val imageUrl: String,
         val author: String
     ) : GroupRoutes()
-    
-    @Serializable
-    data object Done : GroupRoutes()
 
     @Serializable
-    data object Search : GroupRoutes()
+    data class Search(val viewAll: Boolean = false) : GroupRoutes()
 
     @Serializable
     data object My : GroupRoutes()
@@ -31,17 +28,23 @@ sealed class GroupRoutes : Routes() {
     data class RoomUnlock(val roomId: Int) : GroupRoutes()
 
     @Serializable
-    data class Room(val roomId: Int) : GroupRoutes()
+    data class Room(val roomId: Int, val isExpired: Boolean = false) : GroupRoutes()
 
     @Serializable
     data class RoomMates(val roomId: Int) : GroupRoutes()
 
     @Serializable
-    data class RoomChat(val roomId: Int) : GroupRoutes()
+    data class RoomChat(val roomId: Int, val isExpired: Boolean = false) : GroupRoutes()
 
     @Serializable
-    data class Note(val roomId: Int, val page: Int? = null, val isOverview: Boolean? = null) :
-        GroupRoutes()
+    data class Note(
+        val roomId: Int,
+        val page: Int? = null,
+        val openComments: Boolean = false,
+        val isExpired: Boolean = false,
+        val postId: Int? = null,
+        val isOverview: Boolean? = null
+    ) : GroupRoutes()
 
     @Serializable
     data class NoteCreate(
@@ -67,4 +70,7 @@ sealed class GroupRoutes : Routes() {
         val title: String? = null,
         val options: List<String>? = null
     )
+
+    @Serializable
+    data class NoteAi(val roomId: Int) : GroupRoutes()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/search/screen/SearchBookScreen.kt b/app/src/main/java/com/texthip/thip/ui/search/screen/SearchBookScreen.kt
index 36e83c4a..8a5a2876 100644
--- a/app/src/main/java/com/texthip/thip/ui/search/screen/SearchBookScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/search/screen/SearchBookScreen.kt
@@ -23,9 +23,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 import com.texthip.thip.R
 import com.texthip.thip.ui.common.forms.SearchBookTextField
 import com.texthip.thip.ui.common.topappbar.LeftNameTopAppBar
@@ -36,6 +33,9 @@ import com.texthip.thip.ui.search.component.SearchRecentBook
 import com.texthip.thip.ui.search.mock.BookData
 import com.texthip.thip.ui.search.viewmodel.SearchBookViewModel
 import com.texthip.thip.ui.theme.ThipTheme
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
 
 @Composable
 fun SearchBookScreen(
@@ -149,7 +149,7 @@ private fun SearchBookScreenContent(
             modifier = Modifier.fillMaxSize()
         ) {
             LeftNameTopAppBar(
-                title = stringResource(R.string.book_search_topappbar)
+                title = stringResource(R.string.nav_search)
             )
             Column(
                 modifier = Modifier
diff --git a/app/src/main/java/com/texthip/thip/ui/signin/screen/SignupGenreScreen.kt b/app/src/main/java/com/texthip/thip/ui/signin/screen/SignupGenreScreen.kt
index 52cb3f18..19f74f84 100644
--- a/app/src/main/java/com/texthip/thip/ui/signin/screen/SignupGenreScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/signin/screen/SignupGenreScreen.kt
@@ -53,6 +53,7 @@ fun SignupGenreScreen(
         onNextClick = viewModel::signup
     )
 }
+
 @Composable
 fun SignupGenreContent(
     uiState: SignupUiState,
@@ -81,6 +82,7 @@ fun SignupGenreContent(
             modifier = Modifier
                 .padding(horizontal = 20.dp)
                 .fillMaxWidth()
+                .weight(1f)
         ) {
             Text(
                 text = stringResource(R.string.select_genre),
@@ -107,7 +109,14 @@ fun SignupGenreContent(
                 userScrollEnabled = false,
             ) {
                 itemsIndexed(uiState.roleCards) { index, roleItem ->
+                    val modifier = if (index == uiState.roleCards.lastIndex) {
+                        Modifier.padding(bottom = 40.dp)
+                    } else {
+                        Modifier
+                    }
+
                     RoleCard(
+                        modifier = modifier,
                         genre = roleItem.genre,
                         role = roleItem.role,
                         imageUrl = roleItem.imageUrl,
diff --git a/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/LoginViewModel.kt b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/LoginViewModel.kt
index ff33d531..81ef9008 100644
--- a/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/LoginViewModel.kt
+++ b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/LoginViewModel.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.texthip.thip.data.manager.FcmTokenManager
 import com.texthip.thip.data.manager.TokenManager
 import com.texthip.thip.data.model.auth.response.AuthResponse
 import com.texthip.thip.data.repository.AuthRepository
@@ -24,7 +25,8 @@ sealed interface LoginUiState {
 @HiltViewModel
 class LoginViewModel @Inject constructor(
     private val authRepository: AuthRepository,
-    private val tokenManager: TokenManager
+    private val tokenManager: TokenManager,
+    private val fcmTokenManager: FcmTokenManager
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow<LoginUiState>(LoginUiState.Idle)
@@ -40,10 +42,12 @@ class LoginViewModel @Inject constructor(
                     if (response != null) {
                         if (response.isNewUser) {
                             tokenManager.saveTempToken(response.token) // 신규 유저는 임시 토큰으로 저장
+                            _uiState.update { LoginUiState.Success(response) }
                         } else {
                             tokenManager.saveToken(response.token) // 기존 유저는 정식 토큰으로 저장
+                            // 기존 유저의 경우 FCM 토큰 전송 후 Success 상태 업데이트
+                            sendFcmTokenAndUpdateState(response)
                         }
-                        _uiState.update { LoginUiState.Success(response) }
                     } else {
                         _uiState.update { LoginUiState.Error("서버로부터 응답을 받지 못했습니다.") }
                     }
@@ -67,10 +71,12 @@ class LoginViewModel @Inject constructor(
                     if (response != null) {
                         if (response.isNewUser) {
                             tokenManager.saveTempToken(response.token) // 신규 유저는 임시 토큰으로 저장
+                            _uiState.update { LoginUiState.Success(response) }
                         } else {
                             tokenManager.saveToken(response.token) // 기존 유저는 정식 토큰으로 저장
+                            // 기존 유저의 경우 FCM 토큰 전송 후 Success 상태 업데이트
+                            sendFcmTokenAndUpdateState(response)
                         }
-                        _uiState.update { LoginUiState.Success(response) }
                     } else {
                         _uiState.update { LoginUiState.Error("서버로부터 응답을 받지 못했습니다.") }
                     }
@@ -88,4 +94,11 @@ class LoginViewModel @Inject constructor(
     fun clearLoginState() {
         _uiState.update { LoginUiState.Idle }
     }
+
+    private fun sendFcmTokenAndUpdateState(response: AuthResponse) {
+        viewModelScope.launch {
+            fcmTokenManager.sendCurrentTokenIfExists()
+            _uiState.update { LoginUiState.Success(response) }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/SignupViewModel.kt b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/SignupViewModel.kt
index a89243fc..6026eae5 100644
--- a/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/SignupViewModel.kt
+++ b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/SignupViewModel.kt
@@ -4,6 +4,7 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.texthip.thip.R
+import com.texthip.thip.data.manager.FcmTokenManager
 import com.texthip.thip.data.manager.TokenManager
 import com.texthip.thip.data.model.base.ThipApiFailureException
 import com.texthip.thip.data.model.users.request.SignupRequest
@@ -31,7 +32,8 @@ data class SignupUiState(
 @HiltViewModel
 class SignupViewModel @Inject constructor(
     private val userRepository: UserRepository,
-    private val tokenManager: TokenManager
+    private val tokenManager: TokenManager,
+    private val fcmTokenManager: FcmTokenManager
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(SignupUiState())
@@ -139,6 +141,9 @@ class SignupViewModel @Inject constructor(
                         tokenManager.saveToken(signupResponse.accessToken)
                         tokenManager.deleteTempToken()
 
+                        // 회원가입 완료 후 FCM 토큰 전송
+                        sendFcmToken()
+
                         _uiState.update { it.copy(isLoading = false, isSignupSuccess = true) }
                     }
                 }
@@ -151,4 +156,10 @@ class SignupViewModel @Inject constructor(
                 }
         }
     }
+
+    private fun sendFcmToken() {
+        viewModelScope.launch {
+            fcmTokenManager.sendCurrentTokenIfExists()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/SplashViewModel.kt b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/SplashViewModel.kt
index d0abc258..021bdb50 100644
--- a/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/SplashViewModel.kt
+++ b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/SplashViewModel.kt
@@ -2,9 +2,10 @@ package com.texthip.thip.ui.signin.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.texthip.thip.data.manager.FcmTokenManager
 import com.texthip.thip.data.manager.TokenManager
 import dagger.hilt.android.lifecycle.HiltViewModel
-import jakarta.inject.Inject
+import javax.inject.Inject
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -18,7 +19,8 @@ sealed interface SplashDestination {
 
 @HiltViewModel
 class SplashViewModel @Inject constructor(
-    private val tokenManager: TokenManager
+    private val tokenManager: TokenManager,
+    private val fcmTokenManager: FcmTokenManager
 ) : ViewModel() {
 
     private val _destination = MutableStateFlow<SplashDestination>(SplashDestination.Loading)
@@ -37,8 +39,16 @@ class SplashViewModel @Inject constructor(
             if (token.isNullOrBlank()) {
                 _destination.value = SplashDestination.NavigateToLogin
             } else {
+                // 자동 로그인 시 FCM 토큰 전송
+                sendFcmToken()
                 _destination.value = SplashDestination.NavigateToHome
             }
         }
     }
+
+    private fun sendFcmToken() {
+        viewModelScope.launch {
+            fcmTokenManager.sendCurrentTokenIfExists()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/utils/auth/DeviceUtils.kt b/app/src/main/java/com/texthip/thip/utils/auth/DeviceUtils.kt
new file mode 100644
index 00000000..bf32a0d8
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/utils/auth/DeviceUtils.kt
@@ -0,0 +1,99 @@
+package com.texthip.thip.utils.auth
+
+import android.content.Context
+import android.util.Log
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import com.google.firebase.installations.FirebaseInstallations
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.tasks.await
+import java.util.UUID
+
+private val Context.appDeviceIdDataStore: DataStore<Preferences> by preferencesDataStore(name = "app_device_id")
+private val APP_DEVICE_ID_KEY = stringPreferencesKey("app_device_id")
+
+/**
+ * 앱-스코프 디바이스 식별자를 가져옵니다.
+ * ⚠️ 주의: 이 ID는 앱 재설치 시마다 변경됩니다 (기기별로 영구적이지 않음)
+ * 1차: Firebase Installations ID (FID) - Google 권장 앱-스코프 식별자
+ * 2차: 로컬 저장된 UUID - FID 실패 시 백업
+ * 3차: 새 UUID 생성 후 저장 - 최초 실행 시
+ */
+suspend fun Context.getAppScopeDeviceId(): String {
+    return try {
+        // 1차: Firebase Installations ID 시도
+        getFirebaseInstallationId()
+    } catch (e: Exception) {
+        Log.w("DeviceUtils", "Failed to get Firebase Installation ID, using local UUID", e)
+        // 2차/3차: 로컬 UUID 사용 (없으면 생성)
+        getOrCreateLocalDeviceId()
+    }
+}
+
+/**
+ * Firebase Installations ID (FID) 가져오기
+ * - 앱 재설치 시 새로 생성됨 (프라이버시 친화적)
+ * - Google Play 서비스가 있는 기기에서 사용 가능
+ */
+private suspend fun getFirebaseInstallationId(): String {
+    return try {
+        FirebaseInstallations.getInstance().id.await()
+    } catch (e: Exception) {
+        Log.e("DeviceUtils", "Failed to get FID", e)
+        throw e
+    }
+}
+
+/**
+ * 로컬 저장된 UUID 가져오기 또는 새로 생성
+ * - 앱 데이터 삭제 시까지 유지됨
+ * - FID 백업용으로 사용
+ */
+private suspend fun Context.getOrCreateLocalDeviceId(): String {
+    // 기존 저장된 ID 확인
+    val existingId = appDeviceIdDataStore.data
+        .map { preferences -> preferences[APP_DEVICE_ID_KEY] }
+        .first()
+
+    return existingId ?: run {
+        // 새 UUID 생성 후 저장
+        val newId = UUID.randomUUID().toString()
+        appDeviceIdDataStore.edit { preferences ->
+            preferences[APP_DEVICE_ID_KEY] = newId
+        }
+        Log.i("DeviceUtils", "Generated new app-scope device ID")
+        newId
+    }
+}
+
+/**
+ * 기존 getAndroidDeviceId() 호환성을 위한 래퍼 함수
+ * @deprecated ANDROID_ID 사용 중단으로 인해 getAppScopeDeviceId() 사용 권장
+ */
+@Deprecated(
+    message = "Use getAppScopeDeviceId() instead for privacy compliance",
+    replaceWith = ReplaceWith("getAppScopeDeviceId()"),
+    level = DeprecationLevel.WARNING
+)
+suspend fun Context.getAndroidDeviceId(): String {
+    return getAppScopeDeviceId()
+}
+
+/**
+ * 앱-스코프 디바이스 ID와 관련된 모든 로컬 데이터를 삭제합니다.
+ * 회원 탈퇴 시 호출하여 개인정보를 완전히 정리합니다.
+ */
+suspend fun Context.clearAppScopeDeviceData() {
+    try {
+        appDeviceIdDataStore.edit { preferences ->
+            preferences.clear()
+        }
+        Log.i("DeviceUtils", "App-scope device data cleared successfully")
+    } catch (e: Exception) {
+        Log.e("DeviceUtils", "Failed to clear app-scope device data", e)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/utils/image/ImageUploadHelper.kt b/app/src/main/java/com/texthip/thip/utils/image/ImageUploadHelper.kt
index f763cb06..7c1e2722 100644
--- a/app/src/main/java/com/texthip/thip/utils/image/ImageUploadHelper.kt
+++ b/app/src/main/java/com/texthip/thip/utils/image/ImageUploadHelper.kt
@@ -1,11 +1,11 @@
 package com.texthip.thip.utils.image
 
 import android.content.Context
-import android.database.Cursor
 import android.net.Uri
 import android.provider.OpenableColumns
 import com.texthip.thip.BuildConfig
 import com.texthip.thip.data.model.feed.request.ImageMetadata
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.MediaType.Companion.toMediaType
@@ -20,9 +20,9 @@ import javax.inject.Singleton
 
 @Singleton
 class ImageUploadHelper @Inject constructor(
-    private val context: Context
+    @param:ApplicationContext private val context: Context
 ) {
-    
+
     private val s3Client = OkHttpClient.Builder()
         .connectTimeout(10, java.util.concurrent.TimeUnit.SECONDS)
         .writeTimeout(10, java.util.concurrent.TimeUnit.SECONDS)
@@ -37,7 +37,7 @@ class ImageUploadHelper @Inject constructor(
             }
         }
         .build()
-    
+
     suspend fun uploadImageToS3(
         uri: Uri,
         presignedUrl: String
@@ -45,7 +45,7 @@ class ImageUploadHelper @Inject constructor(
         runCatching {
             val mimeType = context.contentResolver.getType(uri) ?: "image/jpeg"
             val tempFile = File(context.cacheDir, "temp_image_${System.currentTimeMillis()}")
-            
+
             try {
                 context.contentResolver.openInputStream(uri)?.use { inputStream ->
                     FileOutputStream(tempFile).use { outputStream ->
@@ -60,7 +60,7 @@ class ImageUploadHelper @Inject constructor(
                     .build()
 
                 val response = s3Client.newCall(request).execute()
-                
+
                 if (!response.isSuccessful) {
                     throw Exception("S3 upload failed: ${response.code} ${response.message}")
                 }
@@ -71,7 +71,7 @@ class ImageUploadHelper @Inject constructor(
             }
         }
     }
-    
+
     suspend fun getImageMetadata(uri: Uri): ImageMetadata? = withContext(Dispatchers.IO) {
         runCatching {
             val mimeType = context.contentResolver.getType(uri) ?: return@withContext null
@@ -81,34 +81,35 @@ class ImageUploadHelper @Inject constructor(
                 "image/gif" -> "gif"
                 else -> return@withContext null
             }
-            
+
             // 성능 최적화된 파일 크기 계산
             val size = getFileSize(uri) ?: return@withContext null
-            
+
             ImageMetadata(
                 extension = extension,
                 size = size
             )
         }.getOrNull()
     }
-    
+
     private fun getFileSize(uri: Uri): Long? {
         return try {
-            context.contentResolver.query(uri, arrayOf(OpenableColumns.SIZE), null, null, null)?.use { cursor ->
-                if (cursor.moveToFirst()) {
-                    val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE)
-                    if (sizeIndex >= 0) {
-                        val size = cursor.getLong(sizeIndex)
-                        if (size > 0) return size
+            context.contentResolver.query(uri, arrayOf(OpenableColumns.SIZE), null, null, null)
+                ?.use { cursor ->
+                    if (cursor.moveToFirst()) {
+                        val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE)
+                        if (sizeIndex >= 0) {
+                            val size = cursor.getLong(sizeIndex)
+                            if (size > 0) return size
+                        }
                     }
                 }
-            }
 
             context.contentResolver.openFileDescriptor(uri, "r")?.use { pfd ->
                 val size = pfd.statSize
                 if (size > 0) return size
             }
-            
+
             null
         } catch (e: Exception) {
             null
diff --git a/app/src/main/java/com/texthip/thip/utils/permission/NotificationPermissionUtils.kt b/app/src/main/java/com/texthip/thip/utils/permission/NotificationPermissionUtils.kt
new file mode 100644
index 00000000..6548c4a8
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/utils/permission/NotificationPermissionUtils.kt
@@ -0,0 +1,36 @@
+package com.texthip.thip.utils.permission
+
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.core.content.ContextCompat
+
+object NotificationPermissionUtils {
+    
+
+    // POST_NOTIFICATIONS 권한이 필요한지 확인
+    fun isNotificationPermissionRequired(): Boolean {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+    }
+    
+
+    // 알림 권한이 허용되었는지 확인
+    fun isNotificationPermissionGranted(context: Context): Boolean {
+        return if (isNotificationPermissionRequired()) {
+            ContextCompat.checkSelfPermission(
+                context,
+                Manifest.permission.POST_NOTIFICATIONS
+            ) == PackageManager.PERMISSION_GRANTED
+        } else {
+            // Android 12 이하에서는 권한이 자동으로 허용됨
+            true
+        }
+    }
+    
+
+    // 알림 권한 요청이 필요한지 확인
+    fun shouldRequestNotificationPermission(context: Context): Boolean {
+        return isNotificationPermissionRequired() && !isNotificationPermissionGranted(context)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_ai_book_review.xml b/app/src/main/res/drawable/ic_ai_book_review.xml
new file mode 100644
index 00000000..b16a0c38
--- /dev/null
+++ b/app/src/main/res/drawable/ic_ai_book_review.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.07,5.359C10.403,4.515 11.597,4.515 11.93,5.359L13.669,9.768C13.771,10.025 13.975,10.229 14.233,10.331L18.641,12.07C19.485,12.403 19.485,13.597 18.641,13.93L14.233,15.669C13.975,15.771 13.771,15.975 13.669,16.233L11.93,20.641C11.597,21.485 10.403,21.485 10.07,20.641L8.331,16.233C8.229,15.975 8.025,15.771 7.768,15.669L3.359,13.93C2.515,13.597 2.515,12.403 3.359,12.07L7.768,10.331C8.025,10.229 8.229,10.025 8.331,9.768L10.07,5.359Z"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FEFEFE"/>
+  <path
+      android:pathData="M19.229,3.992C19.355,4.358 19.642,4.645 20.008,4.771L20.68,5L20.008,5.229C19.687,5.339 19.427,5.573 19.283,5.875L19.229,6.008L19,6.68L18.771,6.008C18.645,5.642 18.358,5.355 17.992,5.229L17.319,5L17.992,4.771C18.358,4.645 18.645,4.358 18.771,3.992L19,3.319L19.229,3.992Z"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FEFEFE"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_plusfriend.xml b/app/src/main/res/drawable/ic_plusfriend.xml
index 6464c2ce..0d2d3279 100644
--- a/app/src/main/res/drawable/ic_plusfriend.xml
+++ b/app/src/main/res/drawable/ic_plusfriend.xml
@@ -1,30 +1,30 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="25"
+    android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12.088,12.062C14.062,12.062 15.663,10.462 15.663,8.487C15.663,6.512 14.062,4.912 12.088,4.912C10.113,4.912 8.513,6.512 8.513,8.487C8.513,10.462 10.113,12.062 12.088,12.062Z"
+      android:pathData="M11.662,10.323C13.684,10.323 15.323,8.684 15.323,6.662C15.323,4.639 13.684,3 11.662,3C9.639,3 8,4.639 8,6.662C8,8.684 9.639,10.323 11.662,10.323Z"
       android:strokeLineJoin="round"
       android:strokeWidth="1.5"
       android:fillColor="#00000000"
       android:strokeColor="#FEFEFE"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M19.434,19.9L21.762,22.229"
+      android:pathData="M19.208,18.351L21.593,20.736"
       android:strokeLineJoin="round"
       android:strokeWidth="1.5"
       android:fillColor="#00000000"
       android:strokeColor="#FEFEFE"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M20.268,17.394C20.268,15.548 18.772,14.051 16.926,14.051C15.08,14.051 13.584,15.548 13.584,17.394C13.584,19.24 15.08,20.736 16.926,20.736C18.772,20.736 20.268,19.24 20.268,17.394Z"
+      android:pathData="M20.063,15.784C20.063,13.893 18.531,12.361 16.64,12.361C14.749,12.361 13.217,13.893 13.217,15.784C13.217,17.674 14.749,19.207 16.64,19.207C18.531,19.207 20.063,17.674 20.063,15.784Z"
       android:strokeLineJoin="round"
       android:strokeWidth="1.5"
       android:fillColor="#00000000"
       android:strokeColor="#FEFEFE"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M11.155,14.892C11.533,14.93 11.829,15.249 11.829,15.638C11.829,16.026 11.533,16.345 11.155,16.384L11.079,16.388H8.513C7.763,16.388 7.044,16.685 6.515,17.215C5.985,17.745 5.688,18.464 5.688,19.213V21C5.687,21.414 5.352,21.75 4.938,21.75C4.523,21.75 4.188,21.414 4.188,21V19.213C4.188,18.066 4.643,16.965 5.454,16.154C6.265,15.343 7.366,14.888 8.513,14.888H11.079L11.155,14.892Z"
+      android:pathData="M10.651,13.216C11.075,13.217 11.419,13.561 11.419,13.985C11.419,14.409 11.075,14.753 10.651,14.753L8.023,14.753C7.256,14.753 6.519,15.058 5.977,15.6C5.434,16.143 5.13,16.88 5.13,17.647V19.477C5.13,19.901 4.785,20.245 4.361,20.246C3.937,20.246 3.593,19.901 3.593,19.477V17.647C3.593,16.472 4.06,15.345 4.891,14.514C5.721,13.684 6.849,13.216 8.023,13.216L10.651,13.216Z"
       android:fillColor="#FEFEFE"/>
 </vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 45d294a7..fe89d6fe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,6 +41,7 @@
     <string name="character_relationship">인물관계도 보기</string>
     <string name="write_record">기록 작성</string>
     <string name="create_vote">투표 생성</string>
+    <string name="create_ai_book_review">AI 독서감상문 생성</string>
     <string name="edit_record">기록 수정</string>
     <string name="edit_vote">투표 수정</string>
 
@@ -76,7 +77,7 @@
     <string name="reactions">반응</string>
     <string name="notification_settings">알림설정</string>
     <string name="guide">가이드</string>
-    <string name="version">버전 1.0.0</string>
+    <string name="version">버전 1.3.0</string>
     <string name="terms_of_use">개인정보처리방침  이용약관</string>
     <string name="customer_service">고객센터</string>
     <string name="notice">공지사항</string>
@@ -111,12 +112,14 @@
 
     <string name="leave_thip">THIP 떠나기</string>
     <string name="leave_thip_notice_title">탈퇴 주의사항</string>
-    <string name="leave_thip_notice_1">회원탈퇴 시 계정정보는 </string>
-    <string name="leave_thip_notice_2">복구 불가능</string>
-    <string name="leave_thip_notice_3">하며 90일 이후 재가입이 가능합니다.</string>
-    <string name="leave_thip_notice_4">-을 사유로 개인정보를 -개월 간 보존합니다.</string>
-    <string name="leave_thip_notice_5">등록된 기록 및 게시물은 자동으로 삭제되지 않습니다.(or 삭제됩니다.)</string>
-    <string name="leave_thip_agree">주의사항을 확인하였으며 이에 동의합니다.</string>
+    <string name="leave_thip_notice_1">회원탈퇴 시 계정 및 활동 데이터는</string>
+    <string name="leave_thip_notice_1_2">즉시 삭제</string>
+    <string name="leave_thip_notice_1_3">되며,</string>
+    <string name="leave_thip_notice_2">복구가 불가능</string>
+    <string name="leave_thip_notice_3">합니다.</string>
+    <string name="leave_thip_notice_4">백업 및 로그 역시 보안 저장 후 최대 90일 내 자동 삭제됩니다.</string>
+    <string name="leave_thip_notice_5">법령상 보존 의무가 있는 정보는 해당 기간 동안 보관됩니다.</string>
+    <string name="leave_thip_agree">주의사항을 이해하였으며 이에 동의합니다.</string>
     <string name="delete_account_complete">탈퇴 완료</string>
     <string name="see_you_again">다음에 또 만나요!</string>
 
@@ -125,6 +128,7 @@
     <string name="notification_description">알림센터의 모든 알림을 포함해요</string>
     <string name="push_off">푸시 알림이 해제되었어요.</string>
     <string name="push_on">푸시 알림이 설정되었어요.</string>
+    <string name="notification_permission_required">알림 권한이 필요합니다. 설정에서 권한을 허용해주세요.</string>
 
     <string name="customer_center_email">texthip2025@gmail.com</string>
     <string name="customer_center_description">이메일로 닉네임과 문의사항을 보내주시면</string>
@@ -156,7 +160,6 @@
     <string name="group_recommend">이런 모임방은 어때요?</string>
     <string name="group_recruiting">"모집"</string>
     <string name="group_genre">"장르"</string>
-    <string name="deadline_string">마감 임박한 독서 모임방</string>
     <string name="group_participant">%1$s명</string>
     <string name="group_participant_string">참여</string>
     <string name="group_progress">"%1$s님의 진행도 "</string>
@@ -173,6 +176,7 @@
     <string name="percent">%</string>
     <string name="leave_room_toast">모임 나가기를 완료했어요.</string>
     <string name="leave_room_fail_toast">모임 나가기를 실패했어요.</string>
+    <string name="until_start">시작까지</string>
 
     <!--    group room    -->
     <string name="introduction_content">소개글</string>
@@ -234,7 +238,7 @@
     <string name="error_page_over">전체페이지를 초과할 수 없어요.</string>
     <string name="my_opinion_title">지금 읽은 그 부분, 어땠나요?</string>
     <string name="my_opinion_placeholder">...한 생각이 들었어요.🤔</string>
-    <string name="vote_title_placeholder">투표 내용을 20자 이내로 입력하세요.</string>
+    <string name="vote_title_placeholder">투표 제목을 20자 이내로 입력하세요.</string>
     <string name="vote_content_placeholder">항목을 20자 이내로 입력</string>
     <string name="add_content">항목 추가</string>
     <string name="condition_of_view_general_review">독서 진행도 80% 이상부터 총평을 볼 수 있어요.</string>
@@ -254,6 +258,19 @@
     <string name="posting_complete">기록이 게시되었습니다!</string>
     <string name="delete_comment_title">이 댓글을 삭제하시겠어요?</string>
     <string name="comment_deleted">삭제된 댓글이에요.</string>
+    <string name="expired_room_read_only_message">완료된 모임방에서는 기존 기록에 대한 조회만 가능해요.</string>
+    <string name="look_around_all_rooms">전체 모임방을 한 눈에 둘러보세요!</string>
+    <string name="look_around_all_rooms_title">전체 모임방 둘러보기</string>
+    <string name="all">전체</string>
+    <string name="ai_book_review_title">AI 독서감상문</string>
+    <string name="ai_review_loading">독서 감상문을 생성중이에요!</string>
+    <string name="ai_review_loading_subtext">조금만 기다려주세요</string>
+    <string name="ai_review_done_info">내 기록과 총평을 바탕으로 생성된 감상문입니다.</string>
+    <string name="copy_to_clipboard">클립보드에 복사</string>
+    <string name="copy_to_clipboard_done">클립보드에 복사가 완료되었어요</string>
+    <string name="ai_review_dialog_title">AI 독서감상문 생성 (Beta)</string>
+    <string name="ai_review_dialog_description">기록장에서 작성한 기록을 기반으로\n독서감상문을 생성하시겠어요?\n(서비스 내 잔여 이용횟수 : %d/%d)</string>
+    <string name="ai_review_exit_dialog_description">생성된 감상문은 다시 볼 수 없으며, 잔여 이용횟수는 차감돼요. 계속하시겠어요?</string>
 
     <!--    alarm    -->
     <string name="alarm_feed">피드</string>
@@ -380,7 +397,6 @@
 
     <!--    book search   -->
     <string name="book_popular_search">가장 많이 검색된 책</string>
-    <string name="book_search_topappbar">검색</string>
     <string name="book_search_hint">책 제목, 작가명을 검색해보세요.</string>
     <string name="book_no_search_result1">현재 등록된 책이 없어요.</string>
     <string name="book_no_search_result2">원하는 책을 신청해주세요!</string>
@@ -407,7 +423,8 @@
     <string name="room_section_deadline">마감 임박한 독서 모임방</string>
     <string name="room_section_popular">인기 있는 독서 모임방</string>
     <string name="room_section_influencer">인플루언서·작가 독서 모임방</string>
-    
+    <string name="room_section_recent">최근 생성된 독서 모임방</string>
+
     <!--    error states    -->
     <string name="error_data_load_failed">데이터를 불러올 수 없습니다</string>
     <string name="error_network_connection">네트워크 연결을 확인해주세요</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a14d89d1..6b8ef7fd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,6 +27,7 @@ retrofitKotlinSerializationConverter = "1.0.0"
 androidxComposeNavigation = "2.8.2"
 lifecycleRuntimeCompose = "2.10.0-alpha01"
 datastorePreferences = "1.1.7"
+firebaseMessaging = "25.0.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -62,6 +63,7 @@ retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit
 retrofit-kotlin-serialization-converter = { group = "com.jakewharton.retrofit", name = "retrofit2-kotlinx-serialization-converter", version.ref = "retrofitKotlinSerializationConverter" }
 androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeCompose" }
 androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastorePreferences" }
+firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging", version.ref = "firebaseMessaging" }
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }