diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..7b3006b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index b8d7919..95dae56 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -40,9 +40,6 @@
     <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
     </inspection_tool>
-    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
     <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
@@ -51,15 +48,6 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
-    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
     <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c003f64..79de61d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -58,7 +58,7 @@ android {
 }
 
 dependencies {
-    implementation(libs.coil.compose.v222)
+
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)
@@ -67,7 +67,6 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
-    implementation(libs.androidx.webkit)
 //    implementation(libs.androidx.core.splashscreen)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 70fe8b1..574f837 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,10 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
-
         android:name=".MyApp"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -17,15 +15,6 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.MySplashScreen"
         tools:targetApi="31">
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/MainActivity.kt b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/MainActivity.kt
index 2893c0d..61dffa4 100644
--- a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/MainActivity.kt
+++ b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/MainActivity.kt
@@ -9,9 +9,12 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.compose.rememberNavController
 import com.yuvrajsinghgmx.shopsmart.api.API
 import com.yuvrajsinghgmx.shopsmart.navigation.Navigation
+import com.yuvrajsinghgmx.shopsmart.screens.HomeScreen
 import com.yuvrajsinghgmx.shopsmart.ui.theme.ShopSmartTheme
 import com.yuvrajsinghgmx.shopsmart.viewmodel.ShoppingListViewModel
 import dagger.hilt.android.AndroidEntryPoint
