diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index d88922f26..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-18T08:00:42.629881Z">
+        <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/app/build.gradle.kts b/app/build.gradle.kts
index b97597095..6568ae17f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -21,8 +21,8 @@ android {
         applicationId = "com.hmoa.app"
         minSdk = 26
         targetSdk = 34
-        versionCode = 35
-        versionName = "1.2.0"
+        versionCode = 36
+        versionName = "1.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders["REDIRECTION_PATH"] = localProperties["REDIRECTION_PATH"] as String
diff --git a/app/src/main/java/com/hmoa/app/view/MainActivity.kt b/app/src/main/java/com/hmoa/app/view/MainActivity.kt
index 3b4ec8e22..b8204f7e8 100644
--- a/app/src/main/java/com/hmoa/app/view/MainActivity.kt
+++ b/app/src/main/java/com/hmoa/app/view/MainActivity.kt
@@ -60,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
 
@@ -185,17 +186,23 @@ class MainActivity : AppCompatActivity() {
 
         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) })
                     }
-                }
             }
         }
 
@@ -292,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 {
diff --git a/app/src/main/java/com/hmoa/app/viewmodel/AppViewModel.kt b/app/src/main/java/com/hmoa/app/viewmodel/AppViewModel.kt
index 6b1adb339..4a9657b08 100644
--- a/app/src/main/java/com/hmoa/app/viewmodel/AppViewModel.kt
+++ b/app/src/main/java/com/hmoa/app/viewmodel/AppViewModel.kt
@@ -6,7 +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.Dispatchers
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -15,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 }
+            }
         }
     }
 
@@ -36,7 +52,8 @@ 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) }
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 8c6613536..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,5 +1,6 @@
 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.*
@@ -36,7 +37,7 @@ fun SearchTopBar(
     onClickSearch: () -> Unit,
     navBack: () -> Unit,
 ) {
-    var searchWord by remember { mutableStateOf("") }
+    var searchWord by remember { mutableStateOf(searchWord) }
     val textFlow = remember { snapshotFlow { searchWord } }
 
     LaunchedEffect(textFlow) {
@@ -51,7 +52,7 @@ fun SearchTopBar(
                     .padding(start = 13.dp),
                 value = searchWord,
                 onValueChange = {
-                    if (it == "") {
+                    if (it.length == 0) {
                         onClearWord()
                     }
                     searchWord = it
@@ -104,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,
diff --git a/feature-brand/build.gradle.kts b/feature-brand/build.gradle.kts
index 5d8142bb6..8596939c0 100644
--- a/feature-brand/build.gradle.kts
+++ b/feature-brand/build.gradle.kts
@@ -35,6 +35,18 @@ android {
     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 {
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-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) }