diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderHistoryAdapter.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderHistoryAdapter.kt
index 8db8d17..d211fa8 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderHistoryAdapter.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderHistoryAdapter.kt
@@ -547,15 +547,6 @@ class OrderHistoryAdapter(
             // Use ViewModel to fetch order details
             viewModel.getOrderDetails(order.orderId)
 
-            // Create loading dialog
-//            val loadingDialog = Dialog(itemView.context).apply {
-//                requestWindowFeature(Window.FEATURE_NO_TITLE)
-//                setContentView(R.layout.dialog_loading)
-//                window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-//                setCancelable(false)
-//            }
-//            loadingDialog.show()
-
             viewModel.error.observe(itemView.findViewTreeLifecycleOwner()!!) { errorMsg ->
                 if (!errorMsg.isNullOrEmpty()) {
                     Toast.makeText(itemView.context, errorMsg, Toast.LENGTH_SHORT).show()
diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/MyStoreActivity.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/MyStoreActivity.kt
index 4141b0b..7df2ca9 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/MyStoreActivity.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/MyStoreActivity.kt
@@ -59,20 +59,20 @@ class MyStoreActivity : AppCompatActivity() {
             finish()
         }
 
-        viewModel.loadMyStore()
-        viewModel.loadMyStoreProducts()
-
         viewModel.myStoreProfile.observe(this){ user ->
             user?.let { myStoreProfileOverview(it.store) }
         }
 
+        viewModel.loadMyStore()
+        viewModel.loadMyStoreProducts()
+        viewModel.fetchBalance()
+
         viewModel.errorMessage.observe(this) { error ->
             Toast.makeText(this, error, Toast.LENGTH_SHORT).show()
         }
         setUpClickListeners()
         getCountOrder()
         observeViewModel()
-        viewModel.fetchBalance()
         fetchBalance()
     }
 
@@ -206,6 +206,13 @@ class MyStoreActivity : AppCompatActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        viewModel.loadMyStore()
+        viewModel.loadMyStoreProducts()
+        viewModel.fetchBalance()
+    }
+
     companion object {
         private const val PROFILE_REQUEST_CODE = 100
     }
diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsListFragment.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsListFragment.kt
index 48680cd..bfc63cd 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsListFragment.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsListFragment.kt
@@ -83,10 +83,10 @@ class SellsListFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        loadSells()
         setupRecyclerView()
         observeSellsList()
         observePaymentConfirmation()
-        loadSells()
 //        getAllOrderCountsAndNavigate()
     }
 
@@ -211,6 +211,12 @@ class SellsListFragment : Fragment() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        viewModel.getSellList(status)
+        observeSellsList()
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null