+import retrofit2.Retrofit
+import retrofit2.converter.scalars.ScalarsConverterFactory
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -26,10 +29,10 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             ShopSmartTheme {
-                val viewModel: ShoppingListViewModel = hiltViewModel()
+                val viewModel : ShoppingListViewModel = hiltViewModel()
                 val navController = rememberNavController()
-                Navigation(viewModel = viewModel, navController = navController)
+                Navigation(navController ,viewModel)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/navigation/Navigation.kt b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/navigation/Navigation.kt
index ac28878..df00edb 100644
--- a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/navigation/Navigation.kt
+++ b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/navigation/Navigation.kt
@@ -11,11 +11,10 @@ import com.yuvrajsinghgmx.shopsmart.screens.HomeScreen
 import com.yuvrajsinghgmx.shopsmart.screens.Profile
 import com.yuvrajsinghgmx.shopsmart.screens.ShopSmartNavBar
 import com.yuvrajsinghgmx.shopsmart.screens.Upcoming
-import com.yuvrajsinghgmx.shopsmart.screens.MyOrders
 import com.yuvrajsinghgmx.shopsmart.viewmodel.ShoppingListViewModel
 
 @Composable
-fun Navigation(viewModel: ShoppingListViewModel, navController: NavHostController) {
+fun Navigation(navController: NavHostController, viewModel: ShoppingListViewModel) {
     Scaffold(
         bottomBar = { ShopSmartNavBar(navController) }
     ) { innerPadding ->
@@ -24,18 +23,9 @@ fun Navigation(viewModel: ShoppingListViewModel, navController: NavHostControlle
             startDestination = "Home",
             modifier = Modifier.padding(innerPadding)
         ) {
-            composable("Home") {
-                HomeScreen(viewModel = viewModel, navController = navController)
-            }
-            composable("UpComing") {
-                Upcoming()
-            }
-            composable("Profile") {
-                Profile(navController = navController)
-            }
-            composable("MyOrders") {
-                MyOrders(navController = navController)
-            }
+            composable("Home") { HomeScreen(viewModel, navController) }
+            composable("UpComing") { Upcoming() }
+            composable("Profile") { Profile() }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/profilefeatures/ImageComponents.kt b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/profilefeatures/ImageComponents.kt
deleted file mode 100644
index e97e9fd..0000000
--- a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/profilefeatures/ImageComponents.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.yuvrajsinghgmx.shopsmart.components
-
-import android.net.Uri
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.window.Dialog
-import coil.compose.AsyncImage
-import coil.request.ImageRequest
-
-@Composable
-fun ImagePreviewDialog(imageUri: Uri?, defaultImageRes: Int, onDismiss: () -> Unit) {
-    Dialog(onDismissRequest = onDismiss) {
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .clickable(onClick = onDismiss)
-        ) {
-            AsyncImage(
-                model = ImageRequest.Builder(LocalContext.current)
-                    .data(imageUri ?: defaultImageRes)
-                    .crossfade(true)
-                    .build(),
-                contentDescription = "Profile Image Preview",
-                modifier = Modifier.fillMaxSize(),
-                contentScale = ContentScale.Fit
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/HomeScreen.kt b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/HomeScreen.kt
index e7141dc..2d5cbda 100644
--- a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/HomeScreen.kt
+++ b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/HomeScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
@@ -25,12 +26,15 @@ import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.colorResource
@@ -47,33 +51,21 @@ import coil.compose.AsyncImage
 import com.yuvrajsinghgmx.shopsmart.R
 import com.yuvrajsinghgmx.shopsmart.datastore.Poduct
 import com.yuvrajsinghgmx.shopsmart.datastore.saveItems
-import com.yuvrajsinghgmx.shopsmart.utils.SharedPrefsHelper
 import com.yuvrajsinghgmx.shopsmart.viewmodel.ShoppingListViewModel
 import kotlinx.coroutines.launch
 
 data class Product(val name: String, val amount: Int, val imageUrl: String? = null)
 
-private fun saveOrdersToSharedPreferences(context: Context, items: List<Product>) {
-    try {
-        val orders = items.map { Poduct(it.name, it.amount, it.imageUrl) }
-        if (orders.isNotEmpty()) {
-            SharedPrefsHelper.saveOrders(context, orders)
-            Log.d("HomeScreen", "Orders saved: ${orders.size}")
-            Toast.makeText(context, "Orders saved successfully", Toast.LENGTH_SHORT).show()
-        } else {
-            // If the order list is empty, clear the orders in SharedPreferences
-            SharedPrefsHelper.saveOrders(context, emptyList())
-            Log.d("HomeScreen", "No orders to save, cleared existing orders")
-            Toast.makeText(context, "Cart is empty", Toast.LENGTH_SHORT).show()
-        }
-    } catch (e: Exception) {
-        Log.e("HomeScreen", "Error saving orders", e)
-        Toast.makeText(context, "Error saving orders", Toast.LENGTH_SHORT).show()
-    }
-}
+data class ButtonNavigationItem(
+    val title: String,
+    val selectedIcon: ImageVector,
+    val unselectedIcon: ImageVector
+)
+
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun HomeScreen(viewModel: ShoppingListViewModel = hiltViewModel(), navController: NavController) {
+fun HomeScreen(viewModel: ShoppingListViewModel = hiltViewModel(),navController: NavController) {
     val context = LocalContext.current
     val items = viewModel.items.collectAsState(initial = emptyList())
     var newItem by remember { mutableStateOf("") }
@@ -84,6 +76,7 @@ fun HomeScreen(viewModel: ShoppingListViewModel = hiltViewModel(), navController
     var showDialog by remember { mutableStateOf(false) }
     var isLoading by remember { mutableStateOf(false) }
 
+
     LaunchedEffect(viewModel) {
         viewModel.loadItems(context)
     }
@@ -112,7 +105,8 @@ fun HomeScreen(viewModel: ShoppingListViewModel = hiltViewModel(), navController
                         }) {
                             Icon(
                                 Icons.Default.Delete,
-                                contentDescription = "Delete Selected"
+                                contentDescription = "Delete Selected",
+//                                tint = Color(primaryColor.value)
                             )
                         }
                     }
@@ -138,40 +132,6 @@ fun HomeScreen(viewModel: ShoppingListViewModel = hiltViewModel(), navController
                         .padding(start = 16.dp, end = 16.dp, bottom = 16.dp)
                 ) {
 
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween
-                        ) {
-                            Text(
-                                "Total:",
-                                style = TextStyle(
-                                    fontSize = 18.sp,
-                                    fontWeight = FontWeight.Bold,
-                                )
-                            )
-                            val total = subtotal + deliveryFee - discount
-                            Text(
-                                "₹$total",
-                                style = TextStyle(
-                                    fontSize = 18.sp,
-                                    fontWeight = FontWeight.Bold,
-                                )
-                            )
-                        }
-                        Spacer(modifier = Modifier.height(16.dp))
-                        Button(
-                            onClick = {
-                                saveOrdersToSharedPreferences(context, items.value)
-                                navController.navigate("MyOrders")
-                            },
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .height(56.dp),
-                            shape = RoundedCornerShape(8.dp),
-                        ) {
-                            Text("Checkout", fontSize = 18.sp)
-                        }
-                    }
                 }
             }
         }
@@ -229,8 +189,12 @@ fun HomeScreen(viewModel: ShoppingListViewModel = hiltViewModel(), navController
                                 .fillMaxWidth()
                                 .padding(bottom = 10.dp)
                                 .clip(RoundedCornerShape(16.dp))
-                                .border(2.dp, color = MaterialTheme.colorScheme.outline, RoundedCornerShape(16.dp)),
-                            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
+                                .border(
+                                    BorderStroke(1.dp, Color(0xFF332D25)),
+                                    RoundedCornerShape(16.dp)
+                                ),
+                            elevation = CardDefaults.cardElevation(defaultElevation = 5.dp),
+                            colors = CardDefaults.cardColors(containerColor = Color(rgb(234, 235, 230)))
 
                         ) {
                             Row(
@@ -453,6 +417,7 @@ fun HomeScreen(viewModel: ShoppingListViewModel = hiltViewModel(), navController
                                             isLoading = false
                                             showDialog = false
                                         }
+
                                 }
                             }
                         ) {
@@ -463,4 +428,4 @@ fun HomeScreen(viewModel: ShoppingListViewModel = hiltViewModel(), navController
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/MyOrders.kt b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/MyOrders.kt
deleted file mode 100644
index 697149b..0000000
--- a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/MyOrders.kt
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.yuvrajsinghgmx.shopsmart.screens
-
-import android.util.Log
-import android.widget.Toast
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.navigation.NavController
-import com.yuvrajsinghgmx.shopsmart.datastore.Poduct
-import com.yuvrajsinghgmx.shopsmart.utils.SharedPrefsHelper
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun MyOrders(navController: NavController) {
-    val context = LocalContext.current
-    var orders by remember { mutableStateOf(listOf<Poduct>()) }
-    val coroutineScope = rememberCoroutineScope()
-
-    LaunchedEffect(Unit) {
-        loadOrders(context) { loadedOrders ->
-            orders = loadedOrders
-        }
-    }
-
-    Scaffold(
-        topBar = {
-            TopAppBar(
-                title = { Text("My Orders") },
-                navigationIcon = {
-                    IconButton(onClick = { navController.navigateUp() }) {
-                        Icon(
-                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                            contentDescription = "Back"
-                        )
-                    }
-                },
-                actions = {
-                    IconButton(
-                        onClick = {
-                            coroutineScope.launch {
-                                clearOrders(context)
-                                orders = emptyList()
-                            }
-                        }
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Delete,
-                            contentDescription = "Clear Orders"
-                        )
-                    }
-                }
-            )
-        },
-        bottomBar = {
-            if (orders.isNotEmpty()) {
-                Surface(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(16.dp),
-                    shape = RoundedCornerShape(16.dp),
-                    color = MaterialTheme.colorScheme.surface,
-                    tonalElevation = 8.dp
-                ) {
-                    Column(modifier = Modifier.padding(16.dp)) {
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween
-                        ) {
-                            Text(
-                                "Total:",
-                                style = MaterialTheme.typography.titleLarge
-                            )
-                            Text(
-                                "₹${orders.sumOf { it.amount }}",
-                                style = MaterialTheme.typography.titleLarge,
-                                fontWeight = FontWeight.Bold
-                            )
-                        }
-                        Spacer(modifier = Modifier.height(16.dp))
-                        Button(
-                            onClick = { /* No functionality added */ },
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .height(56.dp),
-                            shape = RoundedCornerShape(8.dp),
-                            colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF006400))
-                        ) {
-                            Text("Proceed to Payment", fontSize = 18.sp, color = Color.White)
-                        }
-                    }
-                }
-            }
-        }
-    ) { innerPadding ->
-        if (orders.isEmpty()) {
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(innerPadding),
-                contentAlignment = Alignment.Center
-            ) {
-                Text("No orders yet. Start shopping!")
-            }
-        } else {
-            LazyColumn(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(innerPadding)
-                    .padding(horizontal = 16.dp)
-                    .padding(bottom = 100.dp)
-            ) {
-                items(orders) { order ->
-                    OrderItem(order)
-                    HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun OrderItem(order: Poduct) {
-    Card(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(vertical = 8.dp),
-        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
-        shape = RoundedCornerShape(8.dp)
-    ) {
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Column {
-                Text(
-                    text = order.name,
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.Medium
-                )
-                Spacer(modifier = Modifier.height(4.dp))
-                Text(
-                    text = "Quantity: 1", // Assuming quantity is 1, adjust if needed
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                )
-            }
-            Text(
-                text = "₹${order.amount}",
-                style = MaterialTheme.typography.titleMedium,
-                fontWeight = FontWeight.Bold,
-                color = MaterialTheme.colorScheme.primary
-            )
-        }
-    }
-}
-
-private suspend fun loadOrders(context: android.content.Context, onOrdersLoaded: (List<Poduct>) -> Unit) {
-    try {
-        val loadedOrders = SharedPrefsHelper.getOrders(context)
-        Log.d("MyOrders", "Orders loaded: ${loadedOrders.size}")
-        Toast.makeText(context, "Orders loaded: ${loadedOrders.size}", Toast.LENGTH_SHORT).show()
-        onOrdersLoaded(loadedOrders)
-    } catch (e: Exception) {
-        Log.e("MyOrders", "Error loading orders", e)
-        Toast.makeText(context, "Error loading orders", Toast.LENGTH_SHORT).show()
-        onOrdersLoaded(emptyList())
-    }
-}
-
-private suspend fun clearOrders(context: android.content.Context) {
-    try {
-        SharedPrefsHelper.saveOrders(context, emptyList())
-        Log.d("MyOrders", "Orders cleared")
-        Toast.makeText(context, "All orders cleared", Toast.LENGTH_SHORT).show()
-    } catch (e: Exception) {
-        Log.e("MyOrders", "Error clearing orders", e)
-        Toast.makeText(context, "Error clearing orders", Toast.LENGTH_SHORT).show()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/Profile.kt b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/Profile.kt
index 4963b5c..702c3e7 100644
--- a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/Profile.kt
+++ b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/Profile.kt
@@ -1,77 +1,27 @@
 package com.yuvrajsinghgmx.shopsmart.screens
 
-import android.net.Uri
-import android.util.Patterns
-import android.widget.Toast
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.background
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.zIndex
-import coil.compose.AsyncImage
-import coil.request.ImageRequest
 import com.yuvrajsinghgmx.shopsmart.R
-import com.yuvrajsinghgmx.shopsmart.components.ImagePreviewDialog
-import com.yuvrajsinghgmx.shopsmart.utils.ImageHelper
-import com.yuvrajsinghgmx.shopsmart.utils.SharedPrefsHelper
-import kotlinx.coroutines.launch
-import androidx.compose.material.icons.Icons
-import androidx.navigation.NavController
+
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun Profile(modifier: Modifier = Modifier,navController: NavController) {
-    val context = LocalContext.current
-    val coroutineScope = rememberCoroutineScope()
-    val lightBackgroundColor = Color(0xFFF6F5F3)
-    var isEditing by remember { mutableStateOf(false) }
-
-    // Initialize state variables
-    var userName by remember { mutableStateOf("") }
-    var userEmail by remember { mutableStateOf("") }
-    var profilePhotoUri by remember { mutableStateOf<Uri?>(null) }
-    var showImagePreview by remember { mutableStateOf(false) }
-    var isNameError by remember { mutableStateOf(false) }
-    var isEmailError by remember { mutableStateOf(false) }
-
-    // Fetch data once when composable is first composed
-    LaunchedEffect(Unit) {
-        userName = SharedPrefsHelper.getUserName(context)
-        userEmail = SharedPrefsHelper.getUserEmail(context)
-        profilePhotoUri = SharedPrefsHelper.getProfilePhotoUri(context)
-    }
-
-    val launcher = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.GetContent()
-    ) { uri: Uri? ->
-        uri?.let {
-            coroutineScope.launch {
-                val copiedUri = ImageHelper.copyImageToPrivateStorage(context, it)
-                copiedUri?.let { savedUri ->
-                    profilePhotoUri = savedUri
-                    SharedPrefsHelper.saveProfilePhotoUri(context, savedUri)
-                }
-            }
-        }
-    }
-
+fun Profile(modifier: Modifier = Modifier) {
     Scaffold(
         topBar = {
             CenterAlignedTopAppBar(
@@ -80,15 +30,10 @@ fun Profile(modifier: Modifier = Modifier,navController: NavController) {
                         "Profile",
                         fontWeight = FontWeight.Bold,
                         style = MaterialTheme.typography.headlineMedium,
-                        color = Color(0xFF332D25)
                     )
-                },
-                colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
-                    containerColor = lightBackgroundColor
-                )
+                }
             )
-        },
-        containerColor = lightBackgroundColor
+        }
     ) { innerPadding ->
         Column(
             modifier = modifier
@@ -97,163 +42,55 @@ fun Profile(modifier: Modifier = Modifier,navController: NavController) {
                 .padding(16.dp),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
-            Box(
-                modifier = Modifier.size(150.dp)
-            ) {
-                AsyncImage(
-                    model = ImageRequest.Builder(context)
-                        .data(profilePhotoUri ?: R.drawable.profile)
-                        .crossfade(true)
-                        .build(),
-                    contentDescription = "Profile Image",
-                    modifier = Modifier
-                        .size(150.dp)
-                        .clip(CircleShape)
-                        .border(2.dp, Color.Gray, CircleShape)
-                        .clickable {
-                            if (isEditing) {
-                                launcher.launch("image/*")
-                            } else {
-                                showImagePreview = true
-                            }
-                        },
-                    contentScale = ContentScale.Crop,
-                    fallback = painterResource(id = R.drawable.profile),
-                    error = painterResource(id = R.drawable.profile)
-                )
-                if (isEditing) {
-                    Icon(
-                        imageVector = Icons.Default.Edit,
-                        contentDescription = "Edit Profile Picture",
-                        modifier = Modifier
-                            .size(40.dp)
-                            .align(Alignment.TopEnd)
-                            .offset(x = 8.dp, y = (-8).dp)
-                            .zIndex(1f)
-                            .background(MaterialTheme.colorScheme.primary, CircleShape)
-                            .border(2.dp, Color.White, CircleShape)
-                            .padding(8.dp)
-                            .clickable { launcher.launch("image/*") },
-                        tint = Color.White
-                    )
-                }
-            }
-            Spacer(modifier = Modifier.height(16.dp))
-            if (isEditing) {
-                TextField(
-                    value = userName,
-                    onValueChange = {
-                        userName = it
-                        // Re-validate the name field as the user types
-                        isNameError = it.isEmpty()
-                    },
-                    label = { Text("Name") },
-                    singleLine = true,
-                    modifier = Modifier.fillMaxWidth(),
-                    isError = isNameError,  // If there's an error, highlight the text field
-                    supportingText = {
-                        if (isNameError) {
-                            Text("Name cannot be empty", color = MaterialTheme.colorScheme.error)
-                        }
-                    }
-                )
-                Spacer(modifier = Modifier.height(8.dp))
-                TextField(
-                    value = userEmail,
-                    onValueChange = {
-                        userEmail = it
-                        // Re-validate the email field as the user types
-                        isEmailError = !Patterns.EMAIL_ADDRESS.matcher(it).matches()
-                    },
-                    label = { Text("Email") },
-                    singleLine = true,
-                    modifier = Modifier.fillMaxWidth(),
-                    isError = isEmailError,  // If there's an error, highlight the text field
-                    supportingText = {
-                        if (isEmailError) {
-                            Text("Invalid email address format", color = MaterialTheme.colorScheme.error)
-                        }
-                    }
-                )
-            } else {
-                Text(
-                    userName,
-                    style = MaterialTheme.typography.headlineMedium,
-                    fontWeight = FontWeight.Bold,
-                    color = Color(0xFF332D25)
-                )
-                Spacer(modifier = Modifier.height(8.dp))
-                Text(
-                    userEmail,
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = Color.Gray
-                )
-            }
+            Image(
+                painter = painterResource(id = R.drawable.profile),
+                contentDescription = "Profile Image",
+                modifier = Modifier
+                    .size(150.dp)
+                    .clip(CircleShape)
+                    .border(2.dp, Color.Gray, CircleShape),
+                contentScale = ContentScale.Crop
+            )
             Spacer(modifier = Modifier.height(16.dp))
-            Button(
-                onClick = {
-                    if (isEditing) {
-                        isNameError = userName.isEmpty()
-                        isEmailError = !Patterns.EMAIL_ADDRESS.matcher(userEmail).matches()
-
-                        if (!isNameError && !isEmailError) {
-                            SharedPrefsHelper.saveUserName(context, userName)
-                            SharedPrefsHelper.saveUserEmail(context, userEmail)
-                            Toast.makeText(context, "Profile updated", Toast.LENGTH_SHORT).show()
-                            isEditing = false
-                            // No need to refreshProfileData here
-                        } else {
-                            Toast.makeText(context, "Please correct the errors", Toast.LENGTH_SHORT).show()
-                        }
-                    } else {
-                        isEditing = true
-                    }
-                },
-                modifier = Modifier.fillMaxWidth(),
-                colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF006400))
-            ) {
-                Text(if (isEditing) "Save Profile" else "Edit Profile")
-            }
+            Text(
+                "User",
+                style = MaterialTheme.typography.headlineMedium,
+                fontWeight = FontWeight.Bold
+            )
+            Spacer(modifier = Modifier.height(8.dp))
+            Text(
+                "temp@email.com",
+                style = MaterialTheme.typography.bodyMedium,
+                color = Color.Gray
+            )
             Spacer(modifier = Modifier.height(32.dp))
             Card(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(8.dp),
                 shape = RoundedCornerShape(8.dp),
-                colors = CardDefaults.cardColors(containerColor = Color.White),
                 border = BorderStroke(1.dp, Color.LightGray)
             ) {
                 Column(modifier = Modifier.padding(16.dp)) {
-                    ProfileItem(title = "My Orders") {
-                        navController.navigate("MyOrders")
-                    }
+                    ProfileItem(title = "My Orders")
                     ProfileItem(title = "Settings")
                     ProfileItem(title = "Help & Support")
                 }
             }
         }
     }
-
-    if (showImagePreview) {
-        ImagePreviewDialog(
-            imageUri = profilePhotoUri,
-            defaultImageRes = R.drawable.profile
-        ) {
-            showImagePreview = false
-        }
-    }
 }
 
 @Composable
-fun ProfileItem(title: String, onClick: () -> Unit = {}) {
+fun ProfileItem(title: String) {
     TextButton(
-        onClick = onClick,
+        onClick = {
+        },
         modifier = Modifier.fillMaxWidth()
     ) {
         Text(
             text = title,
-            style = MaterialTheme.typography.bodyLarge,
-            color = Color(0xFF332D25)
+            style = MaterialTheme.typography.bodyLarge
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/ShopSmartNavBar.kt b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/ShopSmartNavBar.kt
index 9377ba6..afca87e 100644
--- a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/ShopSmartNavBar.kt
+++ b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/screens/ShopSmartNavBar.kt
@@ -13,17 +13,10 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 
-data class ButtonNavigationItem(
-    val title: String,
-    val selectedIcon: ImageVector,
-    val unselectedIcon: ImageVector
-)
-
 @Composable
 fun ShopSmartNavBar(navController: NavHostController) {
 
@@ -47,9 +40,9 @@ fun ShopSmartNavBar(navController: NavHostController) {
             unselectedIcon = Icons.Default.Person
         )
     )
-    var selectedItemIndex by rememberSaveable { mutableStateOf(0) }
+    var selectedItemIndex by rememberSaveable { mutableIntStateOf(0) }
 
-    NavigationBar(tonalElevation = 4.dp) {
+    NavigationBar( tonalElevation = 4.dp) {
         items.forEachIndexed { index, item ->
             NavigationBarItem(
                 selected = currentDestination?.route == item.title,
@@ -59,8 +52,6 @@ fun ShopSmartNavBar(navController: NavHostController) {
                             saveState = true
                         }
                         launchSingleTop = true
-                        restoreState = true
-
                     }
                 },
                 icon = {
@@ -71,9 +62,9 @@ fun ShopSmartNavBar(navController: NavHostController) {
                 },
                 label = { Text(item.title) },
                 colors = NavigationBarItemDefaults.colors(
-                    selectedIconColor = MaterialTheme.colorScheme.onBackground,
+                    selectedIconColor= MaterialTheme.colorScheme.onBackground,
                     selectedTextColor = Color.Unspecified,
-                    indicatorColor = MaterialTheme.colorScheme.surfaceTint
+                    indicatorColor= MaterialTheme.colorScheme.surfaceTint
                 )
             )
         }
diff --git a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/utils/ImageHelper.kt b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/utils/ImageHelper.kt
deleted file mode 100644
index fbacb04..0000000
--- a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/utils/ImageHelper.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.yuvrajsinghgmx.shopsmart.utils
-
-import android.content.Context
-import android.net.Uri
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-import java.util.UUID
-
-object ImageHelper {
-    fun copyImageToPrivateStorage(context: Context, uri: Uri): Uri? {
-        return try {
-            val inputStream = context.contentResolver.openInputStream(uri)
-            val fileName = "profile_${UUID.randomUUID()}.jpg"
-            val file = File(context.filesDir, fileName)
-            val outputStream = FileOutputStream(file)
-            inputStream?.use { input ->
-                outputStream.use { output ->
-                    input.copyTo(output)
-                }
-            }
-            Uri.fromFile(file)
-        } catch (e: IOException) {
-            e.printStackTrace()
-            null
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/utils/SharedPrefsHelper.kt b/app/src/main/java/com/yuvrajsinghgmx/shopsmart/utils/SharedPrefsHelper.kt
deleted file mode 100644
index 8d700f1..0000000
--- a/app/src/main/java/com/yuvrajsinghgmx/shopsmart/utils/SharedPrefsHelper.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.yuvrajsinghgmx.shopsmart.utils
-
-import android.content.Context
-import android.net.Uri
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-import com.yuvrajsinghgmx.shopsmart.datastore.Poduct
-
-object SharedPrefsHelper {
-    private const val PREFS_NAME = "ShopSmartPrefs"
-    private const val KEY_USER_NAME = "user_name"
-    private const val KEY_USER_EMAIL = "user_email"
-    private const val KEY_PROFILE_PHOTO_URI = "profile_photo_uri"
-    private const val KEY_ORDERS = "orders"
-
-    private fun getPrefs(context: Context) =
-        context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-
-    fun saveUserName(context: Context, name: String) {
-        getPrefs(context).edit().putString(KEY_USER_NAME, name).apply()
-    }
-
-    fun saveUserEmail(context: Context, email: String) {
-        getPrefs(context).edit().putString(KEY_USER_EMAIL, email).apply()
-    }
-
-    fun saveProfilePhotoUri(context: Context, uri: Uri?) {
-        getPrefs(context).edit().putString(KEY_PROFILE_PHOTO_URI, uri?.toString()).apply()
-    }
-
-    fun getUserName(context: Context): String {
-        return getPrefs(context).getString(KEY_USER_NAME, "") ?: ""
-    }
-
-    fun getUserEmail(context: Context): String {
-        return getPrefs(context).getString(KEY_USER_EMAIL, "") ?: ""
-    }
-
-    fun getProfilePhotoUri(context: Context): Uri? {
-        val uriString = getPrefs(context).getString(KEY_PROFILE_PHOTO_URI, null)
-        return if (uriString != null) Uri.parse(uriString) else null
-    }
-
-    // New methods for handling orders
-    fun saveOrders(context: Context, orders: List<Poduct>) {
-        val gson = Gson()
-        val json = gson.toJson(orders)
-        getPrefs(context).edit().putString(KEY_ORDERS, json).apply()
-    }
-
-    fun getOrders(context: Context): List<Poduct> {
-        val gson = Gson()
-        val json = getPrefs(context).getString(KEY_ORDERS, null)
-        return if (json != null) {
-            val type = object : TypeToken<List<Poduct>>() {}.type
-            gson.fromJson(json, type)
-        } else {
-            emptyList()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
deleted file mode 100644
index 4495c28..0000000
--- a/app/src/main/res/xml/file_paths.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <external-path name="external_files" path="."/>
-</paths>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e79f54e..8534212 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
-agp = "8.5.0"
+agp = "8.7.0"
 coilCompose = "2.7.0"
-coilComposeVersion = "2.2.2"
 converterGson = "2.11.0"
 hiltNavigationCompose = "1.2.0"
 kotlin = "2.0.10"
@@ -15,7 +14,6 @@ lifecycleRuntimeKtx = "2.8.6"
 activityCompose = "1.9.2"
 composeBom = "2024.09.02"
 kotlinxCoroutinesAndroid = "1.8.1"
-webkit = "1.12.1"
 
 
 
@@ -26,7 +24,6 @@ androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-lived
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleRuntimeKtx" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleRuntimeKtx" }
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" }
-coil-compose-v222 = { module = "io.coil-kt:coil-compose", version.ref = "coilComposeVersion" }
 converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "converterGson" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
@@ -46,7 +43,6 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3"
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
 kotlinx-coroutines-android-v139 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroidVersion" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "converterGson" }
-androidx-webkit = { group = "androidx.webkit", name = "webkit", version.ref = "webkit" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }