.

app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java

@@ -3,7 +3,6 @@ package com.ssb.simplitend.caregiverdashboard.activities;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
@@ -51,6 +50,12 @@ public class CaregiverDashActivity extends AppCompatActivity implements
 
         clickEvents();
 
+        CaregiverDataCache.getCaregiverData(this, (careGiverData) -> {
+            this.careGiverData = careGiverData;
+
+            watchSubscription();
+        }, true);
+
     }
 
     @Override
@@ -59,7 +64,6 @@ public class CaregiverDashActivity extends AppCompatActivity implements
         CaregiverDataCache.getCaregiverData(this, (careGiverData) -> {
             this.careGiverData = careGiverData;
 
-            watchSubscription();
             setLayoutDetails();
         }, true);
     }
@@ -98,9 +102,6 @@ public class CaregiverDashActivity extends AppCompatActivity implements
                 .inject();
 
         binding.bottomNav.setItemSelectListener(this);
-
-        // initializing dashboard fragment
-        replaceFragment(new CgDashBoardFragment(), "dashboard");
         
     }
 
@@ -156,8 +157,12 @@ public class CaregiverDashActivity extends AppCompatActivity implements
                 intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 startActivity(intent);
                 finish();
+                return;
             }
         }
+
+        // initializing dashboard fragment
+        replaceFragment(new CgDashBoardFragment(), "dashboard");
     }
 
     private void setLayoutDetails() {

app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java

@@ -7,6 +7,7 @@ import static com.ssb.simplitend.cg_geofencing.CgGeoFencingActivity.GEOFENCE_DET
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -86,6 +87,7 @@ public class CgDashBoardFragment extends Fragment implements
     @Override
     public void onResume() {
         super.onResume();
+        Log.d("aditya", "onResume: ");
         CaregiverDataCache.getCaregiverData(requireActivity(), (careGiverData1 -> {
             this.careGiverData = careGiverData1;
 

app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java

@@ -222,7 +222,7 @@ public class SplashFragment extends Fragment
         binding.retry.setVisibility(View.GONE);
         binding.loadAnim.setVisibility(View.GONE);
 
-        if (patientData.isCareGiverConnectedWithPatient == 1){
+        if (patientData.isCareGiverConnectedWithPatient == 1 && patientData.isCaregiverTakeSubscription == 1){
             // go to dashboard
             gotoPatientDashBoard();
         }else if (patientData.isCareGiverLink == 1){