diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
index 2f8ef2b..ddb5fd4 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
@@ -50,19 +50,7 @@ class TestRightResults : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         setupListeners()
         updateResults()
-        binding.ivHome.setOnClickListener {
-            CoroutineScope(Dispatchers.IO).launch {
 
-                if (binding.etBloodGroup.equals("") || binding.etBloodGroup.equals("Select Blood Group")) {
-                    binding.etBloodGroup.error = "Please enter your blood group"
-                    Toast.makeText(context, "Please enter your blood group", Toast.LENGTH_SHORT).show()
-                }else{
-                    bloodGroup = binding.etBloodGroup.text.toString()
-                    checkBloodGroup()
-                }
-
-            }
-        }
         viewModel.fireBaseUpload.observe(viewLifecycleOwner) {
             if (it == "Success") {
                 Toast.makeText(
@@ -75,7 +63,25 @@ class TestRightResults : Fragment() {
     }
 
     private fun setupListeners() {
+        binding.ivHome.setOnClickListener {
+            CoroutineScope(Dispatchers.IO).launch {
 
+                // Get the text from the EditText
+                val bloodGroupText = binding.etBloodGroup.text.toString()
+
+                if (bloodGroupText.isBlank() || bloodGroupText == "Select Blood Group") {
+                    // Show error on EditText
+                    binding.etBloodGroup.error = "Please enter your blood group"
+
+                    // Show toast message
+                    Toast.makeText(context, "Please enter your blood group", Toast.LENGTH_SHORT).show()
+                } else {
+                    // No error, continue with the logic
+                    bloodGroup = bloodGroupText
+                    checkBloodGroup()
+                }
+            }
+        }
         binding.ivNext.setOnClickListener {
             val i = Intent(requireContext().applicationContext, DashboardActivity::class.java)
             startActivity(i)