diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56e..b86273d9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index c1b78e49..1d323dbd 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -13,17 +13,6 @@
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
-      <SelectionState runConfigName="test()">
-        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-02-07T08:23:00.606592900Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=R3CX20PCWHP" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
-      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b157bb26..4940f2bd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DiscordProjectSettings">
     <option name="show" value="ASK" />
     <option name="description" value="" />
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
   <component name="VisualizationToolProject">
     <option name="state">
       <ProjectState>
diff --git a/.idea/other.xml b/.idea/other.xml
new file mode 100644
index 00000000..1811ddc7
--- /dev/null
+++ b/.idea/other.xml
@@ -0,0 +1,450 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="direct_access_persist.xml">
+    <option name="deviceSelectionList">
+      <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="27" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="F01L" />
+          <option name="id" value="F01L" />
+          <option name="manufacturer" value="FUJITSU" />
+          <option name="name" value="F-01L" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1280" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OPPO" />
+          <option name="codename" value="OP573DL1" />
+          <option name="id" value="OP573DL1" />
+          <option name="manufacturer" value="OPPO" />
+          <option name="name" value="CPH2557" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="28" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="SH-01L" />
+          <option name="id" value="SH-01L" />
+          <option name="manufacturer" value="SHARP" />
+          <option name="name" value="AQUOS sense2 SH-01L" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="Lenovo" />
+          <option name="codename" value="TB370FU" />
+          <option name="id" value="TB370FU" />
+          <option name="manufacturer" value="Lenovo" />
+          <option name="name" value="Tab P12" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1840" />
+          <option name="screenY" value="2944" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a15" />
+          <option name="id" value="a15" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A15" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a51" />
+          <option name="id" value="a51" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A51" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="arcfox" />
+          <option name="id" value="arcfox" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="razr plus 2024" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="1272" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b0q" />
+          <option name="id" value="b0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S22 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="32" />
+          <option name="brand" value="google" />
+          <option name="codename" value="bluejay" />
+          <option name="id" value="bluejay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="caiman" />
+          <option name="id" value="caiman" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="960" />
+          <option name="screenY" value="2142" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="comet" />
+          <option name="id" value="comet" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro Fold" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="2076" />
+          <option name="screenY" value="2152" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="crownqlteue" />
+          <option name="id" value="crownqlteue" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Note9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2220" />
+          <option name="screenY" value="1080" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm2q" />
+          <option name="id" value="dm2q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="S23 Plus" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm3q" />
+          <option name="id" value="dm3q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S23 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e1q" />
+          <option name="id" value="e1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e3q" />
+          <option name="id" value="e3q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24 Ultra" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3120" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="eos" />
+          <option name="id" value="eos" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Eos" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix_camera" />
+          <option name="id" value="felix_camera" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold (Camera-enabled)" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="fogona" />
+          <option name="id" value="fogona" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g play - 2024" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="g0q" />
+          <option name="id" value="g0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-S906U1" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gta7lite" />
+          <option name="id" value="gta7lite" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab A7 Lite" />
+          <option name="screenDensity" value="179" />
+          <option name="screenX" value="800" />
+          <option name="screenY" value="1340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8uwifi" />
+          <option name="id" value="gts8uwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8 Ultra" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1848" />
+          <option name="screenY" value="2960" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="husky" />
+          <option name="id" value="husky" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8 Pro" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="java" />
+          <option name="id" value="java" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="G20" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="komodo" />
+          <option name="id" value="komodo" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro XL" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="lynx" />
+          <option name="id" value="lynx" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="maui" />
+          <option name="id" value="maui" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g play - 2023" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="google" />
+          <option name="codename" value="oriole" />
+          <option name="id" value="oriole" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="panther" />
+          <option name="id" value="panther" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q5q" />
+          <option name="id" value="q5q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold5" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1812" />
+          <option name="screenY" value="2176" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q6q" />
+          <option name="id" value="q6q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1856" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="r11" />
+          <option name="id" value="r11" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Watch" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+          <option name="type" value="WEAR_OS" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="r11q" />
+          <option name="id" value="r11q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-S711U" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="redfin" />
+          <option name="id" value="redfin" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 5" />
+          <option name="screenDensity" value="440" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="shiba" />
+          <option name="id" value="shiba" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tangorpro" />
+          <option name="id" value="tangorpro" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Tablet" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="id" value="tokay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/network/RetrofitClient.kt b/app/src/main/java/com/example/yeongkkuel/network/RetrofitClient.kt
index 5a29821e..2ddb9e18 100644
--- a/app/src/main/java/com/example/yeongkkuel/network/RetrofitClient.kt
+++ b/app/src/main/java/com/example/yeongkkuel/network/RetrofitClient.kt
@@ -9,6 +9,7 @@ import com.example.yeongkkuel.presentation.home.store.StoreApiService
 import com.example.yeongkkuel.network.service.MyPageService
 import com.example.yeongkkuel.network.service.NotificationService
 import com.example.yeongkkuel.network.service.StatService
+import com.example.yeongkkuel.presentation.home.entry.data.ExpenseApiService
 
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@@ -91,4 +92,8 @@ object RetrofitClient {
         authRetrofit!!.create(NotificationService::class.java)
     }
 
