diff --git a/app/build.gradle b/app/build.gradle
index f1445dac..a629a2a6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,11 +13,13 @@ plugins {
 
 android {
     compileSdk 34
-    buildToolsVersion "31.0.0"
 
     defaultConfig {
+        namespace 'com.hieuwu.groceriesstore'
         applicationId "com.hieuwu.groceriesstore"
-        minSdkVersion 22
+        buildToolsVersion = "31.0.0"
+
+        minSdkVersion 28
         targetSdkVersion 33
         versionCode 5
         versionName "1.0"
@@ -29,7 +31,6 @@ android {
         buildConfigField("String", "SECRET", "\"${properties.getProperty("SECRET")}\"")
         buildConfigField("String", "SUPABASE_URL", "\"${properties.getProperty("SUPABASE_URL")}\"")
 
-
     }
 
     buildTypes {
@@ -40,12 +41,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_12
+        targetCompatibility JavaVersion.VERSION_12
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = "12"
     }
 
     buildFeatures {
@@ -57,7 +58,7 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion "1.2.0"
     }
-    namespace 'com.hieuwu.groceriesstore'
+
 }
 
 dependencies {
@@ -93,9 +94,7 @@ dependencies {
 
     implementation platform(libs.firebase.bom)
     implementation libs.bundles.firebase
-//    implementation 'io.supabase:postgrest-kt:0.9.0-alpha-4'
 
-//    implementation("io.github.jan-tennert.supabase:postgrest-kt:0.2.0")
     implementation("io.ktor:ktor-client-cio:1.6.0")
     implementation("io.github.jan-tennert.supabase:postgrest-kt-android:0.9.0-alpha-4")
     implementation "io.ktor:ktor-client-android:2.2.1"
@@ -124,7 +123,7 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling-preview:1.4.2"
     def nav_version = "2.5.3"
     implementation("androidx.navigation:navigation-compose:$nav_version")
-    implementation "androidx.compose.material:material-icons-extended:1.0.0"
+    implementation "androidx.compose.material:material-icons-extended:1.5.3"
 
     implementation libs.caruilib
     testImplementation "org.mockito.kotlin:mockito-kotlin:5.1.0"
@@ -134,7 +133,7 @@ dependencies {
     androidTestImplementation libs.androidx.test.arch.core
 }
 
-task wrapper(type: Wrapper) {
+tasks.register('wrapper', Wrapper) {
     gradleVersion = '7.5'
 }
 
@@ -144,7 +143,7 @@ detekt {
 }
 
 ktlint {
-//    android.set(true)
+    //    android.set(true)
 //    reporters {
 //        reporter(ReporterType.PLAIN)
 //        reporter(ReporterType.HTML)
diff --git a/app/src/main/java/com/hieuwu/groceriesstore/MainActivity.kt b/app/src/main/java/com/hieuwu/groceriesstore/MainActivity.kt
index 0a13a50a..d7c3e5b2 100644
--- a/app/src/main/java/com/hieuwu/groceriesstore/MainActivity.kt
+++ b/app/src/main/java/com/hieuwu/groceriesstore/MainActivity.kt
@@ -21,7 +21,8 @@ class MainActivity : AppCompatActivity() {
         val navHostFragment = supportFragmentManager.findFragmentById(
             R.id.appNavHostFragment
         ) as NavHostFragment
-        var navController = navHostFragment.navController
+
+        val navController = navHostFragment.navController
 
         // Setup the bottom navigation view with navController
         val bottomNavigationView = findViewById<BottomNavigationView>(R.id.bottom_nav)
diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/delivery/DeliveryFragment.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/delivery/DeliveryFragment.kt
index ee4cbeb0..d82655c7 100644
--- a/app/src/main/java/com/hieuwu/groceriesstore/presentation/delivery/DeliveryFragment.kt
+++ b/app/src/main/java/com/hieuwu/groceriesstore/presentation/delivery/DeliveryFragment.kt
@@ -11,13 +11,12 @@ import androidx.navigation.fragment.findNavController
 import com.hieuwu.groceriesstore.utilities.KeyData
 
 class DeliveryFragment : Fragment() {
-
+  
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-
         return ComposeView(requireContext()).apply {
             setContent {
                 DeliveryScreen(
diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/orderhistory/OrderHistoryFragment.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/orderhistory/OrderHistoryFragment.kt
index 791c7c04..1e688ccb 100644
--- a/app/src/main/java/com/hieuwu/groceriesstore/presentation/orderhistory/OrderHistoryFragment.kt
+++ b/app/src/main/java/com/hieuwu/groceriesstore/presentation/orderhistory/OrderHistoryFragment.kt
@@ -11,7 +11,6 @@ import dagger.hilt.android.AndroidEntryPoint
 @AndroidEntryPoint
 class OrderHistoryFragment : Fragment() {
 
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
diff --git a/build.gradle b/build.gradle
index 3f4f12ed..e3acdce3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,3 @@ subprojects {
         project.apply from: '../spotless.gradle'
     }
 }
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4c82dbb3..a24046ca 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
-appCompatVersion = "1.4.2"
+appCompatVersion = "1.6.1"
 buildGradleVersion = "7.4.2"
 cardViewVersion = "1.0.0"
-carUiLibVersion = "2.0.0"
+carUiLibVersion = "2.5.1"
 constraintLayoutVersion = "2.1.4"
 coordinatorLayoutVersion = "1.2.0"
-coreTestingVersion = "2.1.0"
+coreTestingVersion = "2.2.0"
 coreVersion = "1.8.0"
 firebaseBomVersion = "30.3.2"
 fireStoreVersion = "24.2.2"
@@ -13,8 +13,8 @@ firebaseVersion = "23.0.6"
 glideVersion = "4.13.2"
 glideComposeVersion = "1.0.0-beta01"
 googleServicesVersion = "4.3.13"
-gsonVersion = "2.9.0"
-hiltVersion = '2.42'
+gsonVersion = "2.10.1"
+hiltVersion = '2.47'
 jUnitVersion = "4.13.2"
 kotlinVersion = "1.7.0"
 kotlinCoroutineAdapter = "0.9.2"
@@ -23,8 +23,8 @@ kotlinxImmutable = "0.3.5"
 ktlintGradleVersion = "11.0.0"
 legacySupportVersion = "1.0.0"
 lifecycleVersion = "2.5.0"
-lottieVersion = "5.2.0"
-materialVersion = "1.6.1"
+lottieVersion = "6.0.1"
+materialVersion = "1.10.0"
 moshiConverterVersion = "2.9.0"
 moshiVersion = "1.12.0"
 navigationVersion = "2.4.2"
@@ -32,9 +32,9 @@ retrofitVersion = "2.9.0"
 roomVersion = "2.5.0"
 rxJavaVersion = "3.1.5"
 spotlessVersion = "6.8.0"
-testRunnerVersion = "1.4.0"
+testRunnerVersion = "1.5.2"
 timberVersion = "5.0.1"
-workVersion = "2.7.1"
+workVersion = "2.8.1"
 
 [libraries]
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appCompatVersion" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 90425f4b..0888d953 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Oct 10 05:12:00 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/local.properties b/local.properties
index 2da2edd7..ba669182 100644
--- a/local.properties
+++ b/local.properties
@@ -4,8 +4,8 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Oct 10 04:51:12 IST 2023
+#Sun Oct 15 13:05:21 IST 2023
 API_KEY=YOUR_SUPABASE_KEY
 SECRET=YOUR_SUPABASE_SECRET
 SUPABASE_URL=YOUR_SUPABASE_URL
-sdk.dir=/Users/hieuvu/Library/Android/sdk
+sdk.dir=C\:\\Users\\HP\\AppData\\Local\\Android\\Sdk