diff --git a/.gitignore b/.gitignore
index 765e11f74..334469fb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,5 @@ local.properties
 deploymentTargetDropDown.xml
 /config.json
 /.idea/other.xml
-/.idea/deploymentTargetSelector.xml
\ No newline at end of file
+/.idea/deploymentTargetSelector.xml
+.kotlin/
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 4c3ff026b..14ef764f1 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-12-03T07:52:40.835602Z">
+        <DropdownSelection timestamp="2025-01-06T16:53:54.187382Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/yongin/.android/avd/Pixel_7_Pro_API_34.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/yongin/.android/avd/Pixel_2_API_34.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 913d5f99a..a6ffab365 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,8 +2,35 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="AndroidLintKotlincFE10" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AndroidLintPermissionNamingConvention" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="Destructure" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index fdf8d994a..ae3f30ae1 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.0" />
+    <option name="version" value="1.9.21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index c8ede7100..edb44bb68 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,8 @@
 ## 멀티 모듈의 관심사 분리 및 아키텍처 적용
 <img width="591" alt="image" src="https://github.com/user-attachments/assets/96590045-3cf8-4c52-b9fd-ea5e3c5d4195">
 
-## MVVM 적용
-<img width="380" alt="image" src="https://github.com/user-attachments/assets/979d10ac-d57a-4654-9668-476284c9ef2b">
+## UI Layer 패턴 - MVVM+MVI 혼합
+<img width="600" alt="image" src="https://github.com/user-attachments/assets/9fe84cf7-92d1-4e14-b23c-0e0ad0451c20">
 
 ### 데이터 전달 및 상태관리 구체화 구조
 <img width="420" alt="image" src="https://github.com/user-attachments/assets/c1fcf841-7baa-4bea-8bf2-63dcaeb66455">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 29b2b7a17..6568ae17f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,12 +1,11 @@
 import java.util.*
 
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
     id("com.google.android.gms.oss-licenses-plugin")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
-    id("com.google.gms.google-services")
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
+    alias(libs.plugins.google.services)
     kotlin("kapt")
 }
 