+    val expenseApiService: ExpenseApiService by lazy {
+        authRetrofit!!.create(ExpenseApiService::class.java)
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/network/YeongkkuelService.kt b/app/src/main/java/com/example/yeongkkuel/network/YeongkkuelService.kt
new file mode 100644
index 00000000..df420b07
--- /dev/null
+++ b/app/src/main/java/com/example/yeongkkuel/network/YeongkkuelService.kt
@@ -0,0 +1,84 @@
+package com.example.yeongkkuel.network
+
+import com.example.yeongkkuel.network.request.expenditure.ExpenditureTargetRequest
+import com.example.yeongkkuel.network.response.Response
+import com.example.yeongkkuel.network.response.expenditure.DayExpenditureResponse
+import com.example.yeongkkuel.network.response.expenditure.MonthExpendituresCalendar
+import com.example.yeongkkuel.network.response.expenditure.MonthExpendituresCategory
+import com.example.yeongkkuel.network.response.expenditure.MonthlyAverageExpenditureResponse
+import com.example.yeongkkuel.network.response.expenditure.WeekExpenditureExpensesResponse
+import com.example.yeongkkuel.network.response.expenditure.WeekExpendituresAverage
+import com.example.yeongkkuel.presentation.home.category.data.CategoryRequest
+import com.example.yeongkkuel.presentation.home.category.data.CategoryResponse
+
+import retrofit2.http.Body
+import retrofit2.http.DELETE
+import retrofit2.http.GET
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+import retrofit2.http.Path
+
+interface YeongkkuelService {
+
+    //stat
+    @GET("/api/expenditures/day")
+    suspend fun getExpendituresDay(
+    ): retrofit2.Response<Response<DayExpenditureResponse>>
+
+    @GET("/api/expenditures/week/expenses")
+    suspend fun getExpendituresWeekExpenses(
+    ): Response<WeekExpenditureExpensesResponse>
+
+    @GET("/api/expenditures/week/average")
+    suspend fun getExpendituresWeekAverage(
+    ): Response<WeekExpendituresAverage>
+
+    @GET("/api/expenditures/month/{year}/{month}")
+    suspend fun getExpendituresMonthCalendar(
+        @Path("year") year: Int,
+        @Path("month") month: Int
+    ): Response<MonthExpendituresCalendar>
+
+    @GET("/api/expenditures/{year}/{month}/{day}")
+    suspend fun getExpendituresMonthCategory(
+        @Path("year") year: Int,
+        @Path("month") month: Int,
+        @Path("day") day: Int,
+    ): Response<MonthExpendituresCategory>
+
+    @POST("/api/expenditures/target")
+    suspend fun postExpendituresTarget(
+        @Body request: ExpenditureTargetRequest
+    )
+
+    @GET("/api/expenditures/target/recommendation")
+    suspend fun getExpenditureAverageMonthly(
+    ): Response<MonthlyAverageExpenditureResponse>
+
+
+    // Category
+    @GET("/api/category/categories")
+    suspend fun getCategories(): Response<List<CategoryResponse>>
+
+    @GET("/api/category/{category_id}")
+    suspend fun getCategoryDetail(
+        @Path("category_id") categoryId: Int
+    ): Response<CategoryResponse>
+
+    @POST("/api/category")
+    suspend fun addCategory(
+        @Body request: CategoryRequest
+    ): Response<Unit>
+
+    @PATCH("/api/category/{category_id}")
+    suspend fun updateCategory(
+        @Path("category_id") categoryId: Int,
+        @Body request: CategoryRequest
+    ): Response<Unit>
+
+    @DELETE("/api/category/{category_id}")
+    suspend fun deleteCategory(
+        @Path("category_id") categoryId: Int
+    ): Response<Unit>
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/network/request/CategoryRequest.kt b/app/src/main/java/com/example/yeongkkuel/network/request/CategoryRequest.kt
new file mode 100644
index 00000000..e69de29b
diff --git a/app/src/main/java/com/example/yeongkkuel/network/response/expenditure/WeekExpendituresAverage.kt b/app/src/main/java/com/example/yeongkkuel/network/response/expenditure/WeekExpendituresAverage.kt
index e0698553..0b8e60ee 100644
--- a/app/src/main/java/com/example/yeongkkuel/network/response/expenditure/WeekExpendituresAverage.kt
+++ b/app/src/main/java/com/example/yeongkkuel/network/response/expenditure/WeekExpendituresAverage.kt
@@ -3,12 +3,12 @@ package com.example.yeongkkuel.network.response.expenditure
 import com.google.gson.annotations.SerializedName
 
 data class WeekExpendituresAverage(
-    @SerializedName("age") val age: String,
-    @SerializedName("job") val job: String,
-    @SerializedName("topPercent") val topPercent: Int,
-    @SerializedName("averageExpenditure") val averageExpenditure: Int,
+    @SerializedName("age") val age: String?,
+    @SerializedName("job") val job: String?,
+    @SerializedName("topPercent") val topPercent: Int?,
+    @SerializedName("averageExpenditure") val averageExpenditure: Int?,
     @SerializedName("myAverageExpenditure") val myAverageExpenditure: Int,
-    @SerializedName("lastWeekExpenditure") val lastWeekExpenditure: Int,
+    @SerializedName("lastWeekExpenditure") val lastWeekExpenditure: Int?,
     @SerializedName("thisWeekExpenditure") val thisWeekExpenditure: Int,
     @SerializedName("categories") val categories: List<Category>
 ) {
diff --git a/app/src/main/java/com/example/yeongkkuel/network/service/StatService.kt b/app/src/main/java/com/example/yeongkkuel/network/service/StatService.kt
index a7a47ffe..ae909c2e 100644
--- a/app/src/main/java/com/example/yeongkkuel/network/service/StatService.kt
+++ b/app/src/main/java/com/example/yeongkkuel/network/service/StatService.kt
@@ -14,32 +14,32 @@ import retrofit2.http.POST
 import retrofit2.http.Path
 
 interface StatService {
-    @GET("/api/expenditures/day")
+    @GET("/api/expense/day")
     suspend fun getExpendituresDay(
     ): retrofit2.Response<Response<DayExpenditureResponse>>
 
-    @GET("/api/expenditures/week/expenses")
+    @GET("/api/expense/week/expenses")
     suspend fun getExpendituresWeekExpenses(
     ): Response<WeekExpenditureExpensesResponse>
 
-    @GET("/api/expenditures/week/average")
+    @GET("/api/expense/week/average")
     suspend fun getExpendituresWeekAverage(
     ): Response<WeekExpendituresAverage>
 
-    @GET("/api/expenditures/month/{year}/{month}")
+    @GET("/api/expense/month/{year}/{month}")
     suspend fun getExpendituresMonthCalendar(
         @Path("year") year: Int,
         @Path("month") month: Int
     ): Response<MonthExpendituresCalendar>
 
-    @GET("/api/expenditures/{year}/{month}/{day}")
+    @GET("/api/expense/{year}/{month}/{day}")
     suspend fun getExpendituresMonthCategory(
         @Path("year") year: Int,
         @Path("month") month: Int,
         @Path("day") day: Int,
     ): Response<MonthExpendituresCategory>
 
-    @POST("/api/expenditures/target")
+    @POST("/api/expense/target")
     suspend fun postExpendituresTarget(
         @Body request: ExpenditureTargetRequest
     )
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/base/MainActivity.kt b/app/src/main/java/com/example/yeongkkuel/presentation/base/MainActivity.kt
index 953de3df..d61aef50 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/base/MainActivity.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/base/MainActivity.kt
@@ -49,8 +49,6 @@ class MainActivity : AppCompatActivity(), BotSheetListener {
     private var rvBottomSheetCollapseStateHeight: Int = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
-
-
         // 스플래시 화면 설정
         val splashScreen = this.installSplashScreen()
 
@@ -71,12 +69,16 @@ class MainActivity : AppCompatActivity(), BotSheetListener {
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        // 스플래시 화면 종료 조건 설정 (예: 데이터 초기화 완료)
-        splashScreen.setKeepOnScreenCondition {
-            // 앱 초기화 작업이 완료될 때까지 유지
-            checkInitialization()
+        // 앱 초기화 작업 중 미리 API 호출하여 데이터를 프리로드
+        lifecycleScope.launch {
+            botSheetViewModel.getSpendingList()
         }
 
+        // 스플래시 화면 종료 조건: 데이터가 로드되지 않았다면 계속 유지
+//        splashScreen.setKeepOnScreenCondition {
+//            !isDataLoaded()  // 데이터가 아직 로드되지 않았다면 true를 반환해서 스플래시 유지
+//        }
+
         setupHamburgerClickListener() // 카테고리 더보기 기능 추가
 
         val navHostFragment =
@@ -96,6 +98,10 @@ class MainActivity : AppCompatActivity(), BotSheetListener {
         setupAddCategoryClickListener(navHostFragment.navController)
     }
 
+    private fun isDataLoaded(): Boolean {
+        return botSheetViewModel.uiState.value.spendingList.isNotEmpty()
+    }
+
     private fun setupAddCategoryClickListener(navController: NavController) {
         binding.tvAddCategory.setOnClickListener {
             navController.navigate(R.id.categoryAddFragment, null, NavOptions.Builder()
@@ -106,6 +112,11 @@ class MainActivity : AppCompatActivity(), BotSheetListener {
         }
     }
 
+    fun resetBottomSheetState() {
+        val bottomSheetBehavior = BottomSheetBehavior.from(binding.clItemBotSheet)
+        bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
+    }
+
     private fun initView() = with(binding) {
         fun initBottomSheet() {
             val bottomSheet = binding.clItemBotSheet
@@ -233,7 +244,7 @@ class MainActivity : AppCompatActivity(), BotSheetListener {
                 when (destination.id) {
                     R.id.navigation_home,
                     R.id.navigation_stat,
-                        -> setBotSheetVisible()
+                    -> setBotSheetVisible()
 
 
                     else -> setBotSheetGone()
@@ -321,7 +332,7 @@ class MainActivity : AppCompatActivity(), BotSheetListener {
         lifecycleScope.launch {
             uiState.flowWithLifecycle(lifecycle)
                 .collectLatest { uiState ->
-                    onBind(uiState) // ✅ UI 데이터 바인딩
+                    onBind(uiState) // UI 데이터 바인딩
                 }
         }
     }
@@ -350,14 +361,15 @@ class MainActivity : AppCompatActivity(), BotSheetListener {
 
         // iv_hamberger 클릭 리스너 추가
         binding.ivHamberger.setOnClickListener {
+            categoryViewModel.updateCategoryOrderLocally(botSheetViewModel.getCategoryList()) // 현재 카테고리 목록을 ViewModel에 업데이트
             navController.navigate(R.id.categoryManageFragment)
             val bottomSheetBehavior = BottomSheetBehavior.from(binding.clItemBotSheet)
-            bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED // BottomSheet 닫기
+            bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
         }
     }
 
     private fun onBind(uiState: BotSheetUiState) = with(binding) {
-
+        Log.e("histories1", uiState.spendingList.map { it.history }.toString())
         botSheetCategoryListAdapter.submitList(uiState.spendingList)
 
         val isEmpty = uiState.spendingList.isEmpty()
@@ -414,23 +426,31 @@ class MainActivity : AppCompatActivity(), BotSheetListener {
         navController.navigate(R.id.expenseEntryFragment, bundle)
     }
 
-    override fun navigateToExpenseView(expenseName: String, expensePrice: Int, categoryColor: Int) {
-        Log.d("MainActivity", "📌 navigateToExpenseView() 호출됨")
-        Log.d("MainActivity", "📌 전달된 데이터 - name: $expenseName, price: $expensePrice, categoryColor: $categoryColor")
+    override fun navigateToExpenseView(
+        expenseId: Int,
+        expenseName: String,
+        expensePrice: Int,
+        categoryColor: Int,
+        categoryName: String
+    ) {
+        Log.d("MainActivity", "navigateToExpenseView() 호출됨 - id=$expenseId, name=$expenseName, price=$expensePrice, color=$categoryColor")
 
-        val navHostFragment =
-            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
+        val navHostFragment = supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
         val navController = navHostFragment.navController
 
-        // 🔹 번들에 데이터 추가하여 ExpenseViewFragment로 전달
         val bundle = Bundle().apply {
+            putInt("expenseId", expenseId)
             putString("expenseName", expenseName)
             putInt("expensePrice", expensePrice)
-            putInt("categoryColor", categoryColor) // ✅ categoryColor를 Int로 전달
+            putInt("categoryColor", categoryColor)
+            putString("categoryName", categoryName)
         }
 
         navController.navigate(R.id.navigation_expense_view, bundle)
     }
+
+
+
     override fun onNoExpenseChanged(isNoExpense: Boolean) {
     }
 
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetCategoryListAdapter.kt b/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetCategoryListAdapter.kt
index 1d0897cb..da1d6a9a 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetCategoryListAdapter.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetCategoryListAdapter.kt
@@ -1,8 +1,7 @@
 package com.example.yeongkkuel.presentation.botsheet
 
 import android.content.res.ColorStateList
-import android.graphics.Color
-import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
@@ -12,9 +11,7 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.example.yeongkkuel.R
 import com.example.yeongkkuel.databinding.ItemBotsheetCategoryBinding
-import android.util.Log
 import android.view.View
-import androidx.navigation.Navigation.findNavController
 
 
 class BotSheetCategoryListAdapter(
@@ -27,58 +24,81 @@ class BotSheetCategoryListAdapter(
         private val binding: ItemBotsheetCategoryBinding
     ) : RecyclerView.ViewHolder(binding.root) {
 
-        // 🔹 클릭 리스너를 Adapter에 직접 추가하지 않고, Fragment로 전달
-        private val historyListAdapter = BotSheetHistoryListAdapter { selectedHistory ->
-                Color.RED // 기본값 검정색 적용
+        fun onBind(item: BotSheetUiState.Spending) = with(binding) {
+            // 카테고리 색상 가져오기
+            val categoryColor = item.color.id
 
-            botSheetListener.navigateToExpenseView(
-                selectedHistory.name,
-                selectedHistory.price,
-                1
-            )
-        }
+            // 1) 원본 목록 (blank+0원 항목도 들어있음)
+            val originalHistories = item.history
 
-        fun onBind(item: BotSheetUiState.Spending) = with(binding) {
-            tvCategory.text = item.kind.name
-            val context = binding.root.context
-            val color = item.color.id // Colors Enum의 id 사용
-            tvCategory.setTextColor(ContextCompat.getColor(context, color))
-            ivBtnAdd.backgroundTintList =
-                ColorStateList.valueOf(ContextCompat.getColor(context, color))
-            binding.ivBtnAdd.setImageResource(R.drawable.ic_plus_default)
-            binding.ivBtnAdd.imageTintList =
-                ColorStateList.valueOf(ContextCompat.getColor(context, item.color.id))
+            // 2) UI에 표시할 목록 (blank+0원 항목 필터링)
+            val displayedHistories = originalHistories.filterNot { hist ->
+                hist.name.isBlank() && hist.price == 0
+            }
+
+            Log.e("histories2", originalHistories.toString())
+
+            // onBind() 안에서 새로 Adapter 생성
+            val localHistoryListAdapter = BotSheetHistoryListAdapter { selectedHistory ->
+                botSheetListener.navigateToExpenseView(
+                    expenseId = selectedHistory.id,
+                    expenseName = selectedHistory.name,
+                    expensePrice = selectedHistory.price,
+                    categoryColor = categoryColor,
+                    categoryName = item.kind.name
+                )
+            }
 
             rvHistory.run {
-                adapter = historyListAdapter
-                historyListAdapter.submitList(item.history ?: emptyList()) {
-                    // ✅ 최신 데이터 반영 후 UI 업데이트
-                    updateNoSpendAndMoreVisibility(item)
+                adapter = localHistoryListAdapter
+                // 🔸 필터링된 목록만 표시!
+                localHistoryListAdapter.submitList(displayedHistories) {
+                    // 🔸 무지출 문구는 '원본 목록'으로 판단
+                    updateNoSpendAndMoreVisibility(originalHistories)
                 }
-                layoutManager = LinearLayoutManager(binding.root.context)
+                layoutManager = LinearLayoutManager(root.context)
             }
-            // 🔹 카테고리 추가 버튼 클릭 리스너
+
+
+            // UI 세팅
+            tvCategory.text = item.kind.name
+            val context = root.context
+            tvCategory.setTextColor(ContextCompat.getColor(context, categoryColor))
+            ivBtnAdd.backgroundTintList =
+                ColorStateList.valueOf(ContextCompat.getColor(context, categoryColor))
+            ivBtnAdd.setImageResource(R.drawable.ic_plus_default)
+            ivBtnAdd.imageTintList =
+                ColorStateList.valueOf(ContextCompat.getColor(context, categoryColor))
+
+            // 카테고리 추가 버튼 클릭 리스너
             ivBtnAdd.setOnClickListener {
-                botSheetListener.navigateToExpenseEntry(item.kind.name, item.color.id)
+                botSheetListener.navigateToExpenseEntry(item.kind.name, categoryColor)
             }
         }
 
-        private fun updateNoSpendAndMoreVisibility(item: BotSheetUiState.Spending) {
-            val hasNoExpenseEntry = item.history.isEmpty() // 모든 항목이 무지출인지 확인
-            val isEmpty = item.history.isEmpty() // 리스트가 비어 있는지 확인
 
-            if (isEmpty) {
+        private fun updateNoSpendAndMoreVisibility(histories: List<BotSheetUiState.Spending.History>) {
+            // ⚠ 인자로 '원본 목록'을 받음 (blank+0원 항목도 포함)
+            if (histories.isEmpty()) {
+                // 내역이 전혀 없으면 → 무지출 문구 안 보임 (사용자 요구사항에 따라 조정)
                 binding.tvNoSpend.visibility = View.GONE
-                botSheetListener.onNoExpenseChanged(false) // ✅ 일반 지출이 없으므로 icMore 보이도록
-            } else if (hasNoExpenseEntry) {
+                botSheetListener.onNoExpenseChanged(false)
+                return
+            }
+            // 내역이 있고, 모두 금액 0원이면 무지출 문구 보임
+            val allZero = histories.all { it.price == 0 }
+            if (allZero) {
                 binding.tvNoSpend.visibility = View.VISIBLE
-                botSheetListener.onNoExpenseChanged(true) // ✅ 무지출 항목만 있으면 icMore 숨김
+                botSheetListener.onNoExpenseChanged(true)
             } else {
                 binding.tvNoSpend.visibility = View.GONE
-                botSheetListener.onNoExpenseChanged(false) // ✅ 일반 지출이 있으면 icMore 보이도록
+                botSheetListener.onNoExpenseChanged(false)
             }
         }
+
     }
+
+
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
@@ -102,13 +122,20 @@ class SpendingCategoryListDiffUtil : DiffUtil.ItemCallback<BotSheetUiState.Spend
         oldItem: BotSheetUiState.Spending,
         newItem: BotSheetUiState.Spending
     ): Boolean {
-        return oldItem == newItem
+        return oldItem.categoryId == newItem.categoryId
     }
 
     override fun areContentsTheSame(
         oldItem: BotSheetUiState.Spending,
         newItem: BotSheetUiState.Spending
     ): Boolean {
-        return oldItem.kind == newItem.kind && oldItem.color == newItem.color
+        return oldItem.kind == newItem.kind &&
+                oldItem.color == newItem.color &&
+                oldItem.plusIconResId == newItem.plusIconResId &&
+                oldItem.history.size == newItem.history.size &&
+                oldItem.history.zip(newItem.history).all { (old, new) ->
+                    old == new
+                }
     }
-}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetHistoryListAdapter.kt b/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetHistoryListAdapter.kt
index 7434a331..074d26cc 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetHistoryListAdapter.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetHistoryListAdapter.kt
@@ -31,6 +31,21 @@ class BotSheetHistoryListAdapter(
                 item.name
             }
 
+            if (item.price > 0) {
+                // 금액이 1원 이상이면 기존처럼 표기
+                tvPrice.text = "-${item.price.toMoneyString()}원"
+            } else {
+                // 금액이 0원이면 가격 부분 숨기거나 "" 처리
+                tvPrice.text = ""
+            }
+
+            // 만약 "내용이 빈칸 + 금액 0원"도 표시하고 싶지 않다면, 여기서 추가 처리
+             if (item.name.isBlank() && item.price == 0) {
+                 root.visibility = View.GONE
+             } else {
+                 root.visibility = View.VISIBLE
+             }
+
             if (!item.imgExist) {
                 icPhotoIncluded.visibility = View.VISIBLE // 사진이 있을 경우 표시
             } else {
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetListener.kt b/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetListener.kt
index 2983bc9e..4acafbf3 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetListener.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetListener.kt
@@ -5,7 +5,7 @@ interface BotSheetListener {
     fun setBotSheetGone()
     fun setBotSheetVisible()
     fun navigateToExpenseEntry(selectedCategory: String, categoryColor: Int)
-    fun navigateToExpenseView(expenseName: String, expensePrice: Int, categoryColor: Int)
+    fun navigateToExpenseView(expenseId: Int, expenseName: String, expensePrice: Int, categoryColor: Int, categoryName: String)
     fun navigateToCategoryAddFragment()
     fun onNoExpenseChanged(isNoExpense: Boolean) // 무지출 여부 전달
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetUiState.kt b/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetUiState.kt
index 397be941..d097a96b 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetUiState.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetUiState.kt
@@ -1,9 +1,12 @@
 package com.example.yeongkkuel.presentation.botsheet
 
 import com.example.yeongkkuel.R
+import com.example.yeongkkuel.presentation.home.entry.data.ExpenseUpdateRequest
 import com.example.yeongkkuel.presentation.util.Colors
 import com.example.yeongkkuel.presentation.util.SpendingCategory
+import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale
 
 data class BotSheetUiState(
     val targetSpending: Int = 0,
@@ -22,8 +25,18 @@ data class BotSheetUiState(
             val id: Int,
             val name: String,       // 🔹 지출 이름
             val price: Int,         // 🔹 금액
-            val imgExist: Boolean,   // 🔹 사진 URL 추가
-        )
+            val imgExist: Boolean   // 🔹 사진 URL 추가
+        ) {
+            fun toRequest(categoryId: Int, date: Date): ExpenseUpdateRequest {
+                return ExpenseUpdateRequest(
+                    day = SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN).format(date),
+                    categoryId = categoryId,
+                    content = name,
+                    amount = price,
+                    expenseImg = if (imgExist) "image_url_placeholder" else null // ✅ 실제 이미지 URL이 있으면 적용
+                )
+            }
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetViewModel.kt b/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetViewModel.kt
index d0b283fe..13de7c73 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetViewModel.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/botsheet/BotSheetViewModel.kt
@@ -10,6 +10,7 @@ import com.example.yeongkkuel.network.RetrofitClient
 import com.example.yeongkkuel.network.response.Response
 import com.example.yeongkkuel.network.response.expenditure.DayExpenditureResponse
 import com.example.yeongkkuel.presentation.home.category.data.Category
+import com.example.yeongkkuel.presentation.home.entry.data.ExpenseListResponse
 import com.example.yeongkkuel.presentation.util.Colors
 import com.example.yeongkkuel.presentation.util.SpendingCategory
 import com.google.firebase.crashlytics.buildtools.reloc.com.google.common.reflect.TypeToken
@@ -27,7 +28,8 @@ class BotSheetViewModel : ViewModel() {
     private val _uiState = MutableStateFlow<BotSheetUiState>(BotSheetUiState.init())
     val uiState = _uiState.asStateFlow()
 
-    private val yeongkkuelService = RetrofitClient.statService
+    private val statService = RetrofitClient.statService
+    private val expenseApiService = RetrofitClient.expenseApiService
 
     // ✅ LiveData → StateFlow로 일관된 상태 관리
     private val _spendingHistoryList =
@@ -36,24 +38,77 @@ class BotSheetViewModel : ViewModel() {
 
     private val _categoryList = MutableLiveData<List<Category>>(emptyList()) // ✅ MutableLiveData 선언 추가
     val categoryList: LiveData<List<Category>> get() = _categoryList // ✅ LiveData로 접근
+    private val _deleteResult = MutableLiveData<Boolean>()
+    val deleteResult: LiveData<Boolean> get() = _deleteResult
 
-    // 🔹 지출 내역 추가 기능
-    fun addExpenseToCategory(
-        category: SpendingCategory,
-        history: BotSheetUiState.Spending.History
-    ) {
-        _uiState.update { prev ->
-            val updatedList = prev.spendingList.map { spending ->
-                if (spending.kind == category) {
-                    spending.copy(history = spending.history + history)
+    fun deleteExpense(expenseId: Int) {
+        viewModelScope.launch {
+            try {
+                val response = expenseApiService.deleteExpense(expenseId)
+
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
+                    _deleteResult.postValue(true) // ✅ 삭제 성공
                 } else {
-                    spending
+                    Log.e("BotSheetViewModel", "삭제 실패: ${response.body()?.message}")
+                    _deleteResult.postValue(false) // ✅ 삭제 실패
                 }
+            } catch (e: Exception) {
+                Log.e("BotSheetViewModel", "API 호출 중 오류 발생", e)
+                _deleteResult.postValue(false)
+            }
+        }
+    }
+
+    private fun removeExpenseFromUi(expenseId: Int) {
+        _uiState.update { prevState ->
+            val updatedSpendingList = prevState.spendingList.map { spending ->
+                val updatedHistory = spending.history.filterNot { it.id == expenseId }
+                spending.copy(history = updatedHistory)
+            }.filterNot { it.history.isEmpty() } // 🔥 내역이 비어 있으면 해당 카테리 삭제
+
+            prevState.copy(spendingList = updatedSpendingList)
+        }
+
+        // ✅ 최신 지출 내역 반영
+        updateSpendingHistoryList()
+        Log.d("BotSheetViewModel", "📌 삭제됨: expenseId=$expenseId, 남은 지출 개수=${_spendingHistoryList.value.size}")
+    }
+
+    // 🔹 지출 내역 추가 기능
+    fun addExpenseToCategory(category: SpendingCategory, history: BotSheetUiState.Spending.History) {
+        _uiState.update { prev ->
+            val updatedList = prev.spendingList.toMutableList()
+
+            // 기존 카테고리가 있는지 확인
+            val categoryIndex = updatedList.indexOfFirst { it.kind == category }
+
+            if (categoryIndex != -1) {
+                // 기존 카테고리가 있으면 해당 카테고리에 내역 추가
+                val existingCategory = updatedList[categoryIndex]
+
+                val updatedCategory = existingCategory.copy(
+                    history = existingCategory.history + history
+                )
+
+                updatedList[categoryIndex] = updatedCategory
+            } else {
+                // 기존 카테고리가 없으면 새로 추가 (색상 유지)
+                updatedList.add(
+                    BotSheetUiState.Spending(
+                        categoryId = history.id,
+                        kind = category,
+                        color = prev.spendingList.find { it.kind == category }?.color ?: Colors.BLACK1,
+                        plusIconResId = R.drawable.ic_plus_default,
+                        history = listOf(history)
+                    )
+                )
             }
+
             prev.copy(spendingList = updatedList)
         }
-        updateSpendingHistoryList() // ✅ 추가된 내역 반영
+        updateSpendingHistoryList()
     }
+
     private val mutex = Mutex()
 
     suspend fun updateBotSheetHistory(updatedExpense: BotSheetUiState.Spending.History) {
@@ -62,37 +117,84 @@ class BotSheetViewModel : ViewModel() {
         mutex.withLock {
             _uiState.update { prevState ->
                 val updatedSpendingList = prevState.spendingList.map { spending ->
-                    val historyMatch = spending.history.find {
-                        it.name == updatedExpense.name
+                    val updatedHistoryList = spending.history.map { history ->
+                        if (history.id == updatedExpense.id) {
+                            updatedExpense.copy() // ✅ 내용과 금액만 변경 (카테고리 변경 없음)
+                        } else {
+                            history
+                        }
                     }
+                    spending.copy(history = updatedHistoryList) // ✅ 카테고리 수정 없이 내용만 업데이트
 
-                    if (historyMatch != null) {
-                        Log.d("BotSheetViewModel", "✅ 기존 데이터 찾음: $historyMatch → $updatedExpense")
-
-                        spending.copy(
-                            history = spending.history.map { history ->
-                                if (history.name == updatedExpense.name) {
-                                    updatedExpense // ✅ 기존 항목을 수정된 값으로 변경
-                                } else {
-                                    history
-                                }
-                            }
-                        )
-                    } else {
-                        Log.d("BotSheetViewModel", "❌ 기존 데이터 없음: 업데이트되지 않음.")
-                        spending
-                    }
                 }
-
                 Log.d("BotSheetViewModel", "✅ spendingList 업데이트 완료: $updatedSpendingList")
-
                 prevState.copy(spendingList = updatedSpendingList)
             }
 
+            // ✅ 추가된 내역을 반영하기 위해 `addExpenseToCategory()` 호출
+            addExpenseToCategory(
+                SpendingCategory.CUSTOM(updatedExpense.name),
+                updatedExpense
+            )
+            addExpenseHistory(updatedExpense)
             updateSpendingHistoryList() // ✅ 최신 데이터 반영
         }
     }
 
+    private fun Category.toBotSheetSpending(): BotSheetUiState.Spending {
+        return BotSheetUiState.Spending(
+            categoryId = this.id, // ✅ 기존 categoryId → id 로 변경
+            kind = SpendingCategory.fromName(this.name), // ✅ 기존 categoryName → name 변경
+            color = this.color, // ✅ 기존 Colors.RED1 → 서버에서 받은 색상 적용
+            plusIconResId = R.drawable.ic_plus_default,
+            history = emptyList() // ✅ 초기 history는 비워둠 (이후 업데이트 가능)
+        )
+    }
+
+    fun updateBotSheetCategories(categories: List<Category>) {
+        Log.d("BotSheetViewModel", "🚀 updateBotSheetCategories 실행됨! categories: $categories")
+
+        _categoryList.postValue(categories)
+
+        val updatedSpendingList = categories.map { category ->
+            BotSheetUiState.Spending(
+                categoryId = category.id,
+                kind = SpendingCategory.fromName(category.name),
+                color = category.color,
+                plusIconResId = R.drawable.ic_plus_default,
+                history = emptyList() // 기본값 (필요에 따라 업데이트 가능)
+            )
+        }
+
+        _uiState.update { prevState ->
+            Log.d("BotSheetViewModel", "✅ 바텀시트 UI 업데이트 완료! 카테고리 개수: ${updatedSpendingList.size}")
+            prevState.copy(spendingList = updatedSpendingList)
+        }
+    }
+
+    fun updateBotSheetData(response: ExpenseListResponse) {
+        _uiState.update { prevState ->
+            val updatedSpendingList = response.result.map { expense ->
+                Log.d("BotSheetViewModel", "🚀 updateBotSheetData(): expenseId=${expense.id}, category=${expense.content}")
+
+                BotSheetUiState.Spending(
+                    categoryId = expense.id,
+                    kind = SpendingCategory.fromName(expense.content),
+                    color = Colors.RED1, // 서버에서 색상을 제공하는 경우 수정 필요
+                    plusIconResId = R.drawable.ic_plus_default,
+                    history = listOf(
+                        BotSheetUiState.Spending.History(
+                            id = expense.id,
+                            name = expense.content,
+                            price = expense.amount,
+                            imgExist = expense.imageUrl?.isNotEmpty() ?: false // ✅ 안전한 처리
+                        )
+                    )
+                )
+            }
+            prevState.copy(spendingList = updatedSpendingList)
+        }
+    }
 
     private fun updateSpendingHistoryList() {
         val historyList = _uiState.value.spendingList.flatMap { it.history }
@@ -100,7 +202,7 @@ class BotSheetViewModel : ViewModel() {
         Log.d("BotSheetViewModel", "📌 updateSpendingHistoryList() 실행됨")
         Log.d("BotSheetViewModel", "📌 최신 spendingHistoryList: $historyList") // ✅ 최신 리스트 확인
 
-//        _spendingHistoryList.value = historyList.sortedByDescending { it.date }
+        _spendingHistoryList.value = historyList // ✅ 최신 리스트로 갱신
     }
 
     // 🔹 카테고리 이동 기능
@@ -156,8 +258,6 @@ class BotSheetViewModel : ViewModel() {
         }
         // 추가된 카테고리를 _categoryList에 업데이트
         _categoryList.value = _categoryList.value.orEmpty() + category
-
-        Log.d("BotSheetViewModel", "✅ 카테고리 추가됨: ${category.name}")
     }
 
     private fun mapCategoryToIcon(color: Colors): Int {
@@ -166,13 +266,13 @@ class BotSheetViewModel : ViewModel() {
 
     // 카테고리 제목, 색상 수정 후 바텀시트 업로드
     fun updateCategory(originalCategoryName: String, updatedCategory: Category) {
-        val updatedCategoryColor = updatedCategory.color // ✅ Colors 타입 유지
+        val updatedCategoryColor = updatedCategory.color
 
         val updatedSpendingList = uiState.value.spendingList.map { spending ->
             if (spending.kind.name == originalCategoryName) {
                 spending.copy(
                     kind = SpendingCategory.fromName(updatedCategory.name),
-                    color = updatedCategoryColor // ✅ Colors 타입 유지
+                    color = updatedCategoryColor
                 )
             } else {
                 spending
@@ -182,7 +282,7 @@ class BotSheetViewModel : ViewModel() {
         // 기존 카테고리 리스트 업데이트
         _categoryList.value = _categoryList.value?.map { category ->
             if (category.name == originalCategoryName) {
-                updatedCategory // 수정된 카테고리 반영
+                updatedCategory
             } else {
                 category
             }
@@ -201,10 +301,10 @@ class BotSheetViewModel : ViewModel() {
         }
     }
 
-    // 🔹 일일 목표 지출 가져오기
+    // 일일 목표 지출 가져오기
     fun getDayTargetSpending() = viewModelScope.launch {
         try {
-            val response = yeongkkuelService.getExpendituresDay()
+            val response = statService.getExpendituresDay()
 
             if (response.isSuccessful) { // HTTP 상태 코드 200~299
                 response.body()?.let { body -> // body가 직접 만든 Response<T> 구조를 따름
@@ -236,7 +336,7 @@ class BotSheetViewModel : ViewModel() {
         }
     }
 
-    // 🔹 매개변수 없는 기본 함수
+    // 매개변수 없는 기본 함수
     fun getSpendingList() {
         val calendar = Calendar.getInstance()
         val year = calendar.get(Calendar.YEAR)
@@ -247,26 +347,41 @@ class BotSheetViewModel : ViewModel() {
         getDayTargetSpending()
     }
 
-    // 🔹 매개변수를 받는 기존 함수
-    // 🔹 월별 지출 내역 가져오기
+    // 매개변수를 받는 기존 함수
+    // 월별 지출 내역 가져오기
     fun getSpendingList(year: Int, month: Int, day: Int) = viewModelScope.launch {
         try {
             // yeongkkuelService를 통해 데이터 요청
-            yeongkkuelService.getExpendituresMonthCategory(
-                year = year,
-                month = month,
-                day = day
-            ).run {
+            statService.getExpendituresMonthCategory(year, month, day).run {
                 if (isSuccess) {
                     result.run {
+                        val categories = categories.map { category ->
+                            Category(
+                                id = category.categoryId,
+                                name = category.categoryName,
+                                color = Colors.fromRGB(
+                                    red = category.red,
+                                    blue = category.blue,
+                                    green = category.green
+                                ) ?: Colors.RED1
+                            )
+                        }
+
+                        // ✅ 추가: 바텀시트 UI 업데이트
+                        updateBotSheetCategories(categories)
+
                         _uiState.update { prev ->
                             val updatedSpendingList = categories.map { category ->
+                                // ✅ 카테고리 ID 기반으로 해당 카테고리의 지출 내역 찾기
+                                val expenses = result.categories
+                                    .find { it.categoryId == category.id }?.expenses ?: emptyList()
+
                                 BotSheetUiState.Spending(
-                                    categoryId = 1,
-                                    kind = SpendingCategory.fromName(category.categoryName),
-                                    color = Colors.fromRGB(red = category.red, blue = category.blue, green = category.green) ?: Colors.RED1,
+                                    categoryId = category.id, // ✅ 기존 1 → category.id 로 수정
+                                    kind = SpendingCategory.fromName(category.name),
+                                    color = category.color,
                                     plusIconResId = R.drawable.ic_plus_default,
-                                    history = category.expenses.map { expense ->
+                                    history = expenses.map { expense -> // ✅ expenses를 여기서 가져오기
                                         BotSheetUiState.Spending.History(
                                             id = expense.expenseId,
                                             name = expense.expenseName,
@@ -283,15 +398,17 @@ class BotSheetViewModel : ViewModel() {
                                 }.time
                             )
                         }
+                        updateSpendingHistoryList() // 최신 데이터 반영
                     }
-                    updateSpendingHistoryList() // 최신 데이터 반영
                 }
             }
         } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e("BotSheetViewModel", "🚨 getSpendingList() 오류: ${e.message}")
         }
     }
 
+
+
 //    fun updateExpense(updatedExpense: BotSheetUiState.Spending.History) {
 //        _spendingHistoryList.value = _spendingHistoryList.value.map { expense ->
 //            if (expense.date == updatedExpense.date && expense.name == updatedExpense.name) {
@@ -305,12 +422,13 @@ class BotSheetViewModel : ViewModel() {
     fun getCategoryList(): List<Category> {
         val categoryList = _uiState.value.spendingList.map { spending ->
             Category(
-                id = spending.hashCode(), // 임시로 고유 id 생성
+                id = spending.categoryId,
                 name = spending.kind.name,
                 color = spending.color
             )
         }
         Log.d("BotSheetViewModel", "getCategoryList() 반환: $categoryList")
+        Log.d("BotSheetViewModel", "📌 getCategoryList() 호출됨, 현재 카테고리 개수: ${_categoryList.value?.size ?: 0}")
         return categoryList
     }
 
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeFragment.kt
index de6e1f9b..5bbda6f9 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeFragment.kt
@@ -15,21 +15,30 @@ import android.view.WindowManager
 import android.widget.ImageView
 import android.widget.Toast
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
 import com.example.yeongkkuel.R
 import com.example.yeongkkuel.databinding.FragmentHomeBinding
+import com.example.yeongkkuel.network.response.expenditure.MonthExpendituresCategory
 import com.example.yeongkkuel.presentation.botsheet.BotSheetViewModel
 import com.example.yeongkkuel.presentation.botsheet.BotSheetUiState
+import com.example.yeongkkuel.presentation.home.category.CategoryViewModel
+import com.example.yeongkkuel.presentation.home.category.data.Category
 import com.example.yeongkkuel.presentation.home.store.Product
 import com.example.yeongkkuel.presentation.home.store.StoreFragment
+//import com.example.yeongkkuel.presentation.home.store.data.MySkin
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
+import com.bumptech.glide.Glide
+import com.example.yeongkkuel.presentation.base.MainActivity
+import com.example.yeongkkuel.presentation.util.dpToPx
 
 
 class HomeFragment : Fragment() {
@@ -39,16 +48,19 @@ class HomeFragment : Fragment() {
         get() = requireNotNull(_binding) { "FragmentHomeBinding -> null" }
     private val PREFS_NAME = "AppPrefs"
     private val KEY_LAST_HIDDEN_DATE = "lastHiddenDate"
-    private val homeViewModel: HomeViewModel by viewModels()
+    private lateinit var repository: HomeRepository
 
-    // BotSheetViewModel을 참조
-    private val botSheetViewModel: BotSheetViewModel by viewModels()
-    override fun onResume() {
-        super.onResume()
-        updateWarningVisibility(botSheetViewModel.uiState.value)
+    private val homeViewModel: HomeViewModel by viewModels {
+        HomeViewModel.Factory(HomeRepository())
     }
+    private val categoryViewModel: CategoryViewModel by viewModels()
+    private val botSheetViewModel: BotSheetViewModel by activityViewModels()
 
 
+    override fun onResume() {
+        super.onResume()
+        botSheetViewModel.getSpendingList()
+    }
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -57,6 +69,8 @@ class HomeFragment : Fragment() {
     ): View {
         _binding = FragmentHomeBinding.inflate(inflater, container, false)
         val showRewardModal = arguments?.getBoolean("showRewardModal") ?: false
+
+        repository = HomeRepository()
         if (showRewardModal) {
             showRewardDialog()
         }
@@ -67,27 +81,27 @@ class HomeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         navController = Navigation.findNavController(view)
-        val sharedPreferences = requireActivity().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-        val lastHiddenDate = sharedPreferences.getString(KEY_LAST_HIDDEN_DATE, "")
-        val todayDate = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
 
-        if (lastHiddenDate == todayDate) {
-            binding.imgWarningStart.visibility = View.GONE
-        }
+        (activity as? MainActivity)?.resetBottomSheetState()
 
-        // FragmentResult API를 통해 StoreFragment에서 데이터 수신
+        // 홈 탭에 진입할 때 바텀시트 상태(피크 높이)를 재설정
+        val displayHeight = resources.displayMetrics.heightPixels
+        val desiredPeekHeight = displayHeight - 430.dpToPx(requireContext())
+        (activity as? MainActivity)?.setPeekHeight(desiredPeekHeight)
+
+        // StoreFragment에서 선택한 상품을 수신하여 홈 화면 업데이트
         parentFragmentManager.setFragmentResultListener("selectedProductKey", this) { _, bundle ->
             val selectedProduct = bundle.getParcelable<Product>("selectedProduct")
             selectedProduct?.let {
-                Log.d("HomeFragment", "Received selected product: ${it.name}")
+                Log.d("HomeFragment", "✅ StoreFragment에서 받은 상품: ${it.name}, area: ${it.area}, imageUrl: ${it.imageUrl}")
                 applySelectedProductToHome(it)
-            }
+            } ?: Log.e("HomeFragment", "❌ StoreFragment에서 받은 상품이 null입니다!")
         }
 
-        setupSwipeToDismiss(binding.imgWarningStart)
+        setupSwipeToDismiss(binding.ivError)
         renderMyProductsForHome()
 
-        // ✅ StateFlow를 collect 할 때 viewLifecycleOwner.lifecycleScope.launch 사용
+        // StateFlow collect
         viewLifecycleOwner.lifecycleScope.launch {
             botSheetViewModel.uiState.collectLatest { uiState ->
                 updateWarningVisibility(uiState)
@@ -106,33 +120,58 @@ class HomeFragment : Fragment() {
         ivHamberger.setOnClickListener {
             navController.navigate(R.id.categoryManageFragment)
         }
+        homeViewModel.homeResult.observe(viewLifecycleOwner) { result ->
+            if (result != null) {
+                Log.d("HomeFragment", "✅ 홈 데이터 수신 완료: $result")
 
-        setupSwipeToDismiss(binding.imgWarningStart)
-
-        homeViewModel.fetchHomeData()
+                // 수정된 데이터 바인딩 방식
+                binding.tvCoin.text = result.myReward.toString() // ✅ 숫자만 표시
+                updateMySkins(result.mySkin) // ✅ 변경된 데이터 클래스 반영
 
-        // ✅ LiveData 관찰
-        homeViewModel.homeResponse.observe(viewLifecycleOwner) { response ->
-            if (response?.isSuccess == true) {
-                binding.tvCoin.text = "보유 리워드: ${response.result.myReward}"
+                // 카테고리 정보 업데이트
+                val categories = result.categories.map { it.toCategory(categoryViewModel) }
+                val expensesMap = result.categories.associate { it.categoryId to it.expenses }
+                updateCategoryExpenses(categories, expensesMap)
 
-                // ✅ 보유한 스킨 업데이트
-                updateMySkins(response.result.mySkin)
+                Log.d("HomeFragment", "🚀 updateBotSheetCategories 호출됨!")
+                botSheetViewModel.updateBotSheetCategories(categories)
 
-                // ✅ 지출 내역 업데이트
-                updateCategoryExpenses(response.result.categories)
+                botSheetViewModel.getSpendingList() // 홈 데이터 수신 후 즉시 지출 내역 갱신 API 호출함
             } else {
-                Toast.makeText(requireContext(), "홈 데이터 불러오기 실패", Toast.LENGTH_SHORT).show()
+                Log.e("HomeFragment", "🚨 홈 데이터 수신 실패 또는 응답 없음!")
+            }
+        }
+        setupSwipeToDismiss(binding.ivError)
+
+        Log.d("HomeFragment", "🚀 fetchHomeData() 호출됨!")
+
+        // 중복 실행 방지: 최초 실행 여부 체크
+        if (savedInstanceState == null) {
+            homeViewModel.fetchHomeData()
+        }
+        // Null 체크 추가
+        parentFragmentManager.setFragmentResultListener("selectedProductKey", this) { _, bundle ->
+            if (bundle.containsKey("selectedProduct")) {
+                bundle.getParcelable<Product>("selectedProduct")?.let {
+                    Log.d("HomeFragment", "Received selected product: ${it.name}")
+                    applySelectedProductToHome(it)
+                }
             }
         }
     }
-    private fun updateCategoryExpenses(categories: List<Category>) {
+
+    // 변환된 Category 리스트를 받도록 변경
+    private fun updateCategoryExpenses(categories: List<Category>, expensesMap: Map<Int, List<Expense>>) {
         categories.forEach { category ->
-            category.expenses.forEach { expense ->
-                Log.d("HomeFragment", "카테고리: ${category.categoryName}, 지출: ${expense.content}, 금액: ${expense.amount}")
+            val expenses = expensesMap[category.id] ?: emptyList() // 카테고리에 해당하는 지출 내역 가져오기
+
+            expenses.forEach { expense ->
+                Log.d("HomeFragment", "📌 카테고리: ${category.name}, 지출: ${expense.content}, 금액: ${expense.amount}")
             }
         }
     }
+
+
     private fun getDrawableFromUrl(url: String): Int {
         return when (url) {
             "swing_1.png" -> R.drawable.img_home_swing1
@@ -163,39 +202,22 @@ class HomeFragment : Fragment() {
     }
 
     private fun updateWarningVisibility(uiState: BotSheetUiState) {
-        val sharedPreferences = requireActivity().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-        val lastHiddenDate = sharedPreferences.getString(KEY_LAST_HIDDEN_DATE, null)
-        val todayDate = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
-
-        // 🔥 한 번 숨김 처리가 되었다면 다시 표시되지 않도록 설정
-        if (lastHiddenDate == null) {
-            sharedPreferences.edit().putString(KEY_LAST_HIDDEN_DATE, todayDate).apply()
-        }
-
-        val hasSpendingData = uiState.spendingList.isNotEmpty()
-        val categoryList = botSheetViewModel.getCategoryList()
-        val hasCategories = categoryList.isNotEmpty()
-
-        Log.d("HomeFragment", "📌 lastHiddenDate 확인: $lastHiddenDate, todayDate: $todayDate")
-        Log.d("HomeFragment", "📌 현재 카테고리 개수: ${categoryList.size}, 지출 내역 개수: ${uiState.spendingList.size}")
-
-        binding.imgWarningStart.post {
-            if (lastHiddenDate == todayDate) {
-                // 🔹 오늘 한 번 숨긴 경우 -> 계속 숨김 유지
-                binding.imgWarningStart.visibility = View.GONE
-                Log.d("HomeFragment", "🚨 오늘 이미 숨김 처리됨 -> imgWarningStart 숨기기")
-            } else {
-                // 🔹 카테고리가 없거나 지출 내역이 없을 때만 보이도록 설정
-                binding.imgWarningStart.visibility = if (hasSpendingData || hasCategories) View.GONE else View.VISIBLE
-                Log.d(
-                    "HomeFragment",
-                    if (hasSpendingData || hasCategories) "✅ 지출 내역 또는 카테고리 있음 -> imgWarningStart 숨기기"
-                    else "❗ 지출 내역 및 카테고리 없음 -> imgWarningStart 보이기"
-                )
-            }
+        // 지출 내역 추가 여부를 판단: 하나라도 있으면 숨기고, 없으면 보이도록 함
+        val hasExpense = uiState.spendingList.any { it.history.isNotEmpty() }
+        if (hasExpense) {
+            binding.ivError.visibility = View.GONE
+        } else {
+            // 지출 내역이 없으면 플로팅 알람 보이기 (애니메이션 적용)
+            binding.ivError.visibility = View.VISIBLE
+            binding.ivError.alpha = 0f
+            binding.ivError.animate()
+                .alpha(1f)
+                .setDuration(300)
+                .start()
         }
     }
 
+
     private fun setupSwipeToDismiss(view: View) {
         var startY = 0f
         var isSwipingDown = false
@@ -234,30 +256,39 @@ class HomeFragment : Fragment() {
             }
         }
     }
+
     private fun applySelectedProductToHome(product: Product) {
-        val homeImageResId = mapToHomeResource(product.imageResId)
+        Log.d("HomeFragment", "🎨 applySelectedProductToHome 호출 - 상품: ${product.name}, area: ${product.area}, imageUrl: ${product.imageUrl}")
 
         when (product.area) {
             "Swing Area" -> binding.imgHomeSwing.post {
-                binding.imgHomeSwing.setImageResource(homeImageResId)
-                Log.d("HomeFragment", "Swing Image Updated: $homeImageResId")
+                Glide.with(binding.imgHomeSwing.context)
+                    .load(product.imageUrl)
+                    .into(binding.imgHomeSwing)
+                Log.d("HomeFragment", "✅ Swing Image 업데이트 완료: ${product.imageUrl}")
             }
             "Toy Area" -> binding.imgHomeToy.post {
-                binding.imgHomeToy.setImageResource(homeImageResId)
-                Log.d("HomeFragment", "Toy Image Updated: $homeImageResId")
+                Glide.with(binding.imgHomeToy.context)
+                    .load(product.imageUrl)
+                    .into(binding.imgHomeToy)
+                Log.d("HomeFragment", "✅ Toy Image 업데이트 완료: ${product.imageUrl}")
             }
             "Bowl Area" -> binding.imgHomeBowl.post {
-                binding.imgHomeBowl.setImageResource(homeImageResId)
-                Log.d("HomeFragment", "Bowl Image Updated: $homeImageResId")
+                Glide.with(binding.imgHomeBowl.context)
+                    .load(product.imageUrl)
+                    .into(binding.imgHomeBowl)
+                Log.d("HomeFragment", "✅ Bowl Image 업데이트 완료: ${product.imageUrl}")
             }
             "Nest Area" -> binding.imgHomeNest.post {
-                binding.imgHomeNest.setImageResource(homeImageResId)
-                Log.d("HomeFragment", "Nest Image Updated: $homeImageResId")
+                Glide.with(binding.imgHomeNest.context)
+                    .load(product.imageUrl)
+                    .into(binding.imgHomeNest)
+                Log.d("HomeFragment", "✅ Nest Image 업데이트 완료: ${product.imageUrl}")
             }
+            else -> Log.e("HomeFragment", "❌ 알 수 없는 area: ${product.area}, imageUrl: ${product.imageUrl}")
         }
     }
 
-
     private fun showRewardDialog() {
         val dialog = Dialog(requireContext())
         dialog.show()
@@ -280,7 +311,7 @@ class HomeFragment : Fragment() {
         }
         dialog.window?.apply {
             setBackgroundDrawableResource(R.drawable.ic_store_topurchase) // VectorDrawable 설정
-            decorView.clipToOutline = true // 💡 둥근 모서리 적용
+            decorView.clipToOutline = true // 둥근 모서리 적용
         }
         dialog.show()
     }
@@ -289,35 +320,51 @@ class HomeFragment : Fragment() {
      * MY 상품을 Home 화면에 렌더링
      */
     private fun renderMyProductsForHome() {
-        val myProducts = StoreFragment.myProducts.map { product ->
-            product.copy(
-                imageResId = mapToHomeResource(product.imageResId) // Home 리소스로 변환
-            )
+        val myProducts = StoreFragment.myProducts
+        Log.d("HomeFragment", "🛒 MY 탭에서 가져온 상품 리스트: ${myProducts.size}개")
+
+        if (myProducts.isEmpty()) {
+            Log.e("HomeFragment", "❌ MY 탭에 저장된 상품이 없습니다!")
         }
 
         myProducts.forEach { product ->
-            when (product.area) {
-                "Swing Area" -> binding.imgHomeSwing.setImageResource(product.imageResId)
-                "Toy Area" -> binding.imgHomeToy.setImageResource(product.imageResId)
-                "Bowl Area" -> binding.imgHomeBowl.setImageResource(product.imageResId)
-                "Nest Area" -> binding.imgHomeNest.setImageResource(product.imageResId)
+            // ✅ `area` 값이 null이면 `itemType`을 기반으로 기본값 설정
+            val area = product.area ?: when (product.itemType) {
+                "SWING" -> "Swing Area"
+                "TOY" -> "Toy Area"
+                "BOWL" -> "Bowl Area"
+                "NEST" -> "Nest Area"
+                else -> "Unknown Area"
             }
-        }
-    }
 
-    private fun mapToHomeResource(storeResourceId: Int): Int {
-        return when (storeResourceId) {
-            R.drawable.img_product_swing1 -> R.drawable.img_home_swing1
-            R.drawable.img_product_swing2 -> R.drawable.img_home_swing2
-            R.drawable.img_product_toy1 -> R.drawable.img_home_toy1
-            R.drawable.img_product_toy2 -> R.drawable.img_home_toy2
-            R.drawable.img_product_bowl1 -> R.drawable.img_home_bowl1
-            R.drawable.img_product_bowl2 -> R.drawable.img_home_bowl2
-            R.drawable.img_product_nest1 -> R.drawable.img_home_nest1
-            R.drawable.img_product_nest2 -> R.drawable.img_home_nest2
-            else -> storeResourceId
+            Log.d("HomeFragment", "🛠 ${area}에 적용할 상품: ${product.name}, imageUrl: ${product.imageUrl}")
+
+            when (area) {
+                "Swing Area" -> Glide.with(binding.imgHomeSwing.context)
+                    .load(product.imageUrl)
+                    .into(binding.imgHomeSwing)
+                    .also { Log.d("HomeFragment", "✅ Swing Image Updated: ${product.imageUrl}") }
+
+                "Toy Area" -> Glide.with(binding.imgHomeToy.context)
+                    .load(product.imageUrl)
+                    .into(binding.imgHomeToy)
+                    .also { Log.d("HomeFragment", "✅ Toy Image Updated: ${product.imageUrl}") }
+
+                "Bowl Area" -> Glide.with(binding.imgHomeBowl.context)
+                    .load(product.imageUrl)
+                    .into(binding.imgHomeBowl)
+                    .also { Log.d("HomeFragment", "✅ Bowl Image Updated: ${product.imageUrl}") }
+
+                "Nest Area" -> Glide.with(binding.imgHomeNest.context)
+                    .load(product.imageUrl)
+                    .into(binding.imgHomeNest)
+                    .also { Log.d("HomeFragment", "✅ Nest Image Updated: ${product.imageUrl}") }
+
+                else -> Log.e("HomeFragment", "❌ 올바르지 않은 area 값: $area")
+            }
         }
     }
+
     private fun saveHiddenDate() {
         val sharedPreferences = requireActivity().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
         val todayDate = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
@@ -329,4 +376,4 @@ class HomeFragment : Fragment() {
             .apply()
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeRepository.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeRepository.kt
index 3e8bb6d1..19f002c4 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeRepository.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeRepository.kt
@@ -2,7 +2,10 @@ package com.example.yeongkkuel.presentation.home
 
 import android.util.Log
 import com.example.yeongkkuel.network.RetrofitClient
+import retrofit2.HttpException
+import java.io.IOException
 
+/*
 class HomeRepository {
     private val api = RetrofitClient.homeApiService
 
@@ -15,4 +18,44 @@ class HomeRepository {
             null
         }
     }
-}
\ No newline at end of file
+}
+*/
+
+class HomeRepository {
+    private val api = RetrofitClient.homeApiService
+    private var isFetching = false // API 중복 요청 방지
+
+    suspend fun getHomeData(): HomeResult? { // ✅ 반환 타입 변경
+        if (isFetching) {
+            Log.w("HomeRepository", "⚠️ API 요청 중, 중복 요청 방지됨")
+            return null
+        }
+
+        isFetching = true // ✅ API 요청 시작 전 true 설정
+
+        return try {
+            Log.d("HomeRepository", "🚀 홈 데이터 API 요청 시작")
+            val response = api.getHomeData()
+            if (response.isSuccessful) {
+                response.body()?.result ?: run {
+                    Log.e("HomeRepository", "홈 데이터 응답의 result가 null입니다.")
+                    null
+                }
+            } else {
+                Log.e("HomeRepository", "홈 데이터 요청 실패: ${response.errorBody()?.string()}")
+                null
+            }
+        } catch (e: IOException) {
+            Log.e("HomeRepository", "네트워크 오류: ${e.message}")
+            null
+        } catch (e: HttpException) {
+            Log.e("HomeRepository", "HTTP 오류 (코드: ${e.code()}): ${e.message}")
+            null
+        } catch (e: Exception) {
+            Log.e("HomeRepository", "알 수 없는 오류: ${e.message}")
+            null
+        } finally {
+            isFetching = false // API 요청 종료 후 false로 설정
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeResponse.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeResponse.kt
index f62c9027..3edb4650 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeResponse.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeResponse.kt
@@ -1,5 +1,10 @@
 package com.example.yeongkkuel.presentation.home
 
+import com.example.yeongkkuel.presentation.home.category.CategoryViewModel
+import com.example.yeongkkuel.presentation.util.Colors
+import com.example.yeongkkuel.presentation.home.category.data.Category // 기존 Category 클래스 사용
+//import com.example.yeongkkuel.presentation.home.store.data.MySkin
+
 data class HomeResponse(
     val isSuccess: Boolean,
     val code: String,
@@ -11,9 +16,14 @@ data class HomeResult(
     val myReward: Int, // 보유 리워드
     val mySkin: List<MySkin>, // 보유한 스킨 리스트
     val today: String, // 오늘 날짜
-    val categories: List<Category> // 카테고리별 지출 내역
+    val categories: List<CategoryResponse> // 🚨 기존 List<Category> → List<CategoryResponse> 로 변경!
 )
 
+data class CategoryResponse(
+    val categoryId: Int,
+    val categoryName: String,
+    val expenses: List<Expense>
+)
 data class MySkin(
     val itemName: String,
     val itemType: String,
@@ -21,6 +31,7 @@ data class MySkin(
 )
 
 data class Category(
+    val categoryId: Int, // 카테고리 ID 추가
     val categoryName: String,
     val expenses: List<Expense>
 )
@@ -28,5 +39,17 @@ data class Category(
 data class Expense(
     val expenseId: Int,
     val content: String,
-    val amount: Int
+    val amount: Int,
+    val imgExist: Boolean
 )
+
+fun CategoryResponse.toCategory(categoryViewModel: CategoryViewModel): Category {
+    val existingCategory = categoryViewModel.categories.value?.find { it.id == this.categoryId }
+    return Category(
+        id = this.categoryId,
+        name = this.categoryName,
+        color = existingCategory?.color ?: Colors.RED1 // ✅ 기존 카테고리 색상 활용, 없으면 RED1
+    )
+}
+
+
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeViewModel.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeViewModel.kt
index ed47909d..1f54728b 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeViewModel.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/HomeViewModel.kt
@@ -1,27 +1,52 @@
 package com.example.yeongkkuel.presentation.home
 
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.CreationExtras
 import kotlinx.coroutines.launch
+import java.io.IOException
 
-class HomeViewModel : ViewModel() {
-    private val repository = HomeRepository()
-
-    private val _homeResponse = MutableLiveData<HomeResponse?>()
-    val homeResponse: LiveData<HomeResponse?> = _homeResponse
+class HomeViewModel(private val repository: HomeRepository) : ViewModel() {
+    private val _homeResult = MutableLiveData<HomeResult?>() // ✅ HomeResult로 변경
+    val homeResult: LiveData<HomeResult?> get() = _homeResult
 
     fun fetchHomeData() {
         viewModelScope.launch {
             try {
                 val response = repository.getHomeData()
-                _homeResponse.postValue(response)
+                if (response != null) {
+                    Log.d("HomeViewModel", "✅ 홈 데이터 업데이트 완료! $response")
+                    _homeResult.postValue(response) // ✅ result만 저장
+                } else {
+                    Log.e("HomeViewModel", "🚨 홈 데이터 null 반환됨, 기본값 설정")
+                    _homeResult.postValue(
+                        HomeResult(
+                            myReward = 0,
+                            mySkin = emptyList(),
+                            today = "",
+                            categories = emptyList()
+                        )
+                    )
+                }
             } catch (e: Exception) {
-                Log.e("HomeViewModel", "홈 데이터 조회 오류: ${e.message}")
-                _homeResponse.postValue(null)
+                Log.e("HomeViewModel", "❌ 홈 데이터 불러오기 실패: ${e.message}")
+                _homeResult.postValue(null)
+            }
+        }
+    }
+
+    // ✅ ViewModelProvider.Factory 추가
+    class Factory(private val repository: HomeRepository) : ViewModelProvider.Factory {
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            if (modelClass.isAssignableFrom(HomeViewModel::class.java)) {
+                @Suppress("UNCHECKED_CAST")
+                return HomeViewModel(repository) as T
             }
+            throw IllegalArgumentException("Unknown ViewModel class")
         }
     }
 }
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryDetailFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryDetailFragment.kt
index cd14bd32..7a10164e 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryDetailFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryDetailFragment.kt
@@ -56,42 +56,36 @@ class CategoryDetailFragment : Fragment() {
             findNavController().popBackStack() // 이전 화면으로 이동
         }
 
-        // 더보기 버튼 클릭 이벤트
+        // 더보기 버튼 클릭 이벤트: PopupWindow 대신 cl_more의 visibility 토글
         binding.tvCategoryMore.setOnClickListener {
-            showCustomMenu(it, categoryName, categoryColorId) // 수정/삭제 메뉴 표시
+            binding.clMore.visibility =
+                if (binding.clMore.visibility == View.GONE) View.VISIBLE else View.GONE
         }
-    }
-
-    // 수정/삭제 커스텀 메뉴 표시
-    private fun showCustomMenu(anchor: View, categoryName: String?, categoryColor: Int?) {
-        val popupBinding = ItemMenuPopupBinding.inflate(layoutInflater)
-        val popupWindow = PopupWindow(popupBinding.root, 300, 300, true)
 
-        popupBinding.tvModify.setOnClickListener {
+        // cl_more 내 수정 버튼 클릭 이벤트
+        binding.clMore.findViewById<TextView>(R.id.tv_modify).setOnClickListener {
             // 수정 화면으로 이동
             val bundle = Bundle().apply {
                 putString("categoryName", categoryName)
-                putInt("categoryColor", categoryColor ?: android.graphics.Color.BLACK)
+                putInt("categoryColor", categoryColorId ?: android.graphics.Color.BLACK)
             }
             findNavController().navigate(
                 R.id.action_categoryDetailFragment_to_categoryEditFragment,
                 bundle
             )
-            popupWindow.dismiss()
+            binding.clMore.visibility = View.GONE
         }
 
-        popupBinding.tvDelete.setOnClickListener {
-            // 삭제 확인 다이얼로그 표시
+        // cl_more 내 삭제 버튼 클릭 이벤트
+        binding.clMore.findViewById<TextView>(R.id.tv_delete).setOnClickListener {
             categoryName?.let {
                 showDeleteConfirmationDialog(it) // Non-nullable로 전달
             } ?: run {
-                Toast.makeText(requireContext(), "카테고리 이름이 없습니다.", Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), "카테고리 이름이 없습니다.", Toast.LENGTH_SHORT)
+                    .show()
             }
-            popupWindow.dismiss()
+            binding.clMore.visibility = View.GONE
         }
-
-        popupWindow.elevation = 10f
-        popupWindow.showAsDropDown(anchor, 0, 0) // 앵커 기준으로 표시
     }
 
     // 삭제 확인 다이얼로그 표시
@@ -103,13 +97,10 @@ class CategoryDetailFragment : Fragment() {
             .setView(dialogView)
             .create()
 
-        // 💡 다이얼로그 스타일 설정
-        dialog.window?.apply {
-            setBackgroundDrawableResource(R.drawable.bg_category_limit_dialog)
-            decorView.clipToOutline = true
-        }
+        // 다이얼로그 스타일 설정
+        dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
 
-        // 커스텀 뷰에서 버튼 참조 및 이벤트 처리
+        // 다이얼로그 내 버튼 설정
         val cancelBtn = dialogView.findViewById<TextView>(R.id.tv_cancel_btn)
         val deleteBtn = dialogView.findViewById<TextView>(R.id.tv_delete_btn)
 
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryItemTouchHelper.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryItemTouchHelper.kt
new file mode 100644
index 00000000..10b0a362
--- /dev/null
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryItemTouchHelper.kt
@@ -0,0 +1,41 @@
+package com.example.yeongkkuel.presentation.home.category
+
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.example.yeongkkuel.presentation.home.category.adapter.CategoryAdapter
+
+// TODO - 다른 기능 구현 끝나고 나서 파일 분리 시작 하자
+
+class CategoryItemTouchHelper(
+    private val categoryAdapter: CategoryAdapter
+) : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0) {
+    override fun onMove(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder,
+        target: RecyclerView.ViewHolder
+    ): Boolean {
+        val fromPosition = viewHolder.bindingAdapterPosition
+        val toPosition = target.bindingAdapterPosition
+        categoryAdapter.moveItem(fromPosition, toPosition) // UI 순서 변경
+        return true
+    }
+
+    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+        // 스와이프 기능 비활성화
+    }
+
+    // 드래그 후 아이템을 업데이트할 때 호출
+    override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+        super.clearView(recyclerView, viewHolder)
+
+        val updatedList = categoryAdapter.getCategoryList()
+        // ViewModel에 변경된 카테고리 순서 반영
+        categoryAdapter.submitList(updatedList)
+    }
+
+    // 롱클릭으로 드래그 활성화
+    override fun isLongPressDragEnabled(): Boolean = true
+
+    // 스와이프 비활성화
+    override fun isItemViewSwipeEnabled(): Boolean = false
+}
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryManageFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryManageFragment.kt
index 5908d9bf..d0f5185c 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryManageFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryManageFragment.kt
@@ -4,13 +4,16 @@ import android.graphics.Rect
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.example.yeongkkuel.R
@@ -18,18 +21,17 @@ import com.example.yeongkkuel.databinding.FragmentCategoryManageBinding
 import com.example.yeongkkuel.presentation.botsheet.BotSheetViewModel
 import com.example.yeongkkuel.presentation.home.category.adapter.CategoryAdapter
 import com.example.yeongkkuel.presentation.home.category.data.Category
+import kotlinx.coroutines.launch
 
 class CategoryManageFragment : Fragment() {
 
     private var _binding: FragmentCategoryManageBinding? = null
     private val binding get() = _binding!!
-    private val viewModel: CategoryViewModel by activityViewModels() // ViewModel 연결
+    private val viewModel: CategoryViewModel by activityViewModels()
     private val botSheetViewModel: BotSheetViewModel by activityViewModels()
-    private val categoryAdapter by lazy {
-        CategoryAdapter(onCategoryClick = { category ->
-            navigateToCategoryDetail(category) // 클릭 시 상세 페이지로 이동
-        })
-    }
+
+    private lateinit var categoryAdapter: CategoryAdapter
+    private lateinit var itemTouchHelper: ItemTouchHelper
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -39,37 +41,68 @@ class CategoryManageFragment : Fragment() {
         return binding.root
     }
 
-    override fun onResume() {
-        super.onResume()
-        viewModel.fetchCategories() // ✅ 프래그먼트가 다시 활성화될 때 최신 데이터 불러오기
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
-        Handler(Looper.getMainLooper()).postDelayed({
-            viewModel.fetchCategories() // ✅ 한 번 더 호출하여 UI 강제 갱신
-        }, 500) // 0.5초 후 한 번 더 호출
-    }
+        // categoryAdapter 초기화
+        categoryAdapter = CategoryAdapter(
+            onCategoryClick = { category ->
+                navigateToCategoryDetail(category)
+            },
+            onStartDrag = { viewHolder ->
+                itemTouchHelper.startDrag(viewHolder)
+            }
+        )
+
+        // itemTouchHelper 초기화
+        itemTouchHelper = ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
+            ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0
+        ) {
+            override fun onMove(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder,
+                target: RecyclerView.ViewHolder
+            ): Boolean {
+                val fromPosition = viewHolder.bindingAdapterPosition
+                val toPosition = target.bindingAdapterPosition
+                Log.d("CategoryManageFragment", "📌 아이템 이동: $fromPosition -> $toPosition")
+
+                categoryAdapter.moveItem(fromPosition, toPosition) // UI 순서 변경
+                return true
+            }
 
+            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+                // 스와이프 기능 비활성화
+            }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+            override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+                super.clearView(recyclerView, viewHolder)
+
+                val updatedList = categoryAdapter.getCategoryList()
+                // ViewModel에 변경된 카테고리 순서 반영
+                viewModel.updateCategoryOrderLocally(updatedList)
+
+                // 변경된 리스트를 RecyclerView에 반영
+                categoryAdapter.submitList(updatedList)
+            }
+        })
 
         // RecyclerView 설정
         setupRecyclerView()
+        itemTouchHelper.attachToRecyclerView(binding.rvCategoryList) // RecyclerView와 연결
 
-        // ViewModel 데이터 관찰
+        // 데이터 가져오기 및 UI 업데이트
         observeViewModel()
-
-        // 서버에서 카테고리 데이터 가져오기
         fetchCategoriesFromServer()
 
+        Log.d("CategoryManageFragment", "✅ onViewCreated() 완료")
+
         // 추가 버튼 클릭 이벤트
         binding.tvCategoryAdd.setOnClickListener {
-            val categoryCount = viewModel.categories.value?.size ?: 0 // 카테고리 개수 가져오기
-
+            val categoryCount = viewModel.categories.value?.size ?: 0
             if (categoryCount >= 6) {
-                // 카테고리가 6개 이상일 때 팝업 띄우기
                 showLimitReachedPopup()
             } else {
-                // 카테고리가 6개 미만일 때 카테고리 추가 화면으로 이동
                 findNavController().navigate(R.id.action_categoryManageFragment_to_categoryAddFragment)
             }
         }
@@ -80,28 +113,39 @@ class CategoryManageFragment : Fragment() {
         }
     }
 
-    private fun fetchCategoriesFromServer() {
-        viewModel.fetchCategories() // 서버에서 데이터 가져오기
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.fetchCategories()
+
+        Handler(Looper.getMainLooper()).postDelayed({
+            viewModel.fetchCategories()
+        }, 500)
     }
 
     private fun observeViewModel() {
-        // 카테고리 관리 페이지 업데이트
-        viewModel.categories.observe(viewLifecycleOwner) { categories ->
-            categoryAdapter.submitList(categories) // 데이터를 어댑터에 반영 - 즉시 UI 업데이트
-            categoryAdapter.notifyDataSetChanged() // 강제로 RecylcerView 갱신
-        }
+        viewLifecycleOwner.lifecycleScope.launch {
+            // 카테고리 데이터 관찰
+            viewModel.categories.observe(viewLifecycleOwner) { categories ->
+                if (categories.isNotEmpty()) {
+                    categoryAdapter.submitList(categories)
+                }
+            }
 
-        // 바텀시트 데이터 관찰하여 삭제 후 즉시 반영
-        botSheetViewModel.categoryList.observe(viewLifecycleOwner) { categories ->
-            categoryAdapter.submitList(categories) // 바텀시트 리스트도 업데이트
-            categoryAdapter.notifyDataSetChanged() // RecyclerView 강제 갱신
-        }
+            // 바텀시트 데이터 관찰
+            botSheetViewModel.categoryList.observe(viewLifecycleOwner) { categories ->
+                if (categories.isNotEmpty()) {
+                    categoryAdapter.submitList(categories)
+                    categoryAdapter.notifyDataSetChanged()
+                }
+            }
 
-        // 에러 메시지 관찰
-        viewModel.errorMessage.observe(viewLifecycleOwner) { errorMessage ->
-            errorMessage?.let {
-                // 에러 메시지 표시 (Toast 또는 다른 방식으로 처리 가능)
-                android.widget.Toast.makeText(requireContext(), it, android.widget.Toast.LENGTH_SHORT).show()
+            // 에러 메시지 관찰
+            viewModel.errorMessage.observe(viewLifecycleOwner) { errorMessage ->
+                errorMessage?.let {
+                    Log.e("CategoryManageFragment", "❌ ViewModel 에러 발생: $it") // ✅ 추가 로그
+                    android.widget.Toast.makeText(requireContext(), it, android.widget.Toast.LENGTH_SHORT).show()
+                }
             }
         }
     }
@@ -111,7 +155,6 @@ class CategoryManageFragment : Fragment() {
             layoutManager = LinearLayoutManager(requireContext())
             adapter = categoryAdapter
 
-            // 카테고리 아이템 간격 추가
             addItemDecoration(object : RecyclerView.ItemDecoration() {
                 override fun getItemOffsets(
                     outRect: Rect,
@@ -119,17 +162,21 @@ class CategoryManageFragment : Fragment() {
                     parent: RecyclerView,
                     state: RecyclerView.State
                 ) {
-                    outRect.top = 16 // 각 아이템의 위쪽에 16dp 간격
-                    outRect.bottom = 16 // 각 아이템의 아래쪽에 16dp 간격
+                    outRect.top = 16
+                    outRect.bottom = 16
                 }
             })
         }
     }
 
+    private fun fetchCategoriesFromServer() {
+        viewModel.fetchCategories()
+    }
+
     private fun navigateToCategoryDetail(category: Category) {
         val bundle = Bundle().apply {
             putString("categoryName", category.name)
-            putInt("categoryColor", category.color.id) // Colors의 id를 Int로 전달
+            putInt("categoryColor", category.color.id)
         }
         findNavController().navigate(R.id.action_categoryManageFragment_to_categoryDetailFragment, bundle)
     }
@@ -154,4 +201,4 @@ class CategoryManageFragment : Fragment() {
         super.onDestroyView()
         _binding = null
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryViewModel.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryViewModel.kt
index 8962de5c..d2a4b313 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryViewModel.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/category/CategoryViewModel.kt
@@ -1,5 +1,6 @@
 package com.example.yeongkkuel.presentation.home.category
 
+import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -34,27 +35,25 @@ class CategoryViewModel : ViewModel() {
         viewModelScope.launch {
             try {
                 val response = RetrofitClient.categoryApiService.getCategories()
-
-                println("Response Body: ${response.result}") // Response Body 확인 로그
-
-                if (response.isSuccess) { // 커스텀 Response의 isSuccess 확인
-                    // TODO - 방어 로직 추가
+                if (response.isSuccess) {
                     val categoryListResponse = response.result
-                    _categories.value = categoryListResponse.categoryList.map { it.toCategory() } // result를 로컬 데이터로 변환
+                    _categories.postValue(categoryListResponse.categoryList.map { it.toCategory() }) // ✅ postValue()로 변경
 
-                    // ✅ UI 강제 갱신 (값이 동일해도 LiveData가 변경되도록)
-                    _categories.value = _categories.value
-                } else {
-                    _errorMessage.value = "Failed to fetch categories: ${response.message}" // 서버 메시지 활용
+                    Log.d("CategoryViewModel", "✅ LiveData postValue() 업데이트 완료!")
                 }
-            } catch (e: HttpException) {
-                _errorMessage.value = "Server error: ${e.message()}"
             } catch (e: Exception) {
-                _errorMessage.value = "Error: ${e.message}"
+                _errorMessage.postValue("Error: ${e.message}") // ✅ postValue() 사용
             }
         }
     }
 
+
+    fun updateCategoryOrderLocally(updatedList: List<Category>) {
+        _categories.value = updatedList // 서버 요청 없이 UI만 업데이트 -  변경된 리스트를 LiveData에 반영
+        Log.d("CategoryViewModel", "✅ 카테고리 순서 로컬 업데이트 완료")
+    }
+
+
     // 카테고리 추가 (서버와 동기화)
     fun addCategory(category: Category): Boolean {
         val currentList = _categories.value.orEmpty()
@@ -136,37 +135,8 @@ class CategoryViewModel : ViewModel() {
         }
     }
 
-
-//    // 카테고리 수정 (서버와 동기화)
-//    fun updateCategory(originalName: String, updatedCategory: Category) {
-//        val categoryToUpdate = _categories.value.orEmpty().find { it.name == originalName }
-//        if (categoryToUpdate != null) {
-//            viewModelScope.launch {
-//                try {
-//                    val request = updatedCategory.toRequest() // 로컬 데이터를 요청 데이터로 변환
-//                    val response = RetrofitClient.yeongkkuelService.updateCategory(categoryToUpdate.id, request)
-//
-//                    if (response.isSuccess) { // 커스텀 Response의 isSuccess 확인
-//                        fetchCategories() // 수정 후 최신 데이터 다시 불러오기
-//
-//                        val updatedList = _categories.value?.toMutableList() ?: mutableListOf()
-//                        val index = updatedList.indexOfFirst { it.name == originalName }
-//                        if (index != -1) {
-//                            updatedList[index] = updatedCategory
-//                            _categories.value = updatedList
-//                        }
-//                    } else {
-//                        _errorMessage.value = "Failed to update category: ${response.message}"
-//                    }
-//                } catch (e: Exception) {
-//                    _errorMessage.value = "Error: ${e.message}"
-//                }
-//            }
-//        }
-//    }
-
     // 카테고리 목록 비어 있는지 확인
     fun isCategoryListEmpty(): Boolean {
         return _categories.value.isNullOrEmpty()
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/category/adapter/CategoryAdapter.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/category/adapter/CategoryAdapter.kt
index 734c6e5f..592410ce 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/category/adapter/CategoryAdapter.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/category/adapter/CategoryAdapter.kt
@@ -1,5 +1,6 @@
 package com.example.yeongkkuel.presentation.home.category.adapter
 
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
@@ -10,8 +11,9 @@ import com.example.yeongkkuel.databinding.ItemCategoryBinding
 import com.example.yeongkkuel.presentation.home.category.data.Category
 
 class CategoryAdapter(
-    private val onCategoryClick: (Category) -> Unit // 클릭 이벤트 전달
-) : ListAdapter<Category, CategoryAdapter.CategoryViewHolder>(CategoryDiffCallback()) {
+    private val onCategoryClick: (Category) -> Unit,
+    private val onStartDrag: (RecyclerView.ViewHolder) -> Unit // 드래그 시작 콜백 추가
+) : ListAdapter<Category, CategoryAdapter.CategoryViewHolder>(CategoryDiffCallback()) { // ListAdapter로 변경
 
     inner class CategoryViewHolder(private val binding: ItemCategoryBinding) :
         RecyclerView.ViewHolder(binding.root) {
@@ -27,6 +29,12 @@ class CategoryAdapter(
             root.setOnClickListener {
                 onCategoryClick(item) // 클릭 이벤트 실행
             }
+
+            // 길게 눌렀을 때 드래그 시작
+            root.setOnLongClickListener {
+                onStartDrag(this@CategoryViewHolder) // 드래그 시작
+                true
+            }
         }
     }
 
@@ -40,9 +48,26 @@ class CategoryAdapter(
     }
 
     override fun onBindViewHolder(holder: CategoryViewHolder, position: Int) {
-        holder.bind(getItem(position)) // 데이터 바인딩
+        val category = getItem(position) // `getItem(position)`으로 아이템 가져오기
+        holder.bind(category)
     }
 
+    override fun getItemCount(): Int = currentList.size // ListAdapter에서는 currentList 사용
+
+    // 드래그하여 순서 변경하는 함수
+    fun moveItem(fromPosition: Int, toPosition: Int) {
+        val currentList = currentList.toMutableList() // 현재 리스트를 MutableList로 변환
+        val movedItem = currentList.removeAt(fromPosition)
+        currentList.add(toPosition, movedItem)
+
+        // 데이터 변경 후 submitList()로 RecyclerView 갱신
+        submitList(currentList)
+    }
+
+    // 현재 리스트 반환
+    fun getCategoryList(): List<Category> = currentList.toList()
+
+    // DiffUtil을 이용하여 변경 사항만 갱신하도록 처리
     class CategoryDiffCallback : DiffUtil.ItemCallback<Category>() {
         override fun areItemsTheSame(oldItem: Category, newItem: Category): Boolean {
             return oldItem.id == newItem.id // ID로 고유성 판단
@@ -52,4 +77,4 @@ class CategoryAdapter(
             return oldItem == newItem // 데이터 클래스 전체 비교
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEditFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEditFragment.kt
index 580cddd8..a566c1de 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEditFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEditFragment.kt
@@ -1,268 +1,159 @@
 package com.example.yeongkkuel.presentation.home.entry
 
-import android.app.Activity
-import android.app.DatePickerDialog
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.graphics.Color
-import android.net.Uri
 import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.TextView
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
+import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import com.bumptech.glide.Glide
-import com.example.yeongkkuel.R
-import com.example.yeongkkuel.databinding.FragmentExpenseEntryBinding
-import com.example.yeongkkuel.presentation.botsheet.BotSheetListener
-import com.example.yeongkkuel.presentation.botsheet.BotSheetUiState
+import com.example.yeongkkuel.databinding.FragmentExpenseViewBinding
 import com.example.yeongkkuel.presentation.botsheet.BotSheetViewModel
+import java.text.SimpleDateFormat
+import java.util.Locale
+import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import java.text.NumberFormat
-import java.text.SimpleDateFormat
-import java.util.Calendar
+import com.example.yeongkkuel.R
+import com.example.yeongkkuel.databinding.FragmentExpenseEditBinding
+import com.example.yeongkkuel.presentation.botsheet.BotSheetUiState
 import java.util.Date
-import java.util.Locale
 
 class ExpenseEditFragment : Fragment() {
 
-    private var _binding: FragmentExpenseEntryBinding? = null
+    private var _binding: FragmentExpenseEditBinding? = null
     private val binding get() = _binding!!
-    private lateinit var sharedPreferences: SharedPreferences
-    private lateinit var botSheetListener: BotSheetListener
-    private lateinit var viewModel: BotSheetViewModel  // 🔹 ViewModel 추가
-    private val PICK_IMAGE_REQUEST = 1
-    private var selectedImageUri: Uri? = null // 🔹 선택한 이미지 URI 저장
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        if (context is BotSheetListener) {
-            botSheetListener = context
-        } else {
-            throw RuntimeException("$context must implement BotSheetListener")
-        }
-    }
+    private val viewModel: BotSheetViewModel by activityViewModels()
+    private var selectedCategoryId: Int? = null
 
     override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
+        inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        _binding = FragmentExpenseEntryBinding.inflate(inflater, container, false)
+        _binding = FragmentExpenseEditBinding.inflate(inflater, container, false)
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        viewModel = ViewModelProvider(requireActivity())[BotSheetViewModel::class.java]
-        observeLatestHistory()
-        setupUi()
+        binding.btnBack.setOnClickListener {
+            requireActivity().onBackPressedDispatcher.onBackPressed()
+        }
+
+        binding.tvExpenseTitleEdit.visibility = View.VISIBLE // 수정 제목 보이기
+        binding.tvEntryComplete.visibility = View.VISIBLE
         binding.tvEntryComplete.setOnClickListener {
-            saveEditedExpense()
+            saveExpense()
         }
 
-        sharedPreferences = requireContext().getSharedPreferences("ExpensePrefs", Context.MODE_PRIVATE)
+        // ✅ 기존 지출 내역 불러오기
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewModel.spendingHistoryList.collectLatest { historyList ->
+                val selectedExpense = historyList.lastOrNull()
 
-        setupDetailInput(view)
-        setupAmountInput(view)
-        setupPhotoFrame(view)
-    }
+                if (selectedExpense != null) {
+                    binding.tvDateInput.text = formatDate(viewModel.uiState.value.date)
 
-    private fun setupPhotoFrame(view: View) {
-        val flPhotoFrame = view.findViewById<FrameLayout>(R.id.fl_photo_frame)
-        flPhotoFrame.setOnClickListener {
-            openGallery()
-        }
-    }
+                    val category = getCategoryForExpense(selectedExpense.id)
+                    selectedCategoryId = category?.categoryId // ✅ 카테고리 ID 저장
 
-    private fun openGallery() {
-        val intent = Intent(Intent.ACTION_PICK).apply {
-            type = "image/*" // 이미지 파일만 선택
-        }
-        startActivityForResult(intent, PICK_IMAGE_REQUEST)
-    }
+                    binding.tvCategoryInput.text = category?.kind?.name ?: "기타"
+                    binding.etDetailInput.setText(selectedExpense.name)
+                    binding.etAmountInput.setText(selectedExpense.price.toString())
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == PICK_IMAGE_REQUEST && resultCode == Activity.RESULT_OK) {
-            selectedImageUri = data?.data
-            selectedImageUri?.let {
-                Glide.with(this)
-                    .load(it)
-                    .into(binding.imgPhotoFrame)
-                binding.ivPhotoIcon.visibility = View.GONE
-            }
-        }
-    }
+                    // ✅ 카테고리 색상 적용
+                    val updatedColor = getCategoryTextColor(category?.kind?.name ?: "기타")
+                    binding.tvCategoryInput.setTextColor(updatedColor)
 
-    private fun observeLatestHistory() {
-        lifecycleScope.launch {
-            viewLifecycleOwner.lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                viewModel.spendingHistoryList.collectLatest { historyList ->
-                    Log.d("ExpenseViewFragment", "🔄 최신 내역 감지됨: $historyList") // ✅ 로그 추가
-                    if (historyList.isNotEmpty()) {
-                        val latestHistory = historyList.last()
-                        updateUiWithHistory(latestHistory)
-                    }
+                    // ✅ 수정 가능하도록 `EditText` 활성화
+                    enableEditing()
                 }
             }
         }
     }
+    private fun getCategoryForExpense(expenseId: Int): BotSheetUiState.Spending? {
+        return viewModel.uiState.value.spendingList.find { spending ->
+            spending.history.any { it.id == expenseId }
+        }
+    }
 
 
-    private fun updateUiWithHistory(history: BotSheetUiState.Spending.History) {
-//        binding.tvDateInput.text = history.date.ifEmpty { getCurrentDate() }
-//        binding.tvCategoryInput.text = history.categoryName
-//        binding.tvCategoryInput.setTextColor(Color.parseColor(history.categoryColor))
-//        binding.etDetailInput.setText(history.name)
-//        binding.etAmountInput.setText(formatPrice(history.price))
-//
-//        if (history.photoUrl.isNotEmpty()) {
-//            Glide.with(binding.root.context) // 🔹 올바른 Context 제공
-//                .load(history.photoUrl)
-//                .into(binding.imgPhotoFrame)
-//            binding.ivPhotoIcon.visibility = View.GONE
-//        } else {
-//            binding.ivPhotoIcon.visibility = View.VISIBLE
-//        }
+    private fun enableEditing() {
+        binding.etDetailInput.isEnabled = true
+        binding.etAmountInput.isEnabled = true
+        binding.tvCategoryInput.isEnabled = false // 카테고리는 수정 불가능하도록 유지
     }
 
-    private fun setupUi() {
-        // 🔹 제목 텍스트뷰 visibility 변경
-        binding.tvExpenseEditTitle.visibility = View.VISIBLE
-        binding.tvExpenseTitle.visibility = View.GONE
-        binding.btnBack.setOnClickListener {
-            findNavController().popBackStack()
-        }
-
-        // 🔹 기존 Bundle 데이터 처리
-        val expenseDate = arguments?.getString("expenseDate") ?: getCurrentDate() // ✅ 오늘 날짜 기본값 설정
-        val categoryName = arguments?.getString("categoryName") ?: ""
-        val categoryColor = arguments?.getString("categoryColor") ?: "#000000" // ✅ 기본 색상 적용
-        val expenseContent = arguments?.getString("expenseContent") ?: ""
-        val expensePrice = arguments?.getInt("expensePrice") ?: 0
-        val expensePhotoUrl = arguments?.getString("expensePhoto") ?: ""
+    private fun getCategoryNameForExpense(expenseId: Int): String {
+        val spendingList = viewModel.uiState.value.spendingList
 
-        binding.tvDateInput.text = expenseDate
-        binding.tvCategoryInput.text = categoryName
-        binding.tvCategoryInput.setTextColor(Color.parseColor(categoryColor))
-        binding.etDetailInput.setText(expenseContent)
-        binding.etAmountInput.setText(formatPrice(expensePrice))
+        // 🔹 expenseId 기반으로 해당 지출이 속한 카테고리를 찾음
+        val category = spendingList.find { spending ->
+            spending.history.any { it.id == expenseId }
+        }
 
-        if (expensePhotoUrl.isNotEmpty()) {
-            Glide.with(this)
-                .load(expensePhotoUrl)
-                .into(binding.imgPhotoFrame)
+        return category?.kind?.name ?: "기타"
+    }
 
-            binding.ivPhotoIcon.visibility = View.GONE
+    private fun formatDate(date: Date?): String {
+        return if (date != null) {
+            val sdf = SimpleDateFormat("yyyy년 M월 d일 E요일", Locale.KOREAN)
+            sdf.format(date)
         } else {
-            binding.ivPhotoIcon.visibility = View.VISIBLE
-        }
-
-        binding.icMore.visibility = View.GONE
-        binding.clExpenseAuto.visibility = View.GONE
-        binding.clCheckNoExpense.visibility = View.GONE
-        binding.tvEntryComplete.setOnClickListener {
-            saveEditedExpense()
+            "날짜 없음"
         }
     }
 
-    private fun getCurrentDate(): String {
-        val dateFormat = SimpleDateFormat("yyyy년 M월 d일 E요일", Locale.KOREA)
-        return dateFormat.format(Date())
-    }
+    private fun getCategoryTextColor(categoryName: String): Int {
+        val spendingList = viewModel.uiState.value.spendingList
+        val category = spendingList.find { it.kind.name == categoryName }
 
-    private fun formatPrice(price: Int): String {
-        return NumberFormat.getNumberInstance(Locale.KOREA).format(price)
+        return category?.color?.id?.let { colorId ->
+            ContextCompat.getColor(requireContext(), colorId) // ✅ 카테고리 색상 적용
+        } ?: ContextCompat.getColor(requireContext(), R.color.black2) // 기본 색상 적용
     }
 
-    private fun saveEditedExpense() {
-//        val updatedExpense = BotSheetUiState.Spending.History(
-//            date = binding.tvDateInput.text.toString(),
-//            categoryName = binding.tvCategoryInput.text.toString(),
-//            categoryColor = String.format("#%06X", (0xFFFFFF and binding.tvCategoryInput.currentTextColor)), // 색상 HEX 변환
-//            name = binding.etDetailInput.text.toString(),
-//            content = binding.etDetailInput.text.toString(),
-//            price = binding.etAmountInput.text.toString().replace(",", "").toIntOrNull() ?: 0,
-//            photoUrl = selectedImageUri?.toString() ?: ""
-//        )
-//
-//        Log.d("ExpenseEditFragment", "saveEditedExpense called with: $updatedExpense")
-//
-//        // ✅ ViewModel을 통해 업데이트 반영 (바텀시트에 즉시 반영됨)
-//        lifecycleScope.launch {
-//            viewModel.updateBotSheetHistory(updatedExpense)
-//        }
-//
-//        // ✅ 저장된 데이터 전달
-//        val bundle = Bundle().apply {
-//            putString("expenseDate", updatedExpense.date)
-//            putString("categoryName", updatedExpense.categoryName)
-//            putString("categoryColor", updatedExpense.categoryColor)
-//            putString("expenseContent", updatedExpense.content)
-//            putInt("expensePrice", updatedExpense.price)
-//            putString("expensePhoto", updatedExpense.photoUrl)
-//        }
-//        findNavController().previousBackStackEntry?.savedStateHandle?.set("editedExpense", bundle)
+    private fun saveExpense() {
+        val newDetail = binding.etDetailInput.text.toString().trim()
+        val newAmount = binding.etAmountInput.text.toString().trim().replace(",", "").toIntOrNull() ?: 0
 
-        Toast.makeText(requireContext(), "지출 내역이 수정되었습니다.", Toast.LENGTH_SHORT).show()
-        findNavController().popBackStack()
-    }
+        if (newDetail.isEmpty() || newAmount <= 0) {
+            Toast.makeText(requireContext(), "모든 항목을 입력하세요.", Toast.LENGTH_SHORT).show()
+            return
+        }
 
+        val selectedExpense = viewModel.spendingHistoryList.value.lastOrNull()
 
-    private fun setupDetailInput(view: View) {
-        val etDetailInput = view.findViewById<EditText>(R.id.et_detail_input)
-        val tvCharacterCount = view.findViewById<TextView>(R.id.tv_character_count)
+        if (selectedExpense != null) {
+            // ✅ 기존 카테고리 ID 유지
+            val existingCategoryId = selectedCategoryId ?: return // 기존 카테고리 ID를 유지
 
-        etDetailInput.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                val length = s?.length ?: 0
-                tvCharacterCount.text = "$length/24"
-                if (length > 24) etDetailInput.error = "최대 24자까지 입력 가능합니다."
-            }
-            override fun afterTextChanged(s: Editable?) {}
-        })
-    }
+            val updatedExpense = selectedExpense.copy(
+                name = newDetail,
+                price = newAmount
+            )
 
-    private fun setupAmountInput(view: View) {
-        val etAmountInput = view.findViewById<EditText>(R.id.et_amount_input)
+            // ✅ suspend 함수는 Coroutine Scope 내에서 호출해야 함!
+            viewLifecycleOwner.lifecycleScope.launch {
+                viewModel.updateBotSheetHistory(updatedExpense)
 
-        etAmountInput.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-            override fun afterTextChanged(s: Editable?) {
-                val input = s?.toString()?.replace(",", "")?.toLongOrNull() ?: return
-                val limitedValue = if (input > 99_999_999) 99_999_999 else input
-                val formatted = String.format("%,d", limitedValue)
-                if (formatted != s.toString()) {
-                    etAmountInput.removeTextChangedListener(this)
-                    etAmountInput.setText(formatted)
-                    etAmountInput.setSelection(formatted.length)
-                    etAmountInput.addTextChangedListener(this)
+                // ✅ 변경된 내역을 반영하기 위해 UIState를 갱신
+                _binding?.let {
+                    binding.etDetailInput.setText(newDetail)
+                    binding.etAmountInput.setText(newAmount.toString())
                 }
+                Toast.makeText(requireContext(), "지출 내역이 수정되었습니다.", Toast.LENGTH_SHORT).show()
+                findNavController().navigate(R.id.action_ExpenseEditFragment_to_HomeFragment)
             }
-        })
+        }
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEditViewModel.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEditViewModel.kt
new file mode 100644
index 00000000..afe124fe
--- /dev/null
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEditViewModel.kt
@@ -0,0 +1,16 @@
+package com.example.yeongkkuel.presentation.home.entry
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.example.yeongkkuel.presentation.botsheet.BotSheetViewModel
+
+class ExpenseEditViewModelFactory(
+    private val viewModel: BotSheetViewModel
+) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        if (modelClass.isAssignableFrom(BotSheetViewModel::class.java)) {
+            return viewModel as T
+        }
+        throw IllegalArgumentException("Unknown ViewModel class")
+    }
+}
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEntryFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEntryFragment.kt
index acb60924..774d0adb 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEntryFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEntryFragment.kt
@@ -20,15 +20,22 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
 import androidx.navigation.fragment.findNavController
 import com.example.yeongkkuel.R
+import com.example.yeongkkuel.network.RetrofitClient
 import com.example.yeongkkuel.presentation.botsheet.BotSheetUiState
 import com.example.yeongkkuel.presentation.botsheet.BotSheetViewModel
+import com.example.yeongkkuel.presentation.home.entry.data.ExpenseRepository
+import com.example.yeongkkuel.presentation.home.entry.data.ExpenseRequest
+import com.example.yeongkkuel.presentation.home.entry.data.ExpenseViewModel
 import com.example.yeongkkuel.presentation.util.SpendingCategory
 import java.text.SimpleDateFormat
 import java.util.Calendar
+import java.util.Date
 import java.util.Locale
 
 class ExpenseEntryFragment : Fragment() {
@@ -40,6 +47,8 @@ class ExpenseEntryFragment : Fragment() {
     private var expensePhotoUrl: String = ""
 
     private val botSheetViewModel: BotSheetViewModel by activityViewModels()
+    private lateinit var expenseViewModel: ExpenseViewModel
+
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -55,6 +64,10 @@ class ExpenseEntryFragment : Fragment() {
         navController = Navigation.findNavController(view)
         sharedPreferences = requireContext().getSharedPreferences("ExpensePrefs", Context.MODE_PRIVATE)
 
+        val repository = ExpenseRepository(RetrofitClient.expenseApiService)
+        expenseViewModel = ViewModelProvider(this, ExpenseViewModel.Factory(repository)).get(ExpenseViewModel::class.java)
+
+
         setupCategory(view)
         initializeViews(view)
         setupDatePicker(view)
@@ -201,13 +214,76 @@ class ExpenseEntryFragment : Fragment() {
     private fun setupCompleteButton(view: View) {
         val tvEntryComplete = view.findViewById<View>(R.id.tv_entry_complete)
         tvEntryComplete.setOnClickListener {
-            // 데이터 검증 및 저장
             if (validateAndSaveEntry(view)) {
-                handleNavigationAfterSave(view) // 데이터 저장 후 화면 이동 처리
+                saveExpense(view) // API 요청 및 저장
+            }
+        }
+    }
+    private fun saveExpense(view: View) {
+        val tvDateInput = view.findViewById<TextView>(R.id.tv_date_input)
+        val etDetailInput = view.findViewById<EditText>(R.id.et_detail_input)
+        val etAmountInput = view.findViewById<EditText>(R.id.et_amount_input)
+        val ivCircleExpenseChecked = view.findViewById<ImageView>(R.id.iv_circle_expense_checked)
+        val ivCircleSendChecked = view.findViewById<ImageView>(R.id.iv_circle_send_auto_checked)
+
+        val detail = etDetailInput.text.toString().trim()
+        val amountString = etAmountInput.text.toString().replace(",", "").trim()
+        val amount = amountString.toIntOrNull() ?: 0
+        val isNoExpenseChecked = ivCircleExpenseChecked.visibility == View.VISIBLE // ✅ 무지출 체크 여부 확인
+        val isSendChatRoomChecked = ivCircleSendChecked.visibility == View.VISIBLE
+
+
+        // 유효한 카테고리 ID를 가져옴 (API 요청 오류 방지)
+        val selectedCategoryName = arguments?.getString("selectedCategory") ?: "기본 카테고리"
+        val matchingCategory = botSheetViewModel.uiState.value.spendingList.find {
+            it.kind.name.equals(selectedCategoryName, ignoreCase = true)
+        }
+        if(matchingCategory == null) {
+            Log.e("ExpenseEntryFragment", "선택된 카테고리에 해당하는 항목이 없습니다.")
+            Toast.makeText(requireContext(), "사용 가능한 카테고리가 없습니다.", Toast.LENGTH_SHORT).show()
+            return
+        }
+        val validCategoryId = matchingCategory.categoryId
+
+
+        if (validCategoryId == -1) {
+            Toast.makeText(requireContext(), "사용 가능한 카테고리가 없습니다.", Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        val expenseRequest = ExpenseRequest(
+            day = formatDateForServer(tvDateInput.text.toString()), // 날짜 포맷 변환
+            categoryId = validCategoryId, // 유효한 카테고리 ID
+            content = detail,
+            amount = if (isNoExpenseChecked) 0 else amount,
+            isExpense = isNoExpenseChecked,
+            expenseImg = expensePhotoUrl.takeIf { it.isNotEmpty() },
+            sendChatRoom = isSendChatRoomChecked
+        )
+
+        Log.d("ExpenseEntryFragment", "지출 내역 요청 데이터: $expenseRequest")
+        expenseViewModel.createExpense(expenseRequest) { response ->
+            if (response?.isSuccess == true) {
+                Log.d("ExpenseEntryFragment", "지출 내역 저장 완료: ${response.result}")
+                Toast.makeText(requireContext(), "지출 내역이 저장되었습니다.", Toast.LENGTH_SHORT).show()
+                navController.navigate(R.id.navigation_home)
+            } else {
+                Log.e("ExpenseEntryFragment", "지출 내역 저장 실패: ${response?.message}")
+                Toast.makeText(requireContext(), "지출 내역 저장 실패.", Toast.LENGTH_SHORT).show()
             }
         }
     }
 
+    private fun formatDateForServer(date: String): String {
+        val regex = """(\d{4})년 (\d{1,2})월 (\d{1,2})일""".toRegex()
+        val matchResult = regex.find(date)
+        return matchResult?.let {
+            val (year, month, day) = it.destructured
+            "%04d-%02d-%02d".format(year.toInt(), month.toInt(), day.toInt())
+        } ?: SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN).format(Date())
+    }
+
+
     private fun validateAndSaveEntry(view: View): Boolean {
         val etDetailInput = view.findViewById<EditText>(R.id.et_detail_input)
         val etAmountInput = view.findViewById<EditText>(R.id.et_amount_input)
@@ -247,8 +323,9 @@ class ExpenseEntryFragment : Fragment() {
         }
 
         // ViewModel에 저장
-        val selectedCategoryColor: String? = null
         val selectedCategory = arguments?.getString("selectedCategory") ?: "기타"
+        // 선택된 카테고리 값 확인
+        Log.d("ExpenseEntryFragment", "validateAndSaveEntry - selectedCategory: '$selectedCategory'")
         val expenseHistory = BotSheetUiState.Spending.History(
             id = 1,
             name =  detail,
@@ -262,11 +339,11 @@ class ExpenseEntryFragment : Fragment() {
         // SpendingCategory 처리
         return try {
             val categoryEnum = SpendingCategory.fromName(selectedCategory)
+            Log.d("ExpenseEntryFragment", "SpendingCategory.fromName 결과: $categoryEnum")
             botSheetViewModel.addExpenseToCategory(categoryEnum, expenseHistory)
             Toast.makeText(requireContext(), "지출 내역이 저장되었습니다.", Toast.LENGTH_SHORT).show()
             true
         } catch (e: Exception) {
-            hasError = true
             Toast.makeText(requireContext(), "카테고리가 유효하지 않습니다.", Toast.LENGTH_SHORT).show()
             Log.e("ExpenseEntryFragment", "Error saving data: ${e.message}", e)
             false
@@ -323,7 +400,7 @@ class ExpenseEntryFragment : Fragment() {
                 val ivPhotoIcon = view?.findViewById<ImageView>(R.id.iv_photo_icon)
                 imgPhotoFrame?.setImageURI(uri)
                 ivPhotoIcon?.visibility = View.GONE
-                expensePhotoUrl = uri.toString() // 🔹 사진 URL 저장
+                expensePhotoUrl = uri.toString()
             }
         }
     }
@@ -342,4 +419,6 @@ class ExpenseEntryFragment : Fragment() {
             else -> ""
         }
     }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEntryViewModel.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEntryViewModel.kt
deleted file mode 100644
index b2c6652f..00000000
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseEntryViewModel.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.example.yeongkkuel.presentation.home.entry
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-
-class ExpenseEntryViewModel : ViewModel() {
-
-    private val _entryData = MutableLiveData<EntryData>()
-    val entryData: LiveData<EntryData> get() = _entryData
-
-    fun saveEntryData(data: EntryData) {
-        _entryData.value = data
-    }
-
-    fun getEntryData(): EntryData? {
-        return _entryData.value
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseViewFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseViewFragment.kt
index 409d33ff..960b7f27 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseViewFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/ExpenseViewFragment.kt
@@ -1,378 +1,173 @@
 package com.example.yeongkkuel.presentation.home.entry
 
-import android.app.AlertDialog
-import android.graphics.Color
+import android.graphics.Rect
 import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
 import android.view.LayoutInflater
+import android.view.TouchDelegate
 import android.view.View
 import android.view.ViewGroup
-import android.widget.EditText
-import android.widget.PopupWindow
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
-import com.bumptech.glide.Glide
 import com.example.yeongkkuel.R
-import com.example.yeongkkuel.databinding.FragmentExpenseEntryBinding
-import com.example.yeongkkuel.databinding.ItemMenuPopupBinding
-import com.example.yeongkkuel.presentation.botsheet.BotSheetUiState
+import com.example.yeongkkuel.databinding.FragmentExpenseViewBinding
 import com.example.yeongkkuel.presentation.botsheet.BotSheetViewModel
+import com.example.yeongkkuel.presentation.botsheet.BotSheetUiState
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import java.text.NumberFormat
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
 class ExpenseViewFragment : Fragment() {
 
-    private var _binding: FragmentExpenseEntryBinding? = null
+    private var _binding: FragmentExpenseViewBinding? = null
     private val binding get() = _binding!!
-    private val viewModel: BotSheetViewModel by activityViewModels()  // ✅ 중복 제거
+
+    private val viewModel: BotSheetViewModel by activityViewModels()
+    private var selectedCategoryId: Int? = null // ✅ 카테고리 ID 저장
 
     override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
+        inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        _binding = FragmentExpenseEntryBinding.inflate(inflater, container, false)
+        _binding = FragmentExpenseViewBinding.inflate(inflater, container, false)
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        // ✅ 최신 내역을 감시하여 UI 업데이트
-        observeLatestHistory()
-
-        // ✅ 수정된 데이터가 반영되도록 설정
-        findNavController().currentBackStackEntry?.savedStateHandle?.getLiveData<Bundle>("editedExpense")
-            ?.observe(viewLifecycleOwner) { bundle ->
-                bundle?.let {
-//                    val updatedExpense = BotSheetUiState.Spending.History(
-//                        date = it.getString("expenseDate", getCurrentDate()),
-//                        categoryName = it.getString("categoryName", ""),
-//                        categoryColor = it.getString("categoryColor", ""),
-//                        name = it.getString("expenseContent", ""),
-//                        content = it.getString("expenseContent", ""),
-//                        price = it.getInt("expensePrice", 0),
-//                        photoUrl = it.getString("expensePhoto", "")
-//                    )
-//                    Log.d("ExpenseViewFragment", "Received editedExpense: $updatedExpense")
-//                    updateUiWithHistory(updatedExpense)
-                }
-            }
-
-        setupUi()
-        Log.d("ExpenseViewFragment", "📌 arguments: $arguments") // ✅ 전체 arguments 확인
-
-        val expenseDate = arguments?.getString("expenseDate", getCurrentDate())
-        val categoryName = arguments?.getString("categoryName", "기본 카테고리")
-        val categoryColorStr = arguments?.getString("categoryColor") // ✅ HEX 값으로 받을 경우
-        val categoryColorResId: Int = arguments?.getInt("categoryColor") ?: -1
-
-        Log.d("ExpenseViewFragment", "📌 expenseDate: $expenseDate, categoryName: $categoryName, categoryColorStr: $categoryColorStr, categoryColorResId: $categoryColorResId")
-
-        setupCategory(categoryName, categoryColorStr, categoryColorResId)
-        binding.icMore.setOnClickListener { view ->
-            showCustomMenu(view)
-        }
-    }
-    private fun setupCategory(categoryName: String?, categoryColorStr: String?, categoryColorResId: Int) {
-        binding.tvCategoryInput.text = categoryName ?: "기본 카테고리"
-
-        try {
-            when {
-                !categoryColorStr.isNullOrEmpty() && categoryColorStr.startsWith("#") -> {
-                    // ✅ HEX 코드 처리
-                    binding.tvCategoryInput.setTextColor(Color.parseColor(categoryColorStr))
-                    Log.d("ExpenseViewFragment", "✅ HEX 색상 적용됨: $categoryColorStr")
-                }
-                categoryColorResId != -1 -> {
-                    // ✅ 리소스 ID 처리
-                    val resolvedColor = ContextCompat.getColor(requireContext(), categoryColorResId)
-                    binding.tvCategoryInput.setTextColor(resolvedColor)
-                    Log.d("ExpenseViewFragment", "✅ 리소스 ID 색상 적용됨: $categoryColorResId")
-                }
-                else -> {
-                    // ✅ 기본 색상 적용
-                    binding.tvCategoryInput.setTextColor(Color.BLACK)
-                    Log.e("ExpenseViewFragment", "❌ categoryColor 값이 올바르지 않음!")
-                }
-            }
-        } catch (e: Exception) {
-            Log.e("ExpenseViewFragment", "❌ 색상 적용 실패: ${e.message}")
-            binding.tvCategoryInput.setTextColor(Color.BLACK) // 기본 색상 적용
+        binding.btnBack.setOnClickListener {
+            requireActivity().onBackPressedDispatcher.onBackPressed()
         }
-    }
 
-
-    private fun observeLatestHistory() {
-        lifecycleScope.launch {
-            viewLifecycleOwner.lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                viewModel.spendingHistoryList.collectLatest { historyList ->
-                    if (historyList.isNotEmpty()) {
-                        val latestHistory = historyList.last() // 🔹 가장 최근 지출 내역 가져오기
-                        updateUiWithHistory(latestHistory)
-                    }
-                    updateIcMoreVisibility(historyList) // ✅ `icMore` 가시성 업데이트
-                }
-            }
+        // icMore 클릭 시 cl_more의 visibility 토글 (수정/삭제 메뉴 표시)
+        binding.icMore.setOnClickListener {
+            binding.clMore.visibility =
+                if (binding.clMore.visibility == View.GONE) View.VISIBLE else View.GONE
         }
-    }
-    private fun updateIcMoreVisibility(historyList: List<BotSheetUiState.Spending.History>) {
-        val hasOnlyNoExpense = historyList.isNotEmpty() && historyList.isNotEmpty() // ✅ 모든 항목이 무지출인지 확인
-        binding.icMore.visibility = if (hasOnlyNoExpense) View.GONE else View.VISIBLE // ✅ `isNoExpense` 값에 따라 표시 여부 조정
-    }
-
-    private fun updateUiWithHistory(history: BotSheetUiState.Spending.History) {
-        Log.d("ExpenseViewFragment", "updateUiWithHistory - content: '${history.name}'")
-
-//        binding.tvDateInput.text = history.date.ifEmpty { getCurrentDate() }
-//        binding.tvCategoryInput.text = history.categoryName
-//        binding.tvCategoryInput.setTextColor(Color.parseColor(history.categoryColor))
-//        binding.etDetailInput.setText(history.name)
-//        binding.etAmountInput.setText(formatPrice(history.price))
-
-//        if (history.photoUrl.isNotEmpty()) {
-//            Glide.with(binding.root.context) // 🔹 올바른 Context 제공
-//                .load(history.photoUrl)
-//                .into(binding.imgPhotoFrame)
-//            binding.ivPhotoIcon.visibility = View.GONE
-//        } else {
-//            binding.ivPhotoIcon.visibility = View.VISIBLE
-//        }
-//        if ((history.content ?: "").trim() == "무지출 기록") {
-//            Log.d("ExpenseViewFragment", "ic_more 숨김 처리")
-//            binding.icMore.visibility = View.GONE
-//        } else {
-//            Log.d("ExpenseViewFragment", "ic_more 표시 처리")
-//            binding.icMore.visibility = View.VISIBLE
-//        }
-        adjustEditTextWidth(binding.etDetailInput)
-
-    }
 
-    private fun setupUi() {
-        // 🔹 제목 텍스트뷰 visibility 변경
-        binding.tvExpenseViewTitle.visibility = View.VISIBLE
-        binding.tvExpenseTitle.visibility = View.GONE
-        binding.btnBack.setOnClickListener {
-            saveHistoryToBotSheet() // 수정된 내용 저장
-            findNavController().popBackStack()
+        // cl_more 내 수정 버튼 클릭 이벤트
+        binding.clMore.findViewById<TextView>(R.id.tv_modify).setOnClickListener {
+            navigateToExpenseEdit()
+            binding.clMore.visibility = View.GONE
         }
 
-        lifecycleScope.launch {
-            viewModel.spendingHistoryList.collectLatest { historyList ->
-                if (historyList.isNotEmpty()) {
-                    val latestHistory = historyList.last()
-                    updateUiWithHistory(latestHistory)
-                }
-            }
+        // cl_more 내 삭제 버튼 클릭 이벤트
+        binding.clMore.findViewById<TextView>(R.id.tv_delete).setOnClickListener {
+            deleteExpense()
+            binding.clMore.visibility = View.GONE
         }
 
-        arguments?.let {
-            val expenseDate = it.getString("expenseDate", getCurrentDate())
-            val categoryName = it.getString("categoryName", "")
-            val categoryColor = it.getInt("categoryColor", R.color.black2)
-            val expenseContent = it.getString("expenseContent", "")
-            val expensePrice = it.getInt("expensePrice", 0)
-            val expensePhotoUrl = it.getString("expensePhoto", "")
-
-            binding.tvDateInput.text = expenseDate
-            binding.tvCategoryInput.text = categoryName
-            binding.tvCategoryInput.setTextColor(categoryColor) // Int 값을 바로 사용
-            binding.etDetailInput.setText(expenseContent)
-            binding.etAmountInput.setText(formatPrice(expensePrice))
-
-            if (expensePhotoUrl.isNotEmpty()) {
-                Glide.with(this)
-                    .load(expensePhotoUrl)
-                    .into(binding.imgPhotoFrame)
-                binding.ivPhotoIcon.visibility = View.GONE
-            } else {
-                binding.ivPhotoIcon.visibility = View.VISIBLE
+        // Bundle에서 데이터 가져와서 UI에 표시
+        val expenseId = arguments?.getInt("expenseId") ?: 0
+        val expenseName = arguments?.getString("expenseName") ?: ""
+        val expensePrice = arguments?.getInt("expensePrice") ?: 0
+        val categoryColor = arguments?.getInt("categoryColor") ?: R.color.black2
+        val categoryName = arguments?.getString("categoryName") ?: "카테고리 없음"
+
+        // 이제 이 값들을 UI에 세팅
+        binding.etDetailInput.setText(expenseName)
+        binding.etAmountInput.setText(expensePrice.toString())
+
+        binding.tvCategoryInput.setTextColor(ContextCompat.getColor(requireContext(), categoryColor))
+        binding.tvCategoryInput.text = categoryName
+        binding.tvCategoryInput.setTextColor(ContextCompat.getColor(requireContext(), categoryColor))
+
+        // 날짜 등은 viewModel에서 가져올 수 있음
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewModel.uiState.collectLatest { uiState ->
+                binding.tvDateInput.text = formatDate(uiState.date)
             }
-            adjustEditTextWidth(binding.etDetailInput) // 초기 UI 설정 시에도 높이 조정
-
-        }
-
-        binding.tvDateInput.isEnabled = false
-        binding.tvCategoryInput.isEnabled = false
-        binding.etDetailInput.isEnabled = false
-        binding.etAmountInput.isEnabled = false
-
-        binding.tvDateInput.isFocusable = false
-        binding.tvCategoryInput.isFocusable = false
-        binding.etDetailInput.isFocusable = false
-        binding.etAmountInput.isFocusable = false
-
-        binding.tvCharacterCount.visibility = View.GONE
-        binding.tvEntryComplete.visibility = View.GONE
-        binding.clExpenseAuto.visibility = View.GONE
-        binding.clCheckNoExpense.visibility = View.GONE
-        binding.icMore.visibility = View.VISIBLE
-        binding.tvEntryComplete.setOnClickListener {
-            saveEditedExpense()
-        }
-        binding.icMore.setOnClickListener { view ->
-            showCustomMenu(view)
         }
-    }
-
-    private fun getCurrentDate(): String {
-        val dateFormat = SimpleDateFormat("yyyy년 M월 d일 E요일", Locale.KOREA)
-        return dateFormat.format(Date())
-    }
 
-    private fun formatPrice(price: Int): String {
-        return NumberFormat.getNumberInstance(Locale.KOREA).format(price)
+        // 필요하면 getCategoryForExpense(expenseId)로 카테고리 찾기
+        val matchedCategory = getCategoryForExpense(expenseId)
+        selectedCategoryId = matchedCategory?.categoryId
     }
 
-    private fun saveEditedExpense() {
-        // 🔹 수정된 데이터를 저장하는 로직 추가
+    private fun getCategoryForExpense(expenseId: Int): BotSheetUiState.Spending? {
+        return viewModel.uiState.value.spendingList.find { spending ->
+            spending.history.any { it.id == expenseId }
+        }
     }
 
-    // 수정/삭제 커스텀 메뉴 표시
-    private fun showCustomMenu(anchor: View) {
-        try {
-            val categoryName = binding.tvCategoryInput.text.toString()
-
-            val categoryColor = String.format("#%06X", (0xFFFFFF and binding.tvCategoryInput.currentTextColor)) // ✅ HEX 변환
-
-            val popupBinding = ItemMenuPopupBinding.inflate(requireActivity().layoutInflater)
-            val popupWindow = PopupWindow(popupBinding.root, 300, 300, true)
-
-            popupBinding.tvModify.setOnClickListener {
-                // ✅ 올바른 네비게이션 컨트롤러 확인 후 이동
-                val navController = findNavControllerSafely()
-                if (navController != null) {
-                    val bundle = Bundle().apply {
-                        putString("categoryName", categoryName)
-                        putString("categoryColor", "#FF5733")
-                    }
-                    navController.navigate(R.id.action_ExpenseViewFragment_to_ExpenseEditFragment, bundle)
-                    Log.d("ExpenseViewFragment", "수정 버튼 클릭됨: categoryName=$categoryName, categoryColor=$categoryColor")
-                } else {
-                    Log.e("ExpenseViewFragment", "네비게이션 컨트롤러를 찾을 수 없음!")
-                }
-                popupWindow.dismiss()
-            }
-
-            popupBinding.tvDelete.setOnClickListener {
-                showDeleteConfirmationDialog()
-                popupWindow.dismiss()
+    private fun navigateToExpenseEdit() {
+        val selectedExpense = viewModel.spendingHistoryList.value.lastOrNull()
+        if (selectedExpense != null) {
+            val bundle = Bundle().apply {
+                putInt("expenseId", selectedExpense.id)
+                putString("expenseName", selectedExpense.name)
+                putInt("expensePrice", selectedExpense.price)
             }
-
-            popupWindow.elevation = 10f
-            popupWindow.showAsDropDown(anchor, 0, 0)
-
-        } catch (e: Exception) {
-            Log.e("ExpenseViewFragment", "showCustomMenu 오류: ${e.message}")
+            findNavController().navigate(R.id.action_ExpenseViewFragment_to_ExpenseEditFragment, bundle)
         }
     }
 
-    private fun Fragment.findNavControllerSafely(): NavController? {
-        return try {
-            findNavController()
-        } catch (e: IllegalStateException) {
-            Log.e("NavigationError", "NavController를 찾을 수 없음: ${e.message}")
-            null
-        }
-    }
+    // 지출 내역 삭제
+    private fun deleteExpense() {
+        val selectedExpense = viewModel.spendingHistoryList.value.lastOrNull() ?: return
 
-    private fun showDeleteConfirmationDialog() {
+        // 삭제 확인 다이얼로그 띄우기
         val dialogView = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_expense_delete, null)
-
         val dialog = AlertDialog.Builder(requireContext())
             .setView(dialogView)
-            .setCancelable(true)
             .create()
 
-        val cancelBtn = dialogView.findViewById<TextView>(R.id.tv_cancel_btn)
-        val deleteBtn = dialogView.findViewById<TextView>(R.id.tv_delete_btn)
-        val titleTextView = dialogView.findViewById<TextView>(R.id.tv_expense_title)
+        val tvExpenseTitle = dialogView.findViewById<TextView>(R.id.tv_expense_title)
+        tvExpenseTitle.text = binding.etDetailInput.text.toString()
+        val btnConfirm = dialogView.findViewById<TextView>(R.id.tv_delete_btn)
+        val btnCancel = dialogView.findViewById<TextView>(R.id.tv_cancel_btn)
 
-        val expenseName = binding.etDetailInput.text.toString()
-        titleTextView.text = expenseName // 🔥 다이얼로그에 삭제할 항목 표시
+        btnConfirm.setOnClickListener {
+            viewModel.deleteExpense(selectedExpense.id) // ✅ 서버에 삭제 요청
 
-        cancelBtn.setOnClickListener {
+            viewModel.deleteResult.observe(viewLifecycleOwner) { isDeleted ->
+                if (isDeleted) {
+                    Toast.makeText(requireContext(), "지출 내역이 삭제되었습니다.", Toast.LENGTH_SHORT).show()
+                    findNavController().popBackStack(R.id.navigation_home, false)
+                } else {
+                    Toast.makeText(requireContext(), "삭제 실패. 다시 시도해주세요.", Toast.LENGTH_SHORT).show()
+                }
+            }
             dialog.dismiss()
         }
 
-        deleteBtn.setOnClickListener {
-            viewModel.removeExpense(expenseName) // ✅ BotSheetViewModel에서 삭제
-            Log.d("ExpenseViewFragment", "✅ 삭제 요청: $expenseName")
-
-            Toast.makeText(requireContext(), "지출 내역이 삭제되었습니다.", Toast.LENGTH_SHORT).show()
+        btnCancel.setOnClickListener {
             dialog.dismiss()
-
-            // ✅ 삭제 후 BotSheet 업데이트 트리거
-            viewModel.spendingHistoryList.value.let {
-                Log.d("ExpenseViewFragment", "삭제 후 바텀시트 업데이트 -> 남은 항목: ${it.size} 개")
-            }
-
-            // ✅ 삭제 후 바텀시트 업데이트를 보장하기 위해 데이터 전달
-            findNavController().previousBackStackEntry?.savedStateHandle?.set("expenseDeleted", true)
-
-            findNavController().popBackStack() // 이전 화면으로 이동
         }
 
+        dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
         dialog.show()
     }
 
 
+    private fun formatDate(date: Date?): String {
+        return if (date != null) {
+            val sdf = SimpleDateFormat("yyyy년 M월 d일 E요일", Locale.KOREAN)
+            sdf.format(date)
+        } else {
+            "날짜 없음"
+        }
+    }
 
-    private fun saveHistoryToBotSheet() {
-//        val updatedExpense = BotSheetUiState.Spending.History(
-//            date = binding.tvDateInput.text.toString(),
-//            categoryName = binding.tvCategoryInput.text.toString(),
-//            categoryColor = String.format("#%06X", (0xFFFFFF and binding.tvCategoryInput.currentTextColor)), // 색상 HEX 변환
-//            name = binding.etDetailInput.text.toString(),
-//            content = binding.etDetailInput.text.toString(),
-//            price = binding.etAmountInput.text.toString().replace(",", "").toIntOrNull() ?: 0,
-//            photoUrl = "" // 📝 이미지 추가 필요시 업데이트
-//        )
-
-//        Log.d("ExpenseViewFragment", "saveHistoryToBotSheet called with: $updatedExpense")
-
-        // ✅ ViewModel을 통해 바텀시트에 반영
+    private fun getCategoryTextColor(categoryName: String): Int {
+        val spendingList = viewModel.uiState.value.spendingList
+        val category = spendingList.find { it.kind.name == categoryName }
+        return category?.color?.id?.let { colorId ->
+            ContextCompat.getColor(requireContext(), colorId)
+        } ?: ContextCompat.getColor(requireContext(), R.color.black2)
     }
 
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
-    private fun adjustEditTextWidth(editText: EditText) {
-        editText.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                // 텍스트 변경 시 넓이 조정
-                adjustWidth(editText)
-            }
-
-            override fun afterTextChanged(s: Editable?) {}
-        })
-
-        // 초기 넓이 조정
-        adjustWidth(editText)
-    }
-
-    private fun adjustWidth(editText: EditText) {
-        val paint = editText.paint
-        val width = (paint.measureText(editText.text.toString()) + editText.paddingLeft + editText.paddingRight).toInt()
-        editText.width = width
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/EntryData.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/EntryData.kt
similarity index 76%
rename from app/src/main/java/com/example/yeongkkuel/presentation/home/entry/EntryData.kt
rename to app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/EntryData.kt
index 86f96e98..ca655db8 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/EntryData.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/EntryData.kt
@@ -1,4 +1,4 @@
-package com.example.yeongkkuel.presentation.home.entry
+package com.example.yeongkkuel.presentation.home.entry.data
 
 data class EntryData(
     val noExpense: Boolean,
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseApiService.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseApiService.kt
new file mode 100644
index 00000000..8d9e8f3a
--- /dev/null
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseApiService.kt
@@ -0,0 +1,25 @@
+package com.example.yeongkkuel.presentation.home.entry.data
+
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.POST
+import retrofit2.http.PUT
+import retrofit2.http.Path
+import retrofit2.http.DELETE
+
+interface ExpenseApiService {
+
+    @POST("/api/expense")
+    suspend fun createExpense(
+        @Body expenseRequest: ExpenseRequest
+    ): Response<ExpenseResponse>
+
+    @PUT("/api/expense/{expenseId}")
+    suspend fun updateExpense(
+        @Path("expenseId") expenseId: Int,
+        @Body request: ExpenseUpdateRequest
+    ): Response<ExpenseUpdateResponse>
+
+    @DELETE("/api/expense/{expenseId}")
+    suspend fun deleteExpense(@Path("expenseId") expenseId: Int): Response<ExpenseDeleteResponse>
+}
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseRepository.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseRepository.kt
new file mode 100644
index 00000000..f88d0571
--- /dev/null
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseRepository.kt
@@ -0,0 +1,44 @@
+package com.example.yeongkkuel.presentation.home.entry.data
+
+import android.util.Log
+
+class ExpenseRepository(private val api: ExpenseApiService) {
+
+    suspend fun createExpense(expenseRequest: ExpenseRequest): ExpenseResponse? {
+        Log.d("ExpenseRepository", "🚀 지출 내역 API 요청: $expenseRequest") // ✅ 요청 데이터 로그 추가
+
+        return try {
+            val response = api.createExpense(expenseRequest)
+            if (response.isSuccessful) {
+                val responseBody = response.body()
+                Log.d("ExpenseRepository", "✅ 지출 내역 저장 성공: $responseBody") // ✅ 응답 데이터 로그 추가
+                responseBody
+            } else {
+                Log.e("ExpenseRepository", "🚨 API 요청 실패: ${response.errorBody()?.string()}")
+                null
+            }
+        } catch (e: Exception) {
+            Log.e("ExpenseRepository", "🚨 네트워크 오류 발생: ${e.message}")
+            null
+        }
+    }
+
+    suspend fun updateExpense(expenseId: Int, request: ExpenseUpdateRequest): ExpenseUpdateResponse? {
+        return try {
+            Log.d("ExpenseRepository", "🚀 지출 내역 수정 요청: $request")
+            val response = api.updateExpense(expenseId, request)
+            if (response.isSuccessful) {
+                response.body() ?: run {
+                    Log.e("ExpenseRepository", "🚨 응답이 null입니다.")
+                    null
+                }
+            } else {
+                Log.e("ExpenseRepository", "🚨 API 요청 실패: ${response.errorBody()?.string()}")
+                null
+            }
+        } catch (e: Exception) {
+            Log.e("ExpenseRepository", "🚨 네트워크 오류 발생: ${e.message}")
+            null
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseRequest.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseRequest.kt
new file mode 100644
index 00000000..4f66b80c
--- /dev/null
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseRequest.kt
@@ -0,0 +1,20 @@
+package com.example.yeongkkuel.presentation.home.entry.data
+
+data class ExpenseRequest(
+    val day: String,
+    val categoryId: Int,
+    val content: String,
+    val amount: Int,
+    val isExpense: Boolean,
+    val expenseImg: String?,
+    val sendChatRoom: Boolean
+)
+
+data class ExpenseUpdateRequest(
+    val day: String,       // 지출 날짜 (YYYY-MM-DD)
+    val categoryId: Int,   // 카테고리 ID
+    val content: String,   // 지출 내용
+    val amount: Int,       // 지출 금액
+    val expenseImg: String? // 첨부 이미지 (선택 사항)
+)
+
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseResponse.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseResponse.kt
new file mode 100644
index 00000000..d27c482e
--- /dev/null
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseResponse.kt
@@ -0,0 +1,74 @@
+package com.example.yeongkkuel.presentation.home.entry.data
+
+import com.example.yeongkkuel.presentation.botsheet.BotSheetUiState
+
+data class ExpenseResponse(
+    val isSuccess: Boolean,
+    val code: String,
+    val message: String,
+    val result: ExpenseResult
+)
+
+data class ExpenseResult(
+    val createdAt: String,
+    val updatedAt: String,
+    val id: Int,
+    val day: String,
+    val content: String,
+    val amount: Int,
+    val isNoSpending: Boolean,
+    val imageUrl: String?,
+    val isSend: Boolean
+)
+data class ExpenseListResponse(
+    val isSuccess: Boolean,
+    val code: String,
+    val message: String,
+    val result: List<ExpenseResult>
+)
+
+data class ExpenseUpdateResponse(
+    val isSuccess: Boolean,
+    val code: String,
+    val message: String,
+    val result: ExpenseUpdateResult
+)
+
+data class ExpenseUpdateResult(
+    val createdAt: String,  // 생성일
+    val updatedAt: String,  // 수정일
+    val id: Int,            // 지출 ID
+    val day: String,        // 날짜
+    val content: String,    // 지출 내용
+    val amount: Int,        // 지출 금액
+    val isNoSpending: Boolean, // 무지출 여부
+    val imageUrl: String?,  // 이미지 URL
+    val isSend: Boolean     // 자동 전송 여부
+)
+data class ExpenseDeleteResponse(
+    val isSuccess: Boolean,
+    val code: String,
+    val message: String,
+    val result: Any? = null // 삭제 요청 시 반환 데이터가 없는 경우 고려
+)
+
+fun ExpenseResult.toBotSheetHistory(): BotSheetUiState.Spending.History {
+    return BotSheetUiState.Spending.History(
+        id = this.id,
+        name = this.content,
+        price = this.amount,
+        imgExist = !this.imageUrl.isNullOrEmpty()
+    )
+}
+
+fun ExpenseUpdateResult.toBotSheetHistory(): BotSheetUiState.Spending.History {
+    return BotSheetUiState.Spending.History(
+        id = this.id,
+        name = this.content, // ✅ 지출 내용
+        price = this.amount, // ✅ 지출 금액
+        imgExist = !this.imageUrl.isNullOrEmpty() // ✅ 사진이 있으면 true
+    )
+}
+
+
+
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseViewModel.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseViewModel.kt
new file mode 100644
index 00000000..e517517f
--- /dev/null
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/entry/data/ExpenseViewModel.kt
@@ -0,0 +1,51 @@
+package com.example.yeongkkuel.presentation.home.entry.data
+
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.launch
+
+class ExpenseViewModel(private val repository: ExpenseRepository) : ViewModel() {
+
+    private val _expenseResponse = MutableLiveData<ExpenseResponse?>()
+    val expenseResponse: LiveData<ExpenseResponse?> get() = _expenseResponse
+    private val _updateResponse = MutableLiveData<ExpenseUpdateResponse?>()
+    val updateResponse: LiveData<ExpenseUpdateResponse?> get() = _updateResponse
+
+    fun createExpense(expenseRequest: ExpenseRequest, onResult: (ExpenseResponse?) -> Unit) {
+        Log.d("ExpenseViewModel", "📌 createExpense() 호출됨 - 요청 데이터: $expenseRequest") // ✅ 요청 로그 추가
+
+        viewModelScope.launch {
+            val response = repository.createExpense(expenseRequest)
+            if (response != null && response.isSuccess) {
+                Log.d("ExpenseViewModel", "✅ 지출 내역 저장 성공: $response") // ✅ 성공 로그
+            } else {
+                Log.e("ExpenseViewModel", "❌ 지출 내역 저장 실패 또는 응답 없음")
+            }
+            onResult(response)
+        }
+    }
+
+    fun updateExpense(expenseId: Int, request: ExpenseUpdateRequest, onComplete: (ExpenseUpdateResponse?) -> Unit) {
+        viewModelScope.launch {
+            val response = repository.updateExpense(expenseId, request)
+            _updateResponse.postValue(response)
+            onComplete(response)
+        }
+    }
+
+
+    // ViewModelProvider.Factory 추가
+    class Factory(private val repository: ExpenseRepository) : ViewModelProvider.Factory {
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            if (modelClass.isAssignableFrom(ExpenseViewModel::class.java)) {
+                @Suppress("UNCHECKED_CAST")
+                return ExpenseViewModel(repository) as T
+            }
+            throw IllegalArgumentException("Unknown ViewModel class")
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/ProductUiState.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/ProductUiState.kt
index 5f50058c..ba38a2c4 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/ProductUiState.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/ProductUiState.kt
@@ -1,82 +1,20 @@
 package com.example.yeongkkuel.presentation.home.store
 
-import com.example.yeongkkuel.R
-
 data class ProductUiState(
-    val totalProducts: Int = 8, // 총 상품 개수
-    val productList: List<Product>
+    val totalProducts: Int = 0, // ✅ 초기 상품 개수 0
+    val productList: List<Product> = emptyList() // ✅ 빈 리스트로 초기화
 ) {
     data class Product(
-        val id: Int, // ✅ id 추가
+        val id: Int,
         val name: String,
         val price: Int,
-        val category: ProductCategory, // ProductCategory 타입
-        val iconResId: Int
+        val imageUrl: String,
+        val category: ProductCategory,
+        val area: String? = null,       // ✅ area 필드 (기존에 있다면 유지)
+        val itemType: String            // ✅ itemType 필드 추가
     )
 
     companion object {
-        fun init() = ProductUiState(
-            productList = listOf(
-                Product(
-                    id =1,
-                    name = "스케이트 보드",
-                    price = 128,
-                    category = ProductCategory.TOY,
-                    iconResId = R.drawable.img_home_toy2,
-                ),
-                Product(
-                    id =2,
-                    name = "탱탱볼",
-                    price = 128,
-                    category = ProductCategory.TOY,
-                    iconResId = R.drawable.img_home_toy1,
-                ),
-                Product(
-                    id=3,
-                    name = "밥그릇 1",
-                    price = 64,
-                    category = ProductCategory.BOWL,
-                    iconResId = R.drawable.img_home_bowl1,
-                ),
-                Product(
-                    id=4,
-                    name = "밥그릇 2",
-                    price = 64,
-                    category = ProductCategory.BOWL,
-                    iconResId = R.drawable.img_home_bowl2,
-                ),
-                Product(
-                    id=5,
-                    name = "둥지 1",
-                    price = 256,
-                    category = ProductCategory.NEST,
-                    iconResId = R.drawable.img_home_nest1
-                ),
-                Product(
-                    id=6,
-                    name = "둥지 2",
-                    price = 768,
-                    category = ProductCategory.NEST,
-                    iconResId = R.drawable.img_home_nest2,
-
-                ),
-                Product(
-                    id=7,
-                    name = "그네 1",
-                    price = 256,
-                    category = ProductCategory.SWING,
-                    iconResId = R.drawable.img_home_swing1
-                ),
-                Product(
-                    id=8,
-                    name = "그네 2",
-                    price = 768,
-                    category = ProductCategory.SWING,
-                    iconResId = R.drawable.img_home_swing2,
-
-                    )
-
-            )
-        )
+        fun init() = ProductUiState() // ✅ 초기 빈 상태 반환
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreAdapter.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreAdapter.kt
index de68a49f..8122a2ad 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreAdapter.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreAdapter.kt
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
 import com.example.yeongkkuel.databinding.ItemStoreProductBinding
 import kotlinx.android.parcel.Parcelize
 
@@ -13,8 +14,9 @@ data class Product(
     val id: Int, // ✅ id 추가
     val name: String,
     val price: Int,
-    val imageResId: Int,
+    val imageUrl: String, // ✅ 변경
     val category: ProductCategory,
+    val itemType: String, // ✅ 추가: itemType 필드
     var area: String? = null
 ) : Parcelable
 
@@ -37,6 +39,7 @@ class StoreAdapter(
         val product = products[position]
         holder.bind(product, position == selectedPosition)
 
+
         // 아이템 클릭 이벤트 처리
         holder.itemView.setOnClickListener {
             val previousPosition = selectedPosition
@@ -52,16 +55,28 @@ class StoreAdapter(
     }
 
     override fun getItemCount(): Int = products.size
-
-    inner class StoreViewHolder(private val binding: ItemStoreProductBinding) :
+    fun clearSelection() {
+        val previousPosition = selectedPosition
+        selectedPosition = RecyclerView.NO_POSITION
+        notifyItemChanged(previousPosition) // 선택 해제된 아이템만 업데이트
+    }
+    class StoreViewHolder(private val binding: ItemStoreProductBinding) :
         RecyclerView.ViewHolder(binding.root) {
 
         fun bind(product: Product, isSelected: Boolean) {
-            binding.imgStoreProduct.setImageResource(product.imageResId)
-            binding.tvStoreProductName.text = product.name
+            // ✅ 서버에서 받은 이미지 URL을 Glide로 로드
+            Glide.with(binding.root.context)
+                .load(product.imageUrl) // ✅ 서버 이미지 URL 사용
+                .into(binding.imgStoreProduct) // ✅ 이미지 로드
 
-            binding.imgStoreCollect.visibility = if (isSelected) View.VISIBLE else View.GONE
+            binding.tvStoreProductName.text = product.name
+            binding.tvProductPrice.text = product.price.toString()
 
+            if (!isSelected) {
+                binding.imgStoreCollect.visibility = View.GONE
+            } else {
+                binding.imgStoreCollect.visibility = View.VISIBLE
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreFragment.kt
index ad444d4c..ad5001c7 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreFragment.kt
@@ -1,6 +1,8 @@
 package com.example.yeongkkuel.presentation.home.store
 
+import android.graphics.Color
 import android.graphics.Rect
+import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.util.Log
 import android.util.TypedValue
@@ -10,9 +12,12 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.GridLayoutManager
@@ -20,6 +25,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.example.yeongkkuel.R
 import com.example.yeongkkuel.databinding.FragmentStoreBinding
 import com.google.android.material.tabs.TabLayout
+import com.bumptech.glide.Glide
+
 
 class StoreFragment : Fragment() {
     private lateinit var navController: NavController
@@ -38,6 +45,8 @@ class StoreFragment : Fragment() {
     }
     private var selectedProduct: Product? = null
     private var selectedProductInMyTab: Product? = null  // 🔹 MY 탭에서 선택한 상품 저장
+    private val _showFailureDialog = MutableLiveData<Boolean>()
+    val showFailureDialog: LiveData<Boolean> get() = _showFailureDialog
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -50,24 +59,68 @@ class StoreFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        viewModel.showFailureDialog.observe(viewLifecycleOwner) { shouldShow ->
+            if (shouldShow) {
+                showPurchaseFailureDialog()
+                viewModel.resetFailureDialog() // 다이얼로그 상태 초기화
+            }
+        }
+
         navController = Navigation.findNavController(view)
         binding.imgGoHome.setOnClickListener {
             navController.navigate(R.id.action_storeFragment_to_homeFragment)
         }
 
         binding.imgPurchaseIcon.setOnClickListener {
-            selectedProduct?.let {
-                Log.d("StoreFragment", "Passing to Dialog: ${it.name}, ResId: ${it.imageResId}")
-                showPurchaseDialog(it)
-            } ?: Log.d("StoreFragment", "No Product Selected")
+            selectedProduct?.let { product ->
+                if (viewModel.currentReward < product.price) {
+                    showPurchaseFailureDialog()
+                } else {
+                    viewModel.purchaseSkin(
+                        itemId = product.id,
+                        itemType = product.category.name,
+                        itemName = product.name,
+                        reward = product.price
+                    )
+                    // ✅ MY 카테고리에 추가
+                    if (!myProducts.contains(product)) {
+                        myProducts.add(product)
+                        Log.d("StoreFragment", "✅ ${product.name}이 MY 카테고리에 추가됨")
+                    }
+                }
+            } ?: Log.d("StoreFragment", "❌ 선택된 상품 없음")
         }
+
         binding.imgSaveIcon.setOnClickListener {
             selectedProductInMyTab?.let { product ->
-                val purchaseIdList = listOf(product.id)
-                viewModel.saveEquippedSkins(purchaseIdList)
-                Toast.makeText(requireContext(), "스킨 착용을 저장 중...", Toast.LENGTH_SHORT).show()
-            } ?: Log.d("StoreFragment", "No product selected in MY tab.")
+                val bundle = Bundle().apply {
+                    putParcelable("selectedProduct", product)
+                }
+                Log.d("StoreFragment", "✅ ${product.name} 선택됨, 홈 화면 업데이트")
+                navController.navigate(R.id.action_storeFragment_to_homeFragment, bundle)
+            } ?: Log.d("StoreFragment", "❌ 선택된 상품 없음")
+        }
+
+        viewModel.productUiState.observe(viewLifecycleOwner) { uiState ->
+            if (uiState.productList.isNotEmpty()) {
+                val productList = uiState.productList.map { productUiState ->
+                    Product(
+                        id = productUiState.id,
+                        name = productUiState.name,
+                        price = productUiState.price,
+                        category = productUiState.category,
+                        imageUrl = productUiState.imageUrl,
+                        itemType = productUiState.itemType, // ✅ itemType 추가
+                        area = mapItemTypeToArea(productUiState.itemType) // ✅ area 자동 설정
+                    )
+                }
+                updateProductList(productList) // ✅ 변환 후 호출
+            } else {
+                Log.d("StoreFragment", "❌ 상품 데이터가 없습니다.")
+            }
         }
+
         viewModel.equipResponse.observe(viewLifecycleOwner) { response ->
             if (response?.isSuccess == true) {
                 Toast.makeText(requireContext(), "스킨 착용이 저장되었습니다!", Toast.LENGTH_SHORT).show()
@@ -77,56 +130,70 @@ class StoreFragment : Fragment() {
             }
         }
 
-        binding.imgPurchaseIcon.setOnClickListener {
-            selectedProduct?.let { product ->
-                viewModel.purchaseSkin(
-                    itemId = product.id,
-                    itemType = product.category.name, // 예: "SWING"
-                    itemName = product.name,
-                    reward = product.price
-                )
-                Toast.makeText(requireContext(), "스킨 구매 중...", Toast.LENGTH_SHORT).show()
-            } ?: Log.d("StoreFragment", "선택된 상품 없음")
-        }
-
-        // ✅ 스킨 구매 응답 처리
         viewModel.purchaseResponse.observe(viewLifecycleOwner) { response ->
+            Log.d("StoreFragment", "🔍 스킨 구매 API 응답: $response")
+
             if (response?.isSuccess == true) {
-                Toast.makeText(requireContext(), "스킨 구매 성공!", Toast.LENGTH_SHORT).show()
-                navController.popBackStack()
+                selectedProduct?.let { product ->
+                    showPurchaseDialog(product) // ✅ 구매 성공 시 다이얼로그 표시
+                }
             } else {
-                Toast.makeText(
-                    requireContext(),
-                    "스킨 구매 실패: ${response?.message ?: "오류 발생"}",
-                    Toast.LENGTH_SHORT
-                ).show()
+                Log.e("StoreFragment", "❌ 스킨 구매 실패: ${response?.message ?: "서버 응답 없음"}")
+
+                // ✅ 리워드 부족 에러 감지 (예: 서버에서 리워드 부족 시 특정 코드 반환)
+                if (response?.code == "REWARD_NOT_ENOUGH") {
+                    showPurchaseFailureDialog()
+                } else {
+                    Toast.makeText(requireContext(), "스킨 구매 실패: ${response?.message ?: "서버 오류"}", Toast.LENGTH_SHORT).show()
+                }
             }
         }
-
         viewModel.fetchShopData("SWING")
         Log.d("StoreFragment", "🔍 Fetching shop data for category: SWING")
-
         viewModel.shopResponse.observe(viewLifecycleOwner) { response ->
-            Log.d("StoreFragment", "API Response: $response")
+            Log.d("StoreFragment", "🛍 API Response: $response") // ✅ 응답 확인 로그 추가
 
             if (response?.isSuccess == true) {
-                binding.tvCoin.text = "보유 리워드: ${response.result.myReward}"
+                binding.tvCoin.text = response.result.myReward.toString() // ✅ 숫자만 표시
+
                 val shopItems = response.result.itemList.map { shopItem ->
-                    Product(
+                    Product( // ✅ ProductUiState.Product → Product 변환
                         id = shopItem.id,
                         name = shopItem.itemName,
-                        price = shopItem.price,
-                        imageResId = getDrawableFromUrl(shopItem.itemImg),
-                        category = ProductCategory.valueOf(response.result.itemType)
+                        price = shopItem.price ?: 0, // ✅ null 방지
+                        imageUrl = shopItem.itemImg, // ✅ 서버에서 받은 이미지 URL 사용
+                        category = ProductCategory.valueOf(response.result.itemType),
+                        itemType = response.result.itemType, // ✅ itemType 값 추가
+                        area = mapItemTypeToArea(response.result.itemType)
                     )
                 }
-                updateProductList(shopItems)
+
+                val selectedCategory = when (binding.tabLayout.selectedTabPosition) {
+                    0 -> ProductCategory.SWING
+                    1 -> ProductCategory.TOY
+                    2 -> ProductCategory.BOWL
+                    3 -> ProductCategory.NEST
+                    else -> null
+                }
+
+                if (selectedCategory != null) {
+                    val filteredItems = shopItems.filter { it.category == selectedCategory }
+                    if (filteredItems.isEmpty()) {
+                        Log.d("StoreFragment", "⚠ ${selectedCategory.name} 카테고리의 상품이 없습니다.")
+                        updateProductList(emptyList()) // ✅ 빈 리스트 전달
+                    } else {
+                        updateProductList(filteredItems)
+                    }
+                } else {
+                    updateProductList(myProducts, isMyTab = true)
+                }
             } else {
-                Log.e("StoreFragment", "상점 데이터 불러오기 실패: ${response?.message ?: "오류 발생"}")
-                Toast.makeText(requireContext(), "상점 데이터 불러오기 실패: ${response?.message}", Toast.LENGTH_SHORT).show()
+                Log.e("StoreFragment", "❌ 상점 데이터 불러오기 실패: ${response?.message ?: "오류 발생"}")
             }
         }
 
+        viewModel.fetchShopData("SWING") // ✅ 초기 데이터 로드
+
         setupRecyclerView()
         setupTabLayout()
     }
@@ -149,44 +216,53 @@ class StoreFragment : Fragment() {
             }
             when (product.category) {
                 ProductCategory.SWING -> {
-                    val imageResId = when (product.name) {
-                        "그네 1" -> R.drawable.img_home_swing1
-                        "그네 2" -> R.drawable.img_home_swing2
-                        else -> product.imageResId
+                    val imageUrl = when (product.name) {
+                        "그네 1" -> "drawable/img_home_swing1" // ✅ 로컬 이미지
+                        "그네 2" -> "drawable/img_home_swing2"
+                        else -> product.imageUrl // ✅ 서버 이미지
                     }
-                    updateImage(binding.imgStoreSwing, imageResId)
-                    Log.d("StoreFragment", "Swing Image Updated: $imageResId")
+                    Glide.with(binding.root.context)
+                        .load(imageUrl)
+                        .into(binding.imgStoreSwing)
+                    Log.d("StoreFragment", "Swing Image Updated: $imageUrl")
                 }
+
                 ProductCategory.TOY -> {
-                    val imageResId = when (product.name) {
-                        "탱탱볼" -> R.drawable.img_home_toy1
-                        "스케이트 보드" -> R.drawable.img_home_toy2
-                        else -> product.imageResId
+                    val imageUrl = when (product.name) {
+                        "탱탱볼" -> "drawable/img_home_toy1"
+                        "스케이트 보드" -> "drawable/img_home_toy2"
+                        else -> product.imageUrl
                     }
-                    updateImage(binding.imgStoreToy, imageResId)
-                    Log.d("StoreFragment", "Toy Image Updated: $imageResId")
+                    Glide.with(binding.root.context)
+                        .load(imageUrl)
+                        .into(binding.imgStoreToy)
+                    Log.d("StoreFragment", "Toy Image Updated: $imageUrl")
                 }
+
                 ProductCategory.BOWL -> {
-                    val imageResId = when (product.name) {
-                        "밥그릇 1" -> R.drawable.img_home_bowl1
-                        "밥그릇 2" -> R.drawable.img_home_bowl2
-                        else -> product.imageResId
+                    val imageUrl = when (product.name) {
+                        "밥그릇 1" -> "drawable/img_home_bowl1"
+                        "밥그릇 2" -> "drawable/img_home_bowl2"
+                        else -> product.imageUrl
                     }
-                    updateImage(binding.imgStoreBowl, imageResId)
-                    Log.d("StoreFragment", "Bowl Image Updated: $imageResId")
+                    Glide.with(binding.root.context)
+                        .load(imageUrl)
+                        .into(binding.imgStoreBowl)
+                    Log.d("StoreFragment", "Bowl Image Updated: $imageUrl")
                 }
+
                 ProductCategory.NEST -> {
-                    val imageResId = when (product.name) {
-                        "둥지 1" -> R.drawable.img_home_nest1
-                        "둥지 2" -> R.drawable.img_home_nest2
-                        else -> product.imageResId
+                    val imageUrl = when (product.name) {
+                        "둥지 1" -> "drawable/img_home_nest1"
+                        "둥지 2" -> "drawable/img_home_nest2"
+                        else -> product.imageUrl
                     }
-                    updateImage(binding.imgStoreNest, imageResId)
-                    Log.d("StoreFragment", "Nest Image Updated: $imageResId")
+                    Glide.with(binding.root.context)
+                        .load(imageUrl)
+                        .into(binding.imgStoreNest)
+                    Log.d("StoreFragment", "Nest Image Updated: $imageUrl")
                 }
-
             }
-
         }
 
         binding.rvStoreItems.apply {
@@ -204,8 +280,10 @@ class StoreFragment : Fragment() {
                     id = productUiStateProduct.id,
                     name = productUiStateProduct.name,
                     price = productUiStateProduct.price,
-                    imageResId = adjustResourceId(productUiStateProduct.iconResId),
-                    category = productUiStateProduct.category
+                    imageUrl = productUiStateProduct.imageUrl,
+                    category = productUiStateProduct.category,
+                    itemType = productUiStateProduct.itemType, // ✅ itemType 추가
+                    area = mapItemTypeToArea(productUiStateProduct.itemType) // ✅ itemType을 area로 변환
                 )
             }
         )
@@ -225,17 +303,17 @@ class StoreFragment : Fragment() {
         }
     }
 
-    private fun getProductsByCategory(category: ProductCategory): List<Product> {
-        return ProductUiState.init().productList.filter { it.category == category }.map { productUiStateProduct ->
-            Product(
-                id = productUiStateProduct.id,
-                name = productUiStateProduct.name,
-                price = productUiStateProduct.price,
-                imageResId = adjustResourceId(productUiStateProduct.iconResId),
-                category = productUiStateProduct.category
-            )
-        }
-    }
+//    private fun getProductsByCategory(category: ProductCategory): List<Product> {
+//        return ProductUiState.init().productList.filter { it.category == category }.map { productUiStateProduct ->
+//            Product(
+//                id = productUiStateProduct.id,
+//                name = productUiStateProduct.name,
+//                price = productUiStateProduct.price,
+//                imageUrl = productUiStateProduct.imageUrl, // ✅ imageResId 대신 imageUrl 사용
+//                category = productUiStateProduct.category
+//            )
+//        }
+//    }
 
     private fun updateImage(imageView: ImageView, imageResId: Int) {
         imageView.setImageResource(imageResId)
@@ -266,36 +344,24 @@ class StoreFragment : Fragment() {
 
         binding.tabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
             override fun onTabSelected(tab: TabLayout.Tab?) {
-                // 탭 커스텀 뷰 업데이트
-                tab?.customView?.let { updateTabView(it, isSelected = true) }
-
-                // 탭 위치에 따른 동작
+                tab?.customView?.let { updateTabView(it, isSelected = true) }                // 탭 커스텀 뷰 업데이트
                 tab?.position?.let { position ->
-                    when (position) {
-                        0 -> {
-                            updateProductList(getProductsByCategory(ProductCategory.SWING))
-                            showPurchaseIconOnly()
-                        }
-                        1 -> {
-                            updateProductList(getProductsByCategory(ProductCategory.TOY))
-                            showPurchaseIconOnly()
-                        }
-                        2 -> {
-                            updateProductList(getProductsByCategory(ProductCategory.BOWL))
-                            showPurchaseIconOnly()
-                        }
-                        3 -> {
-                            updateProductList(getProductsByCategory(ProductCategory.NEST))
-                            showPurchaseIconOnly()
-                        }
-                        4 -> {
-                            updateProductList(myProducts, isMyTab = true)
-                            showSaveIconOnly()
-                        }
-                        else -> {
-                            updateProductList(emptyList())
-                            showPurchaseIconOnly()
-                        }
+                    val selectedCategory = when (position) {
+                        0 -> ProductCategory.SWING
+                        1 -> ProductCategory.TOY
+                        2 -> ProductCategory.BOWL
+                        3 -> ProductCategory.NEST
+                        else -> null
+                    }
+
+                    if (selectedCategory != null) {
+                        Log.d("StoreFragment", "🔄 Fetching data for category: ${selectedCategory.name}") // ✅ 로그 추가
+                        viewModel.fetchShopData(selectedCategory.name)// ✅ API 다시 호출
+                        storeAdapter.clearSelection()
+                        showPurchaseIconOnly()
+                    } else {
+                        updateProductList(myProducts, isMyTab = true)
+                        showSaveIconOnly()
                     }
                 }
             }
@@ -305,7 +371,23 @@ class StoreFragment : Fragment() {
             }
 
             override fun onTabReselected(tab: TabLayout.Tab?) {
-                // 재선택 이벤트 처리 필요 시 여기에 추가
+                // ✅ 같은 탭을 다시 눌렀을 때도 데이터를 다시 불러오도록 함
+                tab?.position?.let { position ->
+                    val selectedCategory = when (position) {
+                        0 -> ProductCategory.SWING
+                        1 -> ProductCategory.TOY
+                        2 -> ProductCategory.BOWL
+                        3 -> ProductCategory.NEST
+                        else -> null
+                    }
+
+                    if (selectedCategory != null) {
+                        Log.d("StoreFragment", "🔄 Re-fetching data for category: ${selectedCategory.name}")
+                        viewModel.fetchShopData(selectedCategory.name) // ✅ 같은 탭 다시 눌러도 데이터 로드
+                        storeAdapter.clearSelection()
+
+                    }
+                }
             }
 
             // Helper 함수: Purchase 아이콘 표시
@@ -341,7 +423,6 @@ class StoreFragment : Fragment() {
     }
 
     private fun showPurchaseDialog(product: Product) {
-        Log.d("showPurchaseDialog", "Product: ${product.name}, ResId: ${product.imageResId}")
 
         val dialogView = LayoutInflater.from(requireContext())
             .inflate(R.layout.dialog_purchase_success, null)
@@ -349,15 +430,20 @@ class StoreFragment : Fragment() {
         val dialog = androidx.appcompat.app.AlertDialog.Builder(requireContext())
             .setView(dialogView)
             .create()
-
+        dialog.window?.apply {
+            setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) // ✅ 배경을 투명하게 설정
+        }
         val imgProduct = dialogView.findViewById<ImageView>(R.id.img_product)
         val tvProductName = dialogView.findViewById<TextView>(R.id.tv_product_name)
         val tvProductPrice = dialogView.findViewById<TextView>(R.id.tv_product_price)
         val btnConfirm = dialogView.findViewById<TextView>(R.id.tv_purchase_confirm)
         val btnCancel = dialogView.findViewById<TextView>(R.id.tv_purchase_cancel)
 
-        imgProduct.setImageResource(product.imageResId)
+        Glide.with(imgProduct.context)
+            .load(product.imageUrl) // ✅ 서버에서 받은 이미지 URL 사용
+            .into(imgProduct) // ✅ 이미지뷰에 적용
         tvProductName.text = product.name
+        tvProductPrice.text = product.price.toString() // ✅ 스웨거에서 받은 가격 적용
 
         btnConfirm.setOnClickListener {
             if (!myProducts.contains(product)) { // 중복 방지
@@ -368,7 +454,7 @@ class StoreFragment : Fragment() {
                         ProductCategory.BOWL -> "Bowl Area"
                         ProductCategory.NEST -> "Nest Area"
                     },
-                    imageResId = product.imageResId // `mapToHomeResource`를 호출하지 않음
+                    imageUrl = product.imageUrl // `mapToHomeResource`를 호출하지 않음
                 )
                 myProducts.add(updatedProduct)
                 Log.d("MY Tab", "Product added to MY: ${updatedProduct.name}, Area: ${updatedProduct.area}")
@@ -392,11 +478,6 @@ class StoreFragment : Fragment() {
         btnCancel.setOnClickListener {
             dialog.dismiss()
         }
-        dialog.window?.apply {
-            setBackgroundDrawableResource(R.drawable.ic_store_topurchase) // VectorDrawable 설정
-            decorView.clipToOutline = true // 💡 둥근 모서리 적용
-        }
-
         dialog.show()
     }
 
@@ -405,6 +486,7 @@ class StoreFragment : Fragment() {
         productList.clear()
         productList.addAll(if (isMyTab) myProducts else newList)
         storeAdapter.notifyDataSetChanged()
+
     }
 
 
@@ -439,8 +521,45 @@ class StoreFragment : Fragment() {
         }
     }
 
+
     fun Int.toPx(context: android.content.Context): Int {
         return (this * context.resources.displayMetrics.density).toInt()
     }
+    private fun showPurchaseFailureDialog() {
+        val dialogView = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_purchase_failure, null)
+
+        val dialog = AlertDialog.Builder(requireContext())
+            .setView(dialogView)
+            .create()
+
+        // ✅ 수정된 코드 (정확한 ID인지 확인)
+        val btnFailureCheck = dialogView.findViewById<View>(R.id.btn_failure_check) as? TextView
+
+        if (btnFailureCheck == null) {
+            Log.e("StoreFragment", "❌ btnFailureCheck 찾을 수 없음. XML 레이아웃 ID 확인 필요!")
+            return
+        }
+
+        btnFailureCheck.setOnClickListener {
+            dialog.dismiss() // 다이얼로그 닫기
+        }
+
+        dialog.window?.apply {
+            setBackgroundDrawableResource(R.drawable.ic_store_topurchase)
+            decorView.clipToOutline = true // 둥근 모서리 적용
+        }
+
+        dialog.show()
+    }
+    private fun mapItemTypeToArea(itemType: String): String {
+        return when (itemType) {
+            "SWING" -> "Swing Area"
+            "TOY" -> "Toy Area"
+            "BOWL" -> "Bowl Area"
+            "NEST" -> "Nest Area"
+            else -> "Unknown Area" // ✅ 예외 처리
+        }
+    }
+
 
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreViewModel.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreViewModel.kt
index 2ef52bdd..f69538d1 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreViewModel.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/StoreViewModel.kt
@@ -5,13 +5,13 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.example.yeongkkuel.R
 import com.example.yeongkkuel.presentation.home.store.data.ShopResponse
 import com.example.yeongkkuel.presentation.home.store.data.SkinEquipResponse
 import com.example.yeongkkuel.presentation.home.store.data.SkinPurchaseResponse
 import com.example.yeongkkuel.presentation.home.store.data.StoreRepository
 import kotlinx.coroutines.launch
 
-
 class StoreViewModel : ViewModel() {
 
     private val repository = StoreRepository()
@@ -25,6 +25,24 @@ class StoreViewModel : ViewModel() {
     private val _shopResponse = MutableLiveData<ShopResponse?>()
     val shopResponse: LiveData<ShopResponse?> = _shopResponse
 
+    private val _productUiState = MutableLiveData<ProductUiState>()
+    val productUiState: LiveData<ProductUiState> = _productUiState
+
+    private val _showFailureDialog = MutableLiveData<Boolean>()
+    val showFailureDialog: LiveData<Boolean> = _showFailureDialog
+
+    private val _isLoading = MutableLiveData<Boolean>()
+    val isLoading: LiveData<Boolean> = _isLoading
+
+    private val _errorMessage = MutableLiveData<String?>()
+    val errorMessage: LiveData<String?> = _errorMessage
+
+    var currentReward: Int = 0 // ✅ 보유 리워드 저장 변수 추가
+
+    init {
+        _productUiState.value = ProductUiState()
+    }
+
     fun saveEquippedSkins(purchaseIds: List<Int>) {
         viewModelScope.launch {
             try {
@@ -41,22 +59,86 @@ class StoreViewModel : ViewModel() {
         viewModelScope.launch {
             try {
                 val response = repository.purchaseSkin(itemId, itemType, itemName, reward)
-                _purchaseResponse.postValue(response)
+
+                if (response != null) {
+                    Log.d("StoreViewModel", "스킨 구매 응답 코드: ${response.code}, 메시지: ${response.message}")
+
+                    if (response.code == "REWARD4001") {
+                        _showFailureDialog.postValue(true) // ✅ 리워드 부족 시 다이얼로그 활성화
+                    } else if (response.isSuccess) {
+                        currentReward -= reward // ✅ 리워드 차감
+                    }
+
+                    _purchaseResponse.postValue(response)
+                } else {
+                    _purchaseResponse.postValue(null)
+                }
             } catch (e: Exception) {
                 Log.e("StoreViewModel", "스킨 구매 오류: ${e.message}")
                 _purchaseResponse.postValue(null)
             }
         }
     }
+
+    fun resetFailureDialog() {
+        _showFailureDialog.postValue(false)
+    }
+
     fun fetchShopData(itemType: String) {
         viewModelScope.launch {
             try {
+                Log.d("StoreViewModel", "🛒 Fetching shop data for itemType: $itemType")
+
                 val response = repository.getShopData(itemType)
-                _shopResponse.postValue(response)
+
+                if (response?.isSuccess == true) {
+                    Log.d("StoreViewModel", "✅ 상점 데이터 조회 성공: ${response.result.itemList}")
+
+                    _shopResponse.postValue(response)
+
+                    // ✅ 보유 리워드 업데이트
+                    response.result.myReward?.let {
+                        currentReward = it
+                    }
+
+                    val shopItems = response.result.itemList.map { shopItem ->
+                        ProductUiState.Product(
+                            id = shopItem.id,
+                            name = shopItem.itemName,
+                            price = shopItem.price,
+                            category = ProductCategory.valueOf(response.result.itemType),
+                            imageUrl = shopItem.itemImg,
+                            itemType = response.result.itemType, // ✅ itemType 값 추가
+                            area = mapItemTypeToArea(response.result.itemType) // 🔥 itemType 없음 (오류 발생)
+                        )
+                    }
+
+                    _productUiState.postValue(
+                        ProductUiState(
+                            totalProducts = shopItems.size,
+                            productList = shopItems
+                        )
+                    )
+                } else {
+                    Log.e("StoreViewModel", "❌ 상점 데이터 조회 실패: ${response?.message ?: "오류 발생"}")
+                    _shopResponse.postValue(null)
+                }
             } catch (e: Exception) {
-                Log.e("StoreViewModel", "상점 데이터 조회 오류: ${e.message}")
+            Log.e("StoreViewModel", "❌ 상점 데이터 조회 오류: ${e.message}")
                 _shopResponse.postValue(null)
             }
         }
+
+    }
+    private fun mapItemTypeToArea(itemType: String): String {
+        return when (itemType) {
+            "SWING" -> "Swing Area"
+            "TOY" -> "Toy Area"
+            "BOWL" -> "Bowl Area"
+            "NEST" -> "Nest Area"
+            else -> "Unknown Area" // ✅ 예외 처리
+        }
     }
+
 }
+
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/data/ShopResponse.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/data/ShopResponse.kt
index af1700aa..e6c75c07 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/data/ShopResponse.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/data/ShopResponse.kt
@@ -24,5 +24,6 @@ data class ShopItem(
     val id: Int,
     val itemName: String,
     val price: Int,
+    val itemType: String,
     val itemImg: String
 )
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/data/StoreRepository.kt b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/data/StoreRepository.kt
index 578e52f1..a7a5ff30 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/home/store/data/StoreRepository.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/home/store/data/StoreRepository.kt
@@ -2,6 +2,7 @@ package com.example.yeongkkuel.presentation.home.store.data
 
 import android.util.Log
 import com.example.yeongkkuel.network.RetrofitClient
+import com.google.gson.Gson
 
 class StoreRepository {
     private val api = RetrofitClient.storeapiService
@@ -28,7 +29,19 @@ class StoreRepository {
         val request = SkinPurchaseRequest(itemId, itemType, itemName, reward)
         return try {
             val response = api.purchaseSkin(request)
-            if (response.isSuccessful) response.body() else null
+
+            if (response.isSuccessful) {
+                Log.d("StoreRepository", "스킨 구매 성공: ${response.body()}")
+                return response.body()
+            } else {
+                val errorResponse = response.errorBody()?.string()
+                Log.e("StoreRepository", "스킨 구매 실패: 응답 코드 ${response.code()} - $errorResponse")
+
+                // 에러 응답을 JSON 객체로 변환
+                val gson = Gson()
+                val errorObj = gson.fromJson(errorResponse, SkinPurchaseResponse::class.java)
+                errorObj
+            }
         } catch (e: Exception) {
             Log.e("StoreRepository", "스킨 구매 API 오류: ${e.message}")
             null
@@ -37,11 +50,20 @@ class StoreRepository {
 
     suspend fun getShopData(itemType: String): ShopResponse? {
         return try {
+            Log.d("StoreRepository", "🛒 API 요청: itemType = $itemType") // ✅ API 요청 로그 추가
             val response = api.getShopData(itemType)
-            if (response.isSuccessful) response.body() else null
+
+            if (response.isSuccessful) {
+                Log.d("StoreRepository", "✅ API 응답 성공: ${response.body()}") // ✅ 응답 성공 로그
+                response.body()
+            } else {
+                Log.e("StoreRepository", "❌ API 응답 실패: ${response.errorBody()?.string()}") // ✅ 응답 실패 로그
+                null
+            }
         } catch (e: Exception) {
-            Log.e("StoreRepository", "상점 데이터 조회 오류: ${e.message}")
+            Log.e("StoreRepository", "❌ API 요청 중 오류 발생: ${e.message}") // ✅ 예외 발생 로그
             null
         }
     }
+
 }
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/StatAnimationListener.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/StatAnimationListener.kt
new file mode 100644
index 00000000..504d24d4
--- /dev/null
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/StatAnimationListener.kt
@@ -0,0 +1,5 @@
+package com.example.yeongkkuel.presentation.stat
+
+interface StatAnimationListener {
+    fun animate()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/StatFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/StatFragment.kt
index 5c6ff3ab..917247a3 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/stat/StatFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/StatFragment.kt
@@ -35,7 +35,8 @@ class StatFragment : Fragment(), ViewPagerTouchListener {
         StatViewPagerAdapter(
             fragment = this@StatFragment,
             weeklyViewModel = weeklyViewModel,
-            monthlyViewModel = monthlyViewModel)
+            monthlyViewModel = monthlyViewModel
+        )
     }
 
     private var botSheetListener: BotSheetListener? = null
@@ -93,6 +94,8 @@ class StatFragment : Fragment(), ViewPagerTouchListener {
                     override fun onPageSelected(position: Int) {
                         super.onPageSelected(position)
 
+                        (adapter as StatViewPagerAdapter).animate(position)
+
                         when (position) {
                             0 -> { // 첫 번째 페이지 (StatDailyFragment)
                                 listner.setBotSheetVisible()
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/StatViewPagerAdapter.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/StatViewPagerAdapter.kt
index 66b79ee3..eb63dc4f 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/stat/StatViewPagerAdapter.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/StatViewPagerAdapter.kt
@@ -30,4 +30,10 @@ class StatViewPagerAdapter(
     }
 
     fun getTitle(position: Int): Int = fragments[position].title
+
+    fun animate(position: Int){
+        (fragments[position]?.fragment as? StatAnimationListener)?.animate()
+    }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/daily/StatDailyFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/daily/StatDailyFragment.kt
index 37203cd5..3c981ad4 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/stat/daily/StatDailyFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/daily/StatDailyFragment.kt
@@ -14,6 +14,7 @@ import com.example.yeongkkuel.R
 import com.example.yeongkkuel.databinding.FragmentStatDailyBinding
 import com.example.yeongkkuel.presentation.botsheet.BotSheetUiState
 import com.example.yeongkkuel.presentation.botsheet.BotSheetViewModel
+import com.example.yeongkkuel.presentation.stat.StatAnimationListener
 import com.example.yeongkkuel.presentation.util.toMoneyString
 import com.github.mikephil.charting.animation.Easing
 import com.github.mikephil.charting.data.PieData
@@ -28,7 +29,7 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
-class StatDailyFragment : Fragment() {
+class StatDailyFragment : Fragment(), StatAnimationListener {
     private var _binding: FragmentStatDailyBinding? = null
     private val binding: FragmentStatDailyBinding
         get() = requireNotNull(_binding) { "FragmentStatBinding -> null" }
@@ -182,4 +183,11 @@ class StatDailyFragment : Fragment() {
         super.onDestroyView()
         _binding = null
     }
+
+    override fun animate() {
+        binding.pieChart.apply {
+            animateY(1400, Easing.EaseInOutQuad) // 애니메이션 적용
+            invalidate() // 차트를 새로 그리기
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyFragment.kt
index b3d0a2da..7ffb9afd 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyFragment.kt
@@ -66,14 +66,19 @@ class StatMonthlyFragment(
     }
 
     private fun onBind(uiState: StatMonthlyUiState)= with(binding){
-        calendarViewPagerAdapter.getCurrentFragment(vpCalendar)?.setTargetExpenditure(uiState.targetExpenditure)
+        when(uiState){
+            StatMonthlyUiState.Init -> {}
+            is StatMonthlyUiState.StatMonthly -> {
+                calendarViewPagerAdapter.getCurrentFragment(vpCalendar)?.setTargetExpenditure(uiState.targetExpenditure)
 
-        tvCurrentMonth.text = uiState.targetMonth.first.toString() + "년 " + uiState.targetMonth.second.toString() + "월"
+                tvCurrentMonth.text = uiState.targetMonth.first.toString() + "년 " + uiState.targetMonth.second.toString() + "월"
 
-        tvTotalSpending.text = uiState.totalSpending.toMoneyString() + "원"
+                tvTotalSpending.text = uiState.totalSpending.toMoneyString() + "원"
 
-        tvAchievementDay.text = (uiState.achieveDay?.toString() ?: "-") + "일"
-        tvRewardAmount.text = "+" + uiState.rewardsAmount.toString()
+                tvAchievementDay.text = (uiState.achieveDay?.toString() ?: "-") + "일"
+                tvRewardAmount.text = "+" + uiState.rewardsAmount.toString()
+            }
+        }
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyUiState.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyUiState.kt
index 3964b15e..9e9953aa 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyUiState.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyUiState.kt
@@ -3,35 +3,43 @@ package com.example.yeongkkuel.presentation.stat.monthly
 import com.example.yeongkkuel.presentation.util.Week
 import com.github.mikephil.charting.data.PieEntry
 
-data class StatMonthlyUiState(
-    val targetMonth: Pair<Int, Int>,// year, month
-    val totalSpending: Int,
-    val rewardsAmount: Int,
-    val achieveDay: Int?,
-    val calendarList: List<CalendarData>,
-    val targetExpenditure: Int?
-) {
-    sealed interface CalendarData {
-        data class CalendarDayOfWeek(
-            val dayOfWeek: Week
-        ) : CalendarData
+sealed class StatMonthlyUiState {
 
-        data class CalendarDay(
-            val targetMonth: Pair<Int, Int>,// year, month
-            val day: Int,
-            val pieDataList: List<PieEntry>
-        ) : CalendarData
-    }
+    // Initial state
+    data object Init : StatMonthlyUiState()
+
+    // State with data
+    data class StatMonthly(
+        val targetMonth: Pair<Int, Int>, // year, month
+        val totalSpending: Int,
+        val rewardsAmount: Int,
+        val achieveDay: Int?,
+        val calendarList: List<CalendarData>,
+        val targetExpenditure: Int?
+    ) : StatMonthlyUiState() {
+
+        // Sealed interface for calendar data
+        sealed interface CalendarData {
+            data class CalendarDayOfWeek(
+                val dayOfWeek: Week
+            ) : CalendarData
 
+            data class CalendarDay(
+                val targetMonth: Pair<Int, Int>, // year, month
+                val day: Int,
+                val pieDataList: List<PieEntry>
+            ) : CalendarData
+        }
 
-    companion object {
-        fun init() = StatMonthlyUiState(
-            targetMonth = Pair(2025, 1),
-            totalSpending = 0,
-            rewardsAmount = 140,
-            achieveDay = 13,
-            targetExpenditure = null,
-            calendarList = emptyList()
-        )
+        companion object {
+            fun init() = StatMonthly(
+                targetMonth = Pair(2025, 1),
+                totalSpending = 0,
+                rewardsAmount = 140,
+                achieveDay = 13,
+                targetExpenditure = null,
+                calendarList = emptyList()
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyViewModel.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyViewModel.kt
index 6e749645..a8010d83 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyViewModel.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/StatMonthlyViewModel.kt
@@ -15,22 +15,22 @@ import java.util.Calendar
 import java.util.Date
 
 class StatMonthlyViewModel : ViewModel() {
-    private val _uiState = MutableStateFlow(StatMonthlyUiState.init())
+    private val _uiState = MutableStateFlow<StatMonthlyUiState>(StatMonthlyUiState.Init)
     val uiState = _uiState.asStateFlow()
 
     private val yeongkkuelService = RetrofitClient.statService
-    private val dayOfWeekList: List<StatMonthlyUiState.CalendarData> =
+    private val dayOfWeekList: List<StatMonthlyUiState.StatMonthly.CalendarData> =
         Week.getListItem().map { week ->
-            StatMonthlyUiState.CalendarData.CalendarDayOfWeek(week)
+            StatMonthlyUiState.StatMonthly.CalendarData.CalendarDayOfWeek(week)
         }
 
     fun getCalender(year: Int, month: Int) = viewModelScope.launch {
-        suspend fun List<StatMonthlyUiState.CalendarData.CalendarDay>.getData(): List<StatMonthlyUiState.CalendarData.CalendarDay> {
+        suspend fun List<StatMonthlyUiState.StatMonthly.CalendarData.CalendarDay>.getData(): List<StatMonthlyUiState.StatMonthly.CalendarData.CalendarDay> {
             try {
                 yeongkkuelService.getExpendituresMonthCalendar(year = year, month = month).run {
                     if (isSuccess) {
-                        _uiState.update { prev ->
-                            prev.copy(
+                        _uiState.update {
+                            StatMonthlyUiState.StatMonthly.init().copy(
                                 targetExpenditure = result.dayTargetExpenditure,
                                 achieveDay = result.achieveDays,
                                 rewardsAmount = result.rewards,
@@ -39,17 +39,18 @@ class StatMonthlyViewModel : ViewModel() {
                         }
 
                         val dataList = result.selectedMonthExpenses.map { expense ->
-                            val pieDataList = result.dayTargetExpenditure?.let { targetExpenditure ->
-                                val rest = targetExpenditure - expense.expenditure
-                                mutableListOf<PieEntry>().apply {
-                                    add(PieEntry(expense.expenditure.toFloat(), "지출"))
-                                    if (rest > 0) {
-                                        add(PieEntry(rest.toFloat(), "나머지"))
+                            val pieDataList =
+                                result.dayTargetExpenditure?.let { targetExpenditure ->
+                                    val rest = targetExpenditure - expense.expenditure
+                                    mutableListOf<PieEntry>().apply {
+                                        add(PieEntry(expense.expenditure.toFloat(), "지출"))
+                                        if (rest > 0) {
+                                            add(PieEntry(rest.toFloat(), "나머지"))
+                                        }
                                     }
-                                }
-                            } ?: emptyList()
+                                } ?: emptyList()
 
-                            StatMonthlyUiState.CalendarData.CalendarDay(
+                            StatMonthlyUiState.StatMonthly.CalendarData.CalendarDay(
                                 targetMonth = Pair(year, month),
                                 day = expense.expenseDate.getDay(),
                                 pieDataList = pieDataList
@@ -83,7 +84,7 @@ class StatMonthlyViewModel : ViewModel() {
         suspend fun getDayList(
             year: Int,
             month: Int
-        ): List<StatMonthlyUiState.CalendarData.CalendarDay> {
+        ): List<StatMonthlyUiState.StatMonthly.CalendarData.CalendarDay> {
             val calendar = Calendar.getInstance().apply {
                 set(Calendar.YEAR, year)
                 set(Calendar.MONTH, month - 1)
@@ -112,7 +113,7 @@ class StatMonthlyViewModel : ViewModel() {
 
                 val rest = if (targetSpending - daySpending > 0) targetSpending - daySpending else 0
 
-                StatMonthlyUiState.CalendarData.CalendarDay(
+                StatMonthlyUiState.StatMonthly.CalendarData.CalendarDay(
                     targetMonth = Pair(year, month),
                     day = day,
                     pieDataList = listOf(
@@ -127,7 +128,7 @@ class StatMonthlyViewModel : ViewModel() {
         val dayList = getDayList(year, month)
 
         _uiState.update { prev ->
-            prev.copy(
+            (prev as StatMonthlyUiState.StatMonthly).copy(
                 targetMonth = Pair(year, month),
                 calendarList = dayOfWeekList + dayList
             )
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/adapter/StatMonthlyCalendarListAdapter.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/adapter/StatMonthlyCalendarListAdapter.kt
index b0b53086..21a1df05 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/adapter/StatMonthlyCalendarListAdapter.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/adapter/StatMonthlyCalendarListAdapter.kt
@@ -21,7 +21,7 @@ import timber.log.Timber
 
 class StatMonthlyCalendarListAdapter(
     private val viewModel: BotSheetViewModel
-) : ListAdapter<StatMonthlyUiState.CalendarData, StatMonthlyCalendarListAdapter.ViewHolder>(
+) : ListAdapter<StatMonthlyUiState.StatMonthly.CalendarData, StatMonthlyCalendarListAdapter.ViewHolder>(
     StatMonthlyCalendarDiffUtil()
 ) {
     private var targetExpenditure: Int? = null
@@ -33,7 +33,7 @@ class StatMonthlyCalendarListAdapter(
     abstract inner class ViewHolder(
         view: View
     ) : RecyclerView.ViewHolder(view) {
-        abstract fun bind(item: StatMonthlyUiState.CalendarData)
+        abstract fun bind(item: StatMonthlyUiState.StatMonthly.CalendarData)
     }
 
     enum class ViewType {
@@ -43,8 +43,8 @@ class StatMonthlyCalendarListAdapter(
     inner class DayOfWeekViewHolder(
         private val binding: ItemCalendarDayofweekBinding
     ) : ViewHolder(binding.root) {
-        override fun bind(item: StatMonthlyUiState.CalendarData)= with(binding) {
-            (item as StatMonthlyUiState.CalendarData.CalendarDayOfWeek).let{
+        override fun bind(item: StatMonthlyUiState.StatMonthly.CalendarData)= with(binding) {
+            (item as StatMonthlyUiState.StatMonthly.CalendarData.CalendarDayOfWeek).let{
                 tvDayOfWeek.text = it.dayOfWeek.kor
             }
         }
@@ -54,8 +54,8 @@ class StatMonthlyCalendarListAdapter(
     inner class DayViewHolder(
         private val binding: ItemCalendarDayBinding
     ) : ViewHolder(binding.root) {
-        override fun bind(item: StatMonthlyUiState.CalendarData): Unit = with(binding) {
-            (item as StatMonthlyUiState.CalendarData.CalendarDay).let { dayItem ->
+        override fun bind(item: StatMonthlyUiState.StatMonthly.CalendarData): Unit = with(binding) {
+            (item as StatMonthlyUiState.StatMonthly.CalendarData.CalendarDay).let { dayItem ->
                 fun initData() {
                     tvDay.text = dayItem.day.toString()
                     if(targetExpenditure == null){
@@ -111,13 +111,13 @@ class StatMonthlyCalendarListAdapter(
     inner class UnknownViewHolder(
         private val binding: ItemUnknownBinding
     ) : ViewHolder(binding.root) {
-        override fun bind(item: StatMonthlyUiState.CalendarData) {
+        override fun bind(item: StatMonthlyUiState.StatMonthly.CalendarData) {
         }
     }
 
     override fun getItemViewType(position: Int): Int = when (getItem(position)) {
-        is StatMonthlyUiState.CalendarData.CalendarDayOfWeek -> ViewType.DayOfWeeK.ordinal
-        is StatMonthlyUiState.CalendarData.CalendarDay -> ViewType.Day.ordinal
+        is StatMonthlyUiState.StatMonthly.CalendarData.CalendarDayOfWeek -> ViewType.DayOfWeeK.ordinal
+        is StatMonthlyUiState.StatMonthly.CalendarData.CalendarDay -> ViewType.Day.ordinal
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
@@ -154,17 +154,17 @@ class StatMonthlyCalendarListAdapter(
 }
 
 private class StatMonthlyCalendarDiffUtil :
-    DiffUtil.ItemCallback<StatMonthlyUiState.CalendarData>() {
+    DiffUtil.ItemCallback<StatMonthlyUiState.StatMonthly.CalendarData>() {
     override fun areItemsTheSame(
-        oldItem: StatMonthlyUiState.CalendarData,
-        newItem: StatMonthlyUiState.CalendarData
+        oldItem: StatMonthlyUiState.StatMonthly.CalendarData,
+        newItem: StatMonthlyUiState.StatMonthly.CalendarData
     ): Boolean {
         return oldItem == newItem
     }
 
     override fun areContentsTheSame(
-        oldItem: StatMonthlyUiState.CalendarData,
-        newItem: StatMonthlyUiState.CalendarData
+        oldItem: StatMonthlyUiState.StatMonthly.CalendarData,
+        newItem: StatMonthlyUiState.StatMonthly.CalendarData
     ): Boolean {
         return oldItem == newItem
     }
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/adapter/viewpager/StatMonthlyCalendarFrameFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/adapter/viewpager/StatMonthlyCalendarFrameFragment.kt
index de33c139..b0901102 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/adapter/viewpager/StatMonthlyCalendarFrameFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/monthly/adapter/viewpager/StatMonthlyCalendarFrameFragment.kt
@@ -86,7 +86,7 @@ class StatMonthlyCalendarFrameFragment(
     }
 
     private fun onBind(uiState: StatMonthlyUiState) = with(binding) {
-        listAdapter.submitList(uiState.calendarList)
+        if(uiState is StatMonthlyUiState.StatMonthly) listAdapter.submitList(uiState.calendarList)
     }
 
     fun setTargetExpenditure(targetExpenditure: Int?){
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/StatWeeklyFragment.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/StatWeeklyFragment.kt
index 2d7d0d92..b9241ff6 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/StatWeeklyFragment.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/StatWeeklyFragment.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.style.StyleSpan
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,13 +18,12 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.yeongkkuel.R
 import com.example.yeongkkuel.databinding.FragmentStatWeeklyBinding
+import com.example.yeongkkuel.presentation.stat.StatAnimationListener
 import com.example.yeongkkuel.presentation.stat.weekly.adapter.StatWeeklyCompareListAdapter
 import com.example.yeongkkuel.presentation.stat.weekly.adapter.StatWeeklyPieChartCategoryListAdapter
 import com.example.yeongkkuel.presentation.stat.weekly.adapter.StatWeeklyWeekListAdapter
-import com.example.yeongkkuel.presentation.util.Week
 import com.example.yeongkkuel.presentation.util.toMoneyString
 import com.github.mikephil.charting.animation.Easing
-import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.data.LineData
 import com.github.mikephil.charting.data.LineDataSet
 import com.github.mikephil.charting.data.PieData
@@ -37,11 +37,10 @@ import java.time.LocalDate
 import java.time.format.TextStyle
 import java.util.Calendar
 import java.util.Locale
-import kotlin.math.exp
 
 class StatWeeklyFragment(
     private val viewModel: StatWeeklyViewModel
-) : Fragment() {
+) : Fragment(), StatAnimationListener {
     private var _binding: FragmentStatWeeklyBinding? = null
     private val binding: FragmentStatWeeklyBinding
         get() = requireNotNull(_binding) { "FragmentStatWeeklyBinding -> null" }
@@ -350,4 +349,25 @@ class StatWeeklyFragment(
         super.onDestroyView()
         _binding = null
     }
+
+    override fun animate() {
+        val compareCnt = compareListAdapter.itemCount
+
+        for (i in 0 until compareCnt) {
+            val viewHolder = binding.rvCompare.findViewHolderForAdapterPosition(i) as? StatWeeklyCompareListAdapter.ViewHolder
+            viewHolder?.let {
+                val item = compareListAdapter.currentList[i]  // 해당 인덱스의 아이템 가져오기
+                it.animateProgress(item)  // 애니메이션 적용
+            }
+        }
+
+
+        // PieChart 애니메이션 추가
+        binding.pieChart.apply {
+            animateY(1400, Easing.EaseInOutQuad) // 애니메이션 적용
+            invalidate() // 차트를 새로 그리기
+        }
+    }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/StatWeeklyViewModel.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/StatWeeklyViewModel.kt
index 13e52b22..e111b70c 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/StatWeeklyViewModel.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/StatWeeklyViewModel.kt
@@ -58,20 +58,29 @@ class StatWeeklyViewModel : ViewModel() {
                     result.run {
                         _uiState.update { prev ->
                             prev.copy(
-                                compareList = listOf(
-                                    StatWeeklyUiState.CompareData.OthersCompare(
-                                        target = "${Age.getEnToKor(age)} ${Job.getEnToKor(job)}",
-                                        targetSpending = averageExpenditure,
-                                        mySpending = myAverageExpenditure,
-                                        spendingUnit = SpendingUnit.WEEK,
-                                        percentile = topPercent
-                                    ),
-                                    StatWeeklyUiState.CompareData.PastCompare(
-                                        pastSpending = lastWeekExpenditure,
-                                        currentSpending = thisWeekExpenditure,
-                                        spendingUnit = SpendingUnit.WEEK
+                                compareList = mutableListOf<StatWeeklyUiState.CompareData>().apply {
+                                    // 조건에 맞는 경우에만 OthersCompare 추가
+                                    if (!age.isNullOrEmpty() && !job.isNullOrEmpty() && averageExpenditure != null && myAverageExpenditure != null && topPercent != null) {
+                                        add(
+                                            StatWeeklyUiState.CompareData.OthersCompare(
+                                                target = "${Age.getEnToKor(age!!)} ${Job.getEnToKor(job!!)}",
+                                                targetSpending = averageExpenditure ?: 0,
+                                                mySpending = myAverageExpenditure,
+                                                spendingUnit = SpendingUnit.WEEK,
+                                                percentile = topPercent ?: 0
+                                            )
+                                        )
+                                    }
+
+                                    // PastCompare는 항상 추가
+                                    add(
+                                        StatWeeklyUiState.CompareData.PastCompare(
+                                            pastSpending = lastWeekExpenditure ?: 0,
+                                            currentSpending = thisWeekExpenditure,
+                                            spendingUnit = SpendingUnit.WEEK
+                                        )
                                     )
-                                ),
+                                },
                                 pieChartList = categories.map {
                                     StatWeeklyUiState.PieChartData(
                                         category = SpendingCategory.fromName(it.categoryName),
diff --git a/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/adapter/StatWeeklyCompareListAdapter.kt b/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/adapter/StatWeeklyCompareListAdapter.kt
index 155aec31..6e9dfa6d 100644
--- a/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/adapter/StatWeeklyCompareListAdapter.kt
+++ b/app/src/main/java/com/example/yeongkkuel/presentation/stat/weekly/adapter/StatWeeklyCompareListAdapter.kt
@@ -1,11 +1,15 @@
 package com.example.yeongkkuel.presentation.stat.weekly.adapter
 
+import android.animation.ValueAnimator
 import android.graphics.Typeface
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.style.StyleSpan
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
+import android.view.animation.DecelerateInterpolator
+import android.widget.ProgressBar
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -104,6 +108,41 @@ class StatWeeklyCompareListAdapter(
                 }
             }
         }
+
+        fun animateProgress(item: StatWeeklyUiState.CompareData) = with(binding){
+            fun animateProgress(progressBar: ProgressBar, targetValue: Int){
+                val animator = ValueAnimator.ofInt(0, targetValue)
+                animator.duration = 2000 // 1초 동안 애니메이션
+                animator.interpolator = DecelerateInterpolator() // 부드러운 감속 효과
+                animator.addUpdateListener {
+                    progressBar.progress = it.animatedValue as Int
+                }
+                animator.start()
+            }
+
+            when(item){
+                is StatWeeklyUiState.CompareData.OthersCompare ->{
+                    val maxValue = maxOf(item.mySpending, item.targetSpending).takeIf { it > 0 } ?: 1
+                    progressComparedTarget.max = 100
+                    progressMyTarget.max = 100
+
+                    animateProgress(progressComparedTarget, (item.targetSpending * 100 / maxValue))
+                    animateProgress(progressMyTarget, (item.mySpending * 100 / maxValue))
+                }
+                is StatWeeklyUiState.CompareData.PastCompare -> {
+                    val maxValue = maxOf(item.currentSpending, item.pastSpending).takeIf { it > 0 } ?: 1
+                    progressComparedTarget.max = 100
+                    progressMyTarget.max = 100
+
+                    animateProgress(progressComparedTarget, (item.pastSpending * 100 / maxValue))
+                    animateProgress(progressMyTarget, (item.currentSpending * 100 / maxValue))
+                }
+            }
+        }
+    }
+
+    fun animateProgressOnViewHolder(holder: ViewHolder, item: StatWeeklyUiState.CompareData) {
+        holder.animateProgress(item)
     }
 
 
diff --git a/app/src/main/res/drawable/bg_box_lightpurple.xml b/app/src/main/res/drawable/bg_box_purple2.xml
similarity index 51%
rename from app/src/main/res/drawable/bg_box_lightpurple.xml
rename to app/src/main/res/drawable/bg_box_purple2.xml
index a3ebf6b0..8ee1c6cf 100644
--- a/app/src/main/res/drawable/bg_box_lightpurple.xml
+++ b/app/src/main/res/drawable/bg_box_purple2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="6dp" />
-    <solid android:color="@color/main4"/>
+    <solid android:color="@color/main1" />
+    <corners android:radius="20dp" /> <!-- 타원형 효과 -->
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_box_strok_lightpurple.xml b/app/src/main/res/drawable/bg_box_strok_lightpurple.xml
index e167d61c..0d5c0737 100644
--- a/app/src/main/res/drawable/bg_box_strok_lightpurple.xml
+++ b/app/src/main/res/drawable/bg_box_strok_lightpurple.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="6dp" />
-    <stroke android:color="@color/main4"
-        android:width="1dp"/>
-</shape>
\ No newline at end of file
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/progress">
+        <scale android:scaleWidth="100%">
+            <shape>
+                <corners android:radius="6dp" />
+                <stroke
+                    android:width="1dp"
+                    android:color="@color/main4" />
+            </shape>
+        </scale>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_progress_lightpurple.xml b/app/src/main/res/drawable/bg_progress_lightpurple.xml
new file mode 100644
index 00000000..1965c579
--- /dev/null
+++ b/app/src/main/res/drawable/bg_progress_lightpurple.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/progress">
+        <scale android:scaleWidth="100%">
+            <shape>
+                <corners android:radius="6dp" />
+                <solid android:color="@color/main4" />
+            </shape>
+        </scale>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_warning_start.xml b/app/src/main/res/drawable/ic_warning_start.xml
new file mode 100644
index 00000000..0aade36f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_warning_start.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="296dp"
+    android:height="52dp"
+    android:viewportWidth="296"
+    android:viewportHeight="52">
+  <path
+      android:pathData="M8,0L288,0A8,8 0,0 1,296 8L296,44A8,8 0,0 1,288 52L8,52A8,8 0,0 1,0 44L0,8A8,8 0,0 1,8 0z"
+      android:fillColor="#FF6666"/>
+  <path
+      android:pathData="M25.7,17.51L16.78,32.35C16.6,32.67 16.5,33.03 16.5,33.4C16.5,33.76 16.59,34.12 16.78,34.44C16.96,34.76 17.22,35.02 17.54,35.21C17.85,35.4 18.21,35.5 18.58,35.5H36.42C36.79,35.5 37.15,35.4 37.46,35.21C37.78,35.02 38.04,34.76 38.22,34.44C38.41,34.12 38.5,33.76 38.5,33.4C38.5,33.03 38.4,32.67 38.22,32.35L29.3,17.51C29.11,17.2 28.85,16.95 28.53,16.77C28.22,16.59 27.86,16.5 27.5,16.5C27.14,16.5 26.78,16.59 26.47,16.77C26.15,16.95 25.89,17.2 25.7,17.51Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#F8F8F8"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M27.5,23.5V27.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#F8F8F8"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M27.5,30.5H27.51"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#F8F8F8"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M53.66,13.71H54.93V14.96C54.93,17.52 53.88,20.03 51.8,20.98L50.9,19.72C52.76,18.89 53.66,16.84 53.66,14.96V13.71ZM54.02,13.71H55.28V14.96C55.28,16.76 56.16,18.68 58.02,19.44L57.16,20.7C55.05,19.79 54.02,17.43 54.02,14.96V13.71ZM51.34,13.02H57.57V14.33H51.34V13.02ZM58.6,11.96H60.21V23.07H58.6V11.96ZM66.24,17.61H67.84V19.22H66.24V17.61ZM62.04,16.67H72.05V17.84H62.04V16.67ZM66.24,11.94H67.83V13.29H66.24V11.94ZM66.15,13.36H67.55V13.58C67.55,15.17 65.93,16.23 62.86,16.4L62.42,15.21C65.13,15.1 66.15,14.34 66.15,13.58V13.36ZM66.52,13.36H67.92V13.58C67.92,14.34 68.94,15.1 71.64,15.21L71.2,16.4C68.14,16.23 66.52,15.17 66.52,13.58V13.36ZM62.98,12.82H71.1V13.98H62.98V12.82ZM63.17,18.51H70.85V21.26H64.76V22.31H63.18V20.19H69.28V19.66H63.17V18.51ZM63.18,21.83H71.14V23H63.18V21.83ZM80.71,11.96H82.32V23.07H80.71V11.96ZM77.44,13.11H79.02C79.02,16.5 77.87,19.29 73.92,21.2L73.09,19.92C76.29,18.39 77.44,16.37 77.44,13.4V13.11ZM73.68,13.11H78.19V14.37H73.68V13.11ZM84.1,17.91H94.17V19.18H84.1V17.91ZM85.33,12.17H92.94V15.18H86.93V16.38H85.35V14.06H91.37V13.38H85.33V12.17ZM85.35,15.9H93.16V17.12H85.35V15.9ZM88.33,16.49H89.93V18.6H88.33V16.49ZM85.21,19.8H93.01V23.03H91.42V21.06H85.21V19.8ZM102.76,11.94H104.36V23.09H102.76V11.94ZM98.38,12.72C100.06,12.72 101.29,14.26 101.29,16.68C101.29,19.13 100.06,20.67 98.38,20.67C96.7,20.67 95.46,19.13 95.46,16.68C95.46,14.26 96.7,12.72 98.38,12.72ZM98.38,14.18C97.55,14.18 96.98,15.05 96.98,16.68C96.98,18.34 97.55,19.23 98.38,19.23C99.2,19.23 99.76,18.34 99.76,16.68C99.76,15.05 99.2,14.18 98.38,14.18ZM110.39,18.46H111.86V19.55H112.97V18.46H114.44V22.95H110.39V18.46ZM111.86,20.7V21.75H112.97V20.7H111.86ZM116.16,18.38H117.37V19.2C117.37,20.84 116.71,22.42 115.07,23.06L114.29,21.87C115.62,21.32 116.16,20.25 116.16,19.2V18.38ZM116.53,18.38H117.74V19.2C117.74,20.36 118.27,21.41 119.63,21.87L118.84,23.06C117.16,22.46 116.53,20.96 116.53,19.2V18.38ZM114.78,14.33H117.56V15.63H114.78V14.33ZM112.24,12.38C113.9,12.38 115.16,13.46 115.16,14.99C115.16,16.53 113.9,17.62 112.24,17.62C110.56,17.62 109.3,16.53 109.3,14.99C109.3,13.46 110.56,12.38 112.24,12.38ZM112.24,13.68C111.42,13.68 110.82,14.18 110.82,14.99C110.82,15.81 111.42,16.31 112.24,16.31C113.05,16.31 113.64,15.81 113.64,14.99C113.64,14.18 113.05,13.68 112.24,13.68ZM116.87,11.96H118.46V17.84H116.87V11.96ZM127.31,11.94H128.91V23.09H127.31V11.94ZM128.55,16.06H130.52V17.37H128.55V16.06ZM120.64,19.1H121.57C123.44,19.1 124.92,19.04 126.55,18.75L126.71,20.07C125.03,20.37 123.5,20.42 121.57,20.42H120.64V19.1ZM120.64,12.98H125.82V14.26H122.22V19.73H120.64V12.98ZM136.61,13.7H139.4V14.97H136.61V13.7ZM136.61,16.08H139.45V17.36H136.61V16.08ZM131.7,12.84H136.95V18.28H131.7V12.84ZM135.38,14.1H133.27V17.03H135.38V14.1ZM138.95,11.97H140.54V20.06H138.95V11.97ZM133.19,21.6H140.78V22.88H133.19V21.6ZM133.19,19.29H134.79V22.26H133.19V19.29ZM147.95,13.71H149.22V14.96C149.22,17.52 148.17,20.03 146.09,20.98L145.18,19.72C147.04,18.89 147.95,16.84 147.95,14.96V13.71ZM148.3,13.71H149.57V14.96C149.57,16.76 150.45,18.68 152.31,19.44L151.45,20.7C149.34,19.79 148.3,17.43 148.3,14.96V13.71ZM145.63,13.02H151.86V14.33H145.63V13.02ZM152.89,11.96H154.5V23.07H152.89V11.96ZM160.53,17.61H162.13V19.22H160.53V17.61ZM156.33,16.67H166.34V17.84H156.33V16.67ZM160.53,11.94H162.12V13.29H160.53V11.94ZM160.44,13.36H161.84V13.58C161.84,15.17 160.22,16.23 157.15,16.4L156.7,15.21C159.42,15.1 160.44,14.34 160.44,13.58V13.36ZM160.81,13.36H162.21V13.58C162.21,14.34 163.23,15.1 165.93,15.21L165.49,16.4C162.43,16.23 160.81,15.17 160.81,13.58V13.36ZM157.27,12.82H165.39V13.98H157.27V12.82ZM157.46,18.51H165.14V21.26H159.04V22.31H157.47V20.19H163.57V19.66H157.46V18.51ZM157.47,21.83H165.43V23H157.47V21.83ZM177.99,11.96H179.6V23.07H177.99V11.96ZM174.71,13.11H176.3C176.3,16.5 175.15,19.29 171.2,21.2L170.37,19.92C173.56,18.39 174.71,16.37 174.71,13.4V13.11ZM170.96,13.11H175.47V14.37H170.96V13.11ZM189.01,11.96H190.62V17.93H189.01V11.96ZM183.22,18.41H184.79V19.44H189.03V18.41H190.62V22.95H183.22V18.41ZM184.79,20.67V21.68H189.03V20.67H184.79ZM184.57,12.41C186.29,12.41 187.58,13.5 187.58,15.04C187.58,16.58 186.29,17.67 184.57,17.67C182.84,17.67 181.54,16.58 181.54,15.04C181.54,13.5 182.84,12.41 184.57,12.41ZM184.57,13.73C183.71,13.73 183.1,14.22 183.1,15.04C183.1,15.87 183.71,16.35 184.57,16.35C185.41,16.35 186.02,15.87 186.02,15.04C186.02,14.22 185.41,13.73 184.57,13.73ZM197.97,18.53H199.57V20.33H197.97V18.53ZM202.64,11.96H204.25V23.07H202.64V11.96ZM203.68,16.47H205.64V17.79H203.68V16.47ZM195.47,21.22L195.28,19.94C197.2,19.94 199.84,19.92 202.09,19.61L202.21,20.76C199.87,21.22 197.35,21.22 195.47,21.22ZM195.49,13.18H202.03V14.43H195.49V13.18ZM198.77,14.87C200.36,14.87 201.49,15.71 201.49,16.95C201.49,18.2 200.36,19.04 198.77,19.04C197.18,19.04 196.06,18.2 196.06,16.95C196.06,15.71 197.18,14.87 198.77,14.87ZM198.77,16.07C198.04,16.07 197.57,16.38 197.57,16.95C197.57,17.52 198.04,17.84 198.77,17.84C199.49,17.84 199.97,17.52 199.97,16.95C199.97,16.38 199.49,16.07 198.77,16.07ZM197.97,12.02H199.57V14.12H197.97V12.02ZM211.8,13.7H214.6V14.97H211.8V13.7ZM211.8,16.08H214.65V17.36H211.8V16.08ZM206.9,12.84H212.15V18.28H206.9V12.84ZM210.58,14.1H208.47V17.03H210.58V14.1ZM214.15,11.97H215.74V20.06H214.15V11.97ZM208.38,21.6H215.98V22.88H208.38V21.6ZM208.38,19.29H209.99V22.26H208.38V19.29ZM221.92,16.05H223.74V17.33H221.92V16.05ZM225.51,11.96H227.03V23.07H225.51V11.96ZM223.24,12.12H224.74V22.56H223.24V12.12ZM219.98,12.74C221.45,12.74 222.4,14.26 222.4,16.77C222.4,19.29 221.45,20.81 219.98,20.81C218.51,20.81 217.58,19.29 217.58,16.77C217.58,14.26 218.51,12.74 219.98,12.74ZM219.98,14.24C219.38,14.24 219.03,15.08 219.03,16.77C219.03,18.47 219.38,19.3 219.98,19.3C220.6,19.3 220.95,18.47 220.95,16.77C220.95,15.08 220.6,14.24 219.98,14.24ZM234.12,15.42H237.05V16.71H234.12V15.42ZM231.1,12.81H232.4V14.42C232.4,17.21 231.45,19.79 229.36,20.84L228.36,19.55C230.26,18.68 231.1,16.53 231.1,14.42V12.81ZM231.43,12.81H232.71V14.42C232.71,16.53 233.51,18.56 235.35,19.37L234.4,20.64C232.31,19.64 231.43,17.19 231.43,14.42V12.81ZM236.26,11.94H237.84V23.09H236.26V11.94ZM50.98,34.17H61.05V35.44H50.98V34.17ZM55.18,34.99H56.76V39.07H55.18V34.99ZM52.14,28.5H59.85V32.98H52.14V28.5ZM58.28,29.76H53.72V31.72H58.28V29.76ZM64.7,29.71H65.97V30.96C65.97,33.52 64.92,36.03 62.84,36.98L61.94,35.72C63.8,34.89 64.7,32.84 64.7,30.96V29.71ZM65.06,29.71H66.32V30.96C66.32,32.76 67.2,34.68 69.06,35.44L68.2,36.7C66.09,35.79 65.06,33.43 65.06,30.96V29.71ZM62.38,29.02H68.61V30.33H62.38V29.02ZM69.64,27.96H71.25V39.07H69.64V27.96ZM77.28,33.61H78.88V35.22H77.28V33.61ZM73.08,32.67H83.09V33.84H73.08V32.67ZM77.28,27.94H78.87V29.29H77.28V27.94ZM77.19,29.36H78.59V29.58C78.59,31.17 76.97,32.23 73.9,32.4L73.45,31.21C76.17,31.1 77.19,30.34 77.19,29.58V29.36ZM77.56,29.36H78.96V29.58C78.96,30.34 79.98,31.1 82.68,31.21L82.24,32.4C79.18,32.23 77.56,31.17 77.56,29.58V29.36ZM74.02,28.82H82.14V29.98H74.02V28.82ZM74.21,34.51H81.89V37.26H75.79V38.31H74.22V36.19H80.32V35.66H74.21V34.51ZM74.22,37.83H82.18V39H74.22V37.83ZM94.83,27.94H96.41V39.09H94.83V27.94ZM92.31,31.86H95.28V33.14H92.31V31.86ZM87.49,28.82H89.08V31.51H91.26V28.82H92.83V36.48H87.49V28.82ZM89.08,32.74V35.19H91.26V32.74H89.08ZM98.11,33.94H108.17V35.22H98.11V33.94ZM99.32,37.6H107.16V38.88H99.32V37.6ZM99.32,35.77H100.91V38.11H99.32V35.77ZM99.36,32.08H107.1V33.28H99.36V32.08ZM99.36,28.32H107.02V29.53H100.94V32.6H99.36V28.32ZM100.5,30.21H106.76V31.38H100.5V30.21ZM114.19,28.11C116.72,28.11 118.21,28.78 118.21,30.01C118.21,31.23 116.72,31.9 114.19,31.9C111.65,31.9 110.17,31.23 110.17,30.01C110.17,28.78 111.65,28.11 114.19,28.11ZM114.19,29.28C112.58,29.28 111.83,29.52 111.83,30.01C111.83,30.52 112.58,30.74 114.19,30.74C115.8,30.74 116.56,30.52 116.56,30.01C116.56,29.52 115.8,29.28 114.19,29.28ZM109.16,32.42H119.21V33.68H109.16V32.42ZM110.32,34.3H118V37.16H111.9V38.14H110.33V36.06H116.42V35.49H110.32V34.3ZM110.33,37.8H118.28V39H110.33V37.8ZM127.4,32.73H128.99V34.86H127.4V32.73ZM124.44,30.18H132.11V31.44H124.44V30.18ZM123.19,32.08H133.26V33.34H123.19V32.08ZM124.44,28.08H126.02V30.85H124.44V28.08ZM124.33,34.2H132.07V37.11H125.94V38.12H124.34V36H130.48V35.4H124.33V34.2ZM124.34,37.78H132.4V39H124.34V37.78ZM141.93,27.94H143.53V39.09H141.93V27.94ZM140.19,31.95H142.26V33.24H140.19V31.95ZM134.61,35.2H135.53C137.33,35.2 138.75,35.17 140.36,34.89L140.51,36.19C138.86,36.46 137.37,36.52 135.53,36.52H134.61V35.2ZM134.59,28.89H139.59V33.07H136.2V35.6H134.61V31.81H138.02V30.16H134.59V28.89ZM148.26,34.17H158.32V35.44H148.26V34.17ZM152.46,34.99H154.04V39.07H152.46V34.99ZM149.42,28.5H157.13V32.98H149.42V28.5ZM155.55,29.76H150.99V31.72H155.55V29.76ZM161.97,29.71H163.24V30.96C163.24,33.52 162.2,36.03 160.11,36.98L159.21,35.72C161.07,34.89 161.97,32.84 161.97,30.96V29.71ZM162.33,29.71H163.59V30.96C163.59,32.76 164.48,34.68 166.34,35.44L165.48,36.7C163.36,35.79 162.33,33.43 162.33,30.96V29.71ZM159.66,29.02H165.88V30.33H159.66V29.02ZM166.92,27.96H168.52V39.07H166.92V27.96ZM174.56,33.61H176.15V35.22H174.56V33.61ZM170.36,32.67H180.37V33.84H170.36V32.67ZM174.56,27.94H176.14V29.29H174.56V27.94ZM174.46,29.36H175.87V29.58C175.87,31.17 174.25,32.23 171.18,32.4L170.73,31.21C173.44,31.1 174.46,30.34 174.46,29.58V29.36ZM174.84,29.36H176.24V29.58C176.24,30.34 177.26,31.1 179.96,31.21L179.51,32.4C176.46,32.23 174.84,31.17 174.84,29.58V29.36ZM171.29,28.82H179.42V29.98H171.29V28.82ZM171.49,34.51H179.17V37.26H173.07V38.31H171.5V36.19H177.6V35.66H171.49V34.51ZM171.5,37.83H179.46V39H171.5V37.83ZM181.39,36.55H191.44V37.84H181.39V36.55ZM185.6,34.45H187.2V37.08H185.6V34.45ZM182.51,28.68H190.32V32.37H184.12V34.24H182.54V31.12H188.73V29.94H182.51V28.68ZM182.54,33.61H190.57V34.89H182.54V33.61ZM200.5,28.41H203.57V29.67H200.5V28.41ZM195.43,33.01H205.43V34.28H195.43V33.01ZM199.83,31.06H201.4V33.55H199.83V31.06ZM202.93,28.41H204.47V29.11C204.47,29.89 204.47,30.96 204.13,32.32L202.58,32.14C202.93,30.8 202.93,29.86 202.93,29.11V28.41ZM196.49,35.16H204.19V39.02H202.59V36.43H196.49V35.16ZM196.22,28.41H198.87V29.67H196.22V28.41ZM198.11,28.41H199.66V28.89C199.66,29.61 199.66,30.8 199.09,32.34L197.55,32.12C198.11,30.55 198.11,29.55 198.11,28.89V28.41ZM217.09,27.96H218.69V39.07H217.09V27.96ZM213.81,29.11H215.39C215.39,32.5 214.24,35.29 210.29,37.2L209.46,35.92C212.66,34.39 213.81,32.37 213.81,29.4V29.11ZM210.05,29.11H214.57V30.37H210.05V29.11ZM228.1,27.96H229.71V33.93H228.1V27.96ZM222.32,34.41H223.89V35.44H228.12V34.41H229.71V38.95H222.32V34.41ZM223.89,36.67V37.68H228.12V36.67H223.89ZM223.66,28.41C225.39,28.41 226.67,29.5 226.67,31.04C226.67,32.58 225.39,33.67 223.66,33.67C221.93,33.67 220.64,32.58 220.64,31.04C220.64,29.5 221.93,28.41 223.66,28.41ZM223.66,29.73C222.81,29.73 222.2,30.22 222.2,31.04C222.2,31.87 222.81,32.35 223.66,32.35C224.5,32.35 225.11,31.87 225.11,31.04C225.11,30.22 224.5,29.73 223.66,29.73ZM231.49,29.62H236.81V30.9H231.49V29.62ZM234.17,31.39C235.59,31.39 236.61,32.48 236.61,34.04C236.61,35.59 235.59,36.68 234.17,36.68C232.77,36.68 231.74,35.59 231.74,34.04C231.74,32.48 232.77,31.39 234.17,31.39ZM234.17,32.72C233.57,32.72 233.15,33.2 233.15,34.04C233.15,34.88 233.57,35.35 234.17,35.35C234.77,35.35 235.2,34.88 235.2,34.04C235.2,33.2 234.77,32.72 234.17,32.72ZM239.54,27.96H241.06V39.07H239.54V27.96ZM238.2,32.47H240.04V33.75H238.2V32.47ZM237.21,28.16H238.7V38.6H237.21V28.16ZM233.39,28.26H234.96V30.43H233.39V28.26ZM246.66,29.19H248.04V29.52C248.04,31.47 246.45,33.07 243.63,33.45L243.04,32.2C245.49,31.9 246.66,30.66 246.66,29.52V29.19ZM247.12,29.19H248.5V29.52C248.5,30.66 249.67,31.9 252.12,32.2L251.55,33.45C248.71,33.07 247.12,31.47 247.12,29.52V29.19ZM246.75,35H248.33V39.08H246.75V35ZM242.56,34.09H252.6V35.36H242.56V34.09ZM243.45,28.52H251.69V29.78H243.45V28.52ZM257.96,31.69H259.8V32.98H257.96V31.69ZM255.59,28.92H256.81V30.79C256.81,33.31 256.12,35.77 254.34,36.86L253.38,35.66C255.01,34.65 255.59,32.67 255.59,30.79V28.92ZM255.94,28.92H257.14V30.72C257.14,32.53 257.61,34.38 259.12,35.36L258.25,36.61C256.49,35.52 255.94,33.12 255.94,30.72V28.92ZM261.61,27.96H263.14V39.07H261.61V27.96ZM259.36,28.12H260.85V38.56H259.36V28.12ZM266.85,33.6H268.43V36.72H266.85V33.6ZM270.88,33.6H272.47V36.72H270.88V33.6ZM264.64,36.49H274.69V37.78H264.64V36.49ZM269.65,28.5C272.04,28.5 273.8,29.67 273.8,31.48C273.8,33.3 272.04,34.46 269.65,34.46C267.25,34.46 265.5,33.3 265.5,31.48C265.5,29.67 267.25,28.5 269.65,28.5ZM269.65,29.74C268.11,29.74 267.07,30.38 267.07,31.48C267.07,32.58 268.11,33.22 269.65,33.22C271.2,33.22 272.23,32.58 272.23,31.48C272.23,30.38 271.2,29.74 269.65,29.74ZM275.95,37.24C275.95,37.01 276.02,36.81 276.19,36.65C276.35,36.49 276.56,36.41 276.84,36.41C277.11,36.41 277.33,36.49 277.49,36.65C277.65,36.81 277.73,37.01 277.73,37.24C277.73,37.47 277.65,37.67 277.49,37.83C277.33,37.99 277.11,38.06 276.84,38.06C276.56,38.06 276.35,37.99 276.19,37.83C276.02,37.67 275.95,37.47 275.95,37.24Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/img_warning_start.png b/app/src/main/res/drawable/img_warning_start.png
deleted file mode 100644
index b624a437..00000000
Binary files a/app/src/main/res/drawable/img_warning_start.png and /dev/null differ
diff --git a/app/src/main/res/layout/dialog_expense_delete.xml b/app/src/main/res/layout/dialog_expense_delete.xml
index f993b130..e10672c9 100644
--- a/app/src/main/res/layout/dialog_expense_delete.xml
+++ b/app/src/main/res/layout/dialog_expense_delete.xml
@@ -4,6 +4,7 @@
     android:layout_height="195dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/bg_category_limit_dialog"
+    android:padding="10dp"
     android:layout_gravity="center">
 
     <TextView
@@ -37,7 +38,6 @@
         android:gravity="center"
         android:weightSum="2"
         android:layout_marginTop="30dp"
-        android:layout_marginBottom="10dp"
         app:layout_constraintTop_toBottomOf="@id/tv_delete_message">
 
         <TextView
diff --git a/app/src/main/res/layout/dialog_purchase_failure.xml b/app/src/main/res/layout/dialog_purchase_failure.xml
index c325a105..4d87745e 100644
--- a/app/src/main/res/layout/dialog_purchase_failure.xml
+++ b/app/src/main/res/layout/dialog_purchase_failure.xml
@@ -32,29 +32,25 @@
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginTop="8dp" />
 
-    <!-- 버튼 영역 -->
-    <FrameLayout
+    <TextView
         android:id="@+id/btn_failure_check"
-        android:layout_width="296dp"
+        android:layout_width="290dp"
         android:layout_height="40dp"
+        android:gravity="center"
+        android:background="@drawable/bg_box_purple2"
+        android:text="확인"
+        android:textColor="@color/white"
+        android:textSize="15sp"
+        android:textStyle="normal"
         app:layout_constraintTop_toBottomOf="@id/tv_purchase_failure_message"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="32dp">
+        android:layout_marginTop="32dp"/>
 
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/bg_box_purple"
-            android:scaleType="fitXY" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="확인"
-            android:textColor="@color/white"
-            android:textSize="15sp"
-            android:textStyle="normal" />
-    </FrameLayout>
+    <View
+        android:layout_width="0dp"
+        android:layout_height="16dp"
+        app:layout_constraintTop_toBottomOf="@id/btn_failure_check"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_category_detail.xml b/app/src/main/res/layout/fragment_category_detail.xml
index f29a6f7e..efd2977a 100644
--- a/app/src/main/res/layout/fragment_category_detail.xml
+++ b/app/src/main/res/layout/fragment_category_detail.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- 상단 바 -->
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -48,6 +49,47 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_more"
+        android:layout_width="92dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/space_median"
+        android:background="@drawable/bg_box_main1"
+        android:elevation="9dp"
+        android:padding="@dimen/space_small"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/cl_toolbar"
+        android:layout_marginTop="-16dp"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/tv_modify"
+            style="@style/body_semibo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/space_xx_small"
+            android:text="수정"
+            android:textColor="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_delete"
+            style="@style/body_semibo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:padding="@dimen/space_xx_small"
+            android:text="삭제"
+            android:textColor="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_modify" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
     <!-- 콘텐츠 -->
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_content"
diff --git a/app/src/main/res/layout/fragment_expense_edit.xml b/app/src/main/res/layout/fragment_expense_edit.xml
new file mode 100644
index 00000000..80d63bd2
--- /dev/null
+++ b/app/src/main/res/layout/fragment_expense_edit.xml
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <!-- 상단 바 -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
+            android:padding="16dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <ImageView
+                android:id="@+id/btn_back"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_arrow_back"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+
+            <TextView
+                android:id="@+id/tv_expense_title_edit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="지출 내역 수정"
+                style="@style/pageTitle"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/btn_back"
+                android:layout_marginStart="12dp" />
+
+            <TextView
+                android:id="@+id/tv_entry_complete"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="완료"
+                android:textSize="15dp"
+                android:textColor="@color/main1"
+                android:layout_marginStart="185dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
+
+        <!-- 콘텐츠 -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/cl_toolbar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:padding="10dp">
+
+            <!-- 날짜 -->
+            <TextView
+                android:id="@+id/tv_expense_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="날짜"
+                style="@style/expense_sectionTitle"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBaseline_toBaselineOf="@id/tv_date_input" />
+
+            <TextView
+                android:id="@+id/tv_date_input"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="50dp"
+                android:background="@drawable/bg_edit_text"
+                android:textColor="@color/main1"
+                android:textSize="15sp"
+                android:paddingHorizontal="5dp"
+                android:paddingVertical="5dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_date"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <!-- 카테고리 -->
+            <TextView
+                android:id="@+id/tv_expense_category"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="카테고리"
+                style="@style/expense_sectionTitle"
+                android:layout_marginTop="35dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_expense_date"
+                app:layout_constraintBaseline_toBaselineOf="@id/tv_category_input" />
+
+            <TextView
+                android:id="@+id/tv_category_input"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_edit_text"
+                android:clickable="true"
+                android:focusable="true"
+                android:inputType="text"
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:paddingHorizontal="5dp"
+                android:paddingVertical="5dp"
+                android:layout_marginTop="35dp"
+                android:layout_marginStart="17dp"
+                android:gravity="center"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_category"
+                app:layout_constraintTop_toBottomOf="@id/tv_date_input" />
+
+            <!-- 지출 내용 -->
+            <TextView
+                android:id="@+id/tv_expense_detail"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="지출 내용"
+                style="@style/expense_sectionTitle"
+                android:layout_marginTop="35dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_expense_category" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_detail_input"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_edit_text"
+                android:layout_marginStart="13dp"
+                android:layout_marginTop="35dp"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_detail"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_category_input"
+                app:layout_constraintBottom_toBottomOf="@id/tv_expense_detail">
+
+                <EditText
+                    android:id="@+id/et_detail_input"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="10dp"
+                    android:background="@drawable/bg_edit_text"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="start|center_vertical"
+                    android:paddingHorizontal="10dp"
+                    android:paddingVertical="5dp"
+                    android:textColor="@color/main1"
+                    android:textSize="15sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/tv_character_count"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.0" />
+
+                <TextView
+                    android:id="@+id/tv_character_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="0/24"
+                    android:textColor="@color/black2"
+                    android:textSize="14sp"
+                    android:gravity="end|center_vertical"
+                    android:layout_marginEnd="10dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <!-- 지출 내역 - 지출 내용 보기-->
+            <TextView
+                android:id="@+id/tv_detail_input_view"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:background="@drawable/bg_edit_text"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="start|center_vertical"
+                android:paddingHorizontal="10dp"
+                android:paddingVertical="5dp"
+                android:layout_marginStart="13dp"
+                android:layout_marginTop="35dp"
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_detail"
+                app:layout_constraintTop_toBottomOf="@id/tv_category_input"
+                app:layout_constraintBottom_toBottomOf="@id/tv_expense_detail"/>
+
+
+            <!--  지출액 -->
+            <TextView
+                android:id="@+id/tv_expense_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="지출액"
+                style="@style/expense_sectionTitle"
+                android:layout_marginTop="35dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_expense_detail"
+                app:layout_constraintBaseline_toBaselineOf="@id/et_amount_input"/>
+
+            <EditText
+                android:id="@+id/et_amount_input"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_edit_text"
+                android:textColor="@color/main1"
+                android:textSize="15sp"
+                android:layout_marginStart="34dp"
+                android:layout_marginTop="35dp"
+                android:paddingHorizontal="10dp"
+                android:paddingVertical="5dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:inputType="number"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_amount"
+                app:layout_constraintTop_toBottomOf="@id/cl_detail_input"/>
+
+            <TextView
+                android:id="@+id/tv_currency"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:text="원"
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                app:layout_constraintStart_toEndOf="@id/et_amount_input"
+                app:layout_constraintBaseline_toBaselineOf="@id/et_amount_input" />
+
+            <!-- 지출 내역 - 지출액 보기-->
+            <TextView
+                android:id="@+id/tv_amount_input_view"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_edit_text"
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:layout_marginStart="34dp"
+                android:layout_marginTop="35dp"
+                android:paddingHorizontal="10dp"
+                android:paddingVertical="5dp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_amount"
+                app:layout_constraintTop_toBottomOf="@id/cl_detail_input"/>
+
+            <TextView
+                android:id="@+id/tv_currency_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:text="원"
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@id/tv_amount_input_view"
+                app:layout_constraintBaseline_toBaselineOf="@id/et_amount_input" />
+
+
+
+            <!-- 무지출 체크 -->
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_check_no_expense"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                app:layout_constraintStart_toStartOf="@id/et_amount_input"
+                app:layout_constraintTop_toBottomOf="@id/et_amount_input"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/iv_circle_expense_unchecked"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_radio_unchecked"
+                    android:layout_marginTop="5dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
+
+                <ImageView
+                    android:id="@+id/iv_circle_expense_checked"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_radio_checked"
+                    android:visibility="invisible"
+                    android:layout_marginTop="5dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
+
+                <TextView
+                    android:id="@+id/tv_no_expense_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="무지출로 기입하기"
+                    style="@style/body_regula"
+                    android:textSize="15sp"
+                    android:textColor="@color/black"
+                    android:layout_marginStart="8dp"
+                    app:layout_constraintStart_toEndOf="@id/iv_circle_expense_unchecked"
+                    app:layout_constraintTop_toTopOf="parent"/>
+
+                <TextView
+                    android:id="@+id/tv_no_expense_hint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="지출액이 없다면 무지출로 기입해주세요."
+                    android:textColor="@color/black2"
+                    style="@style/small_regul"
+                    android:textSize="12sp"
+                    android:maxLines="2"
+                    android:layout_marginTop="4dp"
+                    app:layout_constraintStart_toStartOf="@id/tv_no_expense_label"
+                    app:layout_constraintTop_toBottomOf="@id/tv_no_expense_label" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <!-- 사진 -->
+            <TextView
+                android:id="@+id/tv_expense_photo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="45dp"
+                android:text="사진"
+                style="@style/expense_sectionTitle"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/cl_check_no_expense"/>
+
+            <FrameLayout
+                android:id="@+id/fl_photo_frame"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_marginBottom="20dp"
+                android:layout_marginTop="30dp"
+                android:layout_marginStart="50dp"
+                app:layout_constraintTop_toBottomOf="@id/cl_check_no_expense"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_photo">
+
+                <ImageView
+                    android:id="@+id/img_photo_frame"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/bg_photo_input"/>
+
+                <ImageView
+                    android:id="@+id/iv_photo_icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_photo_input" />
+
+            </FrameLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_expense_entry.xml b/app/src/main/res/layout/fragment_expense_entry.xml
index f2d76cfc..6c835d71 100644
--- a/app/src/main/res/layout/fragment_expense_entry.xml
+++ b/app/src/main/res/layout/fragment_expense_entry.xml
@@ -40,29 +40,6 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@id/btn_back"
                 android:layout_marginStart="12dp" />
-            <TextView
-                android:id="@+id/tv_expense_view_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="지출 내역"
-                style="@style/pageTitle"
-                android:visibility="gone"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/btn_back"
-                android:layout_marginStart="12dp" />
-
-            <TextView
-                android:id="@+id/tv_expense_edit_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="지출 내역 수정"
-                style="@style/pageTitle"
-                android:visibility="gone"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/btn_back"
-                android:layout_marginStart="12dp" />
 
             <TextView
                 android:id="@+id/tv_entry_complete"
@@ -77,17 +54,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"/>
 
-            <ImageView
-                android:id="@+id/ic_more"
-                android:layout_width="20dp"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_more"
-                android:layout_marginStart="190dp"
-                android:layout_marginEnd="15dp"
-                android:visibility="gone"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -151,7 +117,7 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:inputType="text"
-                android:textColor="@color/black"
+                android:textColor="@color/main1"
                 android:textSize="15sp"
                 android:paddingHorizontal="5dp"
                 android:paddingVertical="5dp"
@@ -231,22 +197,23 @@
                 app:layout_constraintTop_toBottomOf="@+id/tv_expense_detail"
                 app:layout_constraintBaseline_toBaselineOf="@id/et_amount_input"/>
 
+
             <EditText
                 android:id="@+id/et_amount_input"
                 android:layout_width="120dp"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginTop="32dp"
                 android:background="@drawable/bg_edit_text"
-                android:textColor="@color/black"
-                android:textSize="15sp"
-                android:layout_marginStart="34dp"
-                android:layout_marginTop="35dp"
-                android:paddingHorizontal="10dp"
-                android:paddingVertical="5dp"
                 android:clickable="true"
                 android:focusable="true"
                 android:inputType="number"
+                android:paddingHorizontal="10dp"
+                android:paddingVertical="5dp"
+                android:textColor="@color/black"
+                android:textSize="15sp"
                 app:layout_constraintStart_toEndOf="@id/tv_expense_amount"
-                app:layout_constraintTop_toBottomOf="@id/cl_detail_input"/>
+                app:layout_constraintTop_toBottomOf="@id/cl_detail_input" />
 
             <TextView
                 android:id="@+id/tv_currency"
@@ -259,6 +226,7 @@
                 app:layout_constraintStart_toEndOf="@id/et_amount_input"
                 app:layout_constraintBaseline_toBaselineOf="@id/et_amount_input" />
 
+
             <!-- 무지출 체크 -->
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_check_no_expense"
diff --git a/app/src/main/res/layout/fragment_expense_view.xml b/app/src/main/res/layout/fragment_expense_view.xml
new file mode 100644
index 00000000..f2ee2371
--- /dev/null
+++ b/app/src/main/res/layout/fragment_expense_view.xml
@@ -0,0 +1,508 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <!-- 상단 바 -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
+            android:padding="16dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <ImageView
+                android:id="@+id/btn_back"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_arrow_back"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <TextView
+                android:id="@+id/tv_expense_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="지출 내역"
+                style="@style/pageTitle"
+                android:visibility="visible"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/btn_back"
+                android:layout_marginStart="12dp" />
+            <TextView
+                android:id="@+id/tv_expense_title_edit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="지출 내역 수정"
+                style="@style/pageTitle"
+                android:visibility="gone"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/btn_back"
+                android:layout_marginStart="12dp" />
+            <TextView
+                android:id="@+id/tv_expense_view_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="지출 내역"
+                style="@style/pageTitle"
+                android:visibility="gone"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/btn_back"
+                android:layout_marginStart="12dp" />
+
+            <TextView
+                android:id="@+id/tv_expense_edit_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="지출 내역 수정"
+                style="@style/pageTitle"
+                android:visibility="gone"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/btn_back"
+                android:layout_marginStart="12dp" />
+
+            <TextView
+                android:id="@+id/tv_entry_complete"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="완료"
+                android:textSize="15dp"
+                android:textColor="@color/main1"
+                android:layout_marginStart="185dp"
+                android:visibility="gone"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <ImageView
+                android:id="@+id/ic_more"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_more"
+                android:layout_marginStart="190dp"
+                android:padding="15dp"
+                android:visibility="visible"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_more"
+            android:layout_width="92dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/space_median"
+            android:background="@drawable/bg_box_main1"
+            android:elevation="9dp"
+            android:padding="@dimen/space_small"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cl_toolbar"
+            android:layout_marginTop="-16dp"
+            tools:visibility="visible">
+
+            <TextView
+                android:id="@+id/tv_modify"
+                style="@style/body_semibo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/space_xx_small"
+                android:text="수정"
+                android:textColor="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_delete"
+                style="@style/body_semibo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:padding="@dimen/space_xx_small"
+                android:text="삭제"
+                android:textColor="@color/white"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_modify" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <!-- 콘텐츠 -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/cl_toolbar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:padding="10dp">
+
+            <!-- 날짜 -->
+            <TextView
+                android:id="@+id/tv_expense_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="날짜"
+                style="@style/expense_sectionTitle"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBaseline_toBaselineOf="@id/tv_date_input" />
+
+            <TextView
+                android:id="@+id/tv_date_input"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="50dp"
+                android:background="@drawable/bg_edit_text"
+                android:textColor="@color/main1"
+                android:textSize="15sp"
+                android:paddingHorizontal="5dp"
+                android:paddingVertical="5dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center"
+                android:enabled="true"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_date"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <!-- 카테고리 -->
+            <TextView
+                android:id="@+id/tv_expense_category"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="카테고리"
+                style="@style/expense_sectionTitle"
+                android:layout_marginTop="35dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_expense_date"
+                app:layout_constraintBaseline_toBaselineOf="@id/tv_category_input" />
+
+            <TextView
+                android:id="@+id/tv_category_input"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_edit_text"
+                android:clickable="true"
+                android:focusable="true"
+                android:inputType="text"
+                android:enabled="true"
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:paddingHorizontal="5dp"
+                android:paddingVertical="5dp"
+                android:layout_marginTop="35dp"
+                android:layout_marginStart="17dp"
+                android:gravity="center"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_category"
+                app:layout_constraintTop_toBottomOf="@id/tv_date_input" />
+
+            <!-- 지출 내용 -->
+            <TextView
+                android:id="@+id/tv_expense_detail"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="지출 내용"
+                style="@style/expense_sectionTitle"
+                android:layout_marginTop="35dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_expense_category" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_detail_input"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_edit_text"
+                android:layout_marginStart="13dp"
+                android:layout_marginTop="35dp"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_detail"
+                app:layout_constraintTop_toBottomOf="@id/tv_category_input"
+                app:layout_constraintBottom_toBottomOf="@id/tv_expense_detail">
+
+                <TextView
+                    android:id="@+id/et_detail_input"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_edit_text"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="start|center_vertical"
+                    android:paddingHorizontal="10dp"
+                    android:paddingVertical="5dp"
+                    android:textColor="@color/main1"
+                    android:enabled="true"
+                    android:textSize="15sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.0" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <!-- 지출 내역 - 지출 내용 보기-->
+            <TextView
+                android:id="@+id/tv_detail_input_view"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:background="@drawable/bg_edit_text"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="start|center_vertical"
+                android:paddingHorizontal="10dp"
+                android:paddingVertical="5dp"
+                android:layout_marginStart="13dp"
+                android:layout_marginTop="35dp"
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_detail"
+                app:layout_constraintTop_toBottomOf="@id/tv_category_input"
+                app:layout_constraintBottom_toBottomOf="@id/tv_expense_detail"/>
+
+
+            <!--  지출액 -->
+            <TextView
+                android:id="@+id/tv_expense_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="지출액"
+                style="@style/expense_sectionTitle"
+                android:layout_marginTop="35dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_expense_detail"
+                app:layout_constraintBaseline_toBaselineOf="@id/et_amount_input"/>
+
+            <TextView
+                android:id="@+id/et_amount_input"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_edit_text"
+                android:textColor="@color/main1"
+                android:textSize="15sp"
+                android:layout_marginStart="34dp"
+                android:layout_marginTop="35dp"
+                android:paddingHorizontal="10dp"
+                android:paddingVertical="5dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:inputType="number"
+                android:enabled="true"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_amount"
+                app:layout_constraintTop_toBottomOf="@id/cl_detail_input"/>
+
+            <TextView
+                android:id="@+id/tv_currency"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:text="원"
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                app:layout_constraintStart_toEndOf="@id/et_amount_input"
+                app:layout_constraintBaseline_toBaselineOf="@id/et_amount_input" />
+
+            <!-- 지출 내역 - 지출액 보기-->
+            <TextView
+                android:id="@+id/tv_amount_input_view"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_edit_text"
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:layout_marginStart="34dp"
+                android:layout_marginTop="35dp"
+                android:paddingHorizontal="10dp"
+                android:paddingVertical="5dp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_amount"
+                app:layout_constraintTop_toBottomOf="@id/cl_detail_input"/>
+
+            <TextView
+                android:id="@+id/tv_currency_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:text="원"
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@id/tv_amount_input_view"
+                app:layout_constraintBaseline_toBaselineOf="@id/et_amount_input" />
+
+
+
+            <!-- 무지출 체크 -->
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_check_no_expense"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                app:layout_constraintStart_toStartOf="@id/et_amount_input"
+                app:layout_constraintTop_toBottomOf="@id/et_amount_input"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/iv_circle_expense_unchecked"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_radio_unchecked"
+                    android:layout_marginTop="5dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
+
+                <ImageView
+                    android:id="@+id/iv_circle_expense_checked"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_radio_checked"
+                    android:visibility="invisible"
+                    android:layout_marginTop="5dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
+
+                <TextView
+                    android:id="@+id/tv_no_expense_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="무지출로 기입하기"
+                    style="@style/body_regula"
+                    android:textSize="15sp"
+                    android:textColor="@color/black"
+                    android:layout_marginStart="8dp"
+                    app:layout_constraintStart_toEndOf="@id/iv_circle_expense_unchecked"
+                    app:layout_constraintTop_toTopOf="parent"/>
+
+                <TextView
+                    android:id="@+id/tv_no_expense_hint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="지출액이 없다면 무지출로 기입해주세요."
+                    android:textColor="@color/black2"
+                    style="@style/small_regul"
+                    android:textSize="12sp"
+                    android:maxLines="2"
+                    android:layout_marginTop="4dp"
+                    app:layout_constraintStart_toStartOf="@id/tv_no_expense_label"
+                    app:layout_constraintTop_toBottomOf="@id/tv_no_expense_label" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <!-- 사진 -->
+            <TextView
+                android:id="@+id/tv_expense_photo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="45dp"
+                android:text="사진"
+                style="@style/expense_sectionTitle"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/cl_check_no_expense"/>
+
+            <FrameLayout
+                android:id="@+id/fl_photo_frame"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_marginBottom="20dp"
+                android:layout_marginTop="30dp"
+                android:layout_marginStart="50dp"
+                app:layout_constraintTop_toBottomOf="@id/cl_check_no_expense"
+                app:layout_constraintStart_toEndOf="@id/tv_expense_photo">
+
+                <ImageView
+                    android:id="@+id/img_photo_frame"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/bg_photo_input"/>
+
+                <ImageView
+                    android:id="@+id/iv_photo_icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_photo_input" />
+
+            </FrameLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_expense_auto"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="30dp"
+                android:layout_marginBottom="30dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/fl_photo_frame"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/iv_circle_send_auto_unchecked"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_radio_unchecked"
+                    android:layout_marginTop="5dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
+
+                <ImageView
+                    android:id="@+id/iv_circle_send_auto_checked"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_radio_checked"
+                    android:layout_marginTop="5dp"
+                    android:visibility="invisible"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
+
+                <TextView
+                    android:id="@+id/tv_auto_send_chat"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="채팅방에 지출 내역 자동 전송"
+                    android:textSize="15sp"
+                    android:layout_marginStart="8dp"
+                    style="@style/body_regula"
+                    android:textColor="@color/black"
+                    app:layout_constraintStart_toEndOf="@id/iv_circle_send_auto_unchecked"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/tv_auto_send_chat_detail"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="가입한 챌린지 그룹 채팅방에 지출 내역을 자동 전송돼요."
+                    android:textColor="@color/black2"
+                    android:textSize="12sp"
+                    android:layout_marginTop="4dp"
+                    app:layout_constraintTop_toBottomOf="@id/tv_auto_send_chat"
+                    app:layout_constraintStart_toStartOf="@id/tv_auto_send_chat"/>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index ccf413ad..a1e8f30f 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -10,6 +10,7 @@
     <include
         android:id="@+id/include_topbar"
         layout="@layout/fragment_topbar_morebell"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
 
@@ -42,6 +43,12 @@
                 app:layout_columnWeight="1"
                 app:layout_row="0">
 
+                <ImageView
+                    android:id="@+id/img_home_swing"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/img_home_swing1" />
             </FrameLayout>
 
             <FrameLayout
@@ -59,15 +66,6 @@
                     app:layout_column="1"
                     app:layout_row="0" />
             </FrameLayout>
-
-            <ImageView
-                android:id="@+id/img_home_swing"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="fitCenter"
-                android:src="@drawable/img_home_swing1"
-                app:layout_column="0"
-                app:layout_row="0" />
         </androidx.gridlayout.widget.GridLayout>
 
         <!-- 하단 영역 -->
@@ -124,7 +122,7 @@
         <!-- Coin -->
         <LinearLayout
             android:id="@+id/ly_coin_bar"
-            android:layout_width="67dp"
+            android:layout_width="wrap_content"
             android:layout_height="28dp"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
@@ -143,13 +141,14 @@
 
             <TextView
                 android:id="@+id/tv_coin"
-                android:layout_width="26dp"
+                android:layout_width="wrap_content"
                 android:layout_height="20dp"
                 android:layout_marginStart="6dp"
-                android:text="124"
+                android:text=" "
                 android:textColor="@color/black"
                 android:textSize="15sp"
-                android:textStyle="normal" />
+                android:textStyle="normal"
+                android:layout_marginEnd="8dp"/>
         </LinearLayout>
 
         <!-- Store  -->
@@ -196,15 +195,19 @@
             app:layout_constraintEnd_toEndOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
     <ImageView
-        android:id="@+id/img_warning_start"
-        android:layout_width="296dp"
-        android:layout_height="52dp"
-        app:layout_constraintTop_toTopOf="parent"
+        android:id="@+id/iv_error"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="271dp"
-        android:src="@drawable/img_warning_start"
-        android:visibility="gone"/>
+        app:layout_constraintBottom_toBottomOf="@+id/img_bird_background"
+        app:layout_constraintDimensionRatio="1"
+        android:src="@drawable/ic_warning_start"
+        android:layout_marginBottom="45dp"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_stat_weekly.xml b/app/src/main/res/layout/fragment_stat_weekly.xml
index 23880f3a..55d9a546 100644
--- a/app/src/main/res/layout/fragment_stat_weekly.xml
+++ b/app/src/main/res/layout/fragment_stat_weekly.xml
@@ -51,7 +51,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/space_x_small"
-            android:paddingHorizontal="32dp"
             android:paddingVertical="@dimen/space_x_small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cl_topCl">
@@ -63,6 +62,7 @@
                 android:orientation="vertical"
                 app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
                 app:layout_constraintTop_toTopOf="parent"
+                android:paddingHorizontal="@dimen/space_median"
                 app:spanCount="7"
                 tools:itemCount="7"
                 tools:listitem="@layout/item_stat_weekly_week" />
@@ -73,6 +73,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="120dp"
                 android:layout_marginTop="@dimen/space_x_small"
+                android:paddingHorizontal="@dimen/space_x_large"
                 app:layout_constraintTop_toBottomOf="@id/rv_weekSending" />
 
             <View
@@ -82,6 +83,7 @@
                 android:background="@color/sub1"
                 app:layout_constraintBottom_toBottomOf="@id/lineChart"
                 app:layout_constraintEnd_toEndOf="@id/lineChart"
+                android:layout_marginHorizontal="@dimen/space_median"
                 app:layout_constraintStart_toStartOf="@id/lineChart"
                 app:layout_constraintTop_toTopOf="@id/lineChart" />
 
diff --git a/app/src/main/res/layout/fragment_store.xml b/app/src/main/res/layout/fragment_store.xml
index a737faec..ea2467a3 100644
--- a/app/src/main/res/layout/fragment_store.xml
+++ b/app/src/main/res/layout/fragment_store.xml
@@ -83,14 +83,14 @@
                 android:layout_height="180dp"
                 app:layout_columnWeight="1">
 
-            <ImageView
-                android:id="@+id/img_store_nest"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="fitCenter"
-                android:src="@drawable/img_home_nest1"
-                app:layout_column="1"
-                app:layout_row="0" />
+                <ImageView
+                    android:id="@+id/img_store_nest"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/img_home_nest1"
+                    app:layout_column="1"
+                    app:layout_row="0" />
             </FrameLayout>
         </androidx.gridlayout.widget.GridLayout>
 
@@ -148,7 +148,7 @@
         <!-- 코인 -->
         <LinearLayout
             android:id="@+id/ly_coin_bar"
-            android:layout_width="67dp"
+            android:layout_width="wrap_content"
             android:layout_height="28dp"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
@@ -167,13 +167,14 @@
 
             <TextView
                 android:id="@+id/tv_coin"
-                android:layout_width="26dp"
+                android:layout_width="wrap_content"
                 android:layout_height="20dp"
                 android:layout_marginStart="6dp"
-                android:text="124"
+                android:text=" "
                 android:textColor="@color/black"
                 android:textSize="15sp"
-                android:textStyle="normal" />
+                android:textStyle="normal"
+                android:layout_marginEnd="8dp"/>
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -203,27 +204,27 @@
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_constraintTop_toBottomOf="@id/tab_layout" />
 
-        <ImageView
-            android:id="@+id/img_purchase_icon"
-            android:layout_width="80dp"
-            android:layout_height="40dp"
-            android:layout_marginStart="4dp"
-            android:layout_marginBottom="20dp"
-            android:visibility="visible"
-            android:src="@drawable/ic_store_topurchase"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
-        <ImageView
-            android:id="@+id/img_save_icon"
-            android:layout_width="80dp"
-            android:layout_height="40dp"
-            android:layout_marginStart="4dp"
-            android:layout_marginBottom="20dp"
-            android:visibility="gone"
-            android:src="@drawable/ic_store_tosave"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
+    <ImageView
+        android:id="@+id/img_purchase_icon"
+        android:layout_width="80dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginBottom="20dp"
+        android:visibility="visible"
+        android:src="@drawable/ic_store_topurchase"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+    <ImageView
+        android:id="@+id/img_save_icon"
+        android:layout_width="80dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginBottom="20dp"
+        android:visibility="gone"
+        android:src="@drawable/ic_store_tosave"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_botsheet_category.xml b/app/src/main/res/layout/item_botsheet_category.xml
index 4db2f720..2421f409 100644
--- a/app/src/main/res/layout/item_botsheet_category.xml
+++ b/app/src/main/res/layout/item_botsheet_category.xml
@@ -34,7 +34,7 @@
             android:id="@+id/tv_no_spend"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="무지출!"
+            android:text="무지출 달성!"
             android:textColor="@color/black"
             style="@style/body_semibo"
             android:visibility="gone"
diff --git a/app/src/main/res/layout/item_stat_weekly_compare.xml b/app/src/main/res/layout/item_stat_weekly_compare.xml
index dcf4fe96..4f8afe34 100644
--- a/app/src/main/res/layout/item_stat_weekly_compare.xml
+++ b/app/src/main/res/layout/item_stat_weekly_compare.xml
@@ -15,21 +15,30 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="20대 직장인 중 상위 10%" />
 
+    <ProgressBar
+        android:id="@+id/progress_comparedTarget"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="0dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="@dimen/sp_small"
+        android:progressDrawable="@drawable/bg_box_strok_lightpurple"
+        app:layout_constraintStart_toStartOf="@id/tv_compareDescription"
+        app:layout_constraintTop_toBottomOf="@id/tv_compareDescription"
+        android:progress="0"
+        tools:progress="100"
+        app:layout_constraintWidth_percent="0.5" />
+
     <TextView
         android:id="@+id/tv_comparedTarget"
         style="@style/small_regul"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/sp_small"
-        android:background="@drawable/bg_box_strok_lightpurple"
-        android:paddingVertical="@dimen/space_x_small"
-        android:paddingStart="@dimen/sp_small"
-        android:paddingEnd="114dp"
+        android:layout_marginStart="@dimen/sp_small"
+        app:layout_constraintBottom_toBottomOf="@id/progress_comparedTarget"
         app:layout_constraintStart_toStartOf="@id/tv_compareDescription"
-        app:layout_constraintTop_toBottomOf="@id/tv_compareDescription"
+        app:layout_constraintTop_toTopOf="@id/progress_comparedTarget"
         tools:text="20대 직장인 평균" />
 
-
     <TextView
         android:id="@+id/tv_comparedMoney"
         style="@style/body_regula"
@@ -37,7 +46,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/space_x_small"
         app:layout_constraintBottom_toBottomOf="@id/tv_comparedTarget"
-        app:layout_constraintStart_toEndOf="@id/tv_comparedTarget"
+        app:layout_constraintStart_toEndOf="@id/progress_comparedTarget"
         app:layout_constraintTop_toTopOf="@id/tv_comparedTarget"
         tools:text="15,700원" />
 
@@ -51,19 +60,29 @@
         app:layout_constraintStart_toEndOf="@id/tv_comparedMoney"
         tools:text=" /일" />
 
+    <ProgressBar
+        android:id="@+id/progress_myTarget"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="0dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="@dimen/sp_small"
+        android:progressDrawable="@drawable/bg_progress_lightpurple"
+        android:progress="0"
+        tools:progress="100"
+        app:layout_constraintStart_toStartOf="@id/progress_comparedTarget"
+        app:layout_constraintTop_toBottomOf="@id/progress_comparedTarget"
+        app:layout_constraintWidth_percent="0.5" />
+
     <TextView
         android:id="@+id/tv_myTarget"
         style="@style/small_regul"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/space_x_small"
-        android:background="@drawable/bg_box_lightpurple"
-        android:paddingVertical="@dimen/space_x_small"
-        android:paddingStart="@dimen/space_small"
-        android:paddingEnd="28dp"
+        android:layout_marginStart="@dimen/space_small"
         android:text="나"
-        app:layout_constraintStart_toStartOf="@id/tv_comparedTarget"
-        app:layout_constraintTop_toBottomOf="@id/tv_comparedTarget" />
+        app:layout_constraintBottom_toBottomOf="@id/progress_myTarget"
+        app:layout_constraintStart_toStartOf="@id/progress_myTarget"
+        app:layout_constraintTop_toTopOf="@id/progress_myTarget" />
 
 
     <TextView
@@ -74,7 +93,7 @@
         android:layout_marginStart="@dimen/space_x_small"
         android:textColor="@color/main1"
         app:layout_constraintBottom_toBottomOf="@id/tv_myTarget"
-        app:layout_constraintStart_toEndOf="@id/tv_myTarget"
+        app:layout_constraintStart_toEndOf="@id/progress_myTarget"
         app:layout_constraintTop_toTopOf="@id/tv_myTarget"
         tools:text="15,700원" />
 
@@ -94,6 +113,8 @@
         android:layout_height="@dimen/space_median"
         android:layout_marginTop="@dimen/space_large"
         android:background="@color/black0"
-        app:layout_constraintTop_toBottomOf="@id/tv_myTarget" />
+        app:layout_constraintTop_toBottomOf="@id/progress_myTarget" />
+
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_stat_weekly_week.xml b/app/src/main/res/layout/item_stat_weekly_week.xml
index f5d4a94f..cac23618 100644
--- a/app/src/main/res/layout/item_stat_weekly_week.xml
+++ b/app/src/main/res/layout/item_stat_weekly_week.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <ImageView
diff --git a/app/src/main/res/layout/item_store_product.xml b/app/src/main/res/layout/item_store_product.xml
index 4ec929b9..bc3ddf82 100644
--- a/app/src/main/res/layout/item_store_product.xml
+++ b/app/src/main/res/layout/item_store_product.xml
@@ -29,8 +29,8 @@
         android:id="@+id/ly_coin_price"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
-        android:layout_marginStart="30dp"
         app:layout_constraintStart_toStartOf="@id/bg_product_box"
+        app:layout_constraintEnd_toEndOf="@id/bg_product_box"
         app:layout_constraintTop_toBottomOf="@id/img_store_product">
 
         <!-- 코인 아이콘 -->
@@ -47,7 +47,7 @@
             android:layout_width="wrap_content"
             android:layout_height="16dp"
             android:layout_marginStart="4dp"
-            android:text="128"
+            android:text=" "
             android:textColor="@color/main1"
             android:textSize="12sp"
             android:textStyle="normal" />
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index c1ee48e0..ac7a504a 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph"
-    app:startDestination="@id/navigation_splash">
+    app:startDestination="@id/navigation_login">
 
     <fragment
         android:id="@+id/navigation_splash"
@@ -75,7 +75,7 @@
         android:id="@+id/navigation_expense_view"
         android:name="com.example.yeongkkuel.presentation.home.entry.ExpenseViewFragment"
         android:label="지출 내역 확인"
-        tools:layout="@layout/fragment_expense_entry">
+        tools:layout="@layout/fragment_expense_view">
 
         <action
             android:id="@+id/action_ExpenseViewFragment_to_ExpenseEditFragment"
@@ -85,8 +85,11 @@
     <fragment
         android:id="@+id/navigation_expense_edit"
         android:name="com.example.yeongkkuel.presentation.home.entry.ExpenseEditFragment"
-        android:label="지출 내역 확인"
-        tools:layout="@layout/fragment_expense_entry">
+        android:label="지출 내역 수정"
+        tools:layout="@layout/fragment_expense_view">
+        <action
+            android:id="@+id/action_ExpenseEditFragment_to_HomeFragment"
+            app:destination="@id/navigation_home" />
     </fragment>
 
 
@@ -370,6 +373,4 @@
         android:label="fragment_term_4"
         tools:layout="@layout/fragment_term4">
     </fragment>
-
-
 </navigation>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 16ca31fc..f73f00a6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.2.2"
+agp = "8.6.0"
 flexiblestepRangeslider = "1.0.0"
 kotlin = "1.9.22"
 coreKtx = "1.15.0"