.

app/src/main/java/com/ssb/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java

@@ -108,12 +108,16 @@ public class PatientDashboardFragment extends Fragment {
             // fake sign out
             // TODO: 08-08-2023 remove this
 
-            AppUtil.patientSignOut(requireContext());
+            AppUtil.showAlert(requireContext(),
+                    "Test mode", "Do you want to log out?",
+                    "LOG OUT", ((dialogInterface, i) -> {
+                        AppUtil.patientSignOut(requireContext());
 
-            Intent intent = new Intent(requireActivity(), WelcomeActivity.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-            startActivity(intent);
-            requireActivity().finish();
+                        Intent intent = new Intent(requireActivity(), WelcomeActivity.class);
+                        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                        startActivity(intent);
+                        requireActivity().finish();
+                    }), "Cancel", ((dialogInterface, i) -> {}));
         });
 
         binding.closeReminder.setOnClickListener(v -> removeReminder());

app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java

@@ -344,8 +344,6 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
             binding.caregiverCheckView.setVisibility(View.VISIBLE);
             this.mustBeeCaregiver = true;
             binding.caregiverCheck.setChecked(true);
-        } else {
-            binding.caregiverCheckView.setVisibility(View.GONE);
         }
 
         // checking if there is any SOS contact already in list
@@ -372,6 +370,7 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
 
         } else {
             binding.sosCheckView.setVisibility(View.VISIBLE);
+            binding.defaultSos.setVisibility(View.VISIBLE);
         }
 
         progressDialog.dismiss();