@@ -22,8 +21,8 @@ android {
         applicationId = "com.hmoa.app"
         minSdk = 26
         targetSdk = 34
-        versionCode = 33
-        versionName = "1.2.0"
+        versionCode = 36
+        versionName = "1.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders["REDIRECTION_PATH"] = localProperties["REDIRECTION_PATH"] as String
@@ -63,7 +62,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     packaging {
         resources {
@@ -75,11 +74,6 @@ android {
 
 
 dependencies {
-    val hilt_version = "2.48.1"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-    val kakao_version = "2.20.5"
-
     implementation(project(":feature-home"))
     implementation(project(":feature-authentication"))
     implementation(project(":feature-userInfo"))
@@ -96,41 +90,22 @@ dependencies {
     implementation(project(":core-repository"))
     implementation(project(":core-common"))
 
-    implementation("io.github.bootpay:android:4.4.0") //boot pay
-
-    implementation("com.kakao.sdk:v2-all:${kakao_version}")// 전체 모듈 설치, 2.11.0 버전부터 지원
-    implementation("com.kakao.sdk:v2-user:${kakao_version}") // 카카오 로그인 API 모듈
-    implementation("com.kakao.sdk:v2-talk:${kakao_version}") // 카카오톡 채널, 카카오톡 소셜, 카카오톡 메시지 API 모듈
-    implementation("com.kakao.sdk:v2-share:${kakao_version}") // 카카오톡 공유 API 모듈
-    implementation("com.kakao.sdk:v2-friend:${kakao_version}") // 피커 API 모듈
-    implementation("com.kakao.sdk:v2-cert:${kakao_version}") // 카카오 인증서비스 API 모듈
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
-    implementation("androidx.compose.material:material:1.2.0-beta02")
-    implementation("androidx.compose.material3:material3:1.2.0")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.ui:ui:1.1.0")
-    implementation("androidx.navigation:navigation-compose:2.7.0")
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.8.0")
-    implementation("androidx.core:core-splashscreen:1.2.0-alpha01")
-    // Import the Firebase BoM
-    implementation(platform("com.google.firebase:firebase-bom:32.8.1"))
-    // When using the BoM, don't specify versions in Firebase dependencies
-    implementation("com.google.firebase:firebase-messaging:21.1.0")
-    implementation("com.google.firebase:firebase-analytics")
-    //google login
-    implementation("com.google.android.gms:play-services-auth:21.0.0")
-    implementation("com.google.gms:google-services:4.4.1")
-    //open licence
-    implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
-
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    implementation(libs.app.update.ktx)
+    implementation(libs.bootpay) //부트페이
+    implementation(libs.bundles.kakao.login) // kakao
+    implementation(libs.bundles.hilt) // hilt
+    kapt(libs.hilt.android.compiler)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.viewmodel)
+    implementation(libs.bundles.ui)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.basic)
+    implementation(libs.google.material)
+    implementation(libs.splash.screen) // splash
+    implementation(libs.bundles.firebase) // firebase
+    implementation(libs.bundles.google.login) //google
+    implementation(libs.open.licenses)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cdfe52f31..2848e56b9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,7 +30,7 @@
             android:usesCleartextTraffic="true"
             tools:targetApi="31">
         <activity
-                android:name=".MainActivity"
+                android:name=".view.MainActivity"
                 android:exported="true"
                 android:theme="@style/SplashTheme"
                 android:launchMode="singleTask">
@@ -64,7 +64,7 @@
             </intent-filter>
         </activity> <!-- 서비스를 추가하고 인텐트 필터를 설정한다. -->
         <service
-                android:name=".FcmAppService"
+                android:name=".service.FcmAppService"
                 android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
@@ -72,4 +72,4 @@
         </service>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/com/hmoa/app/navigation/NavHost.kt b/app/src/main/java/com/hmoa/app/navigation/NavHost.kt
index 8c5150beb..3827b9974 100644
--- a/app/src/main/java/com/hmoa/app/navigation/NavHost.kt
+++ b/app/src/main/java/com/hmoa/app/navigation/NavHost.kt
@@ -3,14 +3,61 @@ package com.hmoa.app.navigation
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
-import com.hmoa.feature_authentication.navigation.*
+import com.hmoa.feature_authentication.navigation.loginScreen
+import com.hmoa.feature_authentication.navigation.navigateToLogin
+import com.hmoa.feature_authentication.navigation.navigateToPickNickname
+import com.hmoa.feature_authentication.navigation.navigateToPickPersonalInfo
+import com.hmoa.feature_authentication.navigation.navigateToSignup
+import com.hmoa.feature_authentication.navigation.pickNicknameScreen
+import com.hmoa.feature_authentication.navigation.pickPersonalInfoScreen
+import com.hmoa.feature_authentication.navigation.signupScreen
 import com.hmoa.feature_brand.navigation.brandScreen
 import com.hmoa.feature_brand.navigation.brandSearchScreen
 import com.hmoa.feature_brand.navigation.navigateToBrand
-import com.hmoa.feature_community.Navigation.*
+import com.hmoa.feature_community.Navigation.navigateToCommunityCommentEditRoute
+import com.hmoa.feature_community.Navigation.navigateToCommunityDescriptionRoute
+import com.hmoa.feature_community.Navigation.navigateToCommunityEditRoute
+import com.hmoa.feature_community.Navigation.navigateToCommunityPage
+import com.hmoa.feature_community.Navigation.navigateToCommunityPostRoute
+import com.hmoa.feature_community.Navigation.navigateToCommunityRoute
+import com.hmoa.feature_community.Navigation.navigateToCommunitySearchRoute
+import com.hmoa.feature_community.Navigation.nestedCommunityGraph
 import com.hmoa.feature_fcm.alarmRoute
-import com.hmoa.feature_hbti.navigation.*
-import com.hmoa.feature_home.navigation.*
+import com.hmoa.feature_hbti.navigation.addAddress
+import com.hmoa.feature_hbti.navigation.editReview
+import com.hmoa.feature_hbti.navigation.hbtiProcessScreen
+import com.hmoa.feature_hbti.navigation.hbtiScreen
+import com.hmoa.feature_hbti.navigation.hbtiSurveyLoadingScreen
+import com.hmoa.feature_hbti.navigation.hbtiSurveyResultScreen
+import com.hmoa.feature_hbti.navigation.hbtiSurveyScreen
+import com.hmoa.feature_hbti.navigation.navigateToAddAddress
+import com.hmoa.feature_hbti.navigation.navigateToEditReview
+import com.hmoa.feature_hbti.navigation.navigateToHbti
+import com.hmoa.feature_hbti.navigation.navigateToHbtiProcess
+import com.hmoa.feature_hbti.navigation.navigateToHbtiSurvey
+import com.hmoa.feature_hbti.navigation.navigateToHbtiSurveyLoading
+import com.hmoa.feature_hbti.navigation.navigateToHbtiSurveyResult
+import com.hmoa.feature_hbti.navigation.navigateToNotePick
+import com.hmoa.feature_hbti.navigation.navigateToNotePickResult
+import com.hmoa.feature_hbti.navigation.navigateToOrder
+import com.hmoa.feature_hbti.navigation.navigateToOrderResult
+import com.hmoa.feature_hbti.navigation.navigateToPerfumeRecommendation
+import com.hmoa.feature_hbti.navigation.navigateToPerfumeRecommendationResult
+import com.hmoa.feature_hbti.navigation.navigateToReview
+import com.hmoa.feature_hbti.navigation.navigateToWriteReview
+import com.hmoa.feature_hbti.navigation.notePickResult
+import com.hmoa.feature_hbti.navigation.notePickScreen
+import com.hmoa.feature_hbti.navigation.order
+import com.hmoa.feature_hbti.navigation.orderResult
+import com.hmoa.feature_hbti.navigation.perfumeRecommendationResultRoute
+import com.hmoa.feature_hbti.navigation.perfumeRecommendationRoute
+import com.hmoa.feature_hbti.navigation.review
+import com.hmoa.feature_hbti.navigation.writeReview
+import com.hmoa.feature_home.navigation.allPerfumeScreen
+import com.hmoa.feature_home.navigation.homeScreen
+import com.hmoa.feature_home.navigation.navigateToAllPerfume
+import com.hmoa.feature_home.navigation.navigateToHome
+import com.hmoa.feature_home.navigation.perfumeSearchScreen
 import com.hmoa.feature_hpedia.Navigation.navigateToHPedia
 import com.hmoa.feature_hpedia.Navigation.navigateToHPediaDescRoute
 import com.hmoa.feature_hpedia.Navigation.navigateToHPediaSearchRoute
@@ -18,8 +65,30 @@ import com.hmoa.feature_hpedia.Navigation.nestedHPediaGraph
 import com.hmoa.feature_magazine.Navigation.magazineDesc
 import com.hmoa.feature_magazine.Navigation.magazineMain
 import com.hmoa.feature_magazine.Navigation.navigateToMagazineDesc
-import com.hmoa.feature_perfume.navigation.*
-import com.hmoa.feature_userinfo.navigation.*
+import com.hmoa.feature_perfume.navigation.createNewPerfumeComment
+import com.hmoa.feature_perfume.navigation.editMyPerfumeComment
+import com.hmoa.feature_perfume.navigation.navigateToCreateNewperfumeComment
+import com.hmoa.feature_perfume.navigation.navigateToPerfume
+import com.hmoa.feature_perfume.navigation.navigateToPerfumeComment
+import com.hmoa.feature_perfume.navigation.navigateToSpecificPerfumeComment
+import com.hmoa.feature_perfume.navigation.perfumeComment
+import com.hmoa.feature_perfume.navigation.perfumeScreen
+import com.hmoa.feature_perfume.navigation.specificComment
+import com.hmoa.feature_userinfo.navigation.navigateToBack
+import com.hmoa.feature_userinfo.navigation.navigateToEditProfilePage
+import com.hmoa.feature_userinfo.navigation.navigateToMyActivity
+import com.hmoa.feature_userinfo.navigation.navigateToMyBirth
+import com.hmoa.feature_userinfo.navigation.navigateToMyCommentPage
+import com.hmoa.feature_userinfo.navigation.navigateToMyFavoriteCommentPage
+import com.hmoa.feature_userinfo.navigation.navigateToMyFavoritePerfume
+import com.hmoa.feature_userinfo.navigation.navigateToMyGenderPage
+import com.hmoa.feature_userinfo.navigation.navigateToMyInfoPage
+import com.hmoa.feature_userinfo.navigation.navigateToMyPostPage
+import com.hmoa.feature_userinfo.navigation.navigateToMyReview
+import com.hmoa.feature_userinfo.navigation.navigateToOrderRecord
+import com.hmoa.feature_userinfo.navigation.navigateToRefund
+import com.hmoa.feature_userinfo.navigation.navigateToRefundRecord
+import com.hmoa.feature_userinfo.navigation.nestedUserInfoGraph
 
 @Composable
 fun SetUpNavGraph(
@@ -110,9 +179,7 @@ fun SetUpNavGraph(
             navCommunityCommentEdit = navController::navigateToCommunityCommentEditRoute,
             onErrorHandleLoginAgain = navController::navigateToLogin,
             navLogin = navController::navigateToLogin,
-            navHome = navController::navigateToHome,
-            navHPedia = navController::navigateToHPedia,
-            popStack = { navController.popBackStack() }
+            navHPedia = navController::navigateToHPedia
         )
 
         /** perfume 모듈 */
diff --git a/app/src/main/java/com/hmoa/app/FcmAppService.kt b/app/src/main/java/com/hmoa/app/service/FcmAppService.kt
similarity index 69%
rename from app/src/main/java/com/hmoa/app/FcmAppService.kt
rename to app/src/main/java/com/hmoa/app/service/FcmAppService.kt
index 10828577e..236698f7f 100644
--- a/app/src/main/java/com/hmoa/app/FcmAppService.kt
+++ b/app/src/main/java/com/hmoa/app/service/FcmAppService.kt
@@ -1,4 +1,4 @@
-package com.hmoa.app
+package com.hmoa.app.service
 
 import android.app.Notification
 import android.app.NotificationChannel
@@ -8,28 +8,36 @@ import android.content.Context
 import android.content.Intent
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import com.hmoa.app.view.MainActivity
 
 class FcmAppService : FirebaseMessagingService() {
     override fun onNewToken(token: String) {
         super.onNewToken(token)
     }
+
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         super.onMessageReceived(remoteMessage)
 
-        if(remoteMessage.data.isNotEmpty()){
+        if (remoteMessage.data.isNotEmpty()) {
             sendNotification(remoteMessage.data)
         }
     }
-    private fun sendNotification(fcmData : Map<String, String>){
+
+    private fun sendNotification(fcmData: Map<String, String>) {
         val CHANNEL_DEFAULT_IMPORTANCE = "channelId"
         val ONGOING_NOTIFICATION = 1
 
-        val notificationIntent = Intent(this, MainActivity::class.java).apply{
+        val notificationIntent = Intent(this, MainActivity::class.java).apply {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
-            putExtra("deeplink",fcmData["deeplink"])
-            putExtra("id",fcmData["id"])
+            putExtra("deeplink", fcmData["deeplink"])
+            putExtra("id", fcmData["id"])
         }
-        val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            0,
+            notificationIntent,
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
 
         val notification = Notification.Builder(this, CHANNEL_DEFAULT_IMPORTANCE)
             .setContentTitle(fcmData["title"])
@@ -41,9 +49,10 @@ class FcmAppService : FirebaseMessagingService() {
 
         val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-        val channel = NotificationChannel(CHANNEL_DEFAULT_IMPORTANCE, "HMOA Channel", NotificationManager.IMPORTANCE_DEFAULT)
+        val channel =
+            NotificationChannel(CHANNEL_DEFAULT_IMPORTANCE, "HMOA Channel", NotificationManager.IMPORTANCE_DEFAULT)
         notificationManager.createNotificationChannel(channel)
 
         notificationManager.notify(ONGOING_NOTIFICATION, notification)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/hmoa/app/MainActivity.kt b/app/src/main/java/com/hmoa/app/view/MainActivity.kt
similarity index 69%
rename from app/src/main/java/com/hmoa/app/MainActivity.kt
rename to app/src/main/java/com/hmoa/app/view/MainActivity.kt
index dabd29521..b8204f7e8 100644
--- a/app/src/main/java/com/hmoa/app/MainActivity.kt
+++ b/app/src/main/java/com/hmoa/app/view/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.hmoa.app
+package com.hmoa.app.view
 
 import android.Manifest
 import android.content.Intent
@@ -8,6 +8,8 @@ import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.compose.setContent
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.Box
@@ -32,19 +34,23 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import com.google.android.material.snackbar.Snackbar
+import com.google.android.play.core.appupdate.AppUpdateInfo
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.appupdate.AppUpdateManagerFactory
+import com.google.android.play.core.appupdate.AppUpdateOptions
+import com.google.android.play.core.install.model.AppUpdateType
+import com.google.android.play.core.install.model.InstallStatus
+import com.google.android.play.core.install.model.UpdateAvailability
 import com.google.firebase.messaging.FirebaseMessaging
+import com.hmoa.app.BuildConfig
 import com.hmoa.app.navigation.SetUpNavGraph
+import com.hmoa.app.viewmodel.AppViewModel
 import com.hmoa.core_common.permissions
 import com.hmoa.core_designsystem.BottomScreen
 import com.hmoa.core_designsystem.component.HomeTopBar
 import com.hmoa.core_designsystem.component.MainBottomBar
-import com.hmoa.core_domain.entity.navigation.AuthenticationRoute
-import com.hmoa.core_domain.entity.navigation.CommunityRoute
-import com.hmoa.core_domain.entity.navigation.HPediaRoute
-import com.hmoa.core_domain.entity.navigation.HomeRoute
-import com.hmoa.core_domain.entity.navigation.MagazineRoute
-import com.hmoa.core_domain.entity.navigation.PerfumeRoute
-import com.hmoa.core_domain.entity.navigation.UserInfoRoute
+import com.hmoa.core_domain.entity.navigation.*
 import com.hmoa.feature_brand.navigation.navigateToBrandSearch
 import com.hmoa.feature_fcm.navigateToAlarmScreen
 import com.hmoa.feature_home.navigation.navigateToHome
@@ -54,6 +60,7 @@ import com.hmoa.feature_magazine.Navigation.navigateToMagazineHome
 import com.hmoa.feature_userinfo.navigation.navigateToUserInfoGraph
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import kr.co.bootpay.android.BootpayAnalytics
 
@@ -86,26 +93,116 @@ class MainActivity : AppCompatActivity() {
         BottomScreen.Magazine.name,
         BottomScreen.MyPage.name
     )
+    private lateinit var appUpdateManager: AppUpdateManager
+    private val activityResultLauncher =
+        registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result: ActivityResult ->
+            handleUpdateResult(result)
+        }
+
+    // Displays the snackbar notification and call to action.
+    fun popupSnackbarForCompleteUpdate() {
+        Snackbar.make(
+            findViewById(com.hmoa.core_designsystem.R.drawable.ic_fab),
+            "새로운 업데이트 다운로드가 완료되었습니다.",
+            Snackbar.LENGTH_INDEFINITE
+        ).apply {
+            setAction("재시작") { appUpdateManager.completeUpdate() }
+            show()
+        }
+    }
+
+    private fun checkImmediateUpdateAvailability() {
+        appUpdateManager.appUpdateInfo.addOnSuccessListener { appUpdateInfo ->
+            if (shouldTriggerImmediateUpdate(appUpdateInfo)) {
+                Log.d("checkUpdateAvailability", "ImemediateUpdate")
+                startImmediateUpdate(appUpdateInfo)
+            }
+        }.addOnFailureListener { e ->
+            Log.e("UpdateFlow", "Failed to check update availability", e)
+        }
+    }
+
+    private fun checkFlexibleUpdateAvailability() {
+        appUpdateManager.appUpdateInfo.addOnSuccessListener { appUpdateInfo ->
+            if (shouldTriggerFlexibleUpdate(appUpdateInfo)) {
+                Log.d("checkUpdateAvailability", "ImemediateUpdate")
+                startFlexibleUpdate(appUpdateInfo)
+                if (appUpdateInfo.installStatus() == InstallStatus.DOWNLOADED) {
+                    popupSnackbarForCompleteUpdate()
+                }
+            }
+        }.addOnFailureListener { e ->
+            Log.e("UpdateFlow", "Failed to check update availability", e)
+        }
+    }
+
+
+    private fun shouldTriggerImmediateUpdate(appUpdateInfo: AppUpdateInfo): Boolean {
+        return appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
+                appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.IMMEDIATE)
+    }
+
+    private fun shouldTriggerFlexibleUpdate(appUpdateInfo: AppUpdateInfo): Boolean {
+        return appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
+                appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.FLEXIBLE)
+    }
+
+
+    private fun startImmediateUpdate(appUpdateInfo: AppUpdateInfo) {
+        appUpdateManager.startUpdateFlowForResult(
+            appUpdateInfo,
+            activityResultLauncher,
+            AppUpdateOptions.newBuilder(AppUpdateType.IMMEDIATE).build()
+        )
+    }
+
+    private fun startFlexibleUpdate(appUpdateInfo: AppUpdateInfo) {
+        appUpdateManager.startUpdateFlowForResult(
+            appUpdateInfo,
+            activityResultLauncher,
+            AppUpdateOptions.newBuilder(AppUpdateType.FLEXIBLE).build()
+        )
+    }
+
+    private fun handleUpdateResult(result: ActivityResult) {
+        if (result.resultCode == RESULT_OK) {
+            Log.d("UpdateFlow", "Update flow completed successfully!")
+        } else {
+            Log.e("UpdateFlow", "Update flow failed! Result code: ${result.resultCode}")
+            // 필요시 재시도 로직 추가 가능
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         installSplashScreen()
         WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        appUpdateManager = AppUpdateManagerFactory.create(this)
+        checkImmediateUpdateAvailability()
+
         requestNotificationPermission()
         BootpayAnalytics.init(this, BuildConfig.BOOTPAY_APPLICATION_ID)
 
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.CREATED) {
-                viewModel.fcmTokenFlow().collectLatest { fcmToken ->
-                    viewModel.getNotificationEnabled().collectLatest { isEnabled ->
-                        Log.d("POST PERMISSION", "is granted : ${isEnabled}")
+                viewModel.fcmTokenFlow()
+                    .combine(viewModel.getNotificationEnabled()) { fcmToken, isNotificationsEnabled ->
+                        Pair(
+                            fcmToken,
+                            isNotificationsEnabled
+                        )
+                    }.collectLatest {
+                        val fcmToken = it.first
+                        val isNotificationsEnabled = it.second
+                        Log.d("POST PERMISSION", "is granted : ${isNotificationsEnabled}")
                         Log.d("FCM TEST", "fcm token : ${fcmToken}")
                         initializeFirebaseSetting(
                             fcmToken = fcmToken,
                             onSaveFcmToken = { token -> viewModel.saveFcmToken(token) })
                         initializeRoute(
-                            onRouteToLogin = { checkFcmToken(fcmToken, isEnabled) })
+                            onRouteToLogin = { checkFcmToken(fcmToken, isNotificationsEnabled) })
                     }
-                }
             }
         }
 
@@ -162,6 +259,11 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        checkFlexibleUpdateAvailability()
+    }
+
     //firebase 초기 토큰 처리
     private fun initializeFirebaseSetting(fcmToken: String?, onSaveFcmToken: (token: String) -> Unit) {
         FirebaseMessaging.getInstance().token.addOnSuccessListener {
@@ -197,10 +299,10 @@ class MainActivity : AppCompatActivity() {
         Log.d("FCM TEST", "checkFcmToken의 fcmToken 값: ${fcmToken}")
     }
 
-    private suspend fun handleFcmToken(
-        fcmToken: String, isEnabled: Boolean
+    private fun handleFcmToken(
+        fcmToken: String, isNotificationEnabled: Boolean
     ) {
-        if (isEnabled) {
+        if (isNotificationEnabled) {
             Log.d("FCM TEST", "post fcm token")
             viewModel.postFcmToken(fcmToken)
         } else {
@@ -273,4 +375,4 @@ class MainActivity : AppCompatActivity() {
             lifecycleScope.launch { viewModel.saveNotificationEnabled(true) }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/hmoa/app/AppViewModel.kt b/app/src/main/java/com/hmoa/app/viewmodel/AppViewModel.kt
similarity index 59%
rename from app/src/main/java/com/hmoa/app/AppViewModel.kt
rename to app/src/main/java/com/hmoa/app/viewmodel/AppViewModel.kt
index daaaf2b65..4a9657b08 100644
--- a/app/src/main/java/com/hmoa/app/AppViewModel.kt
+++ b/app/src/main/java/com/hmoa/app/viewmodel/AppViewModel.kt
@@ -1,4 +1,4 @@
-package com.hmoa.app
+package com.hmoa.app.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -6,9 +6,8 @@ import com.hmoa.core_domain.repository.FcmRepository
 import com.hmoa.core_domain.repository.LoginRepository
 import com.hmoa.core_model.request.FCMTokenSaveRequestDto
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -17,15 +16,30 @@ class AppViewModel @Inject constructor(
     private val loginRepository: LoginRepository,
     private val fcmRepository: FcmRepository,
 ) : ViewModel() {
+    val authTokenState = MutableStateFlow<String?>(null)
     suspend fun authTokenFlow(): Flow<String?> = loginRepository.getAuthToken()
     suspend fun rememberedTokenFlow(): Flow<String?> = loginRepository.getRememberedToken()
+    suspend fun fcmTokenFlow(): Flow<String?> =
+        fcmRepository.getLocalFcmToken().shareIn(viewModelScope, SharingStarted.WhileSubscribed())
 
-    suspend fun fcmTokenFlow(): Flow<String?> = fcmRepository.getLocalFcmToken()
+    init {
+        getAuthToken()
+    }
 
     fun delFcmToken() {
         viewModelScope.launch {
-            fcmRepository.deleteLocalFcmToken()
-            fcmRepository.deleteRemoteFcmToken()
+            if (authTokenState.value != null) {
+                fcmRepository.deleteLocalFcmToken()
+                fcmRepository.deleteRemoteFcmToken()
+            }
+        }
+    }
+
+    fun getAuthToken() {
+        viewModelScope.launch(Dispatchers.IO) {
+            loginRepository.getAuthToken().onEmpty { }.collectLatest {
+                authTokenState.update { it }
+            }
         }
     }
 
@@ -38,9 +52,10 @@ class AppViewModel @Inject constructor(
 
     fun saveFcmToken(token: String) = viewModelScope.launch { fcmRepository.saveLocalFcmToken(token) }
     fun checkAlarm(id: Int) = viewModelScope.launch { fcmRepository.checkAlarm(id) }
-    suspend fun getNotificationEnabled(): Flow<Boolean> = fcmRepository.getNotificationEnabled()
+    suspend fun getNotificationEnabled(): Flow<Boolean> =
+        fcmRepository.getNotificationEnabled().shareIn(viewModelScope, SharingStarted.WhileSubscribed())
 
     suspend fun saveNotificationEnabled(isEnabled: Boolean) =
         viewModelScope.launch { fcmRepository.saveNotificationEnabled(isEnabled) }
 
-}
\ No newline at end of file
+}
diff --git a/build.gradle.kts b/build.gradle.kts
index dbd98f21a..188389a47 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,21 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
         classpath("com.google.dagger:hilt-android-gradle-plugin:2.48.1")
         classpath("com.google.gms:google-services:4.4.1")
         classpath("com.google.android.gms:oss-licenses-plugin:0.10.4")
-
     }
 }
 
-
 plugins {
-    id("com.android.application") version "8.1.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.0" apply false
-    id("org.jetbrains.kotlin.jvm") version "1.9.0" apply false
-    id("com.android.library") version "8.1.0" apply false
-    id("com.google.dagger.hilt.android") version "2.48.1" apply false
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.5.0"
-    id("com.google.gms.google-services") version "4.4.1" apply false
-}
\ No newline at end of file
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.hilt.android) apply false
+    alias(libs.plugins.kotlin.plugin.serialization) apply false
+    alias(libs.plugins.google.services) apply false
+}
diff --git a/core-common/build.gradle.kts b/core-common/build.gradle.kts
index d49a52298..2eea478dc 100644
--- a/core-common/build.gradle.kts
+++ b/core-common/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -32,10 +32,7 @@ android {
 dependencies {
     implementation(project(":core-model"))
 
-    implementation(project(":core-model"))
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.11.0")
+    implementation(libs.bundles.basic)
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     testImplementation("junit:junit:4.13.2")
diff --git a/core-common/src/main/java/com/hmoa/core_common/ErrorHandleFunctions.kt b/core-common/src/main/java/com/hmoa/core_common/ErrorHandleFunctions.kt
index b369475d4..21a80214f 100644
--- a/core-common/src/main/java/com/hmoa/core_common/ErrorHandleFunctions.kt
+++ b/core-common/src/main/java/com/hmoa/core_common/ErrorHandleFunctions.kt
@@ -3,10 +3,6 @@ package com.hmoa.core_common
 import ResultResponse
 
 suspend fun <T> ResultResponse<T>.emitOrThrow(emit: suspend (ResultResponse<T>) -> Unit) {
-    android.util.Log.d(
-        "core-common/ErrorHandleFunctions",
-        "emitOrThrow --- data: ${data}, errorMessage: ${errorMessage?.message}"
-    )
     if (this.data != null) {
         emit(this)
     } else if (this.errorMessage != null) {
@@ -32,4 +28,4 @@ fun handleErrorType(
 
         else -> onGeneralError()
     }
-}
\ No newline at end of file
+}
diff --git a/core-database/build.gradle.kts b/core-database/build.gradle.kts
index 78d34cb8f..072afe18d 100644
--- a/core-database/build.gradle.kts
+++ b/core-database/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -46,33 +45,19 @@ android {
 dependencies {
     implementation(project(":core-model"))
 
-    val hilt_version = "2.48.1"
-    val datastore_version = "1.0.0"
-    val room_version = "2.6.1"
+    //room
+    implementation(libs.room.ktx)
+    kapt(libs.room.compiler)
+    implementation(libs.bundles.hilt) //hilt
+    implementation(libs.datastore) //data store
+    implementation(libs.bundles.basic)
 
-    implementation("androidx.room:room-ktx:$room_version")
-    kapt("androidx.room:room-compiler:$room_version")
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.datastore:datastore-preferences:$datastore_version")
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.11.0")
-    
-    testAnnotationProcessor("com.google.dagger:hilt-android-compiler:2.44")
-
-    testImplementation("junit:junit:4.13.2")
-    implementation("androidx.test.ext:junit-ktx:1.2.1")
     //unit test
-    val mockito_version = "4.8.0"
-    testImplementation("junit:junit:4.13.2")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")
-    testImplementation("org.mockito:mockito-core:$mockito_version")
-    testImplementation("org.mockito:mockito-inline:$mockito_version")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.2")
-    testImplementation("org.jetbrains.kotlin:kotlin-reflect:1.5.30")
+    implementation(libs.junit.ktx)
+    testImplementation(libs.junit)
+    testImplementation(libs.bundles.unit.test)
     //hilt test
-    kaptTest("com.google.dagger:hilt-android-compiler:$hilt_version") // ...with Kotlin.
-    testImplementation("com.google.dagger:hilt-android-testing:$hilt_version") // For Robolectric tests.
-    testAnnotationProcessor("com.google.dagger:hilt-android-compiler:2.44") // ...with Java.
+    kaptTest(libs.hilt.android.compiler)
+    testImplementation(libs.hilt.android.test) // For Robolectric
+    testAnnotationProcessor(libs.hilt.android.compiler)
 }
\ No newline at end of file
diff --git a/core-datastore/build.gradle.kts b/core-datastore/build.gradle.kts
index 5faa8e930..edfcc4ee2 100644
--- a/core-datastore/build.gradle.kts
+++ b/core-datastore/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -33,22 +32,21 @@ android {
 }
 
 dependencies {
-    val hilt_version = "2.48.1"
-    val kotlinx_version = "1.5.0"
-    val room_version = "2.6.1"
-
-    implementation("androidx.room:room-ktx:$room_version")
-    kapt("androidx.room:room-compiler:$room_version")
-
     implementation(project(":core-model"))
     implementation(project(":core-network"))
     implementation(project(":core-database"))
 
+    val hilt_version = "2.48.1"
+    val kotlinx_version = "1.5.0"
+
+    implementation(libs.room.ktx)
+    kapt(libs.room.compiler)
+
     implementation("com.github.skydoves:sandwich:1.3.5")
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_version")
-    implementation("androidx.datastore:datastore-preferences:1.0.0")
+    implementation(libs.sandwich)
+    implementation(libs.bundles.hilt)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.android.compiler)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.datastore)
 }
\ No newline at end of file
diff --git a/core-designsystem/build.gradle.kts b/core-designsystem/build.gradle.kts
index adef05bb8..788eff70a 100644
--- a/core-designsystem/build.gradle.kts
+++ b/core-designsystem/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -28,7 +28,7 @@ android {
         jvmTarget = "17"
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     buildFeatures {
         compose = true
@@ -38,30 +38,19 @@ android {
 dependencies {
     implementation(project(":core-common"))
     implementation(project(":core-model"))
-    //material3
-    implementation("androidx.compose.material3:material3:1.2.1")
 
-    //preview
-    implementation("androidx.compose.ui:ui-tooling-preview")
+    implementation(libs.bundles.ui)
+    implementation(libs.navigation.compose)
 
-    implementation("androidx.compose.ui:ui:1.1.0")
-
-    //bottom navigation
-    implementation("androidx.navigation:navigation-compose:2.7.0")
-
-    //coil 라이브러리
-    implementation("com.github.skydoves:landscapist-glide:1.4.7")
-    implementation("io.coil-kt:coil-gif:2.6.0")
-    implementation("io.coil-kt:coil-compose:2.6.0")
+    implementation(libs.bundles.glide) //glide
+    implementation(libs.bundles.coil) //coil
 
     //paging 라이브러리
-    implementation("com.google.accompanist:accompanist-pager:0.20.0")
+    implementation(libs.accommpanist.pager)
 
-    implementation("com.github.bumptech.glide:glide:4.16.0")
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")
-}
\ No newline at end of file
+    implementation(libs.bundles.basic)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
+    debugImplementation(libs.ui.tooling)
+}
diff --git a/core-designsystem/src/main/java/com/hmoa/core_designsystem/component/MainBottomBar.kt b/core-designsystem/src/main/java/com/hmoa/core_designsystem/component/MainBottomBar.kt
index 5a9267ff9..21523c2c0 100644
--- a/core-designsystem/src/main/java/com/hmoa/core_designsystem/component/MainBottomBar.kt
+++ b/core-designsystem/src/main/java/com/hmoa/core_designsystem/component/MainBottomBar.kt
@@ -1,5 +1,6 @@
 package com.hmoa.core_designsystem.component
 
+import android.util.Log
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -57,6 +58,7 @@ fun MainBottomBar(
         if (navBackStackEntry != null && navBackStackEntry!!.destination.route != null){
             currentScreen = navBackStackEntry!!.destination.route!!
         }
+        Log.d("TAG TEST", "current route: ${currentScreen}")
     }
     val bottomNavItems = listOf(
         BottomNavItem(
diff --git a/core-designsystem/src/main/java/com/hmoa/core_designsystem/component/SearchTopBar.kt b/core-designsystem/src/main/java/com/hmoa/core_designsystem/component/SearchTopBar.kt
index dd052a3d9..092ee0381 100644
--- a/core-designsystem/src/main/java/com/hmoa/core_designsystem/component/SearchTopBar.kt
+++ b/core-designsystem/src/main/java/com/hmoa/core_designsystem/component/SearchTopBar.kt
@@ -1,31 +1,16 @@
 package com.hmoa.core_designsystem.component
 
+import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-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.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarColors
-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.material3.*
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -39,8 +24,11 @@ import androidx.compose.ui.unit.sp
 import com.hmoa.core_designsystem.R
 import com.hmoa.core_designsystem.theme.CustomColor
 import com.hmoa.core_designsystem.theme.pretendard
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.filter
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, FlowPreview::class)
 @Composable
 fun SearchTopBar(
     searchWord: String,
@@ -49,6 +37,12 @@ fun SearchTopBar(
     onClickSearch: () -> Unit,
     navBack: () -> Unit,
 ) {
+    var searchWord by remember { mutableStateOf(searchWord) }
+    val textFlow = remember { snapshotFlow { searchWord } }
+
+    LaunchedEffect(textFlow) {
+        textFlow.debounce(700).filter { it.isNotBlank() }.collect { onChangeWord(it) }
+    }
 
     TopAppBar(
         title = {
@@ -58,17 +52,21 @@ fun SearchTopBar(
                     .padding(start = 13.dp),
                 value = searchWord,
                 onValueChange = {
-                    if(it == ""){
+                    if (it.length == 0) {
                         onClearWord()
                     }
-                    onChangeWord(it)
+                    searchWord = it
                 },
                 singleLine = true,
                 textStyle = TextStyle(
                     fontSize = 16.sp,
-                    fontWeight = FontWeight.Normal,fontFamily = pretendard
+                    fontWeight = FontWeight.Normal, fontFamily = pretendard
                 ),
-                keyboardActions = KeyboardActions(onDone = {onClickSearch()}, onGo = {onClickSearch()}, onSend = {onClickSearch()}, onSearch = {onClickSearch()})
+                keyboardActions = KeyboardActions(
+                    onDone = { onClickSearch() },
+                    onGo = { onClickSearch() },
+                    onSend = { onClickSearch() },
+                    onSearch = { onClickSearch() })
             ) {
                 Row(
                     verticalAlignment = Alignment.CenterVertically
@@ -77,7 +75,7 @@ fun SearchTopBar(
                         Text(
                             text = "키워드를 검색해보세요",
                             fontSize = 16.sp,
-                            style = TextStyle(fontWeight = FontWeight.Normal,fontFamily = pretendard),
+                            style = TextStyle(fontWeight = FontWeight.Normal, fontFamily = pretendard),
                             color = CustomColor.gray3
                         )
                     } else {
@@ -107,7 +105,10 @@ fun SearchTopBar(
                     modifier = Modifier.size(20.dp)
                         .background(color = CustomColor.gray2, shape = CircleShape)
                         .clip(CircleShape),
-                    onClick = onClearWord
+                    onClick = {
+                        onClearWord()
+                        searchWord = ""
+                    }
                 ) {
                     Icon(
                         imageVector = Icons.Filled.Close,
@@ -158,4 +159,4 @@ fun TestSearchBar() {
             navBack = {}
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core-domain/build.gradle.kts b/core-domain/build.gradle.kts
index 12afbf2bf..bb2d85857 100644
--- a/core-domain/build.gradle.kts
+++ b/core-domain/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -34,17 +33,13 @@ android {
 
 dependencies {
     implementation(project(":core-model"))
-    val hilt_version = "2.48.1"
 
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
+    implementation(libs.bundles.hilt)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.android.compiler)
 
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.11.0")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    implementation(libs.bundles.basic)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
 }
\ No newline at end of file
diff --git a/core-model/build.gradle.kts b/core-model/build.gradle.kts
index 2e89e7f99..700c5f7eb 100644
--- a/core-model/build.gradle.kts
+++ b/core-model/build.gradle.kts
@@ -21,12 +21,12 @@ tasks {
 
 dependencies {
     val kotlinx_version = "1.5.0"
-    
+
+    implementation(libs.kotlinx.collections.immutable)
     implementation("io.ktor:ktor-client-serialization:2.3.7")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_version")
     testImplementation("junit:junit:4.13.2")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.3.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.3.1")
     implementation(kotlin("stdlib"))
-
-}
\ No newline at end of file
+}
diff --git a/core-network/build.gradle.kts b/core-network/build.gradle.kts
index 9119df4cc..f27aed543 100644
--- a/core-network/build.gradle.kts
+++ b/core-network/build.gradle.kts
@@ -1,12 +1,11 @@
-import java.util.*
+import java.util.Properties
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
+    alias(libs.plugins.kotlin.plugin.serialization)
     id("kotlinx-serialization")
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.5.0"
     kotlin("kapt")
 }
 
@@ -45,27 +44,22 @@ android {
 }
 
 dependencies {
-    val mockito_version = "4.8.0"
-    val hilt_version = "2.48.1"
-    val kotlinx_version = "1.5.0"
-
     implementation(project(":core-model"))
     implementation(project(":core-database"))
     implementation(project(":core-common"))
-    implementation("com.github.skydoves:sandwich:1.3.5")
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
-    implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_version")
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    implementation("androidx.datastore:datastore-preferences:1.0.0")
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.mockito:mockito-core:$mockito_version")
-    testImplementation("org.mockito:mockito-inline:$mockito_version")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    implementation(libs.sandwich)
+    implementation(libs.logging.interceptor)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.datastore)
+    implementation(libs.bundles.retrofit)
+
+    implementation(libs.bundles.hilt)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.android.compiler)
+
+    //test
+    testImplementation(libs.bundles.unit.test)
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
 }
\ No newline at end of file
diff --git a/core-repository/build.gradle.kts b/core-repository/build.gradle.kts
index ccaaaba92..a1c915f76 100644
--- a/core-repository/build.gradle.kts
+++ b/core-repository/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
     kotlin("plugin.serialization") version "1.5.0"
 }
@@ -35,14 +34,11 @@ android {
 
 
 dependencies {
-    val hilt_version = "2.48.1"
-
     implementation(project(":core-model"))
     implementation(project(":core-datastore"))
     implementation(project(":core-domain"))
 
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
+    implementation(libs.bundles.hilt)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.android.compiler)
 }
\ No newline at end of file
diff --git a/feature-authentication/build.gradle.kts b/feature-authentication/build.gradle.kts
index cd4cd008b..550796af9 100644
--- a/feature-authentication/build.gradle.kts
+++ b/feature-authentication/build.gradle.kts
@@ -1,11 +1,10 @@
-import java.util.*
+import java.util.Properties
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
-    id("com.google.gms.google-services")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
+    alias(libs.plugins.google.services)
     kotlin("kapt")
     kotlin("plugin.serialization") version "1.5.0"
 }
@@ -56,7 +55,7 @@ android {
         jvmTarget = "1.8"
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     buildFeatures {
         compose = true
@@ -69,51 +68,32 @@ android {
 }
 
 dependencies {
-    implementation("com.google.firebase:firebase-messaging-ktx:23.4.1")
-    val hilt_version = "2.48.1"
-    val kakao_version = "2.20.5"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-
     implementation(project(":core-designsystem"))
     implementation(project(":core-domain"))
     implementation(project(":core-common"))
     implementation(project(":core-model"))
 
-    implementation("com.kakao.sdk:v2-all:${kakao_version}")// 전체 모듈 설치, 2.11.0 버전부터 지원
-    implementation("com.kakao.sdk:v2-user:${kakao_version}") // 카카오 로그인 API 모듈
-    implementation("com.kakao.sdk:v2-talk:${kakao_version}") // 카카오톡 채널, 카카오톡 소셜, 카카오톡 메시지 API 모듈
-    implementation("com.kakao.sdk:v2-share:${kakao_version}") // 카카오톡 공유 API 모듈
-    implementation("com.kakao.sdk:v2-friend:${kakao_version}") // 피커 API 모듈
-    implementation("com.kakao.sdk:v2-cert:${kakao_version}") // 카카오 인증서비스 API 모듈
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.5.1")
+    implementation(libs.bundles.hilt)
+    kapt(libs.hilt.android.compiler)
+    kapt(libs.hilt.viewmodel)
+    testAnnotationProcessor(libs.hilt.compiler)
+    implementation(libs.hilt.navigation.compose)
 
-    implementation("androidx.compose.material:material:1.2.0-beta02")
-    implementation("androidx.compose.material3:material3:1.1.0")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.ui:ui:1.1.0")
-    implementation("androidx.navigation:navigation-compose:2.7.0")
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.8.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    //goole-login
-    implementation("com.google.android.gms:play-services-auth:21.0.0")
-    implementation("com.google.gms:google-services:4.4.1")
-    implementation("com.google.firebase:firebase-bom:32.0.0")
+    implementation(libs.bundles.kakao.login)
+    implementation(libs.bundles.google.login)
+    implementation(libs.firebase.messaging)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.ui)
+    implementation(libs.bundles.basic)
+    implementation(libs.google.material)
+    implementation(libs.constraintlayout)
 
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.3.1")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.3.1")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1-Beta")
-}
\ No newline at end of file
+    // test
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
+    testImplementation(libs.junit)
+    testImplementation(libs.junit.jupiter.api)
+    testRuntimeOnly(libs.junit.jupiter.engine)
+    testImplementation(libs.coroutine.test)
+}
diff --git a/feature-brand/build.gradle.kts b/feature-brand/build.gradle.kts
index f021fb446..8596939c0 100644
--- a/feature-brand/build.gradle.kts
+++ b/feature-brand/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -31,41 +30,46 @@ android {
         jvmTarget = "1.8"
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     buildFeatures {
         compose = true
     }
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=${project.buildDir.absolutePath}/compose_metrics",
+        )
+    }
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${project.buildDir.absolutePath}/compose_reports",
+        )
+    }
 }
 
 dependencies {
 
-    val hilt_version = "2.44"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-
     implementation(project(":core-designsystem"))
     implementation(project(":core-domain"))
     implementation(project(":core-model"))
     implementation(project(":core-common"))
-    implementation("androidx.paging:paging-compose:3.2.0")
-    implementation("androidx.compose.material:material:1.2.0-beta02")
-    implementation("androidx.compose.material3:material3:1.1.0")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.ui:ui:1.1.0")
-    implementation("androidx.navigation:navigation-compose:2.7.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0")
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
 
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.5.2")
-}
\ No newline at end of file
+    implementation(libs.paging.compose)
+    implementation(libs.bundles.ui)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.bundles.basic)
+
+    implementation(libs.bundles.hilt)
+    kapt(libs.hilt.android.compiler)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.compiler)
+
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
+    debugImplementation(libs.ui.tooling)
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(libs.junit.jupiter.engine)
+}
diff --git a/feature-brand/src/main/java/com/hmoa/feature_brand/screen/BrandSearchScreen.kt b/feature-brand/src/main/java/com/hmoa/feature_brand/screen/BrandSearchScreen.kt
index ff93f382e..8e7aff24c 100644
--- a/feature-brand/src/main/java/com/hmoa/feature_brand/screen/BrandSearchScreen.kt
+++ b/feature-brand/src/main/java/com/hmoa/feature_brand/screen/BrandSearchScreen.kt
@@ -3,8 +3,8 @@ package com.hmoa.feature_brand.screen
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -68,15 +68,14 @@ fun BrandSearchScreen(
 @Composable
 fun BrandSearchContent(
     searchWord: String,
-    consonantBrands: MutableMap<Consonant?, List<BrandDefaultResponseDto>?>?,
-    searchResult: MutableMap<Consonant?, List<BrandDefaultResponseDto>?>?,
+    consonantBrands: Map<Consonant?, List<BrandDefaultResponseDto>?>?,
+    searchResult: Map<Consonant?, List<BrandDefaultResponseDto>?>?,
     onBrandClick: (brandId: Int) -> Unit,
     onBackClick: () -> Unit,
     onChangedWord: (word: String) -> Unit,
     onClearWord: () -> Unit,
     onClickSearch: (word: String) -> Unit
 ) {
-    var scrollState = rememberScrollState()
     Column {
         Row(modifier = Modifier.padding(start = 16.dp)) {
             SearchTopBar(
@@ -93,23 +92,27 @@ fun BrandSearchContent(
         )
         Column(
             modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp)
-                .padding(top = 16.dp).verticalScroll(scrollState)
+                .padding(top = 16.dp)
         ) {
             if (searchWord == "") {
-                Consonant.entries.forEach { consonant ->
-                    BrandGridView(
-                        brands = consonantBrands?.get(consonant),
-                        onBrandClick = { onBrandClick(it) },
-                        consonant = consonant
-                    )
+                LazyColumn {
+                    items(Consonant.entries.toList()) { consonant ->
+                        BrandGridView(
+                            brands = consonantBrands?.get(consonant),
+                            onBrandClick = { onBrandClick(it) },
+                            consonant = consonant
+                        )
+                    }
                 }
             } else {
-                Consonant.entries.forEach { consonant ->
-                    BrandGridView(
-                        brands = searchResult?.get(consonant),
-                        onBrandClick = { onBrandClick(it) },
-                        consonant = consonant
-                    )
+                LazyColumn {
+                    items(Consonant.entries.toList()) { consonant ->
+                        BrandGridView(
+                            brands = searchResult?.get(consonant),
+                            onBrandClick = { onBrandClick(it) },
+                            consonant = consonant
+                        )
+                    }
                 }
             }
         }
diff --git a/feature-brand/src/main/java/com/hmoa/feature_brand/viewmodel/BrandSearchViewmodel.kt b/feature-brand/src/main/java/com/hmoa/feature_brand/viewmodel/BrandSearchViewmodel.kt
index a34c976cd..1c1915392 100644
--- a/feature-brand/src/main/java/com/hmoa/feature_brand/viewmodel/BrandSearchViewmodel.kt
+++ b/feature-brand/src/main/java/com/hmoa/feature_brand/viewmodel/BrandSearchViewmodel.kt
@@ -4,8 +4,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hmoa.core_common.Result
 import com.hmoa.core_common.asResult
-import com.hmoa.core_domain.repository.SearchRepository
 import com.hmoa.core_domain.entity.data.Consonant
+import com.hmoa.core_domain.repository.SearchRepository
 import com.hmoa.core_model.response.BrandDefaultResponseDto
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.*
@@ -14,7 +14,6 @@ import javax.inject.Inject
 
 @HiltViewModel
 class BrandSearchViewmodel @Inject constructor(private val searchRepository: SearchRepository) : ViewModel() {
-    val PAGE_SIZE = 10
     private var consonantBrandMapState =
         MutableStateFlow<MutableMap<Consonant?, List<BrandDefaultResponseDto>?>?>(null)
     private var searchWordState = MutableStateFlow<String>("")
@@ -38,19 +37,19 @@ class BrandSearchViewmodel @Inject constructor(private val searchRepository: Sea
 
     fun initializeBrands() {
         viewModelScope.launch {
+            val newMap = consonantBrandMapState.value?.toMutableMap() ?: mutableMapOf()
             for (i in 1..19) {
                 flow { emit(searchRepository.getBrandAll(i)) }.asResult().collectLatest {
                     when (it) {
                         is Result.Success -> {
-                            val newMap = consonantBrandMapState.value?.toMutableMap() ?: mutableMapOf()
                             newMap[mapNumberIntoConsonant(i)] = it.data.data
-                            consonantBrandMapState.value = newMap
                         }
 
                         else -> {}
                     }
                 }
             }
+            consonantBrandMapState.value = newMap
         }
     }
 
@@ -65,12 +64,11 @@ class BrandSearchViewmodel @Inject constructor(private val searchRepository: Sea
             flow { emit(searchRepository.getBrand(word)) }.asResult().collectLatest {
                 when (it) {
                     is Result.Success -> {
+                        val newMap = searchResultState.value?.toMutableMap() ?: mutableMapOf()
                         it.data.data?.forEach {
-                            val newMap = searchResultState.value?.toMutableMap()
-                                ?: mutableMapOf()
                             newMap[mapNumberIntoConsonant(it.consonant)] = it.brandList
-                            searchResultState.value = newMap
                         }
+                        searchResultState.value = newMap
                     }
 
                     is Result.Error -> {
@@ -121,4 +119,4 @@ class BrandSearchViewmodel @Inject constructor(private val searchRepository: Sea
         data object Error : BrandSearchUiState
     }
 
-}
\ No newline at end of file
+}
diff --git a/feature-community/build.gradle.kts b/feature-community/build.gradle.kts
index 0c4e69041..13cc38350 100644
--- a/feature-community/build.gradle.kts
+++ b/feature-community/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -32,53 +31,45 @@ android {
         jvmTarget = "17"
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     buildFeatures {
         compose = true
     }
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=${project.buildDir.absolutePath}/compose_metrics",
+        )
+    }
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${project.buildDir.absolutePath}/compose_reports",
+        )
+    }
 }
 
 dependencies {
-
-    val hilt_version = "2.48.1"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-
     implementation(project(":core-designsystem"))
     implementation(project(":core-domain"))
     implementation(project(":core-model"))
     implementation(project(":core-common"))
 
-    //material3
-    implementation("androidx.compose.material3:material3:1.2.0")
-
-    //preview
-    implementation("androidx.compose.ui:ui-tooling-preview")
+    implementation(libs.bundles.ui)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.paging.compose)
+    implementation(libs.bundles.basic)
+    implementation(libs.kotlinx.collections.immutable)
 
-    implementation("androidx.compose.ui:ui:1.1.0")
+    implementation(libs.bundles.hilt)
+    kapt(libs.hilt.android.compiler)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.compiler)
 
-    //bottom navigation
-    implementation("androidx.navigation:navigation-compose:2.7.0")
-
-    //collectAsStateWithLifecycle 함수
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0")
-
-    //paging
-    implementation("androidx.paging:paging-compose:3.2.0")
-    implementation("androidx.compose.material:material:1.2.0-beta02")
-
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
-
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")
-}
\ No newline at end of file
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
+    debugImplementation(libs.ui.tooling)
+}
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/Navigation/NavGraph.kt b/feature-community/src/main/java/com/hmoa/feature_community/Navigation/NavGraph.kt
index c850ed68a..687eb0daa 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/Navigation/NavGraph.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/Navigation/NavGraph.kt
@@ -1,10 +1,20 @@
 package com.hmoa.feature_community.Navigation
 
-import androidx.navigation.*
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavType
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.navigation
+import androidx.navigation.navArgument
+import androidx.navigation.navDeepLink
 import com.hmoa.core_domain.entity.navigation.CommunityRoute
-import com.hmoa.feature_community.Screen.*
+import com.hmoa.feature_community.Screen.CommunityCommentEditRoute
+import com.hmoa.feature_community.Screen.CommunityDescriptionRoute
+import com.hmoa.feature_community.Screen.CommunityEditRoute
+import com.hmoa.feature_community.Screen.CommunityHomeRoute
+import com.hmoa.feature_community.Screen.CommunityPostRoute
+import com.hmoa.feature_community.Screen.CommunityPreviewRoute
+import com.hmoa.feature_community.Screen.CommunitySearchRoute
 
 //게시글 기본 화면
 fun NavController.navigateToCommunityRoute() = navigate(CommunityRoute.CommunityGraphRoute.name)
@@ -28,11 +38,16 @@ fun NavController.navigateToCommunityEditRoute(id: Int) =
     }
 
 //게시글 상세 화면
-fun NavController.navigateToCommunityDescriptionRoute(id: Int) =
+fun NavController.navigateToCommunityDescriptionRoute(befScreen: CommunityRoute, id: Int) {
     navigate("${CommunityRoute.CommunityDescriptionRoute.name}/${id}") {
-        popUpTo("${CommunityRoute.CommunityDescriptionRoute.name}/{id}") { inclusive = true }
+        if (befScreen == CommunityRoute.CommunityEditRoute) {
+            popUpTo("${CommunityRoute.CommunityEditRoute.name}/{id}"){inclusive = true}
+        } else if (befScreen == CommunityRoute.CommunityPostRoute) {
+            popUpTo("${CommunityRoute.CommunityCommentEditRoute.name}/{type}"){inclusive = true}
+        }
+        launchSingleTop = true
     }
-
+}
 //게시글 검색 화면
 fun NavController.navigateToCommunitySearchRoute() = navigate(CommunityRoute.CommunitySearchRoute.name)
 
@@ -45,14 +60,12 @@ fun NavGraphBuilder.nestedCommunityGraph(
     navCommunityPage: () -> Unit,
     navCommunityPost: (String) -> Unit,
     navCommunityEdit: (Int) -> Unit,
-    navCommunityDescription: (Int) -> Unit,
+    navCommunityDescription: (befRoute: CommunityRoute, communityId: Int) -> Unit,
     navCommunitySearch: () -> Unit,
     navCommunityCommentEdit: (Int) -> Unit,
     onErrorHandleLoginAgain: () -> Unit,
     navLogin: () -> Unit,
-    navHome: () -> Unit,
     navHPedia: () -> Unit,
-    popStack: () -> Unit,
 ) {
     navigation(
         startDestination = CommunityRoute.CommunityPreviewRoute.name,
@@ -63,7 +76,6 @@ fun NavGraphBuilder.nestedCommunityGraph(
                 navCommunityDescription = navCommunityDescription,
                 navCommunityGraph = navCommunityPage,
                 onErrorHandleLoginAgain = onErrorHandleLoginAgain,
-                navHome = navHome
             )
         }
         composable(route = CommunityRoute.CommunityPreviewRoute.name) {
@@ -73,7 +85,6 @@ fun NavGraphBuilder.nestedCommunityGraph(
                 navCommunityDescription = navCommunityDescription,
                 navPost = navCommunityPost,
                 navLogin = onErrorHandleLoginAgain,
-                navHPedia = navHPedia,
             )
         }
         composable(route = "${CommunityRoute.CommunityPostRoute.name}/{type}") {
@@ -90,7 +101,8 @@ fun NavGraphBuilder.nestedCommunityGraph(
             CommunityEditRoute(
                 id = id?.toInt(),
                 navBack = navBack,
-                navCommunityDesc = navCommunityDescription
+                navCommunityDesc = navCommunityDescription,
+                navLogin = navLogin
             )
         }
         composable(
@@ -102,12 +114,10 @@ fun NavGraphBuilder.nestedCommunityGraph(
 
             CommunityDescriptionRoute(
                 id = id,
-                onNavCommunityEdit = navCommunityEdit,
-                onNavCommentEdit = navCommunityCommentEdit,
-                onNavLogin = navLogin,
-                onNavBack = navBack,
-                onNavHPedia = navHPedia,
-                onNavPopStack = popStack
+                navCommunityEdit = navCommunityEdit,
+                navCommentEdit = navCommunityCommentEdit,
+                navLogin = navLogin,
+                navBack = navBack
             )
         }
         composable(route = CommunityRoute.CommunitySearchRoute.name) {
@@ -120,7 +130,8 @@ fun NavGraphBuilder.nestedCommunityGraph(
             val id = it.arguments?.getString("commentId")?.toInt()
             CommunityCommentEditRoute(
                 _commentId = id,
-                navBack = navBack
+                navBack = navBack,
+                navLogin = navLogin
             )
         }
     }
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityCommentEditScreen.kt b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityCommentEditScreen.kt
index f18ecd937..248dc2eb8 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityCommentEditScreen.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityCommentEditScreen.kt
@@ -9,6 +9,11 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.BasicTextField
 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.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
@@ -18,7 +23,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.hmoa.core_common.ErrorUiState
 import com.hmoa.core_designsystem.component.AppLoadingScreen
+import com.hmoa.core_designsystem.component.ErrorUiSetView
 import com.hmoa.core_designsystem.component.TopBarWithEvent
 import com.hmoa.feature_community.ViewModel.CommunityCommentEditUiState
 import com.hmoa.feature_community.ViewModel.CommunityCommentEditViewModel
@@ -27,71 +34,85 @@ import com.hmoa.feature_community.ViewModel.CommunityCommentEditViewModel
 fun CommunityCommentEditRoute(
     _commentId : Int?,
     navBack : () -> Unit,
+    navLogin: () -> Unit,
     viewModel : CommunityCommentEditViewModel = hiltViewModel()
 ){
-    viewModel.setId(_commentId)
-
-    val comment = viewModel.comment.collectAsStateWithLifecycle()
-    val uiState = viewModel.uiState.collectAsStateWithLifecycle()
+    LaunchedEffect(Unit){ viewModel.setId(_commentId) }
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val errState by viewModel.errorUiState.collectAsStateWithLifecycle()
 
     CommunityCommentEditScreen(
-        uiState = uiState.value,
-        comment = comment.value,
-        onCommentChange = {
-            viewModel.updateComment(it)
-        },
-        onEditDone = {
-            viewModel.editComment()
-            navBack()
-        },
-        navBack = navBack
+        uiState = uiState,
+        errState = errState,
+        onEditDone = viewModel::editComment,
+        navBack = navBack,
+        navLogin = navLogin
     )
 }
 
 @Composable
 fun CommunityCommentEditScreen(
-    uiState : CommunityCommentEditUiState,
-    comment : String,
-    onCommentChange : (String) -> Unit,
-    onEditDone : () -> Unit,
-    navBack : () -> Unit,
+    uiState: CommunityCommentEditUiState,
+    errState: ErrorUiState,
+    onEditDone: (newComment: String, onSuccess: () -> Unit) -> Unit,
+    navBack: () -> Unit,
+    navLogin: () -> Unit,
 ){
     when(uiState){
         CommunityCommentEditUiState.Loading -> {
             AppLoadingScreen()
         }
-        CommunityCommentEditUiState.Comment -> {
-            Column(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .background(color = Color.White)
-            ){
-                TopBarWithEvent(
-                    onCancelClick = navBack,
-                    onConfirmClick = onEditDone,
-                    title = "댓글"
-                )
-
-                Spacer(Modifier.height(20.dp))
-
-                BasicTextField(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(horizontal = 32.dp),
-                    value = comment,
-                    onValueChange = {
-                        onCommentChange(it)
-                    },
-                    textStyle = TextStyle(
-                        fontSize = 14.sp,
-                        color = Color.Black,
-                        fontFamily = FontFamily(Font(com.hmoa.core_designsystem.R.font.pretendard_regular))
-                    )
-                )
-            }
+        is CommunityCommentEditUiState.Comment -> {
+            CommunityCommentEditContent(
+                initComment = uiState.comment,
+                navBack = navBack,
+                onEditDone = onEditDone
+            )
         }
         CommunityCommentEditUiState.Error -> {
-            Text("오류")
+            ErrorUiSetView(
+                onLoginClick = navLogin,
+                errorUiState = errState,
+                onCloseClick = navBack
+            )
         }
     }
+}
+
+@Composable
+fun CommunityCommentEditContent(
+    initComment: String,
+    navBack: () -> Unit,
+    onEditDone: (newComment: String, onSuccess: () -> Unit) -> Unit,
+){
+    var comment by remember{mutableStateOf(initComment)}
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(color = Color.White)
+    ){
+        TopBarWithEvent(
+            onCancelClick = navBack,
+            onConfirmClick = {
+                onEditDone(comment, navBack)
+            },
+            title = "댓글"
+        )
+
+        Spacer(Modifier.height(20.dp))
+
+        BasicTextField(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 32.dp),
+            value = comment,
+            onValueChange = {comment = it},
+            textStyle = TextStyle(
+                fontSize = 14.sp,
+                color = Color.Black,
+                fontFamily = FontFamily(Font(com.hmoa.core_designsystem.R.font.pretendard_regular))
+            )
+        )
+    }
 }
\ No newline at end of file
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityDescriptionPage.kt b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityDescriptionPage.kt
index 79ca357b9..533516b6d 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityDescriptionPage.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityDescriptionPage.kt
@@ -38,21 +38,18 @@ import kotlinx.coroutines.launch
 @Composable
 fun CommunityDescriptionRoute(
     id: Int?,
-    onNavCommunityEdit: (Int) -> Unit,
-    onNavCommentEdit: (Int) -> Unit,
-    onNavLogin: () -> Unit,
-    onNavBack: () -> Unit,
-    onNavHPedia: () -> Unit,
-    onNavPopStack: () -> Unit,
+    navCommunityEdit: (communityId: Int) -> Unit,
+    navCommentEdit: (communityId: Int) -> Unit,
+    navLogin: () -> Unit,
+    navBack: () -> Unit,
     viewModel: CommunityDescViewModel = hiltViewModel()
 ) {
     viewModel.setId(id)
 
+    val context = LocalContext.current
     val errState = viewModel.errorUiState.collectAsStateWithLifecycle()
     val uiState = viewModel.uiState.collectAsStateWithLifecycle()
-    val isLiked = viewModel.isLiked.collectAsStateWithLifecycle()
     val comments = viewModel.commentPagingSource().collectAsLazyPagingItems()
-    val reportState = viewModel.reportState.collectAsStateWithLifecycle()
     val onHeartClick = remember<(commentId: Int, isLiked: Boolean) -> Unit> {
         { commentId, isLiked ->
             viewModel.updateCommentLike(
@@ -61,48 +58,44 @@ fun CommunityDescriptionRoute(
             )
         }
     }
-
-    val context = LocalContext.current
+    val onReportCommunityClick = remember<() -> Unit>{{
+        viewModel.reportCommunity { Toast.makeText(context,"신고 완료",Toast.LENGTH_SHORT).show() }
+    }}
+    val onReportCommentClick = remember<(commentId: Int) -> Unit>{{
+        viewModel.reportComment(it){ Toast.makeText(context, "신고 완료", Toast.LENGTH_SHORT).show() }
+    }}
+    val postComment = remember<(comment: String)-> Unit>{{
+        viewModel.postComment(it)
+        comments.refresh()
+    }}
+    val deleteCommunity = remember<() -> Unit>{{
+        viewModel.delCommunity{
+            Toast.makeText(context, "게시글 삭제 완료", Toast.LENGTH_SHORT).show()
+            navBack()
+        }
+    }}
+    val deleteComment = remember<(commentId: Int) -> Unit>{{
+        viewModel.delComment(it){
+            comments.refresh()
+            Toast.makeText(context, "댓글 삭제", Toast.LENGTH_SHORT).show()
+        }
+    }}
 
     CommunityDescriptionPage(
         errState = errState.value,
         onChangeLike = viewModel::updateLike,
         uiState = uiState.value,
         commentList = comments,
-        onNavBack = onNavBack,
-        onReportCommunity = {
-            viewModel.reportCommunity()
-            if (reportState.value) {
-                Toast.makeText(context, "신고 완료", Toast.LENGTH_SHORT).show()
-            }
-        },
-        onReportComment = {
-            viewModel.reportComment(it)
-            if (reportState.value) {
-                Toast.makeText(context, "신고 완료", Toast.LENGTH_SHORT).show()
-            }
-        },
-        onPostComment = {
-            viewModel.postComment(it)
-            comments.refresh()
-        },
+        navBack = navBack,
+        onReportCommunity = onReportCommunityClick,
+        onReportComment = onReportCommentClick,
+        onPostComment = postComment,
         onChangeCommentLike = onHeartClick,
-        onDeleteCommunity = {
-            viewModel.delCommunity()
-            onNavBack()
-            Toast.makeText(context, "게시글 삭제 완료", Toast.LENGTH_SHORT).show()
-        },
-        onDeleteComment = { commentId ->
-            viewModel.delComment(commentId)
-            comments.refresh()
-            Toast.makeText(context, "댓글 삭제", Toast.LENGTH_SHORT).show()
-        },
-        onNavCommunityEdit = { onNavCommunityEdit(id!!) },
-        onNavCommentEdit = onNavCommentEdit,
-        onErrorHandleLoginAgain = {
-            onNavLogin()
-        },
-        onNavPopStack = onNavPopStack
+        onDeleteCommunity = deleteCommunity,
+        onDeleteComment = deleteComment,
+        navCommunityEdit = { navCommunityEdit(id!!) },
+        navCommentEdit = navCommentEdit,
+        onErrorHandleLoginAgain = navLogin
     )
 }
 
@@ -113,24 +106,22 @@ fun CommunityDescriptionPage(
     commentList: LazyPagingItems<CommunityCommentWithLikedResponseDto>,
     onChangeLike: (isLiked: Boolean) -> Unit,
     onReportCommunity: () -> Unit,
-    onReportComment: (Int) -> Unit,
-    onPostComment: (String) -> Unit,
-    onChangeCommentLike: (Int, Boolean) -> Unit,
+    onReportComment: (commentId: Int) -> Unit,
+    onPostComment: (comment: String) -> Unit,
+    onChangeCommentLike: (commentId: Int, isLiked: Boolean) -> Unit,
     onDeleteCommunity: () -> Unit,
-    onDeleteComment: (Int) -> Unit,
-    onNavBack: () -> Unit,
-    onNavCommunityEdit: () -> Unit,
-    onNavCommentEdit: (Int) -> Unit,
+    onDeleteComment: (commentId: Int) -> Unit,
+    navBack: () -> Unit,
+    navCommunityEdit: () -> Unit,
+    navCommentEdit: (commentId: Int) -> Unit,
     onErrorHandleLoginAgain: () -> Unit,
-    onNavPopStack: () -> Unit,
 ) {
     when (uiState) {
         CommunityDescUiState.Loading -> AppLoadingScreen()
         is CommunityDescUiState.CommunityDesc -> {
             CommunityDescContent(
-                community = uiState.community,
+                community = uiState,
                 commentList = commentList,
-                photoList = uiState.photoList,
                 onChangeLike = onChangeLike,
                 onReportCommunity = onReportCommunity,
                 onReportComment = onReportComment,
@@ -138,18 +129,16 @@ fun CommunityDescriptionPage(
                 onChangeCommentLike = onChangeCommentLike,
                 onDeleteCommunity = onDeleteCommunity,
                 onDeleteComment = onDeleteComment,
-                onNavBack = onNavBack,
-                onNavCommunityEdit = onNavCommunityEdit,
-                onNavCommentEdit = onNavCommentEdit,
-                onNavPopStack = onNavPopStack
+                navBack = navBack,
+                navCommunityEdit = navCommunityEdit,
+                navCommentEdit = navCommentEdit,
             )
         }
-
         CommunityDescUiState.Error -> {
             ErrorUiSetView(
                 onLoginClick = onErrorHandleLoginAgain,
                 errorUiState = errState,
-                onCloseClick = onNavBack,
+                onCloseClick = navBack,
             )
         }
     }
@@ -158,9 +147,8 @@ fun CommunityDescriptionPage(
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 private fun CommunityDescContent(
-    community: CommunityDefaultResponseDto,
+    community: CommunityDescUiState.CommunityDesc,
     commentList: LazyPagingItems<CommunityCommentWithLikedResponseDto>,
-    photoList: List<String>,
     onChangeLike: (isLiked: Boolean) -> Unit,
     onReportCommunity: () -> Unit,
     onReportComment: (Int) -> Unit,
@@ -168,10 +156,9 @@ private fun CommunityDescContent(
     onChangeCommentLike: (Int, Boolean) -> Unit,
     onDeleteCommunity: () -> Unit,
     onDeleteComment: (Int) -> Unit,
-    onNavBack: () -> Unit,
-    onNavCommunityEdit: () -> Unit,
-    onNavCommentEdit: (Int) -> Unit,
-    onNavPopStack: () -> Unit
+    navBack: () -> Unit,
+    navCommunityEdit: () -> Unit,
+    navCommentEdit: (Int) -> Unit,
 ) {
     var type by remember { mutableStateOf("post") }
     val onChangeType: (String) -> Unit = { type = it }
@@ -183,7 +170,7 @@ private fun CommunityDescContent(
     val dialogOpen = { scope.launch { modalSheetState.show() } }
     val dialogClose = {
         scope.launch { modalSheetState.hide() }
-        onNavPopStack()
+        navBack()
     }
 
     ModalBottomSheetLayout(
@@ -193,28 +180,23 @@ private fun CommunityDescContent(
             if (type == "post" && community.writed) {
                 EditModal(
                     onDeleteClick = onDeleteCommunity,
-                    onEditClick = onNavCommunityEdit,
-                    onCancelClick = { dialogClose() }
+                    onEditClick = navCommunityEdit,
+                    onCancelClick = dialogClose
                 )
             } else if (type == "comment" && comment != null && comment!!.writed) {
                 EditModal(
                     onDeleteClick = { onDeleteComment(comment!!.commentId) },
-                    onEditClick = { onNavCommentEdit(comment!!.commentId) },
-                    onCancelClick = { dialogClose() }
+                    onEditClick = { navCommentEdit(comment!!.commentId) },
+                    onCancelClick = dialogClose
                 )
             } else {
                 ReportModal(
                     onOkClick = {
-                        if (type == "post") {
-                            onReportCommunity()
-                        } else {
-                            if (comment != null) {
-                                onReportComment(comment!!.commentId)
-                            }
-                        }
+                        if (type == "post") { onReportCommunity() }
+                        else { if (comment != null) { onReportComment(comment!!.commentId) }}
                         dialogClose()
                     },
-                    onCancelClick = { dialogClose() },
+                    onCancelClick = dialogClose,
                 )
             }
         },
@@ -228,22 +210,20 @@ private fun CommunityDescContent(
                 onChangeType("post")
             },
             onChangeLike = onChangeLike,
-            photoList = photoList,
             commentList = commentList,
             onChangeCommentLike = onChangeCommentLike,
             onChangeType = onChangeType,
             onPostComment = onPostComment,
             setComment = { comment = it },
-            onNavBack = onNavBack,
+            onNavBack = navBack,
         )
     }
 }
 
 @Composable
 private fun CommunityDescMainContent(
-    community: CommunityDefaultResponseDto,
+    community: CommunityDescUiState.CommunityDesc,
     onChangeLike: (Boolean) -> Unit,
-    photoList: List<String>,
     commentList: LazyPagingItems<CommunityCommentWithLikedResponseDto>,
     onChangeType: (String) -> Unit,
     onChangeCommentLike: (Int, Boolean) -> Unit,
@@ -294,7 +274,7 @@ private fun CommunityDescMainContent(
                 heartCount = community.heartCount,
                 isLiked = community.liked,
                 onChangeLike = onChangeLike,
-                pictures = photoList
+                pictures = community.communityPhotos
             )
             Column(modifier = Modifier.padding(16.dp)) {
                 HorizontalDivider(thickness = 1.dp, color = CustomColor.gray2)
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityEditPage.kt b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityEditPage.kt
index f50a5975b..234f9aef4 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityEditPage.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityEditPage.kt
@@ -1,5 +1,6 @@
 package com.hmoa.feature_community.Screen
 
+import android.content.Context
 import android.net.Uri
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -19,11 +20,16 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 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.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
@@ -31,12 +37,16 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.hmoa.core_common.ErrorUiState
 import com.hmoa.core_designsystem.R
 import com.hmoa.core_designsystem.component.AppLoadingScreen
 import com.hmoa.core_designsystem.component.BottomCameraBtn
+import com.hmoa.core_designsystem.component.ErrorUiSetView
 import com.hmoa.core_designsystem.component.ImageView
 import com.hmoa.core_designsystem.component.TopBarWithEvent
 import com.hmoa.core_designsystem.theme.CustomColor
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
+import com.hmoa.core_model.Category
 import com.hmoa.feature_community.ViewModel.CommunityEditUiState
 import com.hmoa.feature_community.ViewModel.CommunityEditViewModel
 
@@ -44,116 +54,122 @@ import com.hmoa.feature_community.ViewModel.CommunityEditViewModel
 fun CommunityEditRoute(
     id: Int?,
     navBack: () -> Unit,
-    navCommunityDesc: (Int) -> Unit,
+    navCommunityDesc: (befRoute: CommunityRoute, communityId: Int) -> Unit,
+    navLogin: () -> Unit,
     viewModel: CommunityEditViewModel = hiltViewModel()
 ) {
     //id가 null이 아니면 view model에 setting
     viewModel.setId(id)
 
-    val uiState = viewModel.uiState.collectAsStateWithLifecycle()
-    val title = viewModel.title.collectAsStateWithLifecycle()
-    val content = viewModel.content.collectAsStateWithLifecycle()
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val errState by viewModel.errorUiState.collectAsStateWithLifecycle()
     val pictures = viewModel.newPictures.collectAsStateWithLifecycle()
-    val category = viewModel.category.collectAsStateWithLifecycle()
+    val onPostClick = remember{ { navCommunityDesc(CommunityRoute.CommunityEditRoute, id!!) }}
 
     CommunityEditPage(
-        uiState = uiState.value,
-        category = category.value?.name,
-        title = title.value,
-        onTitleChanged = {
-            viewModel.updateTitle(it)
-        },
-        content = content.value,
-        onContentChanged = {
-            viewModel.updateContent(it)
-        },
+        uiState = uiState,
+        errState = errState,
         pictures = pictures.value,
-        onUpdatePictures = {
-            viewModel.updatePictures(it)
-        },
-        onDeletePictures = {
-            viewModel.deletePicture(it)
-        },
-        onPostCommunity = {
-            //view model의 update community 사용
-            viewModel.updateCommunity()
-        },
+        onUpdatePictures = viewModel::updatePictures,
+        onDeletePictures = viewModel::deletePicture,
+        onPostCommunity = viewModel::updateCommunity,
         navBack = navBack,
-        navCommunityDesc = { navCommunityDesc(id!!) }
+        navCommunityDesc = onPostClick,
+        navLogin = navLogin
     )
 }
 
 @Composable
 fun CommunityEditPage(
     uiState: CommunityEditUiState,
-    category: String?,
-    title: String,
-    onTitleChanged: (String) -> Unit,
-    content: String,
-    onContentChanged: (String) -> Unit,
+    errState: ErrorUiState,
     pictures: List<Uri>,
     onUpdatePictures: (List<Uri>) -> Unit,
     onDeletePictures: (Uri) -> Unit,
-    onPostCommunity: () -> Unit,
+    onPostCommunity: (context: Context, title: String, content: String, onSuccess: () -> Unit ) -> Unit,
     navBack: () -> Unit,
-    navCommunityDesc: () -> Unit
+    navCommunityDesc: () -> Unit,
+    navLogin: () -> Unit
 ) {
     when (uiState) {
         CommunityEditUiState.Loading -> AppLoadingScreen()
-        CommunityEditUiState.Success -> {
-            val scrollableState = rememberScrollState()
-
-            Column(
-                modifier = Modifier.fillMaxSize(),
-                horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-                TopBarWithEvent(
-                    onCancelClick = navBack,
-                    onConfirmClick = {
-                        onPostCommunity()
-                        navCommunityDesc()
-                    },
-                    title = category!!
-                )
-                HorizontalDivider(Modifier.fillMaxWidth(), thickness = 1.dp, color = Color.Black)
-                //title input
-                EditTitleTextField(
-                    title = title,
-                    onTitleChanged = onTitleChanged
-                )
-                HorizontalDivider(Modifier.fillMaxWidth(), thickness = 1.dp, color = Color.Black)
-                Column(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .weight(1f)
-                        .padding(horizontal = 33.dp, vertical = 27.dp)
-                        .scrollable(state = scrollableState, orientation = Orientation.Vertical)
-                ) {
-                    //content input
-                    EditContentTextField(
-                        content = content,
-                        onContentChanged = onContentChanged
-                    )
-                }
-
-                if (pictures.isNotEmpty()) {
+        is CommunityEditUiState.Success -> {
+            CommunityEditContent(
+                category = uiState.category,
+                initTitle = uiState.title,
+                initContent = uiState.content,
+                pictures = pictures,
+                onDeletePictures = onDeletePictures,
+                onUpdatePictures = onUpdatePictures,
+                onPostCommunity = onPostCommunity,
+                navCommunityDesc = navCommunityDesc,
+                navBack = navBack
+            )
+        }
 
-                    Spacer(Modifier.height(10.dp))
+        CommunityEditUiState.Error -> {
+            ErrorUiSetView(
+                onLoginClick = navLogin,
+                errorUiState = errState,
+                onCloseClick = navBack
+            )
+        }
+    }
+}
 
-                    EditImageViewPager(
-                        pictures = pictures,
-                        onDeletePictures = onDeletePictures
-                    )
-                }
-                BottomCameraBtn(
-                    onUpdatePictures = onUpdatePictures
-                )
-            }
+@Composable
+fun CommunityEditContent(
+    category: Category,
+    initTitle: String,
+    initContent: String,
+    pictures: List<Uri>,
+    onDeletePictures: (Uri) -> Unit,
+    onUpdatePictures: (List<Uri>) -> Unit,
+    onPostCommunity: (context: Context, title: String, content: String, onSuccess: () -> Unit) -> Unit,
+    navCommunityDesc: () -> Unit,
+    navBack: () -> Unit,
+){
+    var title by remember{mutableStateOf(initTitle)}
+    var content by remember{mutableStateOf(initContent)}
+    val context = LocalContext.current
+    val scrollableState = rememberScrollState()
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        TopBarWithEvent(
+            onCancelClick = navBack,
+            onConfirmClick = {onPostCommunity(context, title, content, navCommunityDesc)},
+            title = category.name
+        )
+        HorizontalDivider(Modifier.fillMaxWidth(), thickness = 1.dp, color = Color.Black)
+        //title input
+        EditTitleTextField(
+            title = title,
+            onTitleChanged = { title = it }
+        )
+        HorizontalDivider(Modifier.fillMaxWidth(), thickness = 1.dp, color = Color.Black)
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f)
+                .padding(horizontal = 33.dp, vertical = 27.dp)
+                .scrollable(state = scrollableState, orientation = Orientation.Vertical)
+        ) {
+            EditContentTextField(
+                content = content,
+                onContentChanged = { content = it }
+            )
         }
 
-        CommunityEditUiState.Error -> {
-            Text("Error")
+        if (pictures.isNotEmpty()) {
+            Spacer(Modifier.height(10.dp))
+            EditImageViewPager(
+                pictures = pictures,
+                onDeletePictures = onDeletePictures
+            )
         }
+        BottomCameraBtn(onUpdatePictures = onUpdatePictures)
     }
 }
 
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityHome.kt b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityHome.kt
index bab3bb3c8..3d4696e46 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityHome.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityHome.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -25,6 +26,7 @@ import com.hmoa.core_designsystem.R
 import com.hmoa.core_designsystem.component.AppLoadingScreen
 import com.hmoa.core_designsystem.component.ErrorUiSetView
 import com.hmoa.core_designsystem.theme.CustomColor
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 import com.hmoa.core_model.response.CommunityByCategoryResponseDto
 import com.hmoa.feature_community.ViewModel.CommunityHomeUiState
 import com.hmoa.feature_community.ViewModel.CommunityHomeViewModel
@@ -32,24 +34,20 @@ import com.hmoa.feature_community.ViewModel.CommunityHomeViewModel
 @Composable
 fun CommunityHomeRoute(
     navCommunityGraph: () -> Unit,
-    navCommunityDescription: (Int) -> Unit,
+    navCommunityDescription: (befRoute: CommunityRoute, communityId: Int) -> Unit,
     onErrorHandleLoginAgain: () -> Unit,
-    navHome: () -> Unit,
     viewModel: CommunityHomeViewModel = hiltViewModel(),
 ) {
-
-    //ui state를 전달 >> 여기에 community list를 가지고 이를 통해 LazyColumn 이용
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val errorUiState by viewModel.errorUiState.collectAsStateWithLifecycle()
+    val onPostClick = remember<(communityId: Int) -> Unit>{{navCommunityDescription(CommunityRoute.CommunityHomeRoute, it)}}
 
     CommunityHome(
         errorUiState = errorUiState,
         uiState = uiState,
-        onNavCommunityGraph = navCommunityGraph,
-        onNavCommunityDescription = navCommunityDescription,
-        onErrorHandleLoginAgain = {
-            onErrorHandleLoginAgain()
-        },
+        navCommunityGraph = navCommunityGraph,
+        navCommunityDescription = onPostClick,
+        onErrorHandleLoginAgain = onErrorHandleLoginAgain,
     )
 }
 
@@ -57,40 +55,50 @@ fun CommunityHomeRoute(
 fun CommunityHome(
     errorUiState: ErrorUiState,
     uiState: CommunityHomeUiState,
-    onNavCommunityGraph: () -> Unit,
-    onNavCommunityDescription: (Int) -> Unit,
+    navCommunityGraph: () -> Unit,
+    navCommunityDescription: (communityId: Int) -> Unit,
     onErrorHandleLoginAgain: () -> Unit,
+) {
+    when (uiState) {
+        is CommunityHomeUiState.Loading -> AppLoadingScreen()
+        is CommunityHomeUiState.Community -> {
+            CommunityHomeContent(
+                communities = uiState.communities,
+                navCommunityDescription = navCommunityDescription,
+                navCommunityByCategory = navCommunityGraph
+            )
+        }
+
+        is CommunityHomeUiState.Error -> {
+            ErrorUiSetView(
+                onLoginClick = onErrorHandleLoginAgain,
+                errorUiState = errorUiState,
+                onCloseClick = onErrorHandleLoginAgain
+            )
+        }
+    }
+}
+@Composable
+fun CommunityHomeContent(
+    communities: List<CommunityByCategoryResponseDto>,
+    navCommunityDescription: (communityId: Int) -> Unit,
+    navCommunityByCategory: () -> Unit,
 ) {
     Column(
         modifier = Modifier
             .padding(horizontal = 16.dp)
             .fillMaxSize()
     ) {
-        CommunityTitleBar(onNavCommunityByCategory = onNavCommunityGraph)
-
-        when (uiState) {
-            is CommunityHomeUiState.Loading -> AppLoadingScreen()
-            is CommunityHomeUiState.Community -> {
-                CommunityHomeContent(
-                    communities = uiState.communities,
-                    onNavCommunityDescription = onNavCommunityDescription
-                )
-            }
-
-            is CommunityHomeUiState.Error -> {
-                ErrorUiSetView(
-                    onLoginClick = onErrorHandleLoginAgain,
-                    errorUiState = errorUiState,
-                    onCloseClick = onErrorHandleLoginAgain
-                )
-            }
-        }
+        CommunityTitleBar(navCommunityByCategory = navCommunityByCategory)
+        PostList(
+            communities = communities,
+            navCommunityDescription = navCommunityDescription
+        )
     }
 }
-
 @Composable
 fun CommunityTitleBar(
-    onNavCommunityByCategory: () -> Unit,
+    navCommunityByCategory: () -> Unit,
 ) {
     Row(
         modifier = Modifier
@@ -107,7 +115,7 @@ fun CommunityTitleBar(
         )
 
         Text(
-            modifier = Modifier.clickable { onNavCommunityByCategory() },
+            modifier = Modifier.clickable { navCommunityByCategory() },
             text = "전체보기",
             fontSize = 12.sp,
             fontFamily = FontFamily(Font(R.font.pretendard_regular)),
@@ -117,21 +125,10 @@ fun CommunityTitleBar(
     Spacer(Modifier.height(16.dp))
 }
 
-@Composable
-fun CommunityHomeContent(
-    communities: List<CommunityByCategoryResponseDto>,
-    onNavCommunityDescription: (Int) -> Unit,
-) {
-    PostList(
-        communities = communities,
-        onNavCommunityDescription = onNavCommunityDescription
-    )
-}
-
 @Composable
 fun PostList(
     communities: List<CommunityByCategoryResponseDto>,
-    onNavCommunityDescription: (Int) -> Unit
+    navCommunityDescription: (communityId: Int) -> Unit
 ) {
     LazyColumn(
         modifier = Modifier
@@ -149,9 +146,7 @@ fun PostList(
                         color = CustomColor.gray2,
                         shape = RoundedCornerShape(10.dp)
                     ),
-                onPostClick = {
-                    onNavCommunityDescription(community.communityId)
-                },
+                onPostClick = {navCommunityDescription(community.communityId)},
                 postType = community.category,
                 postTitle = community.title,
                 heartCount = community.heartCount,
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityPostPage.kt b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityPostPage.kt
index d5d270576..67468607c 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityPostPage.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityPostPage.kt
@@ -29,7 +29,6 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 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
@@ -60,7 +59,6 @@ fun CommunityPostRoute(
     navBack : () -> Unit,
     viewModel : CommunityPostViewModel = hiltViewModel()
 ){
-    val isDone = viewModel.isDone.collectAsStateWithLifecycle()
     val category = when(category){
         Category.추천.name -> Category.추천
         Category.자유.name -> Category.자유
@@ -68,29 +66,26 @@ fun CommunityPostRoute(
         else -> Category.자유
     }
     val pictures = viewModel.pictures.collectAsStateWithLifecycle()
+    val postCommunity = remember<(title: String, content: String) -> Unit>{{ title, content ->
+        viewModel.postCommunity(title, content, category, navBack)
+    }}
 
     PostCommunityPage(
         category = category,
         pictures = pictures.value,
-        onUpdatePictures = {viewModel.updatePictures(it)},
-        onDeletePictures = {viewModel.deletePicture(it)},
+        onUpdatePictures = viewModel::updatePictures,
+        onDeletePictures = viewModel::deletePicture,
         navBack = navBack,
-        onPostCommunity = { title, content ->
-            viewModel.postCommunity(title = title, content = content, category = category)
-        }
+        onPostCommunity = postCommunity
     )
-
-    LaunchedEffect(isDone.value){
-        if(isDone.value){navBack()}
-    }
 }
 
 @Composable
 fun PostCommunityPage(
     category : Category,
     pictures : List<Uri>,
-    onUpdatePictures : (List<Uri>) -> Unit,
-    onDeletePictures : (Int) -> Unit,
+    onUpdatePictures : (pictureUris: List<Uri>) -> Unit,
+    onDeletePictures : (delPictureId: Int) -> Unit,
     navBack: () -> Unit,
     onPostCommunity: (title: String, content: String) -> Unit,
 ) {
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityPreview.kt b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityPreview.kt
index c29689aac..820b107e2 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityPreview.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunityPreview.kt
@@ -24,50 +24,39 @@ import com.hmoa.component.PostListItem
 import com.hmoa.core_common.ErrorUiState
 import com.hmoa.core_designsystem.component.*
 import com.hmoa.core_designsystem.theme.CustomColor
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 import com.hmoa.core_model.Category
 import com.hmoa.core_model.response.CommunityByCategoryResponseDto
 import com.hmoa.feature_community.ViewModel.CommunityMainUiState
 import com.hmoa.feature_community.ViewModel.CommunityMainViewModel
 
-
 @Composable
 fun CommunityPreviewRoute(
     navBack: () -> Unit,
     navSearch: () -> Unit,
-    navCommunityDescription: (Int) -> Unit,
+    navCommunityDescription: (befRoute: CommunityRoute, communityId: Int) -> Unit,
     navPost: (String) -> Unit,
     navLogin: () -> Unit,
-    navHPedia: () -> Unit,
     viewModel: CommunityMainViewModel = hiltViewModel()
 ) {
     //view model의 ui state에서 type, list 를 받아서 사용하는 방식
     val uiState = viewModel.uiState.collectAsStateWithLifecycle()
     val errState = viewModel.errorUiState.collectAsStateWithLifecycle()
     val type by viewModel.type.collectAsStateWithLifecycle()
+    val onPostClick = remember<(Int) -> Unit>{{navCommunityDescription(CommunityRoute.CommunityPreviewRoute, it)}}
+    val communities = viewModel.communityPagingSource().collectAsLazyPagingItems()
 
     CommunityPage(
         uiState = uiState.value,
         errState = errState.value,
-        communities = viewModel.communityPagingSource().collectAsLazyPagingItems(),
+        communities = communities,
         type = type,
-        onTypeChanged = { viewModel.updateCategory(it) },
+        onTypeChanged = viewModel::updateCategory,
         navBack = navBack,
         navSearch = navSearch,
-        navCommunityDescription = navCommunityDescription,
-        navPost = {
-            if (viewModel.hasToken()) {
-                navPost(it)
-            } else {
-                viewModel.updateLoginError()
-            }
-        },
-        onErrorHandleLoginAgain = {
-            if (viewModel.hasToken()) {
-                navHPedia()
-            } else {
-                navLogin()
-            }
-        }
+        navCommunityDescription = onPostClick,
+        navPost = navPost,
+        onErrorHandleLoginAgain = navLogin
     )
 }
 
@@ -77,79 +66,27 @@ fun CommunityPage(
     errState: ErrorUiState,
     communities: LazyPagingItems<CommunityByCategoryResponseDto>,
     type: Category,
-    onTypeChanged: (Category) -> Unit,
+    onTypeChanged: (newCategory: Category) -> Unit,
     navBack: () -> Unit,
     navSearch: () -> Unit,
     navCommunityDescription: (Int) -> Unit,
     navPost: (String) -> Unit,
     onErrorHandleLoginAgain: () -> Unit,
 ) {
-    var isOpen by remember { mutableStateOf(true) }
-    var isFabOpen by remember { mutableStateOf(false) }
-    val animatedAlpha by animateFloatAsState(
-        targetValue = if (isFabOpen) 0.8f else 0f, label = "fab alpha animation"
-    )
-
     when (uiState) {
-        is CommunityMainUiState.Loading -> AppLoadingScreen()
-        is CommunityMainUiState.Community -> {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.BottomEnd
-            ) {
-                Column(
-                    modifier = Modifier.fillMaxSize()
-                ) {
-                    TopBar(
-                        title = "Community",
-                        navIcon = painterResource(com.hmoa.core_designsystem.R.drawable.ic_back),
-                        onNavClick = navBack,
-                        menuIcon = painterResource(com.hmoa.core_designsystem.R.drawable.ic_search),
-                        onMenuClick = navSearch
-                    )
-                    ContentDivider()
-                    CommunityMainTypes(
-                        type = type,
-                        onTypeChanged = onTypeChanged,
-                    )
-                    ContentDivider()
-                    CommunityPagePostList(
-                        communities = communities.itemSnapshotList,
-                        navCommunityDescription = navCommunityDescription
-                    )
-                }
-                Column(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .wrapContentHeight()
-                        .padding(end = 8.dp),
-                    horizontalAlignment = Alignment.End
-                ) {
-                    FloatingActionBtn(
-                        width = 135.dp,
-                        fontSize = 16.sp,
-                        options = listOf(
-                            Category.추천.name,
-                            Category.시향기.name,
-                            Category.자유.name,
-                        ),
-                        events = listOf(
-                            { navPost(Category.추천.name) },
-                            { navPost(Category.시향기.name) },
-                            { navPost(Category.자유.name) }
-                        ),
-                        isAvailable = true,
-                        isFabOpen = isFabOpen,
-                        onFabClick = { isFabOpen = it }
-                    )
-                }
-            }
-
-            //fab 선택 시 화면 필터
-            Box(modifier = Modifier.fillMaxSize().alpha(animatedAlpha).background(Color.Black))
+        CommunityMainUiState.Loading -> AppLoadingScreen()
+        CommunityMainUiState.Community -> {
+            PreviewContent(
+                communities = communities,
+                type = type,
+                navBack = navBack,
+                navSearch = navSearch,
+                onTypeChanged = onTypeChanged,
+                navCommunityDescription = navCommunityDescription,
+                navPost = navPost
+            )
         }
-
-        is CommunityMainUiState.Error -> {
+        CommunityMainUiState.Error -> {
             ErrorUiSetView(
                 onLoginClick = onErrorHandleLoginAgain,
                 errorUiState = errState,
@@ -159,6 +96,78 @@ fun CommunityPage(
     }
 }
 
+@Composable
+fun PreviewContent(
+    communities: LazyPagingItems<CommunityByCategoryResponseDto>,
+    type: Category,
+    onTypeChanged: (type: Category) -> Unit,
+    navBack: () -> Unit,
+    navSearch: () -> Unit,
+    navCommunityDescription: (communityId: Int) -> Unit,
+    navPost: (type: String) -> Unit,
+){
+    var isFabOpen by remember { mutableStateOf(false) }
+    val animatedAlpha by animateFloatAsState( targetValue = if (isFabOpen) 0.8f else 0f, label = "fab alpha animation" )
+
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.BottomEnd
+    ) {
+        Column(
+            modifier = Modifier.fillMaxSize()
+        ) {
+            TopBar(
+                title = "Community",
+                navIcon = painterResource(com.hmoa.core_designsystem.R.drawable.ic_back),
+                onNavClick = navBack,
+                menuIcon = painterResource(com.hmoa.core_designsystem.R.drawable.ic_search),
+                onMenuClick = navSearch
+            )
+            ContentDivider()
+            CommunityMainTypes(
+                type = type,
+                onTypeChanged = onTypeChanged,
+            )
+            ContentDivider()
+            CommunityPagePostList(
+                communities = communities.itemSnapshotList,
+                navCommunityDescription = navCommunityDescription
+            )
+        }
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .wrapContentHeight()
+                .padding(end = 8.dp),
+            horizontalAlignment = Alignment.End
+        ) {
+            FloatingActionBtn(
+                width = 135.dp,
+                fontSize = 16.sp,
+                options = listOf(
+                    Category.추천.name,
+                    Category.시향기.name,
+                    Category.자유.name,
+                ),
+                events = listOf(
+                    { navPost(Category.추천.name) },
+                    { navPost(Category.시향기.name) },
+                    { navPost(Category.자유.name) }
+                ),
+                isAvailable = true,
+                isFabOpen = isFabOpen,
+                onFabClick = { isFabOpen = it }
+            )
+        }
+    }
+
+    //fab 선택 시 화면 필터
+    Box(modifier = Modifier
+        .fillMaxSize()
+        .alpha(animatedAlpha)
+        .background(Color.Black))
+}
+
 @Composable
 fun CommunityMainTypes(
     type: Category,
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunitySearchPage.kt b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunitySearchPage.kt
index 391923579..187ef4be3 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunitySearchPage.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/Screen/CommunitySearchPage.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
@@ -20,6 +21,7 @@ import com.hmoa.core_designsystem.component.AppLoadingScreen
 import com.hmoa.core_designsystem.component.ErrorUiSetView
 import com.hmoa.core_designsystem.component.SearchTopBar
 import com.hmoa.core_designsystem.theme.CustomColor
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 import com.hmoa.core_model.response.CommunityByCategoryResponseDto
 import com.hmoa.feature_community.ViewModel.CommunitySearchUiState
 import com.hmoa.feature_community.ViewModel.CommunitySearchViewModel
@@ -27,22 +29,23 @@ import com.hmoa.feature_community.ViewModel.CommunitySearchViewModel
 @Composable
 fun CommunitySearchRoute(
     navBack : () -> Unit,
-    navCommunityDesc: (Int) -> Unit,
+    navCommunityDesc: (befRoute: CommunityRoute, communityId: Int) -> Unit,
     viewModel : CommunitySearchViewModel = hiltViewModel()
 ){
     val searchWord = viewModel.searchWord.collectAsStateWithLifecycle()
     val uiState = viewModel.uiState.collectAsStateWithLifecycle()
     val errState = viewModel.errorUiState.collectAsStateWithLifecycle()
+    val onPostClick = remember<(communityId: Int) -> Unit>{{navCommunityDesc(CommunityRoute.CommunitySearchRoute, it)}}
 
     CommunitySearchPage(
         uiState = uiState.value,
         errState = errState.value,
         searchWord = searchWord.value,
-        onSearchWordChanged = { viewModel.updateSearchWord(it) },
-        onClearSearchWord = { viewModel.clearSearchWord() },
-        onClickSearch = { viewModel.updateFlag() },
+        onSearchWordChanged = viewModel::updateSearchWord,
+        onClearSearchWord = viewModel::clearSearchWord,
+        onClickSearch = viewModel::updateFlag,
         navBack = navBack,
-        navCommunityDesc = navCommunityDesc
+        navCommunityDesc = onPostClick
     )
 }
 
@@ -51,7 +54,7 @@ fun CommunitySearchPage(
     uiState : CommunitySearchUiState,
     errState: ErrorUiState,
     searchWord : String,
-    onSearchWordChanged : (String) -> Unit,
+    onSearchWordChanged : (newWord: String) -> Unit,
     onClearSearchWord : () -> Unit,
     onClickSearch : () -> Unit,
     navBack : () -> Unit,
@@ -84,11 +87,11 @@ fun CommunitySearchPage(
 private fun SearchContent(
     communities: List<CommunityByCategoryResponseDto>,
     searchWord: String,
-    onSearchWordChanged: (String) -> Unit,
+    onSearchWordChanged: (newWord: String) -> Unit,
     onClearSearchWord: () -> Unit,
     onClickSearch: () -> Unit,
     navBack: () -> Unit,
-    navCommunityDesc: (Int) -> Unit
+    navCommunityDesc: (communityId: Int) -> Unit
 ){
     Column(
         modifier = Modifier
@@ -106,7 +109,10 @@ private fun SearchContent(
         LazyColumn(
             modifier = Modifier.weight(1f),
         ){
-            items(communities){community ->
+            items(
+                items = communities,
+                key = {it.communityId}
+            ){community ->
                 PostListItem(
                     modifier = Modifier
                         .fillMaxWidth()
@@ -117,9 +123,7 @@ private fun SearchContent(
                     heartCount = community.heartCount,
                     commentCount = community.commentCount
                 )
-                if (communities.indexOf(community) != communities.lastIndex){
-                    HorizontalDivider(thickness = 1.dp, color = CustomColor.gray2)
-                }
+                if (communities.indexOf(community) != communities.lastIndex){ HorizontalDivider(thickness = 1.dp, color = CustomColor.gray2) }
             }
         }
     }
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityCommentEditViewModel.kt b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityCommentEditViewModel.kt
index 62c259ffc..d21950aa9 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityCommentEditViewModel.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityCommentEditViewModel.kt
@@ -2,17 +2,17 @@ package com.hmoa.feature_community.ViewModel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.hmoa.core_common.ErrorMessageType
 import com.hmoa.core_common.ErrorUiState
 import com.hmoa.core_common.Result
 import com.hmoa.core_common.asResult
+import com.hmoa.core_common.handleErrorType
 import com.hmoa.core_domain.repository.CommunityCommentRepository
-import com.hmoa.core_model.data.ErrorMessage
 import com.hmoa.core_model.request.CommunityCommentDefaultRequestDto
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
@@ -24,11 +24,7 @@ import javax.inject.Inject
 class CommunityCommentEditViewModel @Inject constructor(
     private val communityCommentRepository: CommunityCommentRepository
 ) : ViewModel() {
-
-    private val commentId = MutableStateFlow<Int?>(null)
-
-    private val _comment = MutableStateFlow<String>("")
-    val comment get() = _comment.asStateFlow()
+    private val commentId = MutableStateFlow<Int>(-1)
 
     private var expiredTokenErrorState = MutableStateFlow<Boolean>(false)
     private var wrongTypeTokenErrorState = MutableStateFlow<Boolean>(false)
@@ -53,44 +49,60 @@ class CommunityCommentEditViewModel @Inject constructor(
     )
 
     val uiState: StateFlow<CommunityCommentEditUiState> = combine(errorUiState, commentId) { errorState, id ->
-        if (id == null) throw NullPointerException("Id is NULL")
-        if (errorState is ErrorUiState.ErrorData) throw Exception(errorState.generalError.second)
+        if (errorState is ErrorUiState.ErrorData && errorState.isValidate()) throw Exception("")
         val response = communityCommentRepository.getCommunityComment(id)
         if (response.errorMessage != null) throw Exception(response.errorMessage!!.message)
         response.data!!
-    }.asResult()
-        .map { result ->
-            when (result) {
-                Result.Loading -> CommunityCommentEditUiState.Loading
-                is Result.Success -> {
-                    val data = result.data
-                    _comment.update { data.content }
-                    CommunityCommentEditUiState.Comment
-                }
-                is Result.Error -> {
-                    if (!generalErrorState.value.first) {generalErrorState.update{Pair(true, result.exception.message)}}
-                    CommunityCommentEditUiState.Error
+    }.asResult().map { result ->
+        when (result) {
+            Result.Loading -> CommunityCommentEditUiState.Loading
+            is Result.Success -> CommunityCommentEditUiState.Comment(comment = result.data.content)
+            is Result.Error -> {
+                if (result.exception.message != "") {
+                    handleErrorType(
+                        error = result.exception,
+                        onExpiredTokenError = {expiredTokenErrorState.update{true}},
+                        onWrongTypeTokenError = {wrongTypeTokenErrorState.update{true}},
+                        onUnknownError = {unLoginedErrorState.update{true}},
+                        onGeneralError = {generalErrorState.update{Pair(true, result.exception.message)}},
+                    )
                 }
+                CommunityCommentEditUiState.Error
             }
-        }.stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(3_000),
-            initialValue = CommunityCommentEditUiState.Loading
-        )
+        }
+    }.stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.WhileSubscribed(3_000),
+        initialValue = CommunityCommentEditUiState.Loading
+    )
+
     //comment id 설정
-    fun setId(id: Int?) = commentId.update { id }
-    //comment 업데이트
-    fun updateComment(newComment: String) = _comment.update { newComment }
+    fun setId(id: Int?) {
+        if (id == null) {
+            generalErrorState.update { Pair(true, "해당 댓글을 찾을 수 없습니다.") }
+            return
+        }
+        commentId.update { id }
+    }
+
     //comment 수정
-    fun editComment() {
+    fun editComment(newComment: String, onSuccess: () -> Unit) {
         viewModelScope.launch {
-            val id = commentId.value!!
-            val requestDto = CommunityCommentDefaultRequestDto(comment.value)
+            val requestDto = CommunityCommentDefaultRequestDto(newComment)
             val result = communityCommentRepository.putCommunityComment(
-                commentId = id,
+                commentId = commentId.value,
                 dto = requestDto
             )
-            if (result.errorMessage is ErrorMessage) generalErrorState.update{Pair(true, result.errorMessage!!.message)}
+            if (result.errorMessage != null) {
+                when(result.errorMessage!!.message){
+                    ErrorMessageType.UNKNOWN_ERROR.name -> unLoginedErrorState.update{true}
+                    ErrorMessageType.WRONG_TYPE_TOKEN.name -> wrongTypeTokenErrorState.update{true}
+                    ErrorMessageType.EXPIRED_TOKEN.name -> expiredTokenErrorState.update{true}
+                    else -> generalErrorState.update{Pair(true, result.errorMessage!!.message)}
+                }
+                return@launch
+            }
+            onSuccess()
         }
     }
 
@@ -98,6 +110,6 @@ class CommunityCommentEditViewModel @Inject constructor(
 
 sealed interface CommunityCommentEditUiState {
     data object Error : CommunityCommentEditUiState
-    data object Comment : CommunityCommentEditUiState
+    data class Comment(val comment: String) : CommunityCommentEditUiState
     data object Loading : CommunityCommentEditUiState
 }
\ No newline at end of file
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityDescViewModel.kt b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityDescViewModel.kt
index b335b0f94..2b3ab3aa1 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityDescViewModel.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityDescViewModel.kt
@@ -10,15 +10,18 @@ import com.hmoa.core_common.ErrorMessageType
 import com.hmoa.core_common.ErrorUiState
 import com.hmoa.core_common.Result
 import com.hmoa.core_common.asResult
+import com.hmoa.core_common.handleErrorType
 import com.hmoa.core_domain.repository.CommunityCommentRepository
 import com.hmoa.core_domain.repository.CommunityRepository
 import com.hmoa.core_domain.repository.ReportRepository
 import com.hmoa.core_model.request.CommunityCommentDefaultRequestDto
 import com.hmoa.core_model.request.TargetRequestDto
 import com.hmoa.core_model.response.CommunityCommentWithLikedResponseDto
-import com.hmoa.core_model.response.CommunityDefaultResponseDto
 import com.hmoa.feature_community.CommunityCommentPagingSource
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -29,6 +32,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @HiltViewModel
@@ -38,16 +42,11 @@ class CommunityDescViewModel @Inject constructor(
     private val reportRepository: ReportRepository,
 ) : ViewModel() {
     //community id
-    private val _id = MutableStateFlow(-1)
-    val id get() = _id.asStateFlow()
+    private val id = MutableStateFlow(-1)
 
     //like 여부
     private val _isLiked = MutableStateFlow(false)
     val isLiked get() = _isLiked.asStateFlow()
-    private val _reportState = MutableStateFlow<Boolean>(false)
-    val reportState get() = _reportState.asStateFlow()
-
-    private val flag = MutableStateFlow<Boolean>(false)
 
     private var expiredTokenErrorState = MutableStateFlow<Boolean>(false)
     private var wrongTypeTokenErrorState = MutableStateFlow<Boolean>(false)
@@ -71,25 +70,41 @@ class CommunityDescViewModel @Inject constructor(
         initialValue = ErrorUiState.Loading
     )
     //ui state
-    val uiState: StateFlow<CommunityDescUiState> = combine(errorUiState, _id) { errState, id ->
-        if (errState is ErrorUiState.ErrorData &&
-            (errState.expiredTokenError || errState.wrongTypeTokenError || errState.unknownError || errState.generalError.first)){
-            throw Exception("")
-        }
-        val result = communityRepository.getCommunity(id)
-        result
-    }.asResult().map{ communityResult ->
-        when(communityResult) {
+    val uiState: StateFlow<CommunityDescUiState> = combine(errorUiState, id) { errState, id ->
+        if (errState is ErrorUiState.ErrorData && errState.isValidate()){ throw Exception("") }
+        val response = communityRepository.getCommunity(id)
+        if (response.errorMessage != null) throw Exception(response.errorMessage!!.message)
+        response.data!!
+    }.asResult().map{ result ->
+        when(result) {
             is Result.Loading -> CommunityDescUiState.Loading
-            is Result.Success -> CommunityDescUiState.CommunityDesc((communityResult).data.data!!)
+            is Result.Success -> {
+                val data = result.data
+                val communityPhotos = data.communityPhotos.map{it.photoUrl}
+                CommunityDescUiState.CommunityDesc(
+                    author = data.author,
+                    category = data.category,
+                    communityPhotos = communityPhotos.toImmutableList(),
+                    content = data.content,
+                    heartCount = data.heartCount,
+                    imagesCount = data.imagesCount,
+                    liked = data.liked,
+                    myProfileImgUrl = data.myProfileImgUrl,
+                    profileImgUrl = data.profileImgUrl,
+                    time = data.time,
+                    title = data.title,
+                    writed = data.writed
+                )
+            }
             is Result.Error -> {
-                if(communityResult.exception.message != "") {
-                    when (communityResult.exception.message) {
-                        ErrorMessageType.EXPIRED_TOKEN.message -> expiredTokenErrorState.update { true }
-                        ErrorMessageType.WRONG_TYPE_TOKEN.message -> wrongTypeTokenErrorState.update { true }
-                        ErrorMessageType.UNKNOWN_ERROR.message -> unLoginedErrorState.update { true }
-                        else -> generalErrorState.update {Pair(true,communityResult.exception.message)}
-                    }
+                if(result.exception.message != "") {
+                    handleErrorType(
+                        error = result.exception,
+                        onExpiredTokenError = {expiredTokenErrorState.update{true}},
+                        onWrongTypeTokenError = {wrongTypeTokenErrorState.update { true }},
+                        onUnknownError = {unLoginedErrorState.update { true }},
+                        onGeneralError = {generalErrorState.update {Pair(true,result.exception.message)}}
+                    )
                 }
                 CommunityDescUiState.Error
             }
@@ -101,17 +116,23 @@ class CommunityDescViewModel @Inject constructor(
     )
 
     //커뮤니티 삭제
-    fun delCommunity() {
+    fun delCommunity(onSuccess: () -> Unit) {
         viewModelScope.launch {
-            try {
-                communityRepository.deleteCommunity(id.value)
-            } catch (e: Exception) {
-                generalErrorState.update { Pair(true, e.message) }
+            val result = communityRepository.deleteCommunity(id.value)
+            if (result.errorMessage != null){
+                when(result.errorMessage!!.message){
+                    ErrorMessageType.UNKNOWN_ERROR.name -> {unLoginedErrorState.update { true }}
+                    ErrorMessageType.EXPIRED_TOKEN.name -> {expiredTokenErrorState.update { true }}
+                    ErrorMessageType.WRONG_TYPE_TOKEN.name -> {wrongTypeTokenErrorState.update { true }}
+                    else -> {generalErrorState.update { Pair(true, result.errorMessage!!.message) }}
+                }
+                return@launch
             }
+            withContext(Dispatchers.Main){ onSuccess() }
         }
     }
     //커뮤니티 신고하기
-    fun reportCommunity() {
+    fun reportCommunity(onSuccess: () -> Unit) {
         viewModelScope.launch {
             val requestDto = TargetRequestDto(targetId = id.value.toString())
             val result = reportRepository.reportCommunity(requestDto)
@@ -122,6 +143,10 @@ class CommunityDescViewModel @Inject constructor(
                     ErrorMessageType.EXPIRED_TOKEN.name -> {expiredTokenErrorState.update{true}}
                     else -> {generalErrorState.update{Pair(true, result.errorMessage!!.message)}}
                 }
+                return@launch
+            }
+            withContext(Dispatchers.Main){
+                onSuccess()
             }
         }
     }
@@ -160,11 +185,10 @@ class CommunityDescViewModel @Inject constructor(
                 }
                 return@launch
             }
-            flag.update{!flag.value}
         }
     }
     //댓글 삭제
-    fun delComment(id: Int) {
+    fun delComment(id: Int, onSuccess: () -> Unit) {
         viewModelScope.launch {
             val result = communityCommentRepository.deleteCommunityComment(id)
             if (result.errorMessage != null){
@@ -176,11 +200,11 @@ class CommunityDescViewModel @Inject constructor(
                 }
                 return@launch
             }
-            flag.update{!flag.value}
+            withContext(Dispatchers.Main){ onSuccess() }
         }
     }
     //댓글 신고하기
-    fun reportComment(id: Int) {
+    fun reportComment(id: Int, onSuccess: () -> Unit) {
         viewModelScope.launch {
             val requestDto = TargetRequestDto(id.toString())
             val result = reportRepository.reportCommunityComment(requestDto)
@@ -191,7 +215,9 @@ class CommunityDescViewModel @Inject constructor(
                     ErrorMessageType.EXPIRED_TOKEN.name -> {expiredTokenErrorState.update{true}}
                     else -> {generalErrorState.update{Pair(true, result.errorMessage!!.message)}}
                 }
+                return@launch
             }
+            withContext(Dispatchers.Main){ onSuccess() }
         }
     }
     //댓글 좋아요
@@ -212,15 +238,12 @@ class CommunityDescViewModel @Inject constructor(
         }
     }
     //id 설정
-    fun setId(id: Int?) {
-        if (id == null) {
+    fun setId(newId: Int?) {
+        if (newId == null) {
             generalErrorState.update { Pair(true, "해당 글을 찾을 수 없습니다.") }
             return
-        } else if (id == -1) {
-            generalErrorState.update { Pair(true, "이미 삭제된 게시글 입니다.") }
-            return
         }
-        _id.update { id }
+        id.update { newId }
     }
     private fun getCommentPaging(id: Int) : CommunityCommentPagingSource {
         return CommunityCommentPagingSource(
@@ -233,9 +256,18 @@ class CommunityDescViewModel @Inject constructor(
 sealed interface CommunityDescUiState {
     data object Loading : CommunityDescUiState
     data class CommunityDesc(
-        val community: CommunityDefaultResponseDto,
-    ) : CommunityDescUiState {
-        val photoList = community.communityPhotos.map {it.photoUrl}
-    }
+        val author: String,
+        val category: String,
+        val communityPhotos: ImmutableList<String>,
+        val content: String,
+        val heartCount: Int,
+        val imagesCount: Int,
+        val liked: Boolean,
+        val myProfileImgUrl: String?,
+        val profileImgUrl: String?,
+        val time: String,
+        val title: String,
+        val writed: Boolean,
+    ) : CommunityDescUiState
     data object Error : CommunityDescUiState
 }
\ No newline at end of file
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityEditViewModel.kt b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityEditViewModel.kt
index 25d1dafb5..3f9533003 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityEditViewModel.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityEditViewModel.kt
@@ -1,6 +1,6 @@
 package com.hmoa.feature_community.ViewModel
 
-import android.app.Application
+import android.content.Context
 import android.net.Uri
 import androidx.core.net.toUri
 import androidx.lifecycle.ViewModel
@@ -8,7 +8,9 @@ import androidx.lifecycle.viewModelScope
 import com.hmoa.core_common.ErrorMessageType
 import com.hmoa.core_common.ErrorUiState
 import com.hmoa.core_common.Result
+import com.hmoa.core_common.absolutePath
 import com.hmoa.core_common.asResult
+import com.hmoa.core_common.handleErrorType
 import com.hmoa.core_domain.repository.CommunityRepository
 import com.hmoa.core_model.Category
 import com.hmoa.core_model.data.ErrorMessage
@@ -24,31 +26,14 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import java.io.File
-import java.io.FileOutputStream
 import javax.inject.Inject
 
 @HiltViewModel
 class CommunityEditViewModel @Inject constructor(
-    private val application: Application,
     private val repository: CommunityRepository,
 ) : ViewModel() {
-    private val context = application.applicationContext
-
     //가져올 게시글 id
-    private val _id = MutableStateFlow<Int?>(null)
-    val id get() = _id.asStateFlow()
-
-    //title
-    private val _title = MutableStateFlow("")
-    val title get() = _title.asStateFlow()
-
-    //content
-    private val _content = MutableStateFlow("")
-    val content get() = _content.asStateFlow()
-
-    //category
-    private val _category = MutableStateFlow<Category?>(null)
-    val category get() = _category.asStateFlow()
+    private val id = MutableStateFlow<Int>(-1)
 
     //pictures
     private val _pictures = MutableStateFlow<List<CommunityPhotoDefaultResponseDto>>(listOf())
@@ -82,39 +67,37 @@ class CommunityEditViewModel @Inject constructor(
     )
 
     val uiState: StateFlow<CommunityEditUiState> = combine(id, errorUiState) { communityId, errorState ->
+        if (errorState is ErrorUiState.ErrorData && errorState.isValidate()) throw Exception("")
         val result = repository.getCommunity(communityId!!)
-        if (errorState is ErrorUiState.ErrorData && errorState.generalError.first) throw Exception(errorState.generalError.second)
         if (result.errorMessage is ErrorMessage) throw Exception(result.errorMessage!!.message)
         result.data!!
-    }.asResult()
-        .map { result ->
+    }.asResult().map { result ->
             when (result) {
                 Result.Loading -> CommunityEditUiState.Loading
                 is Result.Success -> {
-                    val data = result.data
-                    _title.update { data.title }
-                    _content.update { data.content }
-                    _category.update {
-                        val category = when (data.category) {
-                            "시향기" -> Category.시향기
-                            "추천" -> Category.추천
-                            "자유" -> Category.자유
-                            else -> throw IllegalArgumentException("올바르지 않은 Category")
-                        }
-                        category
+                    val category = when(result.data.category){
+                        "시향기" -> Category.시향기
+                        "추천" -> Category.추천
+                        "자유" -> Category.자유
+                        else -> throw IllegalArgumentException("올바르지 않은 Category")
                     }
-                    _pictures.update { data.communityPhotos }
-                    _newPictures.update { data.communityPhotos.map { it.photoUrl.toUri() } }
-                    CommunityEditUiState.Success
+                    _pictures.update { result.data.communityPhotos }
+                    _newPictures.update { result.data.communityPhotos.map { it.photoUrl.toUri() } }
+                    CommunityEditUiState.Success(
+                        title = result.data.title,
+                        content = result.data.content,
+                        category = category
+                    )
                 }
                 is Result.Error -> {
-                    if (!generalErrorState.value.first) {
-                        when (result.exception.message) {
-                            ErrorMessageType.EXPIRED_TOKEN.message -> expiredTokenErrorState.update { true }
-                            ErrorMessageType.WRONG_TYPE_TOKEN.message -> wrongTypeTokenErrorState.update { true }
-                            ErrorMessageType.UNKNOWN_ERROR.message -> unLoginedErrorState.update { true }
-                            else -> generalErrorState.update { Pair(true, result.exception.message) }
-                        }
+                    if (result.exception.message != "") {
+                        handleErrorType(
+                            error = result.exception,
+                            onExpiredTokenError = { expiredTokenErrorState.update { true } },
+                            onWrongTypeTokenError = { wrongTypeTokenErrorState.update { true } },
+                            onUnknownError = { unLoginedErrorState.update { true } },
+                            onGeneralError = {generalErrorState.update { Pair(true, result.exception.message) }}
+                        )
                     }
                     CommunityEditUiState.Error
                 }
@@ -126,16 +109,14 @@ class CommunityEditViewModel @Inject constructor(
         )
 
     //id setting
-    fun setId(id: Int?) {
-        _id.update {
-            if (id == null) generalErrorState.update{Pair(true, "Not Found ID")}
-            id
+    fun setId(newId: Int?) {
+        if (newId == null) {
+            generalErrorState.update { Pair(true, "해당 게시글을 찾을 수 없습니다.") }
+            return
         }
+        id.update {newId}
     }
-    //title update
-    fun updateTitle(title: String) = _title.update { title }
-    //content update
-    fun updateContent(content: String) = _content.update { content }
+
     //사진 추가
     fun updatePictures(newPictures: List<Uri>) = _newPictures.update { it.plus(newPictures) }
     //사진 삭제
@@ -143,8 +124,9 @@ class CommunityEditViewModel @Inject constructor(
         _newPictures.update { it.minus(uri) }
         delPicture.add(uri)
     }
+
     //게시글 수정 POST
-    fun updateCommunity() {
+    fun updateCommunity(context: Context, title: String, content: String, onSuccess: () -> Unit) {
         viewModelScope.launch {
             val pictureUris = _pictures.value.map { it.photoUrl.toUri() }
             val addPictures = mutableListOf<Uri>()
@@ -154,25 +136,32 @@ class CommunityEditViewModel @Inject constructor(
                 }
             }
             val images = addPictures.map {
-                val uri = absolutePath(it)
+                val uri = absolutePath(context, it)
                 if (uri == null) generalErrorState.update { Pair(true, "파일 경로가 NULL 입니다.") }
                 File(uri!!)
             }
             val delPictureId = getDeletePictureId(delPicture)
-            if (id.value != null) {
-                val result = repository.postCommunityUpdate(
-                    images = images.toTypedArray(),
-                    title = title.value,
-                    content = content.value,
-                    communityId = id.value!!,
-                    deleteCommunityPhotoIds = delPictureId.toTypedArray()
-                )
-                if (result.errorMessage is ErrorMessage) {generalErrorState.update { Pair(true, result.errorMessage!!.message) }}
-            } else {
-                generalErrorState.update { Pair(true,"id is null") }
+            val response = repository.postCommunityUpdate(
+                images = images.toTypedArray(),
+                title = title,
+                content = content,
+                communityId = id.value,
+                deleteCommunityPhotoIds = delPictureId.toTypedArray()
+            )
+
+            if (response.errorMessage != null) {
+                when(response.errorMessage!!.message){
+                    ErrorMessageType.UNKNOWN_ERROR.name -> unLoginedErrorState.update{true}
+                    ErrorMessageType.WRONG_TYPE_TOKEN.name -> wrongTypeTokenErrorState.update{true}
+                    ErrorMessageType.EXPIRED_TOKEN.name -> expiredTokenErrorState.update{true}
+                    else -> generalErrorState.update{Pair(true, response.errorMessage!!.message)}
+                }
+                return@launch
             }
+            onSuccess()
         }
     }
+
     //삭제할 사진 id 계산
     private fun getDeletePictureId(pictures: List<Uri>): ArrayList<Int> {
         val ids = arrayListOf<Int>()
@@ -184,27 +173,14 @@ class CommunityEditViewModel @Inject constructor(
         }
         return ids
     }
-    private fun absolutePath(uri: Uri): String? {
-        val contentResolver = context.contentResolver
-        val filePath = (context.applicationInfo.dataDir + File.separator + System.currentTimeMillis())
-        val file = File(filePath)
-        try {
-            val inputStream = contentResolver.openInputStream(uri) ?: return null
-            val outputStream = FileOutputStream(file)
-            val buf = ByteArray(1024)
-            var len: Int
-            while (inputStream.read(buf).also { len = it } > 0) outputStream.write(buf, 0, len)
-            outputStream.close()
-            inputStream.close()
-        } catch (ignore: Exception) {
-            return null
-        }
-        return file.absolutePath
-    }
 }
 
 sealed interface CommunityEditUiState {
     data object Loading : CommunityEditUiState
-    data object Success : CommunityEditUiState
+    data class Success(
+        val title: String,
+        val content: String,
+        val category: Category
+    ) : CommunityEditUiState
     data object Error : CommunityEditUiState
 }
\ No newline at end of file
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityHomeViewModel.kt b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityHomeViewModel.kt
index fad85ff01..e3109e71e 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityHomeViewModel.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityHomeViewModel.kt
@@ -2,45 +2,42 @@ package com.hmoa.feature_community.ViewModel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.hmoa.core_common.ErrorMessageType
 import com.hmoa.core_common.ErrorUiState
 import com.hmoa.core_common.Result
 import com.hmoa.core_common.asResult
+import com.hmoa.core_common.handleErrorType
 import com.hmoa.core_domain.repository.CommunityRepository
-import com.hmoa.core_domain.repository.LoginRepository
 import com.hmoa.core_model.response.CommunityByCategoryResponseDto
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
 import javax.inject.Inject
 
 @HiltViewModel
 class CommunityHomeViewModel @Inject constructor(
-    private val communityRepository: CommunityRepository,
-    private val loginRepository: LoginRepository,
+    private val communityRepository: CommunityRepository
 ) : ViewModel() {
-    private val authToken = MutableStateFlow<String?>(null)
-
-    private val _community = MutableStateFlow(emptyList<CommunityByCategoryResponseDto>())
-    val community get() = _community.asStateFlow()
-
     private var expiredTokenErrorState = MutableStateFlow<Boolean>(false)
     private var wrongTypeTokenErrorState = MutableStateFlow<Boolean>(false)
     private var unLoginedErrorState = MutableStateFlow<Boolean>(false)
-    private var memberNotFoundErrorState = MutableStateFlow<Boolean>(false)
     private var generalErrorState = MutableStateFlow<Pair<Boolean, String?>>(Pair(false, null))
     val errorUiState: StateFlow<ErrorUiState> = combine(
         expiredTokenErrorState,
         wrongTypeTokenErrorState,
         unLoginedErrorState,
-        memberNotFoundErrorState,
         generalErrorState
-    ) { expiredTokenError, wrongTypeTokenError, unknownError, memberNotFoundError, generalError ->
+    ) { expiredTokenError, wrongTypeTokenError, unknownError, generalError ->
         ErrorUiState.ErrorData(
             expiredTokenError = expiredTokenError,
             wrongTypeTokenError = wrongTypeTokenError,
             unknownError = unknownError,
-            memberNotFoundError = memberNotFoundError,
             generalError = generalError
         )
     }.stateIn(
@@ -49,55 +46,36 @@ class CommunityHomeViewModel @Inject constructor(
         initialValue = ErrorUiState.Loading
     )
 
-    init {
-        getAuthToken()
-    }
-
     val uiState: StateFlow<CommunityHomeUiState> = flow {
         val result = communityRepository.getCommunitiesHome()
-        if (result.errorMessage != null) {
-            throw Exception(result.errorMessage!!.message)
-        }
+        if (result.errorMessage != null) throw Exception(result.errorMessage!!.message)
         emit(result.data!!)
-    }.asResult()
-        .map { result ->
-            when (result) {
-                is Result.Loading -> CommunityHomeUiState.Loading
-                is Result.Success -> CommunityHomeUiState.Community(result.data)
-                is Result.Error -> {
-                    when (result.exception.message) {
-                        ErrorMessageType.EXPIRED_TOKEN.message -> expiredTokenErrorState.update { true }
-                        ErrorMessageType.WRONG_TYPE_TOKEN.message -> wrongTypeTokenErrorState.update { true }
-                        ErrorMessageType.UNKNOWN_ERROR.message -> unLoginedErrorState.update { true }
-                        ErrorMessageType.MEMBER_NOT_FOUND.message -> memberNotFoundErrorState.update { true }
-                        else -> generalErrorState.update { Pair(true, result.exception.message) }
-                    }
-                    CommunityHomeUiState.Error
-                }
-            }
-        }.stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(1_000),
-            initialValue = CommunityHomeUiState.Loading
-        )
-
-    fun hasToken(): Boolean = authToken.value != null
-
-    // get token
-    private fun getAuthToken() {
-        viewModelScope.launch {
-            loginRepository.getAuthToken().onEmpty { }.collectLatest {
-                authToken.value = it
+    }.asResult().map { result ->
+        when (result) {
+            Result.Loading -> CommunityHomeUiState.Loading
+            is Result.Success -> CommunityHomeUiState.Community(result.data.toImmutableList())
+            is Result.Error -> {
+                handleErrorType(
+                    error = result.exception,
+                    onExpiredTokenError = {expiredTokenErrorState.update { true }},
+                    onWrongTypeTokenError = {wrongTypeTokenErrorState.update { true }},
+                    onUnknownError = {unLoginedErrorState.update { true }},
+                    onGeneralError = {generalErrorState.update { Pair(true, result.exception.message) }}
+                )
+                CommunityHomeUiState.Error
             }
         }
-    }
+    }.stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.WhileSubscribed(3_000),
+        initialValue = CommunityHomeUiState.Loading
+    )
 }
 
 sealed interface CommunityHomeUiState {
     data object Loading : CommunityHomeUiState
     data class Community(
-        val communities: List<CommunityByCategoryResponseDto>
+        val communities: kotlinx.collections.immutable.ImmutableList<CommunityByCategoryResponseDto>
     ) : CommunityHomeUiState
-
     data object Error : CommunityHomeUiState
 }
\ No newline at end of file
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityMainViewModel.kt b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityMainViewModel.kt
index 4cdd9919b..a02ca278e 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityMainViewModel.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityMainViewModel.kt
@@ -8,29 +8,31 @@ import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import com.hmoa.core_common.ErrorUiState
 import com.hmoa.core_domain.repository.CommunityRepository
-import com.hmoa.core_domain.repository.LoginRepository
 import com.hmoa.core_model.Category
 import com.hmoa.core_model.response.CommunityByCategoryResponseDto
 import com.hmoa.feature_community.CommunityPagingSource
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
 import javax.inject.Inject
 
 const val PAGE_SIZE = 10
 
 @HiltViewModel
 class CommunityMainViewModel @Inject constructor(
-    private val communityRepository: CommunityRepository,
-    private val loginRepository: LoginRepository
+    private val communityRepository: CommunityRepository
 ) : ViewModel() {
-    private val authToken = MutableStateFlow<String?>(null)
-
     //type 정보
     private val _type = MutableStateFlow(Category.추천)
     val type get() = _type.asStateFlow()
     private var _communities = MutableStateFlow<PagingData<CommunityByCategoryResponseDto>?>(null)
-    val _enableLoginErrorDialog = MutableStateFlow<Boolean>(false)
 
     private var expiredTokenErrorState = MutableStateFlow<Boolean>(false)
     private var wrongTypeTokenErrorState = MutableStateFlow<Boolean>(false)
@@ -54,28 +56,17 @@ class CommunityMainViewModel @Inject constructor(
         initialValue = ErrorUiState.Loading
     )
 
-    val uiState: StateFlow<CommunityMainUiState> = combine(
-        _communities,
-        _enableLoginErrorDialog
-    ) { communities, isLoginUser ->
-        CommunityMainUiState.Community(
-            communities, isLoginUser
-        )
+    val uiState: StateFlow<CommunityMainUiState> = errorUiState.map{ errState ->
+        CommunityMainUiState.Community
     }.stateIn(
         scope = viewModelScope,
         started = SharingStarted.WhileSubscribed(3_000),
         initialValue = CommunityMainUiState.Loading
     )
 
-    init {
-        getAuthToken()
-    }
-
     fun communityPagingSource(): Flow<PagingData<CommunityByCategoryResponseDto>> = Pager(
         config = PagingConfig(pageSize = PAGE_SIZE),
-        pagingSourceFactory = {
-            getCommunityPaging(type.value.name)
-        }
+        pagingSourceFactory = { getCommunityPaging(type.value.name) }
     ).flow.cachedIn(viewModelScope)
 
     //category 정보 변경
@@ -88,28 +79,10 @@ class CommunityMainViewModel @Inject constructor(
         communityRepository = communityRepository,
         category = category
     )
-
-    //err state update
-    fun updateLoginError() {
-        unLoginedErrorState.update { true }
-    }
-
-    fun hasToken() = authToken.value != null
-
-    //get token
-    private fun getAuthToken() {
-        viewModelScope.launch {
-            loginRepository.getAuthToken().onEmpty { }.collectLatest { authToken.value = it }
-        }
-    }
 }
 
 sealed interface CommunityMainUiState {
     data object Loading : CommunityMainUiState
-    data class Community(
-        val communities: PagingData<CommunityByCategoryResponseDto>?,
-        val enableLoginErrorDialog: Boolean
-    ) : CommunityMainUiState
-
+    data object Community : CommunityMainUiState
     data object Error : CommunityMainUiState
 }
\ No newline at end of file
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityPostViewModel.kt b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityPostViewModel.kt
index 602966002..f72585bea 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityPostViewModel.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunityPostViewModel.kt
@@ -4,7 +4,9 @@ import android.app.Application
 import android.net.Uri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.hmoa.core_common.ErrorMessageType
 import com.hmoa.core_common.ErrorUiState
+import com.hmoa.core_common.absolutePath
 import com.hmoa.core_domain.repository.CommunityRepository
 import com.hmoa.core_model.Category
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -17,7 +19,6 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import java.io.File
-import java.io.FileOutputStream
 import javax.inject.Inject
 
 @HiltViewModel
@@ -75,10 +76,10 @@ class CommunityPostViewModel @Inject constructor(
     }
 
     //게시글 게시
-    fun postCommunity(title: String, content: String, category: Category) {
+    fun postCommunity(title: String, content: String, category: Category, onSuccess: () -> Unit,) {
         val images = arrayListOf<File>()
         pictures.value.map { picture ->
-            val path = absolutePath(picture) ?: throw NullPointerException("file path is NULL")
+            val path = absolutePath(context, picture) ?: throw NullPointerException("file path is NULL")
             images.add(File(path))
         }
         viewModelScope.launch {
@@ -89,32 +90,15 @@ class CommunityPostViewModel @Inject constructor(
                 content = content
             )
             if (result.errorMessage != null) {
-                _generalErrorState.update { Pair(true, result.errorMessage!!.message) }
+                when(result.errorMessage!!.message){
+                    ErrorMessageType.UNKNOWN_ERROR.name -> _unLoginedErrorState.update{true}
+                    ErrorMessageType.WRONG_TYPE_TOKEN.name -> _wrongTypeTokenErrorState.update{true}
+                    ErrorMessageType.EXPIRED_TOKEN.name -> _expiredTokenErrorState.update{true}
+                    else -> _generalErrorState.update{Pair(true, result.errorMessage!!.message)}
+                }
                 return@launch
             }
-            isDone.update{true}
+            onSuccess()
         }
     }
-
-    private fun absolutePath(uri: Uri): String? {
-        val contentResolver = context.contentResolver
-
-        val filePath = (context.applicationInfo.dataDir + File.separator + System.currentTimeMillis())
-        val file = File(filePath)
-
-        try {
-            val inputStream = contentResolver.openInputStream(uri) ?: return null
-
-            val outputStream = FileOutputStream(file)
-
-            val buf = ByteArray(1024)
-            var len: Int
-            while (inputStream.read(buf).also { len = it } > 0) outputStream.write(buf, 0, len)
-            outputStream.close()
-            inputStream.close()
-        } catch (ignore: Exception) {
-            return null
-        }
-        return file.absolutePath
-    }
 }
\ No newline at end of file
diff --git a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunitySearchViewModel.kt b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunitySearchViewModel.kt
index 94ada361c..c9231957e 100644
--- a/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunitySearchViewModel.kt
+++ b/feature-community/src/main/java/com/hmoa/feature_community/ViewModel/CommunitySearchViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
 import com.hmoa.core_common.ErrorUiState
 import com.hmoa.core_common.Result
 import com.hmoa.core_common.asResult
+import com.hmoa.core_common.handleErrorType
 import com.hmoa.core_domain.repository.SearchRepository
 import com.hmoa.core_model.response.CommunityByCategoryResponseDto
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -13,6 +14,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
@@ -56,20 +58,22 @@ class CommunitySearchViewModel @Inject constructor(
         _searchWord,
         _flag
     ) { word, flag ->
-        if (_searchWord.value.isEmpty()) {
-            return@combine emptyList()
-        }
+        if (_searchWord.value.isEmpty()) { return@combine emptyList() }
         val result = searchRepository.getCommunity(0, word)
-        if (result.errorMessage != null) {
-            throw Exception(result.errorMessage!!.message)
-        }
+        if (result.errorMessage != null) { throw Exception(result.errorMessage!!.message) }
         result.data!!
-    }.asResult().map { result ->
+    }.debounce(500).asResult().map { result ->
         when (result) {
             is Result.Loading -> CommunitySearchUiState.Loading
             is Result.Success -> CommunitySearchUiState.SearchResult(result.data)
             is Result.Error -> {
-                generalErrorState.update{ Pair(true, result.exception.message)}
+                handleErrorType(
+                    error = result.exception,
+                    onExpiredTokenError = {expiredTokenErrorState.update{true}},
+                    onUnknownError = {unLoginedErrorState.update{true}},
+                    onWrongTypeTokenError = {wrongTypeTokenErrorState.update{true}},
+                    onGeneralError = {generalErrorState.update{Pair(true, result.exception.message)}},
+                )
                 CommunitySearchUiState.Error
             }
         }
diff --git a/feature-fcm/build.gradle.kts b/feature-fcm/build.gradle.kts
index e671685a9..502884900 100644
--- a/feature-fcm/build.gradle.kts
+++ b/feature-fcm/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -32,67 +31,37 @@ android {
     kotlinOptions {
         jvmTarget = "17"
     }
-    composeOptions{
-        kotlinCompilerExtensionVersion = "1.5.0"
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
-    buildFeatures{
+    buildFeatures {
         compose = true
         buildConfig = true
     }
 }
 
 dependencies {
-    val hilt_version = "2.48.1"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-
     implementation(project(":core-designsystem"))
     implementation(project(":core-domain"))
     implementation(project(":core-model"))
     implementation(project(":core-common"))
 
-    //material3
-    implementation("androidx.compose.material3:material3:1.2.0")
-    implementation("androidx.compose.material:material:1.2.0-beta02")
-
-    //preview
-    implementation("androidx.compose.ui:ui-tooling-preview")
-
-    implementation("androidx.compose.ui:ui:1.1.0")
-
-    //bottom navigation
-    implementation("androidx.navigation:navigation-compose:2.7.0")
+    implementation(libs.bundles.ui)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.bundles.kakao.login)
+    implementation(libs.bundles.basic)
 
-    //collectAsStateWithLifecycle 함수
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0")
-
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
-
-    implementation("com.kakao.sdk:v2-all:2.19.0")// 전체 모듈 설치, 2.11.0 버전부터 지원
-    implementation("com.kakao.sdk:v2-user:2.19.0") // 카카오 로그인 API 모듈
-    implementation("com.kakao.sdk:v2-talk:2.19.0") // 카카오톡 채널, 카카오톡 소셜, 카카오톡 메시지 API 모듈
-    implementation("com.kakao.sdk:v2-share:2.19.0") // 카카오톡 공유 API 모듈
-    implementation("com.kakao.sdk:v2-friend:2.19.0") // 피커 API 모듈
-    implementation("com.kakao.sdk:v2-cert:2.19.0") // 카카오 인증서비스 API 모듈
-
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")
+    implementation(libs.bundles.hilt)
+    kapt(libs.hilt.android.compiler)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.viewmodel)
 
     //unit test
-    val mockito_version = "4.8.0"
-    testImplementation("com.google.dagger:hilt-android-testing:$hilt_version")
-    testImplementation("org.mockito:mockito-core:$mockito_version")
-    testImplementation("org.mockito:mockito-inline:$mockito_version")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.2")
-    testImplementation("org.jetbrains.kotlin:kotlin-reflect:1.5.30")
-    kaptTest("com.google.dagger:hilt-android-compiler:$hilt_version")
-}
\ No newline at end of file
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
+    debugImplementation(libs.ui.tooling)
+    testImplementation(libs.bundles.unit.test)
+    testImplementation(libs.hilt.android.test)
+    kaptTest(libs.hilt.android.compiler)
+}
diff --git a/feature-fcm/src/main/java/com/hmoa/feature_fcm/AlarmNavigation.kt b/feature-fcm/src/main/java/com/hmoa/feature_fcm/AlarmNavigation.kt
index a349c4965..696bd2c1c 100644
--- a/feature-fcm/src/main/java/com/hmoa/feature_fcm/AlarmNavigation.kt
+++ b/feature-fcm/src/main/java/com/hmoa/feature_fcm/AlarmNavigation.kt
@@ -3,6 +3,7 @@ package com.hmoa.feature_fcm
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 
 const val ALARM_ROUTE = "ALARM_ROUTE"
 
@@ -10,7 +11,7 @@ fun NavController.navigateToAlarmScreen() = navigate(ALARM_ROUTE)
 
 fun NavGraphBuilder.alarmRoute(
     onNavBack : () -> Unit,
-    onNavCommunityDesc : (Int) -> Unit,
+    onNavCommunityDesc : (befRoute: CommunityRoute, communityId: Int) -> Unit,
     onNavPerfumeComment : (Int) -> Unit,
 ){
     composable(route = ALARM_ROUTE){
diff --git a/feature-fcm/src/main/java/com/hmoa/feature_fcm/AlarmScreen.kt b/feature-fcm/src/main/java/com/hmoa/feature_fcm/AlarmScreen.kt
index 8eee0569d..b2ddf909a 100644
--- a/feature-fcm/src/main/java/com/hmoa/feature_fcm/AlarmScreen.kt
+++ b/feature-fcm/src/main/java/com/hmoa/feature_fcm/AlarmScreen.kt
@@ -3,12 +3,18 @@ package com.hmoa.feature_fcm
 import android.net.Uri
 import android.util.Log
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -24,17 +30,19 @@ import com.hmoa.core_designsystem.component.AlarmItem
 import com.hmoa.core_designsystem.component.AppLoadingScreen
 import com.hmoa.core_designsystem.component.ErrorUiSetView
 import com.hmoa.core_designsystem.component.TopBar
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 import com.hmoa.core_model.response.AlarmResponse
 
 @Composable
 fun AlarmScreenRoute(
     onNavBack: () -> Unit,
-    onNavCommunityDesc: (Int) -> Unit,
-    onNavPerfumeComment: (Int) -> Unit,
+    onNavCommunityDesc: (befRoute: CommunityRoute, communityId: Int) -> Unit,
+    onNavPerfumeComment: (perfumeId: Int) -> Unit,
     viewModel: AlarmViewModel = hiltViewModel()
 ) {
     val uiState = viewModel.uiState.collectAsStateWithLifecycle()
     val errorState = viewModel.errorUiState.collectAsStateWithLifecycle()
+    val onPostClick = remember<(Int) -> Unit>{{onNavCommunityDesc(CommunityRoute.CommunityHomeRoute, it)}}
     AlarmScreen(
         uiState = uiState.value,
         errState = errorState.value,
@@ -42,7 +50,7 @@ fun AlarmScreenRoute(
             val uri = Uri.parse(type)
             val type = uri.host
             when (type) {
-                "community" -> onNavCommunityDesc(id)
+                "community" -> onPostClick(id)
                 "perfume_comment" -> onNavPerfumeComment(id)
                 else -> {
                     Log.d("NAVIGATION TEST", "type : ${type}")
diff --git a/feature-hbti/build.gradle.kts b/feature-hbti/build.gradle.kts
index 331c6caca..2461ee335 100644
--- a/feature-hbti/build.gradle.kts
+++ b/feature-hbti/build.gradle.kts
@@ -1,11 +1,10 @@
 import java.util.Properties
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
     id("kotlinx-serialization")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -24,7 +23,11 @@ android {
         consumerProguardFiles("consumer-rules.pro")
         buildConfigField("String", "PRIVACY_CONSENT_URL", localProperties.getProperty("PRIVACY_CONSENT_URL"))
         buildConfigField("String", "ADDRESS_SEARCH_URL", localProperties.getProperty("ADDRESS_SEARCH_URL"))
-        buildConfigField("String", "BOOTPAY_APPLICATION_ID", localProperties.getProperty("BOOTPAY_APPLICATION_ID") as String)
+        buildConfigField(
+            "String",
+            "BOOTPAY_APPLICATION_ID",
+            localProperties.getProperty("BOOTPAY_APPLICATION_ID") as String
+        )
         buildConfigField("String", "SHIPPING_REFUND_URL", localProperties.getProperty("SHIPPING_REFUND_URL") as String)
     }
 
@@ -42,7 +45,7 @@ android {
         jvmTarget = "1.8"
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     buildFeatures {
         compose = true
@@ -57,64 +60,45 @@ android {
 }
 
 dependencies {
-    val hilt_version = "2.48.1"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-    val kotlinx_version = "1.5.0"
-
     implementation(project(":core-designsystem"))
     implementation(project(":core-domain"))
     implementation(project(":core-model"))
     implementation(project(":core-common"))
     implementation(project(":core-repository"))
 
-    implementation("io.github.bootpay:android:4.4.0") //boot pay
-    implementation("androidx.paging:paging-compose:3.2.0") //paging
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_version")
-    implementation("com.google.code.gson:gson:2.9.0")
-
-    implementation("androidx.compose.ui:ui:1.1.0")
-    implementation("androidx.compose.material3:material3:1.2.0")
-    implementation("androidx.compose.material:material:1.2.0-beta02")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.navigation:navigation-compose:2.7.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0")
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
+    implementation(libs.bootpay)
+    implementation(libs.paging.compose)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.bundles.ui)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.bundles.basic)
+    implementation(libs.google.material)
+    implementation(libs.core.gson)
 
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("com.google.android.material:material:1.12.0")
+    implementation(libs.bundles.hilt)
+    kapt(libs.hilt.android.compiler)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.compiler)
 
-    testImplementation("junit:junit:4.13.2")
-    implementation("androidx.test.ext:junit-ktx:1.2.1")
-    //unit test
-    val mockito_version = "4.8.0"
-    debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")
-    testImplementation("org.mockito:mockito-core:$mockito_version")
-    testImplementation("org.mockito:mockito-inline:$mockito_version")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.2")
-    testImplementation("org.jetbrains.kotlin:kotlin-reflect:1.5.30")
-    //hilt test
-    kaptTest("com.google.dagger:hilt-android-compiler:$hilt_version") // ...with Kotlin.
-    testImplementation("com.google.dagger:hilt-android-testing:$hilt_version") // For Robolectric tests.
+    implementation(libs.junit.ktx)
+    debugImplementation(libs.ui.tooling)
+    testImplementation(libs.bundles.unit.test)
+    kaptTest(libs.hilt.android.compiler)
+    testImplementation(libs.hilt.android.test)
 
     //androidTest
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.6.8")
-    debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.8")
+    androidTestImplementation(libs.ui.test.junit4)
+//    debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.8")
+    debugImplementation(libs.ui.test.manifest)
     // AndroidX Test 라이브러리 - Android 기기에서 실행되는 테스트를 위한 라이브러리
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-    //Mockito androidTest
-    androidTestImplementation("org.mockito:mockito-core:5.3.1")
-    androidTestImplementation("org.mockito:mockito-android:5.3.1")
-    androidTestImplementation("org.mockito.kotlin:mockito-kotlin:5.0.0")
-    //Hilt androidTest
-    androidTestImplementation("com.google.dagger:hilt-android-testing:$hilt_version")
-    // ...with Kotlin.
-    kaptAndroidTest("com.google.dagger:hilt-android-compiler:$hilt_version")
-}
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
+    testImplementation(libs.bundles.android.test.mockito) //Mockito androidTest
+    androidTestImplementation(libs.hilt.android.test) //Hilt androidTest
+    kaptAndroidTest(libs.hilt.android.compiler) // ...with Kotlin.
+    debugImplementation(libs.ui.tooling)
+
+    //androidTest
+    androidTestImplementation(libs.bundles.android.test.mockito) //Mockito androidTest
+}
\ No newline at end of file
diff --git a/feature-hbti/src/main/java/com/hmoa/feature_hbti/viewmodel/PerfumeRecommendationViewModel.kt b/feature-hbti/src/main/java/com/hmoa/feature_hbti/viewmodel/PerfumeRecommendationViewModel.kt
index 8e54a0186..5e6a7c5c4 100644
--- a/feature-hbti/src/main/java/com/hmoa/feature_hbti/viewmodel/PerfumeRecommendationViewModel.kt
+++ b/feature-hbti/src/main/java/com/hmoa/feature_hbti/viewmodel/PerfumeRecommendationViewModel.kt
@@ -85,13 +85,15 @@ class PerfumeRecommendationViewModel @Inject constructor(
                     _perfumeSurveyContentsState.update { result.data.data }
                     _noteCategoryTagsState.update { result.data.data?.noteCategoryTags }
                     _isNextButtonAvailableState.update { List(2) { false } } //price, note 2페이지에 대한 버튼 상태 초기화
+                    println("isNextButtonAvailableState: ${_isNextButtonAvailableState.value}")
                 }
 
                 is Result.Error -> {
-
+                    println("Error:${result.exception.message}")
                 }
 
                 is Result.Loading -> {
+                    println("Loading")
                     PerfumeRecommendationUiState.Loading
                 }
             }
@@ -318,4 +320,4 @@ sealed interface PerfumeRecommendationUiState {
     ) : PerfumeRecommendationUiState
 
     data object Error : PerfumeRecommendationUiState
-}
\ No newline at end of file
+}
diff --git a/feature-hbti/src/test/java/com/hmoa/feature_hbti/HbtiSurveyViewModelTest.kt b/feature-hbti/src/test/java/com/hmoa/feature_hbti/HbtiSurveyViewModelTest.kt
index 0c8be0f45..1a1c16d03 100644
--- a/feature-hbti/src/test/java/com/hmoa/feature_hbti/HbtiSurveyViewModelTest.kt
+++ b/feature-hbti/src/test/java/com/hmoa/feature_hbti/HbtiSurveyViewModelTest.kt
@@ -19,6 +19,7 @@ import org.junit.Test
 import org.mockito.Mockito
 import org.mockito.Mockito.*
 
+
 class HbtiSurveyViewModelTest : TestCase() {
     @get:Rule(order = 0)
     val coroutineRule = TestCoroutineRule()
diff --git a/feature-hbti/src/test/java/com/hmoa/feature_hbti/PerfumeRecommendationViewmodelTest.kt b/feature-hbti/src/test/java/com/hmoa/feature_hbti/PerfumeRecommendationViewmodelTest.kt
index ae57ce29f..c1fbcc280 100644
--- a/feature-hbti/src/test/java/com/hmoa/feature_hbti/PerfumeRecommendationViewmodelTest.kt
+++ b/feature-hbti/src/test/java/com/hmoa/feature_hbti/PerfumeRecommendationViewmodelTest.kt
@@ -12,6 +12,7 @@ import com.hmoa.core_model.response.PerfumeRecommendResponseDto
 import com.hmoa.core_model.response.PerfumeRecommendsResponseDto
 import com.hmoa.feature_hbti.viewmodel.PerfumeRecommendationViewModel
 import junit.framework.TestCase
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.junit.Before
 import org.junit.Rule
@@ -100,7 +101,8 @@ class PerfumeRecommendationViewmodelTest : TestCase() {
 
     @Test
     fun `test_getSurveyQuestions_checkIfInitializedStates`() = coroutineRule.runTest {
-        viewmodel.getSurveyResult()
+        launch { viewmodel.getSurveyResult() }.join()
+        println("기다림 완료")
         assertEquals(perfumeSurveyQuestions.data, viewmodel.perfumeSurveyContentsState.value)
         assertEquals(perfumeSurveyQuestions.data?.noteCategoryTags, viewmodel.noteCategoryTagsState.value)
         assertEquals(listOf(false, false), viewmodel.isNextButtonAvailableState.value)
@@ -279,4 +281,4 @@ class PerfumeRecommendationViewmodelTest : TestCase() {
         )
         assertEquals(expectedSurveyAnswerRequestDto, result)
     }
-}
\ No newline at end of file
+}
diff --git a/feature-home/build.gradle.kts b/feature-home/build.gradle.kts
index c4ff0e444..bb61acaef 100644
--- a/feature-home/build.gradle.kts
+++ b/feature-home/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -31,43 +30,47 @@ android {
         jvmTarget = "1.8"
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     buildFeatures {
         compose = true
     }
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=${project.buildDir.absolutePath}/compose_metrics",
+        )
+    }
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${project.buildDir.absolutePath}/compose_reports",
+        )
+    }
 }
 
 dependencies {
-
-    implementation("com.google.firebase:firebase-messaging-ktx:23.4.1")
-    val hilt_version = "2.44"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-
     implementation(project(":core-designsystem"))
     implementation(project(":core-domain"))
     implementation(project(":core-model"))
     implementation(project(":core-common"))
 
-    implementation("androidx.compose.material:material:1.2.0-beta02")
-    implementation("androidx.compose.material3:material3:1.1.0")
-    implementation("androidx.paging:paging-compose:3.2.0")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.ui:ui:1.1.0")
-    implementation("androidx.navigation:navigation-compose:2.7.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0")
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
+    implementation(libs.bundles.ui)
+    implementation(libs.bundles.firebase)
+    implementation(libs.paging.compose)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.kotlinx.collections.immutable)
+    implementation(libs.bundles.basic)
+
+    implementation(libs.bundles.hilt)
+    kapt(libs.hilt.android.compiler)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.viewmodel)
 
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.5.2")
-}
\ No newline at end of file
+    androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.espresso)
+    debugImplementation(libs.ui.tooling)
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(libs.junit.jupiter.engine)
+}
diff --git a/feature-home/src/main/java/com/hmoa/feature_home/PerfumeNameSearchPagingSource.kt b/feature-home/src/main/java/com/hmoa/feature_home/PerfumeNameSearchPagingSource.kt
deleted file mode 100644
index e42c5731d..000000000
--- a/feature-home/src/main/java/com/hmoa/feature_home/PerfumeNameSearchPagingSource.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.hmoa.feature_home
-
-import androidx.paging.PagingSource
-import androidx.paging.PagingState
-import com.hmoa.core_domain.repository.SearchRepository
-import com.hmoa.core_model.response.PerfumeNameSearchResponseDto
-
-class PerfumeNameSearchPagingSource(
-    val searchRepository: SearchRepository,
-    val word: String
-) : PagingSource<Int, PerfumeNameSearchResponseDto>() {
-    override fun getRefreshKey(state: PagingState<Int, PerfumeNameSearchResponseDto>): Int? {
-        return state.anchorPosition?.let {
-            state.closestPageToPosition(it)?.prevKey?.plus(1)
-                ?: state.closestPageToPosition(it)?.nextKey?.minus(1)
-        }
-    }
-
-    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, PerfumeNameSearchResponseDto> {
-        val pageNumber = params.key ?: 0
-        try {
-            val response = searchRepository.getPerfumeName(page = pageNumber, searchWord = word)
-
-            if (response.errorMessage != null) {
-                throw Exception(response.errorMessage!!.message)
-            }
-
-            val prevKey = if (pageNumber > 0) pageNumber - 1 else null
-            val nextKey = if (response.data!!.isEmpty()) null else pageNumber + 1
-
-            return LoadResult.Page(
-                data = response.data!!,
-                prevKey = prevKey,
-                nextKey = nextKey
-            )
-        } catch (e: Exception) {
-            return LoadResult.Error(e)
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/feature-home/src/main/java/com/hmoa/feature_home/PerfumePagingSource.kt b/feature-home/src/main/java/com/hmoa/feature_home/PerfumePagingSource.kt
new file mode 100644
index 000000000..d5ee53887
--- /dev/null
+++ b/feature-home/src/main/java/com/hmoa/feature_home/PerfumePagingSource.kt
@@ -0,0 +1,36 @@
+package com.hmoa.feature_home
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+
+class PerfumePagingSource<T : Any, R>(
+    private val fetcher: suspend (pageNumber: Int) -> R,
+    private val mapper: (R) -> List<T>
+) : PagingSource<Int, T>() {
+
+    override fun getRefreshKey(state: PagingState<Int, T>): Int? {
+        return state.anchorPosition?.let {
+            state.closestPageToPosition(it)?.prevKey?.plus(1)
+                ?: state.closestPageToPosition(it)?.nextKey?.minus(1)
+        }
+    }
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, T> {
+        val pageNumber = params.key ?: 0
+        return try {
+            val response = fetcher(pageNumber)
+            val data = mapper(response)
+
+            val prevKey = if (pageNumber > 0) pageNumber - 1 else null
+            val nextKey = if (data.isEmpty()) null else pageNumber + 1
+
+            LoadResult.Page(
+                data = data,
+                prevKey = prevKey,
+                nextKey = nextKey
+            )
+        } catch (e: Exception) {
+            LoadResult.Error(e)
+        }
+    }
+}
diff --git a/feature-home/src/main/java/com/hmoa/feature_home/PerfumeSearchPagingSource.kt b/feature-home/src/main/java/com/hmoa/feature_home/PerfumeSearchPagingSource.kt
deleted file mode 100644
index d10a2ae3f..000000000
--- a/feature-home/src/main/java/com/hmoa/feature_home/PerfumeSearchPagingSource.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.hmoa.feature_home
-
-import androidx.paging.PagingSource
-import androidx.paging.PagingState
-import com.hmoa.core_domain.repository.SearchRepository
-import com.hmoa.core_model.response.PerfumeSearchResponseDto
-
-class PerfumeSearchPagingSource(
-    val searchRepository: SearchRepository,
-    val word: String
-) : PagingSource<Int, PerfumeSearchResponseDto>() {
-    override fun getRefreshKey(state: PagingState<Int, PerfumeSearchResponseDto>): Int? {
-        return state.anchorPosition?.let {
-            state.closestPageToPosition(it)?.prevKey?.plus(1)
-                ?: state.closestPageToPosition(it)?.nextKey?.minus(1)
-        }
-    }
-
-    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, PerfumeSearchResponseDto> {
-        val pageNumber = params.key ?: 0
-        try {
-            val response = searchRepository.getPerfume(page = pageNumber, searchWord = word)
-
-            if (response.errorMessage != null) {
-                throw Exception(response.errorMessage!!.message)
-            }
-
-            val prevKey = if (pageNumber > 0) pageNumber - 1 else null
-            val nextKey = if (response.data!!.isEmpty()) null else pageNumber + 1
-
-            return LoadResult.Page(
-                data = response.data!!,
-                prevKey = prevKey,
-                nextKey = nextKey
-            )
-        } catch (e: Exception) {
-            return LoadResult.Error(e)
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/feature-home/src/main/java/com/hmoa/feature_home/screen/AllPerfumeScreen.kt b/feature-home/src/main/java/com/hmoa/feature_home/screen/AllPerfumeScreen.kt
index 612cb2bee..554aa73c7 100644
--- a/feature-home/src/main/java/com/hmoa/feature_home/screen/AllPerfumeScreen.kt
+++ b/feature-home/src/main/java/com/hmoa/feature_home/screen/AllPerfumeScreen.kt
@@ -26,6 +26,7 @@ import com.hmoa.core_designsystem.theme.CustomColor
 import com.hmoa.core_domain.entity.data.AllPerfumeScreenId
 import com.hmoa.core_model.response.HomeMenuAllResponseDto
 import com.hmoa.feature_home.viewmodel.AllPerfumeViewModel
+import kotlinx.collections.immutable.ImmutableList
 
 fun String?.mapToAllPerfumeScreenId(): AllPerfumeScreenId {
     var result: AllPerfumeScreenId? = null
@@ -98,7 +99,7 @@ fun AllPerfumeScreen(
 @Composable
 fun AllPerfumeContent(
     onNavBack: () -> Unit,
-    perfumeList: List<HomeMenuAllResponseDto>?,
+    perfumeList: ImmutableList<HomeMenuAllResponseDto>?,
     onPerfumeClick: (perfumeId: Int) -> Unit
 ) {
     Column(
@@ -123,7 +124,7 @@ fun AllPerfumeContent(
 
 @Composable
 fun PerfumeAllList(
-    perfumeList: List<HomeMenuAllResponseDto>?,
+    perfumeList: ImmutableList<HomeMenuAllResponseDto>?,
     onClickPerfume: (perfumeId: Int) -> Unit
 ) {
     LazyVerticalGrid(
diff --git a/feature-home/src/main/java/com/hmoa/feature_home/screen/HomeScreen.kt b/feature-home/src/main/java/com/hmoa/feature_home/screen/HomeScreen.kt
index b2fc80858..43cf5ddab 100644
--- a/feature-home/src/main/java/com/hmoa/feature_home/screen/HomeScreen.kt
+++ b/feature-home/src/main/java/com/hmoa/feature_home/screen/HomeScreen.kt
@@ -34,6 +34,7 @@ import com.hmoa.core_domain.entity.data.AllPerfumeScreenId
 import com.hmoa.core_model.response.HomeMenuDefaultResponseDto
 import com.hmoa.core_model.response.HomeMenuPerfumeResponseDto
 import com.hmoa.feature_home.viewmodel.HomeViewModel
+import kotlinx.collections.immutable.toImmutableList
 
 @Composable
 fun HomeRoute(
@@ -102,7 +103,11 @@ fun TopMenu(
                 )
             }
             FirstMenuView(
-                (firstMenuWithBannerState as HomeViewModel.BannerWithFirstMenuState.Data).firstMenu!!,
+                (firstMenuWithBannerState as HomeViewModel.BannerWithFirstMenuState.Data).firstMenu
+                    ?: HomeMenuDefaultResponseDto(
+                        perfumeList = emptyList<HomeMenuPerfumeResponseDto>().toImmutableList(),
+                        title = ""
+                    ),
                 { onPerfumeClick(it) })
         }
 
@@ -126,7 +131,7 @@ fun BottomMenu(
             BottomMenuContent(
                 onPerfumeClick = { onPerfumeClick(it) },
                 onAllPerfumeClick = { onAllPerfumeClick(it) },
-                (bottomMenuState as HomeViewModel.BottomMenuState.Data).bottomMenu!!
+                (bottomMenuState as HomeViewModel.BottomMenuState.Data).bottomMenu
             )
             HmoaCompanyMetaData()
         }
@@ -315,10 +320,10 @@ private fun FirstMenuView(firstMenu: HomeMenuDefaultResponseDto, onPerfumeClick:
         fontSize = 14.sp,
         fontWeight = FontWeight.Medium,
         modifier = Modifier
-            .padding(horizontal = 16.dp)
-            .padding(vertical = 12.dp).fillMaxWidth(),
+            .padding(horizontal = 16.dp).fillMaxWidth()
+            .padding(vertical = 12.dp),
         fontFamily = CustomFont.regular,
-        textAlign = TextAlign.Start
+        textAlign = TextAlign.Start,
     )
     Row(
         modifier = Modifier
@@ -415,7 +420,7 @@ fun BottomMenuView(
         )
     }
     LazyRow() {
-        items(data!!.perfumeList) {
+        items(data?.perfumeList ?: emptyList()) {
             Column(modifier = Modifier.clickable { onPerfumeClick(it.perfumeId) }) {
                 PerfumeItemView(
                     it.imgUrl, it.perfumeName, it.brandName, 126, 126, 0.9f, 0.9f, CustomColor.gray1,
@@ -440,19 +445,16 @@ fun ImageWithTitleView(
     Box(
         modifier = Modifier
             .clickable { onItemClick() }
-            .background(color = CustomColor.gray8)
             .fillMaxWidth(containerWidth)
             .fillMaxHeight(containerHeight), contentAlignment = Alignment.BottomStart
     ) {
-        Column(modifier = Modifier.padding(20.dp).background(color = CustomColor.gray8)) {
-            ImageView(
-                imageUrl,
-                width = width,
-                height = height,
-                backgroundColor = CustomColor.gray8,
-                contentScale = ContentScale.Fit
-            )
-        }
+        ImageView(
+            imageUrl,
+            width = width,
+            height = height,
+            backgroundColor = CustomColor.gray8,
+            contentScale = ContentScale.Fit
+        )
         Text(
             text = title,
             fontWeight = FontWeight.SemiBold,
@@ -489,7 +491,7 @@ private fun HomePreview() {
                     HomeMenuPerfumeResponseDto("딥디크", "", 1, "오 로즈 오 드 뚜왈렛 50ml"),
                     HomeMenuPerfumeResponseDto("딥디크", "", 1, "오 로즈 오 드 뚜왈렛 50ml"),
                     HomeMenuPerfumeResponseDto("딥디크", "", 1, "오 로즈 오 드 뚜왈렛 50ml")
-                )
+                ).toImmutableList()
             ),
             HomeMenuDefaultResponseDto(
                 title = "변함없이 사랑받는, 스테디 셀러", perfumeList = listOf(
@@ -497,8 +499,8 @@ private fun HomePreview() {
                     HomeMenuPerfumeResponseDto("딥디크", "", 1, "오 로즈 오 드 뚜왈렛 50ml"),
                     HomeMenuPerfumeResponseDto("딥디크", "", 1, "오 로즈 오 드 뚜왈렛 50ml"),
                     HomeMenuPerfumeResponseDto("딥디크", "", 1, "오 로즈 오 드 뚜왈렛 50ml")
-                )
+                ).toImmutableList()
             )
-        )
+        ).toImmutableList()
     )
 }
diff --git a/feature-home/src/main/java/com/hmoa/feature_home/screen/PerfumeSearchScreen.kt b/feature-home/src/main/java/com/hmoa/feature_home/screen/PerfumeSearchScreen.kt
index 0d1ef4f92..b0ad7ceba 100644
--- a/feature-home/src/main/java/com/hmoa/feature_home/screen/PerfumeSearchScreen.kt
+++ b/feature-home/src/main/java/com/hmoa/feature_home/screen/PerfumeSearchScreen.kt
@@ -3,13 +3,7 @@ package com.hmoa.feature_home.screen
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-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.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
@@ -61,11 +55,7 @@ fun PerfumeSearchScreen(
         perfumeNameSearchResult = perfumeNameSearchResult,
         perfumeSearchResult = perfumeSearchResult,
         viewType = viewType.value,
-        onChangedWord = {
-            viewModel.updatePerfumeNameSearchWord(it)
-            viewModel.updatePerfumeSearchWord(it)
-            perfumeNameSearchResult?.refresh()
-        },
+        onChangedWord = { viewModel.handlePerfumeNameChange(it) },
         onClearWord = {
             viewModel.updatePerfumeNameSearchWord(word = "")
             viewModel.changeViewType(PerfumeSearchViewType.List)
@@ -109,22 +99,32 @@ fun PerfumeSearchContent(
             )
         }
         Spacer(modifier = Modifier.fillMaxWidth().height(1.dp).background(color = CustomColor.gray2))
-        Column(
-            modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp).background(Color.White),
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            when (viewType) {
-                PerfumeSearchViewType.List -> {
-                    PerfumeNameSearchResultList(
-                        perfumeNameList = perfumeNameSearchResult,
-                        onPerfumeSearchResultClick = { onPerfumeSearchResultClick(it) })
-                }
+        PerfumeSearchView(viewType, perfumeNameSearchResult, perfumeSearchResult, onPerfumeSearchResultClick)
+    }
+}
 
-                PerfumeSearchViewType.Grid -> {
-                    PerfumeSearchResultList(
-                        perfumeList = perfumeSearchResult,
-                        onPerfumeSearchResultClick = { onPerfumeSearchResultClick(it) })
-                }
+@Composable
+fun PerfumeSearchView(
+    viewType: PerfumeSearchViewType,
+    perfumeNameSearchResult: LazyPagingItems<PerfumeNameSearchResponseDto>?,
+    perfumeSearchResult: LazyPagingItems<PerfumeSearchResponseDto>?,
+    onPerfumeSearchResultClick: (searchWord: String) -> Unit,
+) {
+    Column(
+        modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp).background(Color.White),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        when (viewType) {
+            PerfumeSearchViewType.List -> {
+                PerfumeNameSearchResultList(
+                    perfumeNameList = perfumeNameSearchResult,
+                    onPerfumeSearchResultClick = { onPerfumeSearchResultClick(it) })
+            }
+
+            PerfumeSearchViewType.Grid -> {
+                PerfumeSearchResultList(
+                    perfumeList = perfumeSearchResult,
+                    onPerfumeSearchResultClick = { onPerfumeSearchResultClick(it) })
             }
         }
     }
@@ -138,7 +138,7 @@ fun PerfumeNameSearchResultList(
     LazyColumn(modifier = Modifier.padding(horizontal = 16.dp, vertical = 10.dp)) {
         items(perfumeNameList?.itemSnapshotList?.items ?: emptyList()) {
             Text(
-                text = it!!.perfumeName ?: "",
+                text = it.perfumeName,
                 modifier = Modifier.clickable { onPerfumeSearchResultClick(it.perfumeName) }
                     .padding(vertical = 10.dp).fillMaxWidth(),
                 style = TextStyle(fontWeight = FontWeight.Normal, fontSize = 14.sp)
@@ -156,14 +156,14 @@ fun PerfumeSearchResultList(
         columns = GridCells.Fixed(2),
         horizontalArrangement = Arrangement.Center
     ) {
-        items(perfumeList?.itemSnapshotList?.items ?: emptyList()) {
+        items(perfumeList?.itemSnapshotList?.items ?: emptyList(), key = { it.perfumeId }) {
             Column(modifier = Modifier.clickable { onPerfumeSearchResultClick(it.perfumeName) }
                 .padding(bottom = 16.dp),
                 horizontalAlignment = Alignment.CenterHorizontally) {
                 PerfumeItemView(
-                    imageUrl = it?.perfumeImageUrl ?: "",
-                    perfumeName = it?.perfumeName ?: "",
-                    brandName = it?.brandName ?: "",
+                    imageUrl = it.perfumeImageUrl,
+                    perfumeName = it.perfumeName,
+                    brandName = it.brandName,
                     containerWidth = 160,
                     containerHeight = 160,
                     imageWidth = 0.7f,
@@ -233,4 +233,4 @@ fun PerfumeSearchScreenPreview() {
         onPerfumeSearchResultClick = {},
         onBackClick = {}
     )
-}
\ No newline at end of file
+}
diff --git a/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/AllPerfumeViewModel.kt b/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/AllPerfumeViewModel.kt
index ea0c913bc..5bf26bb6c 100644
--- a/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/AllPerfumeViewModel.kt
+++ b/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/AllPerfumeViewModel.kt
@@ -7,10 +7,12 @@ import com.hmoa.core_common.ErrorMessageType
 import com.hmoa.core_common.ErrorUiState
 import com.hmoa.core_common.Result
 import com.hmoa.core_common.asResult
+import com.hmoa.core_domain.entity.data.AllPerfumeScreenId
 import com.hmoa.core_domain.repository.MainRepository
 import com.hmoa.core_model.response.HomeMenuAllResponseDto
-import com.hmoa.core_domain.entity.data.AllPerfumeScreenId
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
@@ -58,7 +60,7 @@ class AllPerfumeViewModel @Inject constructor(private val mainRepository: MainRe
             perfumes.asResult().collectLatest { result ->
                 when (result) {
                     is Result.Success -> {
-                        _uiState.update { AllPerfumeUiState.Data(perfumeList = result.data.data) }
+                        _uiState.update { AllPerfumeUiState.Data(perfumeList = result.data.data?.toImmutableList()) }
                     }
 
                     is Result.Error -> {
@@ -94,9 +96,9 @@ class AllPerfumeViewModel @Inject constructor(private val mainRepository: MainRe
     sealed interface AllPerfumeUiState {
         data object Loading : AllPerfumeUiState
         data class Data(
-            val perfumeList: List<HomeMenuAllResponseDto>?,
+            val perfumeList: ImmutableList<HomeMenuAllResponseDto>?,
         ) : AllPerfumeUiState
 
         data object Error : AllPerfumeUiState
     }
-}
\ No newline at end of file
+}
diff --git a/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/HomeViewModel.kt b/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/HomeViewModel.kt
index 017faac63..0b719a1d6 100644
--- a/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/HomeViewModel.kt
+++ b/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/HomeViewModel.kt
@@ -1,5 +1,6 @@
 package com.hmoa.feature_home.viewmodel
 
+import androidx.compose.runtime.Stable
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hmoa.core_common.Result
@@ -7,6 +8,8 @@ import com.hmoa.core_common.asResult
 import com.hmoa.core_domain.repository.MainRepository
 import com.hmoa.core_model.response.HomeMenuDefaultResponseDto
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -56,20 +59,25 @@ class HomeViewModel @Inject constructor(
                 when (it) {
                     is Result.Success -> {
                         _bottomMenuState.value =
-                            BottomMenuState.Data(it.data.data)
+                            BottomMenuState.Data(
+                                it.data.data?.toImmutableList()
+                                    ?: emptyList<HomeMenuDefaultResponseDto>().toImmutableList()
+                            )
                     }
 
                     is Result.Error -> {
 
-                    }//TODO()
+                    }
+
                     is Result.Loading -> {
                         BottomMenuState.Loading
-                    }//TODO()
+                    }
                 }
             }
         }
     }
 
+    @Stable
     sealed interface BannerWithFirstMenuState {
         data object Loading : BannerWithFirstMenuState
         data class Data(
@@ -81,13 +89,14 @@ class HomeViewModel @Inject constructor(
         data object Error : BannerWithFirstMenuState
     }
 
+    @Stable
     sealed interface BottomMenuState {
         data object Loading : BottomMenuState
         data class Data(
-            val bottomMenu: List<HomeMenuDefaultResponseDto>?,
+            //모델 패키지로 분리해서 분해해서 사용하자. 외부 모듈이니까 unstable인 건 어쩔 수 없음
+            val bottomMenu: ImmutableList<HomeMenuDefaultResponseDto>,
         ) : BottomMenuState
 
         data object Error : BottomMenuState
     }
-
 }
diff --git a/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/PerfumeSearchViewmodel.kt b/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/PerfumeSearchViewmodel.kt
index c9953f8e5..0afe14dc7 100644
--- a/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/PerfumeSearchViewmodel.kt
+++ b/feature-home/src/main/java/com/hmoa/feature_home/viewmodel/PerfumeSearchViewmodel.kt
@@ -7,12 +7,11 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
+import com.hmoa.core_domain.entity.data.PerfumeSearchViewType
 import com.hmoa.core_domain.repository.SearchRepository
 import com.hmoa.core_model.response.PerfumeNameSearchResponseDto
 import com.hmoa.core_model.response.PerfumeSearchResponseDto
-import com.hmoa.feature_home.PerfumeNameSearchPagingSource
-import com.hmoa.feature_home.PerfumeSearchPagingSource
-import com.hmoa.core_domain.entity.data.PerfumeSearchViewType
+import com.hmoa.feature_home.PerfumePagingSource
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -27,12 +26,26 @@ class PerfumeSearchViewmodel @Inject constructor(private val searchRepository: S
     private var _perfumeSearchWordState = MutableStateFlow<String?>(null)
     val perfumeSearchWordState: StateFlow<String?> = _perfumeSearchWordState
     private var _searchResultViewType = MutableStateFlow<PerfumeSearchViewType>(
-        PerfumeSearchViewType.List)
+        PerfumeSearchViewType.List
+    )
     val searchResultViewType: StateFlow<PerfumeSearchViewType> = _searchResultViewType
 
-    fun perfumeNameSearchPagingSource(word: String) = PerfumeNameSearchPagingSource(searchRepository, word)
+    fun handlePerfumeNameChange(word: String) {
+        updatePerfumeNameSearchWord(word)
+        updatePerfumeSearchWord(word)
+        getPagingPerfumeNameSearchResults()
+    }
+
+    fun perfumeNameSearchPagingSource(word: String) =
+        PerfumePagingSource(
+            fetcher = { pageNumber -> searchRepository.getPerfumeName(pageNumber, word) },
+            mapper = { it.data ?: emptyList() }
+        )
 
-    fun perfumeSearchPagingSource(word: String) = PerfumeSearchPagingSource(searchRepository, word)
+    fun perfumeSearchPagingSource(word: String) = PerfumePagingSource(
+        fetcher = { pageNumber -> searchRepository.getPerfume(page = pageNumber, searchWord = word) },
+        mapper = { it.data ?: emptyList() }
+    )
 
     fun getPagingPerfumeNameSearchResults(): Flow<PagingData<PerfumeNameSearchResponseDto>>? {
         if (_perfumeNameSearchWordState.value != null) {
@@ -65,4 +78,4 @@ class PerfumeSearchViewmodel @Inject constructor(private val searchRepository: S
     fun changeViewType(viewType: PerfumeSearchViewType) {
         _searchResultViewType.update { viewType }
     }
-}
\ No newline at end of file
+}
diff --git a/feature-hpedia/build.gradle.kts b/feature-hpedia/build.gradle.kts
index 7b2a6e6f5..b40e86261 100644
--- a/feature-hpedia/build.gradle.kts
+++ b/feature-hpedia/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -32,55 +31,35 @@ android {
     kotlinOptions {
         jvmTarget = "17"
     }
-    composeOptions{
-        kotlinCompilerExtensionVersion = "1.5.0"
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
-    buildFeatures{
+    buildFeatures {
         compose = true
     }
 }
 
 dependencies {
-
-    val hilt_version = "2.48.1"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-
     implementation(project(":core-designsystem"))
     implementation(project(":core-domain"))
     implementation(project(":core-model"))
     implementation(project(":core-common"))
     implementation(project(":feature-community"))
 
-    //material3
-    implementation("androidx.compose.material3:material3:1.1.0")
-
-    //preview
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")
-
-    implementation("androidx.compose.ui:ui:1.1.0")
+    implementation(libs.bundles.ui)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.paging.compose)
+    implementation(libs.bundles.basic)
+    implementation(libs.google.material)
 
-    //bottom navigation
-    implementation("androidx.navigation:navigation-compose:2.7.0")
+    implementation(libs.bundles.hilt)
+    kapt(libs.hilt.android.compiler)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.viewmodel)
 
-    //collectAsStateWithLifecycle 함수
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0")
-
-    //paging
-    implementation("androidx.paging:paging-compose:3.2.0")
-
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
-
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.11.0")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-}
\ No newline at end of file
+    debugImplementation(libs.ui.tooling)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
+}
diff --git a/feature-hpedia/src/main/java/com/hmoa/feature_hpedia/Navigation/NavGraph.kt b/feature-hpedia/src/main/java/com/hmoa/feature_hpedia/Navigation/NavGraph.kt
index cfc00d2da..24bcba1bd 100644
--- a/feature-hpedia/src/main/java/com/hmoa/feature_hpedia/Navigation/NavGraph.kt
+++ b/feature-hpedia/src/main/java/com/hmoa/feature_hpedia/Navigation/NavGraph.kt
@@ -6,6 +6,7 @@ import androidx.navigation.NavType
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.navigation
 import androidx.navigation.navArgument
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 import com.hmoa.feature_hpedia.Screen.HPediaDescRoute
 import com.hmoa.feature_hpedia.Screen.HPediaRoute
 import com.hmoa.feature_hpedia.Screen.HPediaSearchRoute
@@ -21,7 +22,7 @@ fun NavController.navigateToHPediaSearchRoute(type: String) = navigate("${com.hm
 
 fun NavGraphBuilder.nestedHPediaGraph(
     navBack: () -> Unit,
-    navCommunityDesc: (Int) -> Unit,
+    navCommunityDesc: (befRoute: CommunityRoute, community: Int) -> Unit,
     navCommunityGraph: () -> Unit,
     navHPediaSearch: (String) -> Unit,
     navHPediaDesc: (Int, String) -> Unit,
@@ -64,7 +65,6 @@ fun NavGraphBuilder.nestedHPediaGraph(
                 navCommunityDesc = navCommunityDesc,
                 navCommunityGraph = navCommunityGraph,
                 navLogin = navLogin,
-                navHome = navHome,
             )
         }
     }
diff --git a/feature-hpedia/src/main/java/com/hmoa/feature_hpedia/Screen/HPediaScreen.kt b/feature-hpedia/src/main/java/com/hmoa/feature_hpedia/Screen/HPediaScreen.kt
index b14948fea..be5fc7623 100644
--- a/feature-hpedia/src/main/java/com/hmoa/feature_hpedia/Screen/HPediaScreen.kt
+++ b/feature-hpedia/src/main/java/com/hmoa/feature_hpedia/Screen/HPediaScreen.kt
@@ -24,22 +24,21 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.hmoa.core_designsystem.R
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 import com.hmoa.feature_community.Screen.CommunityHomeRoute
 
 @Composable
 fun HPediaRoute(
     navHPediaSearch: (String) -> Unit,
-    navCommunityDesc: (Int) -> Unit,
+    navCommunityDesc: (befRoute: CommunityRoute, communityId: Int) -> Unit,
     navCommunityGraph: () -> Unit,
-    navLogin: () -> Unit,
-    navHome : () -> Unit,
+    navLogin: () -> Unit
 ) {
     HPediaScreen(
         navHPediaSearch = navHPediaSearch,
         navCommunityDesc = navCommunityDesc,
         navCommunityGraph = navCommunityGraph,
-        onErrorHandleLoginAgain = navLogin,
-        navHome = navHome
+        onErrorHandleLoginAgain = navLogin
     )
 
 }
@@ -47,10 +46,9 @@ fun HPediaRoute(
 @Composable
 fun HPediaScreen(
     navHPediaSearch: (String) -> Unit,
-    navCommunityDesc: (Int) -> Unit,
+    navCommunityDesc: (communityRoute: CommunityRoute, communityId: Int) -> Unit,
     navCommunityGraph: () -> Unit,
     onErrorHandleLoginAgain: () -> Unit,
-    navHome : () -> Unit
 ) {
     Column(
         modifier = Modifier
@@ -72,7 +70,6 @@ fun HPediaScreen(
             navCommunityGraph = navCommunityGraph,
             navCommunityDescription = navCommunityDesc,
             onErrorHandleLoginAgain = onErrorHandleLoginAgain,
-            navHome = navHome
         )
     }
 }
diff --git a/feature-magazine/build.gradle.kts b/feature-magazine/build.gradle.kts
index 66c6d0604..1847563f4 100644
--- a/feature-magazine/build.gradle.kts
+++ b/feature-magazine/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -32,43 +31,35 @@ android {
     kotlinOptions {
         jvmTarget = "17"
     }
-    composeOptions{
-        kotlinCompilerExtensionVersion = "1.5.0"
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
-    buildFeatures{
+    buildFeatures {
         compose = true
     }
 }
 
 dependencies {
-    val hilt_version = "2.44"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-
     implementation(project(":core-designsystem"))
     implementation(project(":core-domain"))
     implementation(project(":core-model"))
     implementation(project(":core-common"))
 
-    implementation("androidx.compose.material:material:1.2.0-beta02")
-    implementation("androidx.compose.material3:material3:1.2.0")
-    implementation("androidx.paging:paging-compose:3.2.0")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.ui:ui:1.1.0")
-    implementation("androidx.navigation:navigation-compose:2.7.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0")
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
+    implementation(libs.bundles.ui)
+    implementation(libs.paging.compose)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.bundles.basic)
+
+    implementation(libs.bundles.hilt)
+    kapt(libs.hilt.android.compiler)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.viewmodel)
 
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.5.2")
-    testImplementation("org.testng:testng:6.9.6")
-}
\ No newline at end of file
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
+    debugImplementation(libs.ui.tooling)
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(libs.junit.jupiter.engine)
+    testImplementation(libs.testing)
+}
diff --git a/feature-magazine/src/main/java/com/hmoa/feature_magazine/Navigation/MagazineNavigation.kt b/feature-magazine/src/main/java/com/hmoa/feature_magazine/Navigation/MagazineNavigation.kt
index f052c5366..828bca779 100644
--- a/feature-magazine/src/main/java/com/hmoa/feature_magazine/Navigation/MagazineNavigation.kt
+++ b/feature-magazine/src/main/java/com/hmoa/feature_magazine/Navigation/MagazineNavigation.kt
@@ -3,6 +3,7 @@ package com.hmoa.feature_magazine.Navigation
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 import com.hmoa.core_domain.entity.navigation.MagazineRoute
 import com.hmoa.feature_magazine.Screen.MagazineDescRoute
 import com.hmoa.feature_magazine.Screen.MagazineMainRoute
@@ -14,7 +15,7 @@ fun NavHostController.navigateToMagazineDesc(magazineId : Int) = navigate("${Mag
 fun NavGraphBuilder.magazineMain(
     onNavHome : () -> Unit,
     onNavPerfumeDesc : (Int) -> Unit,
-    onNavCommunityDesc : (Int) -> Unit,
+    onNavCommunityDesc : (befRoute: CommunityRoute, communityId: Int) -> Unit,
     onNavMagazineDesc : (Int) -> Unit,
 ){
     composable(MagazineRoute.Magazine.name){
diff --git a/feature-magazine/src/main/java/com/hmoa/feature_magazine/Screen/MagazineMain.kt b/feature-magazine/src/main/java/com/hmoa/feature_magazine/Screen/MagazineMain.kt
index 6ebca983f..bf6154978 100644
--- a/feature-magazine/src/main/java/com/hmoa/feature_magazine/Screen/MagazineMain.kt
+++ b/feature-magazine/src/main/java/com/hmoa/feature_magazine/Screen/MagazineMain.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -32,6 +33,7 @@ import com.hmoa.core_common.ErrorUiState
 import com.hmoa.core_designsystem.R
 import com.hmoa.core_designsystem.component.*
 import com.hmoa.core_designsystem.theme.CustomColor
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 import com.hmoa.core_model.response.MagazineSummaryResponseDto
 import com.hmoa.core_model.response.MagazineTastingCommentResponseDto
 import com.hmoa.core_model.response.RecentPerfumeResponseDto
@@ -42,13 +44,14 @@ import com.hmoa.feature_magazine.ViewModel.MagazineMainViewModel
 fun MagazineMainRoute(
     onNavHome: () -> Unit,
     onNavPerfumeDesc: (Int) -> Unit,
-    onNavCommunityDesc: (Int) -> Unit,
+    onNavCommunityDesc: (befRoute: CommunityRoute, communityId: Int) -> Unit,
     onNavMagazineDesc: (Int) -> Unit,
     viewModel: MagazineMainViewModel = hiltViewModel()
 ) {
     val uiState = viewModel.uiState.collectAsStateWithLifecycle()
     val errorState = viewModel.errorUiState.collectAsStateWithLifecycle()
     val magazineList = viewModel.magazinePagingSource().collectAsLazyPagingItems()
+    val onPostClick = remember<(Int) -> Unit>{{onNavCommunityDesc(CommunityRoute.CommunityHomeRoute, it)}}
 
     MagazineMainScreen(
         uiState = uiState.value,
@@ -56,7 +59,7 @@ fun MagazineMainRoute(
         magazineList = magazineList,
         onNavHome = onNavHome,
         onNavPerfumeDesc = onNavPerfumeDesc,
-        onNavCommunityDesc = onNavCommunityDesc,
+        onNavCommunityDesc = onPostClick,
         onNavMagazineDesc = onNavMagazineDesc
     )
 }
diff --git a/feature-perfume/build.gradle.kts b/feature-perfume/build.gradle.kts
index 234aac967..b9d6b29ee 100644
--- a/feature-perfume/build.gradle.kts
+++ b/feature-perfume/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -31,42 +30,45 @@ android {
         jvmTarget = "17"
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     buildFeatures {
         compose = true
     }
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=${project.buildDir.absolutePath}/compose_metrics",
+        )
+    }
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${project.buildDir.absolutePath}/compose_reports",
+        )
+    }
 }
 
 dependencies {
-
-    val hilt_version = "2.44"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-
     implementation(project(":core-designsystem"))
     implementation(project(":core-domain"))
     implementation(project(":core-model"))
     implementation(project(":core-common"))
 
-    implementation("androidx.compose.material:material:1.2.0-beta02")
-    implementation("androidx.compose.material3:material3:1.1.0")
-    implementation("androidx.paging:paging-compose:3.2.0")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.ui:ui:1.1.0")
-    implementation("androidx.navigation:navigation-compose:2.7.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0")
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
+    implementation(libs.paging.compose)
+    implementation(libs.bundles.ui)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.bundles.basic)
+
+    implementation(libs.bundles.hilt)
+    kapt(libs.hilt.android.compiler)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.viewmodel)
 
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.5.2")
-}
\ No newline at end of file
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
+    debugImplementation(libs.ui.tooling)
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(libs.junit.jupiter.engine)
+}
diff --git a/feature-perfume/src/main/java/com/hmoa/feature_perfume/PerfumeCommentLatestPagingSource.kt b/feature-perfume/src/main/java/com/hmoa/feature_perfume/PerfumeCommentLatestPagingSource.kt
deleted file mode 100644
index b7fbd2a64..000000000
--- a/feature-perfume/src/main/java/com/hmoa/feature_perfume/PerfumeCommentLatestPagingSource.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.hmoa.feature_perfume
-
-import androidx.paging.PagingSource
-import androidx.paging.PagingState
-import com.hmoa.core_domain.repository.PerfumeCommentRepository
-import com.hmoa.core_model.response.PerfumeCommentResponseDto
-
-class PerfumeCommentLatestPagingSource(
-    private val perfumeCommentRepository: PerfumeCommentRepository,
-    private val perfumeId: Int,
-) : PagingSource<Int, PerfumeCommentResponseDto>() {
-    private var commentCounts = 0
-    private var cursor = 0
-
-    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, PerfumeCommentResponseDto> {
-        val pageNumber = params.key ?: 0
-        try {
-            val response =
-                perfumeCommentRepository.getPerfumeCommentsLatest(
-                    pageNumber,
-                    cursor = cursor,
-                    perfumeId = perfumeId
-                )
-            commentCounts = response.commentCount
-            cursor = response.comments.get(response.comments.lastIndex).id
-            val prevKey = if (pageNumber > 0) pageNumber - 1 else null
-            val nextKey = if (response.lastPage) null else pageNumber + 1
-
-            return LoadResult.Page(
-                data = response.comments,
-                prevKey = prevKey,
-                nextKey = nextKey
-            )
-        } catch (e: Exception) {
-            return LoadResult.Error(e)
-        }
-    }
-
-    override fun getRefreshKey(state: PagingState<Int, PerfumeCommentResponseDto>): Int? {
-        return state.anchorPosition?.let {
-            state.closestPageToPosition(it)?.prevKey?.plus(1)
-                ?: state.closestPageToPosition(it)?.nextKey?.minus(1)
-        }
-    }
-}
\ No newline at end of file
diff --git a/feature-perfume/src/main/java/com/hmoa/feature_perfume/PerfumeCommentLikePagingSource.kt b/feature-perfume/src/main/java/com/hmoa/feature_perfume/PerfumeCommentPagingSource.kt
similarity index 74%
rename from feature-perfume/src/main/java/com/hmoa/feature_perfume/PerfumeCommentLikePagingSource.kt
rename to feature-perfume/src/main/java/com/hmoa/feature_perfume/PerfumeCommentPagingSource.kt
index efe33afdd..988ce3817 100644
--- a/feature-perfume/src/main/java/com/hmoa/feature_perfume/PerfumeCommentLikePagingSource.kt
+++ b/feature-perfume/src/main/java/com/hmoa/feature_perfume/PerfumeCommentPagingSource.kt
@@ -2,12 +2,11 @@ package com.hmoa.feature_perfume
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import com.hmoa.core_domain.repository.PerfumeCommentRepository
+import com.hmoa.core_model.response.PerfumeCommentGetResponseDto
 import com.hmoa.core_model.response.PerfumeCommentResponseDto
 
-class PerfumeCommentLikePagingSource(
-    private val perfumeCommentRepository: PerfumeCommentRepository,
-    private val perfumeId: Int,
+class PerfumeCommentPagingSource(
+    private val fetcher: suspend (pageNumber: Int, cursor: Int) -> PerfumeCommentGetResponseDto,
 ) : PagingSource<Int, PerfumeCommentResponseDto>() {
     private var commentCounts = 0
     private var cursor = 0
@@ -15,11 +14,7 @@ class PerfumeCommentLikePagingSource(
     override suspend fun load(params: LoadParams<Int>): LoadResult<Int, PerfumeCommentResponseDto> {
         val pageNumber = params.key ?: 0
         try {
-            val response =
-                perfumeCommentRepository.getPerfumeCommentsLikest(
-                    page = pageNumber.toString(),
-                    perfumeId = perfumeId.toString()
-                )
+            val response = fetcher(pageNumber, cursor)
             commentCounts = response.commentCount
             cursor = response.comments.get(response.comments.lastIndex).id
             val prevKey = if (pageNumber > 0) pageNumber - 1 else null
@@ -41,4 +36,4 @@ class PerfumeCommentLikePagingSource(
                 ?: state.closestPageToPosition(it)?.nextKey?.minus(1)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature-perfume/src/main/java/com/hmoa/feature_perfume/screen/PerfumeScreen.kt b/feature-perfume/src/main/java/com/hmoa/feature_perfume/screen/PerfumeScreen.kt
index 74a3f2db3..bf6e78642 100644
--- a/feature-perfume/src/main/java/com/hmoa/feature_perfume/screen/PerfumeScreen.kt
+++ b/feature-perfume/src/main/java/com/hmoa/feature_perfume/screen/PerfumeScreen.kt
@@ -1,7 +1,11 @@
 package com.hmoa.feature_perfume.screen
 
-import androidx.compose.foundation.*
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
@@ -169,7 +173,6 @@ fun PerfumeContent(
     perfumeCommentsCount: Int,
     updatePerfumeCommentIdToReport: (commentId: Int) -> Unit
 ) {
-    val verticalScrollState = rememberScrollState()
     val scope = rememberCoroutineScope()
     val modalSheetState = rememberModalBottomSheetState(
         initialValue = ModalBottomSheetValue.Hidden,
@@ -195,120 +198,191 @@ fun PerfumeContent(
         sheetBackgroundColor = CustomColor.gray2,
         sheetContentColor = Color.Transparent,
     ) {
-        Column(
-            modifier = Modifier.fillMaxWidth().verticalScroll(verticalScrollState)
+        LazyColumn(
+            modifier = Modifier.fillMaxWidth()
                 .background(color = Color.White)
         ) {
-            TopBar(
-                title = data.brandKoreanName,
-                iconSize = 25.dp,
-                navIcon = painterResource(com.hmoa.core_designsystem.R.drawable.ic_back),
-                onNavClick = { onBackClick() },
-                menuIcon = painterResource(com.hmoa.core_designsystem.R.drawable.ic_home),
-                onMenuClick = { onHomeClick() }
-            )
-            Column(
-                modifier = Modifier.fillMaxWidth().heightIn(360.dp).background(color = CustomColor.gray2)
-                    .padding(vertical = 20.dp),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center
-            ) {
-                ImageView(
-                    data.perfumeImageUrl,
-                    width = 0.6f,
-                    height = 0.6f,
-                    backgroundColor = CustomColor.gray2,
-                    contentScale = ContentScale.FillWidth
-                )
-            }
-            Column(modifier = Modifier.padding(16.dp).background(color = Color.White)) {
-                PerfumeInfo(
-                    isLikedPerfume = data.liked,
-                    heartCount = data.likedCount,
-                    perfumeKoreanName = data.perfumeKoreanName,
-                    perfumeEnglishName = data.perfumeEnglishName,
-                    perfumeVolume = data.perfumeVolume,
-                    perfumeVolumes = data.perfumeVolumeList,
-                    price = data.price
-                )
-                Spacer(
-                    modifier = Modifier.fillMaxWidth().height(1.dp).background(color = CustomColor.gray2)
+            item {
+                TopBar(
+                    title = data.brandKoreanName,
+                    iconSize = 25.dp,
+                    navIcon = painterResource(com.hmoa.core_designsystem.R.drawable.ic_back),
+                    onNavClick = { onBackClick() },
+                    menuIcon = painterResource(com.hmoa.core_designsystem.R.drawable.ic_home),
+                    onMenuClick = { onHomeClick() }
                 )
                 Column(
-                    modifier = Modifier.clickable { onBrandClick(data.brandId) }.padding(horizontal = 16.dp)
-                        .padding(top = 48.dp)
+                    modifier = Modifier.fillMaxWidth().heightIn(360.dp).background(color = CustomColor.gray2)
+                        .padding(vertical = 20.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center
                 ) {
-                    BrandCard(data.brandEnglishName, data.brandKoreanName)
+                    ImageView(
+                        data.perfumeImageUrl,
+                        width = 0.6f,
+                        height = 0.6f,
+                        backgroundColor = CustomColor.gray2,
+                        contentScale = ContentScale.FillWidth
+                    )
                 }
-                TastingNoteView(
-                    notes = arrayOf(data.topNote ?: "", data.heartNote ?: "", data.baseNote ?: ""),
-                    imageUrls = data.notePhotos,
-                    noteTitle = listOf("TOP", "HEART", "BASE")
-                )
-                PerfumeWeathernessView(onWeatherClick = { onWeatherClick(it) }, weather)
-                PerfumeGenderView(onGenderClick = { onGenderClick(it) }, gender)
-                PerfumeAgeView(
-                    onAgeDragFinish = { onAgeDragFinish(it) },
-                    onInitializeAgeClick = { onInitializeAgeClick() },
-                    age
-                )
-                CommentView(
-                    commentCount = perfumeCommentsCount,
-                    perfumeComments = perfumeComments ?: emptyList(),
-                    onViewCommentAllClick = { onViewCommentAllClick(data.perfumeId.toInt()) },
-                    onSpecificCommentClick = { commentId, isEditable ->
-                        onSpecificCommentClick(
-                            commentId,
-                            isEditable
+            }
+            item {
+                Column(modifier = Modifier.padding(16.dp).background(color = Color.White)) {
+                    PerfumeInfo(
+                        isLikedPerfume = data.liked,
+                        heartCount = data.likedCount,
+                        perfumeKoreanName = data.perfumeKoreanName,
+                        perfumeEnglishName = data.perfumeEnglishName,
+                        perfumeVolume = data.perfumeVolume,
+                        perfumeVolumes = data.perfumeVolumeList,
+                        price = data.price
+                    )
+                    Spacer(
+                        modifier = Modifier.fillMaxWidth().height(1.dp).background(color = CustomColor.gray2)
+                    )
+                    Column(
+                        modifier = Modifier.clickable { onBrandClick(data.brandId) }.padding(horizontal = 16.dp)
+                            .padding(top = 48.dp)
+                    ) {
+                        BrandCard(data.brandEnglishName, data.brandKoreanName)
+                    }
+                    TastingNoteView(
+                        notes = arrayOf(data.topNote ?: "", data.heartNote ?: "", data.baseNote ?: ""),
+                        imageUrls = data.notePhotos,
+                        noteTitle = listOf("TOP", "HEART", "BASE")
+                    )
+                    PerfumeWeathernessView(onWeatherClick = { onWeatherClick(it) }, weather)
+                    PerfumeGenderView(onGenderClick = { onGenderClick(it) }, gender)
+                    PerfumeAgeView(
+                        onAgeDragFinish = { onAgeDragFinish(it) },
+                        onInitializeAgeClick = { onInitializeAgeClick() },
+                        age
+                    )
+                }
+            }
+            item {
+                Row(
+                    verticalAlignment = Alignment.Bottom,
+                    modifier = Modifier.padding(bottom = 4.dp).padding(top = 48.dp).padding(horizontal = 16.dp)
+                        .background(color = Color.White)
+                ) {
+                    Text(
+                        "댓글",
+                        style = TextStyle(
+                            fontSize = 20.sp,
+                            fontWeight = FontWeight.Medium,
+                            fontFamily = CustomFont.regular
+                        ),
+                        modifier = Modifier.padding(end = 4.dp)
+                    )
+                    Text(
+                        "${perfumeCommentsCount}",
+                        style = TextStyle(
+                            fontSize = 14.sp,
+                            fontWeight = FontWeight.Light,
+                            fontFamily = CustomFont.regular
                         )
-                    },
-                    onSpecificCommentLikeClick = { commentId, isLike, index ->
-                        onSpecificCommentLikeClick(
-                            commentId,
-                            isLike,
-                            index
+                    )
+                }
+            }
+            if (perfumeCommentsCount == 0) {
+                item {
+                    Column(modifier = Modifier.padding(16.dp).background(color = Color.White)) {
+                        Text(
+                            "해당 제품에 대한 의견을 남겨주세요",
+                            style = TextStyle(
+                                fontSize = 14.sp,
+                                fontWeight = FontWeight.Medium,
+                                color = CustomColor.gray3,
+                                fontFamily = CustomFont.regular
+                            ),
+                            modifier = Modifier.fillMaxWidth().padding(vertical = 52.dp),
+                            textAlign = TextAlign.Center
                         )
-                    },
-                    onPerfumeCommentReportClick = {
-                        updatePerfumeCommentIdToReport(it)
-                        scope.launch { modalSheetState.show() }
-                    },
-                )
-                Text(
-                    "같은 브랜드의 제품",
-                    style = TextStyle(
-                        fontSize = 20.sp,
-                        fontWeight = FontWeight.Medium,
-                        fontFamily = CustomFont.regular
-                    ),
-                    modifier = Modifier.padding(end = 4.dp).padding(top = 40.dp)
-                )
-                Spacer(
-                    modifier = Modifier.padding(top = 14.dp).padding(bottom = 12.dp).fillMaxWidth().height(1.dp)
-                        .background(color = CustomColor.gray2)
-                )
-                LazyRow {
-                    itemsIndexed(data.similarPerfumes) { index, it ->
-                        Column(modifier = Modifier.clickable { onSimilarPerfumeClick(it.perfumeId) }) {
-                            PerfumeItemView(
-                                it.perfumeImgUrl,
-                                it.perfumeName,
-                                it.brandName,
-                                88,
-                                88,
-                                1f,
-                                1f,
-                                Color.White,
-                                BorderStroke(width = 0.dp, color = Color.Transparent)
+                    }
+                }
+            } else {
+                itemsIndexed(
+                    items = perfumeComments ?: emptyList(),
+                    key = { index, item -> item.id }) { index, it ->
+                    Column(modifier = Modifier.padding(horizontal = 16.dp).background(color = Color.White)) {
+                        CommentItem(
+                            count = it.heartCount,
+                            isCommentLiked = it.liked,
+                            userImgUrl = it.profileImg ?: "",
+                            userName = it.nickname,
+                            content = it.content,
+                            createdDate = it.createdAt ?: "",
+                            onReportClick = { onPerfumeCommentReportClick() },
+                            onCommentItemClick = { onSpecificCommentClick(it.id.toString(), it.writed) },
+                            onCommentLikedClick = { onSpecificCommentLikeClick(it.id, !it.liked, index) }
+                        )
+                        if (index < perfumeCommentsCount - 1) {
+                            Spacer(
+                                modifier = Modifier.fillMaxWidth().height(1.dp).background(color = CustomColor.gray2)
                             )
                         }
-                        Spacer(
-                            modifier = Modifier.fillMaxWidth().height(1.dp).background(color = CustomColor.gray2)
-                        )
                     }
                 }
+
+            }
+            item {
+                Column(modifier = Modifier.padding(top = 8.dp).padding(horizontal = 16.dp)) {
+                    Button(
+                        isEnabled = true,
+                        btnText = "모두 보기",
+                        onClick = { onViewCommentAllClick(data.perfumeId.toInt()) },
+                        buttonModifier = Modifier.fillMaxWidth().height(32.dp).background(color = CustomColor.gray4),
+                        textColor = Color.White,
+                        textSize = 14
+                    )
+
+                }
+            }
+            item {
+                Column(modifier = Modifier.padding(16.dp).background(color = Color.White)) {
+                    Text(
+                        "같은 브랜드의 제품",
+                        style = TextStyle(
+                            fontSize = 20.sp,
+                            fontWeight = FontWeight.Medium,
+                            fontFamily = CustomFont.regular
+                        ),
+                        modifier = Modifier.padding(end = 4.dp).padding(top = 40.dp)
+                    )
+                    Spacer(
+                        modifier = Modifier.padding(top = 14.dp).padding(bottom = 12.dp).fillMaxWidth().height(1.dp)
+                            .background(color = CustomColor.gray2)
+                    )
+                    LazyRow {
+                        itemsIndexed(data.similarPerfumes) { index, it ->
+                            Column(modifier = Modifier.clickable { onSimilarPerfumeClick(it.perfumeId) }) {
+                                PerfumeItemView(
+                                    it.perfumeImgUrl,
+                                    it.perfumeName,
+                                    it.brandName,
+                                    88,
+                                    88,
+                                    1f,
+                                    1f,
+                                    Color.White,
+                                    BorderStroke(width = 0.dp, color = Color.Transparent)
+                                )
+                            }
+                            if (index < perfumeCommentsCount - 1) {
+                                Spacer(
+                                    modifier = Modifier.fillMaxWidth().height(1.dp)
+                                        .background(color = CustomColor.gray2)
+                                )
+                            }
+                        }
+                    }
+                }
+                BottomToolBar(
+                    data.liked,
+                    onLikeClick = { onLikeClick(it) },
+                    onCommentAddClick = { onCommentAddClick() })
             }
-            BottomToolBar(data.liked, onLikeClick = { onLikeClick(it) }, onCommentAddClick = { onCommentAddClick() })
         }
     }
 }
@@ -581,76 +655,6 @@ fun PerfumeAgeView(
     }
 }
 
-@Composable
-fun CommentView(
-    commentCount: Int,
-    perfumeComments: List<PerfumeCommentResponseDto>,
-    onViewCommentAllClick: () -> Unit,
-    onSpecificCommentClick: (commentId: String, isEditable: Boolean) -> Unit,
-    onSpecificCommentLikeClick: (commentId: Int, isLike: Boolean, index: Int) -> Unit,
-    onPerfumeCommentReportClick: (commentId: Int) -> Unit
-) {
-    Row(
-        verticalAlignment = Alignment.Bottom,
-        modifier = Modifier.padding(bottom = 4.dp).padding(top = 48.dp)
-    ) {
-        Text(
-            "댓글",
-            style = TextStyle(fontSize = 20.sp, fontWeight = FontWeight.Medium, fontFamily = CustomFont.regular),
-            modifier = Modifier.padding(end = 4.dp)
-        )
-        Text(
-            "${commentCount}",
-            style = TextStyle(fontSize = 14.sp, fontWeight = FontWeight.Light, fontFamily = CustomFont.regular)
-        )
-    }
-    if (commentCount == 0) {
-        Text(
-            "해당 제품에 대한 의견을 남겨주세요",
-            style = TextStyle(
-                fontSize = 14.sp,
-                fontWeight = FontWeight.Medium,
-                color = CustomColor.gray3,
-                fontFamily = CustomFont.regular
-            ),
-            modifier = Modifier.fillMaxWidth().padding(vertical = 52.dp),
-            textAlign = TextAlign.Center
-        )
-    } else {
-        perfumeComments.forEachIndexed { index, it ->
-            key(it.id) {
-                CommentItem(
-                    count = it.heartCount,
-                    isCommentLiked = it.liked,
-                    userImgUrl = it.profileImg ?: "",
-                    userName = it.nickname,
-                    content = it.content,
-                    createdDate = it.createdAt ?: "",
-                    onReportClick = { onPerfumeCommentReportClick(it.id) },
-                    onCommentItemClick = { onSpecificCommentClick(it.id.toString(), it.writed) },
-                    onCommentLikedClick = { onSpecificCommentLikeClick(it.id, !it.liked, index) }
-                )
-                if (index < commentCount - 1) {
-                    Spacer(
-                        modifier = Modifier.fillMaxWidth().height(1.dp).background(color = CustomColor.gray2)
-                    )
-                }
-            }
-        }
-        Column(modifier = Modifier.padding(top = 8.dp)) {
-            Button(
-                isEnabled = true,
-                btnText = "모두 보기",
-                onClick = { onViewCommentAllClick() },
-                buttonModifier = Modifier.fillMaxWidth().height(32.dp).background(color = CustomColor.gray4),
-                textColor = Color.White,
-                textSize = 14
-            )
-
-        }
-    }
-}
-
 @Composable
 fun BottomToolBar(isLiked: Boolean, onLikeClick: (value: Boolean) -> Unit, onCommentAddClick: () -> Unit) {
     var heartLike by remember { mutableStateOf(isLiked) }
diff --git a/feature-perfume/src/main/java/com/hmoa/feature_perfume/viewmodel/PerfumeCommentViewmodel.kt b/feature-perfume/src/main/java/com/hmoa/feature_perfume/viewmodel/PerfumeCommentViewmodel.kt
index dac39c292..77c437d41 100644
--- a/feature-perfume/src/main/java/com/hmoa/feature_perfume/viewmodel/PerfumeCommentViewmodel.kt
+++ b/feature-perfume/src/main/java/com/hmoa/feature_perfume/viewmodel/PerfumeCommentViewmodel.kt
@@ -7,15 +7,14 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
+import com.hmoa.core_domain.entity.data.SortType
 import com.hmoa.core_domain.repository.LoginRepository
 import com.hmoa.core_domain.repository.PerfumeCommentRepository
 import com.hmoa.core_domain.repository.ReportRepository
 import com.hmoa.core_domain.usecase.UpdateLikePerfumeCommentUseCase
-import com.hmoa.core_domain.entity.data.SortType
 import com.hmoa.core_model.request.TargetRequestDto
 import com.hmoa.core_model.response.PerfumeCommentResponseDto
-import com.hmoa.feature_perfume.PerfumeCommentLatestPagingSource
-import com.hmoa.feature_perfume.PerfumeCommentLikePagingSource
+import com.hmoa.feature_perfume.PerfumeCommentPagingSource
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
@@ -77,15 +76,21 @@ class PerfumeCommentViewmodel @Inject constructor(
         _unLoginedErrorState.update { true }
     }
 
-    fun latestPerfumeCommentPagingSource(perfumeId: Int) = PerfumeCommentLatestPagingSource(
-        perfumeId = perfumeId,
-        perfumeCommentRepository = perfumeCommentRepository
-    )
+    fun latestPerfumeCommentPagingSource(perfumeId: Int) = PerfumeCommentPagingSource(fetcher = { pageNumber, cursor ->
+        perfumeCommentRepository.getPerfumeCommentsLatest(
+            pageNumber,
+            cursor = cursor,
+            perfumeId = perfumeId
+        )
+    })
+
+    fun likePerfumeCommentPagingSource(perfumeId: Int) = PerfumeCommentPagingSource(fetcher = { pageNumber, cursor ->
+        perfumeCommentRepository.getPerfumeCommentsLikest(
+            pageNumber.toString(),
+            perfumeId = perfumeId.toString()
+        )
+    })
 
-    fun likePerfumeCommentPagingSource(perfumeId: Int) = PerfumeCommentLikePagingSource(
-        perfumeId = perfumeId,
-        perfumeCommentRepository = perfumeCommentRepository
-    )
 
     fun getPagingLatestPerfumeComments(perfumeId: Int?): Flow<PagingData<PerfumeCommentResponseDto>>? {
         if (perfumeId != null) {
@@ -152,4 +157,4 @@ class PerfumeCommentViewmodel @Inject constructor(
 
         data object Error : PerfumeCommentUiState
     }
-}
\ No newline at end of file
+}
diff --git a/feature-userInfo/build.gradle.kts b/feature-userInfo/build.gradle.kts
index 7d5a447ac..af8f44730 100644
--- a/feature-userInfo/build.gradle.kts
+++ b/feature-userInfo/build.gradle.kts
@@ -1,10 +1,9 @@
-import java.util.*
+import java.util.Properties
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
     kotlin("kapt")
 }
 
@@ -42,7 +41,7 @@ android {
         jvmTarget = "17"
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     buildFeatures {
         compose = true
@@ -51,59 +50,27 @@ android {
 }
 
 dependencies {
-
-    val hilt_version = "2.48.1"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-
     implementation(project(":core-designsystem"))
     implementation(project(":core-domain"))
     implementation(project(":core-model"))
     implementation(project(":core-common"))
 
-    //material3
-    implementation("androidx.compose.material3:material3:1.2.0")
-    implementation("androidx.compose.material:material:1.2.0-beta02")
-
-    //preview
-    implementation("androidx.compose.ui:ui-tooling-preview")
-
-    implementation("androidx.compose.ui:ui:1.1.0")
-
-    //bottom navigation
-    implementation("androidx.navigation:navigation-compose:2.7.0")
-
-    //collectAsStateWithLifecycle 함수
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0")
+    implementation(libs.bundles.ui)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.paging.compose)
+    implementation(libs.open.licenses)
+    implementation(libs.bundles.firebase)
+    implementation(libs.bundles.kakao.login)
+    implementation(libs.bundles.basic)
 
-    //paging
-    implementation("androidx.paging:paging-compose:3.2.0")
+    implementation(libs.bundles.hilt)
+    kapt(libs.hilt.android.compiler)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.viewmodel)
 
-    //open licence
-    implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
+    debugImplementation(libs.ui.tooling)
+    testImplementation(libs.junit)
+    implementation(libs.junit.ext)
 
-    // Import the Firebase BoM
-    implementation(platform("com.google.firebase:firebase-bom:32.8.1"))
-    // When using the BoM, don't specify versions in Firebase dependencies
-    implementation("com.google.firebase:firebase-messaging:21.1.0")
-    implementation("com.google.firebase:firebase-analytics")
-
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
-
-    implementation("com.kakao.sdk:v2-all:2.19.0")// 전체 모듈 설치, 2.11.0 버전부터 지원
-    implementation("com.kakao.sdk:v2-user:2.19.0") // 카카오 로그인 API 모듈
-    implementation("com.kakao.sdk:v2-talk:2.19.0") // 카카오톡 채널, 카카오톡 소셜, 카카오톡 메시지 API 모듈
-    implementation("com.kakao.sdk:v2-share:2.19.0") // 카카오톡 공유 API 모듈
-    implementation("com.kakao.sdk:v2-friend:2.19.0") // 피커 API 모듈
-    implementation("com.kakao.sdk:v2-cert:2.19.0") // 카카오 인증서비스 API 모듈
-
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.6.0")
-
-}
\ No newline at end of file
+}
diff --git a/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/Screen/MyCommentPage.kt b/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/Screen/MyCommentPage.kt
index 3a494088e..a0b93064b 100644
--- a/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/Screen/MyCommentPage.kt
+++ b/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/Screen/MyCommentPage.kt
@@ -1,10 +1,17 @@
 package com.hmoa.feature_userinfo.screen
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+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.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -21,9 +28,15 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.ItemSnapshotList
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.hmoa.core_common.ErrorUiState
-import com.hmoa.core_designsystem.component.*
+import com.hmoa.core_designsystem.component.AppLoadingScreen
+import com.hmoa.core_designsystem.component.Comment
+import com.hmoa.core_designsystem.component.EmptyDataPage
+import com.hmoa.core_designsystem.component.ErrorUiSetView
+import com.hmoa.core_designsystem.component.TopBar
+import com.hmoa.core_designsystem.component.TypeBadge
 import com.hmoa.core_designsystem.theme.CustomColor
 import com.hmoa.core_domain.entity.data.MyPageCategory
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 import com.hmoa.core_model.response.CommunityCommentDefaultResponseDto
 import com.hmoa.feature_userinfo.viewModel.CommentUiState
 import com.hmoa.feature_userinfo.viewModel.CommentViewModel
@@ -31,7 +44,7 @@ import com.hmoa.feature_userinfo.viewModel.CommentViewModel
 @Composable
 fun MyCommentRoute(
     navBack: () -> Unit,
-    navCommunity: (communityId: Int) -> Unit,
+    navCommunity: (befRoute: CommunityRoute, communityId: Int) -> Unit,
     navPerfume : (perfumeId: Int) -> Unit,
     navLogin: () -> Unit,
     viewModel: CommentViewModel = hiltViewModel()
@@ -39,13 +52,14 @@ fun MyCommentRoute(
     //comment list
     val commentUiState = viewModel.uiState.collectAsStateWithLifecycle()
     val errState = viewModel.errorUiState.collectAsStateWithLifecycle()
+    val onCommentClick = remember<(Int) -> Unit>{{navCommunity(CommunityRoute.CommunityHomeRoute, it)}}
 
     MyCommentPage(
         uiState = commentUiState.value,
         errState = errState.value,
         navBack = navBack,
         navPerfume = navPerfume,
-        navCommunity = navCommunity,
+        navCommunity = onCommentClick,
         onTypeChanged = viewModel::changeType,
         navLogin = navLogin
     )
diff --git a/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/Screen/MyFavoriteCommentPage.kt b/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/Screen/MyFavoriteCommentPage.kt
index 48a33a3c5..ee714cfd9 100644
--- a/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/Screen/MyFavoriteCommentPage.kt
+++ b/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/Screen/MyFavoriteCommentPage.kt
@@ -1,11 +1,20 @@
 package com.hmoa.feature_userinfo
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+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.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
@@ -16,9 +25,15 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.ItemSnapshotList
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.hmoa.core_common.ErrorUiState
-import com.hmoa.core_designsystem.component.*
+import com.hmoa.core_designsystem.component.AppLoadingScreen
+import com.hmoa.core_designsystem.component.Comment
+import com.hmoa.core_designsystem.component.EmptyDataPage
+import com.hmoa.core_designsystem.component.ErrorUiSetView
+import com.hmoa.core_designsystem.component.TopBar
+import com.hmoa.core_designsystem.component.TypeBadge
 import com.hmoa.core_designsystem.theme.CustomColor
 import com.hmoa.core_domain.entity.data.MyPageCategory
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 import com.hmoa.core_model.response.CommunityCommentDefaultResponseDto
 import com.hmoa.feature_userinfo.viewModel.FavoriteCommentUiState
 import com.hmoa.feature_userinfo.viewModel.FavoriteCommentViewModel
@@ -26,7 +41,7 @@ import com.hmoa.feature_userinfo.viewModel.FavoriteCommentViewModel
 @Composable
 fun MyFavoriteCommentRoute(
     navBack: () -> Unit,
-    navCommunity: (communityId: Int) -> Unit,
+    navCommunity: (befRoute: CommunityRoute, communityId: Int) -> Unit,
     navPerfume: (perfumeId: Int) -> Unit,
     viewModel: FavoriteCommentViewModel = hiltViewModel()
 ) {
@@ -34,6 +49,7 @@ fun MyFavoriteCommentRoute(
     val uiState = viewModel.uiState.collectAsStateWithLifecycle()
     val errState = viewModel.errorUiState.collectAsStateWithLifecycle()
     val type by viewModel.type.collectAsStateWithLifecycle()
+    val onCommentClick = remember<(Int) -> Unit>{{navCommunity(CommunityRoute.CommunityHomeRoute, it)}}
 
     MyFavoriteCommentPage(
         uiState = uiState.value,
@@ -42,7 +58,7 @@ fun MyFavoriteCommentRoute(
         onTypeChanged = viewModel::changeType,
         navBack = navBack,
         navPerfume = navPerfume,
-        navCommunity = navCommunity,
+        navCommunity = onCommentClick,
     )
 }
 
diff --git a/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/navigation/NavGraph.kt b/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/navigation/NavGraph.kt
index 4a6b3fa2d..489cc12fd 100644
--- a/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/navigation/NavGraph.kt
+++ b/feature-userInfo/src/main/java/com/hmoa/feature_userinfo/navigation/NavGraph.kt
@@ -7,6 +7,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.navigation
 import androidx.navigation.navArgument
 import com.example.userinfo.MyPageRoute
+import com.hmoa.core_domain.entity.navigation.CommunityRoute
 import com.hmoa.core_domain.entity.navigation.HbtiRoute
 import com.hmoa.core_domain.entity.navigation.UserInfoRoute
 import com.hmoa.feature_userinfo.MyFavoriteCommentRoute
@@ -72,7 +73,7 @@ fun NavGraphBuilder.nestedUserInfoGraph(
     navLogin: () -> Unit,
     navReview: (befRoute: HbtiRoute) -> Unit,
     navBack: () -> Unit,
-    navCommunity: (Int) -> Unit,
+    navCommunity: (befRoute: CommunityRoute, communityId: Int) -> Unit,
     navEditPost: (Int) -> Unit,
     navEditProfile: () -> Unit,
     navManageMyInfo: () -> Unit,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 000000000..84901f190
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,150 @@
+[versions]
+# plugins
+android-application = "8.1.0"
+kotlin-android = "1.9.21"
+kotlin-jvm = "1.9.21"
+android-library = "8.1.0"
+hilt-android = "2.48.1"
+kotlin-serialization = "1.5.0"
+plugin-google-services = "4.4.1"
+
+# dependencies
+hilt-version = "2.48.1"
+hilt-viewmodel-version = "1.0.0-alpha03"
+hilt-nav-compose-version = "1.0.0"
+
+firebase-messaging-version = "23.4.1"
+firebase-analytics-version = "21.6.2"
+play-service-auth-version = "21.0.0"
+google-services-version = "4.4.1"
+oss-licenses-version = "17.0.0"
+kakao-version = "2.20.5"
+bootpay-version = "4.4.0"
+kotlinx-collections-immutable-version = "0.3.8"
+material-version = "1.2.0-beta02"
+metarial3-version = "1.2.0"
+google-material-version = "1.8.0"
+navigation-compose-version = "2.7.0"
+ui-version = "1.1.0"
+coil-version = "2.6.0"
+landscapist-glide-version = "1.4.7"
+bumptech-glide-version = "4.16.0"
+paging-version = "0.20.0"
+paging-compose-version = "3.2.0"
+core-ktx-version = "1.9.0"
+appcompat-version = "1.6.1"
+splash-screen-version = "1.2.0-alpha01"
+constraintlayout-version = "2.1.4"
+lifecycle-version = "2.5.1"
+app-update-version = "2.1.0"
+
+room-version = "2.6.1"
+datastore-version = "1.0.0"
+sandwich-version = "1.3.5"
+kotlinx-version = "1.5.0"
+retrofit-version = "2.9.0"
+okhttp3-version = "4.12.0"
+gson-version = "2.9.0"
+
+mockito-version = "5.3.1"
+mockito-kotlin-version = "5.0.0"
+coroutine-test-version = "1.8.1-Beta"
+kotlin-reflect-version = "1.5.30"
+junit-version = "4.13.2"
+junit-ktx-version = "1.2.1"
+junit-ext-version = "1.1.5"
+espresso-version = "3.5.1"
+junit4-version = "1.6.8"
+ui-tooling-version = "1.6.0"
+testing-version = "6.9.6"
+hilt-test-version = "2.44"
+junit-jupiter-version = "5.3.1"
+
+[libraries]
+app-update-ktx = { group = "com.google.android.play", name = "app-update-ktx", version.ref = "app-update-version" }
+bootpay = { group = "io.github.bootpay", name = "android", version.ref = "bootpay-version" }
+kakao-all = { group = "com.kakao.sdk", name = "v2-all", version.ref = "kakao-version" }
+kakao-user = { group = "com.kakao.sdk", name = "v2-user", version.ref = "kakao-version" }
+kakao-talk = { group = "com.kakao.sdk", name = "v2-talk", version.ref = "kakao-version" }
+kakao-share = { group = "com.kakao.sdk", name = "v2-share", version.ref = "kakao-version" }
+kakao-freind = { group = "com.kakao.sdk", name = "v2-friend", version.ref = "kakao-version" }
+kakao-cert = { group = "com.kakao.sdk", name = "v2-cert", version.ref = "kakao-version" }
+hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt-version" }
+hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt-version" }
+hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt-version" }
+hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hilt-nav-compose-version" }
+hilt-viewmodel = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "hilt-viewmodel-version" }
+ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "ui-version" }
+ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "ui-tooling-version" }
+ui = { group = "androidx.compose.ui", name = "ui", version.ref = "ui-version" }
+navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation-compose-version" }
+core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx-version" }
+appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat-version" }
+splash-screen = { group = "androidx.core", name = "core-splashscreen", version.ref = "splash-screen-version" }
+google-material = { group = "com.google.android.material", name = "material", version.ref = "google-material-version" }
+material = { group = "androidx.compose.material", name = "material", version.ref = "material-version" }
+material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "metarial3-version" }
+firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging", version.ref = "firebase-messaging-version" }
+firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics", version.ref = "firebase-analytics-version" }
+play-service-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "play-service-auth-version" }
+google-services = { group = "com.google.gms", name = "google-services", version.ref = "google-services-version" }
+open-licenses = { group = "com.google.android.gms", name = "play-services-oss-licenses", version.ref = "oss-licenses-version" }
+room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room-version" }
+room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room-version" }
+datastore = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore-version" }
+junit = { group = "junit", name = "junit", version.ref = "junit-version" }
+junit-ktx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "junit-ktx-version" }
+junit-ext = { group = "androidx.test.ext", name = "junit", version.ref = "junit-ext-version" }
+mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito-version" }
+mockito-inline = { group = "org.mockito", name = "mockito-inline", version.ref = "mockito-version" }
+mockito-android = { group = "org.mockito", name = "mockito-android", version.ref = "mockito-version" }
+mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin-version" }
+espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-version" }
+coroutine-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutine-test-version" }
+reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin-reflect-version" }
+hilt-android-test = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt-test-version" }
+sandwich = { group = "com.github.skydoves", name = "sandwich", version.ref = "sandwich-version" }
+kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-version" }
+coil-gif = { group = "io.coil-kt", name = "coil-gif", version.ref = "coil-version" }
+coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil-version" }
+landscapist-glide = { group = "com.github.skydoves", name = "landscapist-glide", version.ref = "landscapist-glide-version" }
+bumptech-glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "bumptech-glide-version" }
+accommpanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "paging-version" }
+retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit-version" }
+retrofit-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit-version" }
+logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp3-version" }
+lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle-version" }
+lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle-version" }
+lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle-version" }
+constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout-version" }
+junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit-jupiter-version" }
+junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit-jupiter-version" }
+paging-compose = { group = "androidx.paging", name = "paging-compose", version.ref = "paging-compose-version" }
+core-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson-version" }
+ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "junit4-version" }
+ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "junit4-version" }
+kotlinx-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version.ref = "kotlinx-collections-immutable-version" }
+testing = { group = "org.testing", name = "testing", version.ref = "testing-version" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "android-application" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-android" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-jvm" }
+android-library = { id = "com.android.library", version.ref = "android-library" }
+hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt-android" }
+kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-serialization" }
+google-services = { id = "com.google.gms.google-services", version.ref = "plugin-google-services" }
+
+[bundles]
+kakao-login = ["kakao-all", "kakao-user", "kakao-talk", "kakao-cert", "kakao-share", "kakao-freind"]
+hilt = ["hilt-android", "hilt-compiler", "hilt-navigation-compose"]
+ui = ["ui-tooling-preview", "ui", "material3", "material"]
+basic = ["core-ktx", "appcompat"]
+firebase = ["firebase-messaging", "firebase-analytics"]
+google-login = ["play-service-auth", "google-services"]
+unit-test = ["junit", "mockito-core", "mockito-inline", "coroutine-test", "reflect"]
+coil = ["coil-gif", "coil-compose"]
+glide = ["landscapist-glide", "bumptech-glide"]
+retrofit = ["retrofit", "retrofit-gson"]
+lifecycle = ["lifecycle-runtime", "lifecycle-viewmodel-compose", "lifecycle-viewmodel-ktx"]
+android-test-mockito = ["mockito-core", "mockito-android", "mockito-kotlin"]