fix kyc screen not launching to correct screen

app/src/main/java/com/remit/jmecustomer/features/home/view/HomeActivityV2.java

@@ -518,7 +518,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
     @Override
     public void showKYCScreen(boolean isForExistingCustomer, boolean isKYCSubmitted) {
         if (isForExistingCustomer) {
-            ExistingKYCV3Activity.startActivity(this, false, "", "");
+            ExistingKYCV3Activity.startActivity(this, false, "", "",isKYCSubmitted);
         } else {
             KYCV3Activity.startActivity(this, false, "", "", isKYCSubmitted);
         }

app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3PresenterInterface.java

@@ -20,7 +20,7 @@ public interface ExistingKYCV3PresenterInterface extends BasePresenterInterface
 
     void checkImageStatus(int requestCode, int resultCode, File data);
 
-    void getKycRelatedData();
+    void getKycRelatedData(boolean isKYCSubmitted);
     void setNewToken(String newToken);
     void termsAndConditionAccept();
 

app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/presenter/ExistingKYCV3ViewModel.java

@@ -66,6 +66,7 @@ public class ExistingKYCV3ViewModel extends BaseViewModel implements ExistingKYC
     ExistingCustomerDetailViewLiveData.CustomerDetailViewBinding viewBindings;
     private CustomerDetailViewValidator validator;
     private String newToken;
+    private boolean isKYCSubmitted;
 
     public ExistingKYCV3ViewModel(KYCV3ViewContractInterface view, ExistingKYCV3GatewayInterface gatewayInterface, ExistingFileDownloadGateway existingFileDownloadGateway, LoginV2InteractorInterface.Login2GatewayInterface loginGateway, String userId, String userPwd) {
         this.compositeDisposable = new CompositeDisposable();
@@ -404,7 +405,8 @@ public class ExistingKYCV3ViewModel extends BaseViewModel implements ExistingKYC
 
 
     @Override
-    public void getKycRelatedData() {
+    public void getKycRelatedData(boolean isKYCSubmittedkey) {
+        isKYCSubmitted = isKYCSubmittedkey;
         viewSubscriptions.add(
                 Observable.combineLatest(
                         form1ValidationSubject,
@@ -604,6 +606,7 @@ public class ExistingKYCV3ViewModel extends BaseViewModel implements ExistingKYC
 
 
     }
+
     private boolean shouldPromptToInputAnswer(ExistingIDTextDTO data) {
         return (data != null && (view.getContext().getString(R.string.othersSpecify).equalsIgnoreCase(data.getText()) || view.getContext().getString(R.string.othersSpecify1).equalsIgnoreCase(data.getText()) || view.getContext().getString(R.string.othersSpecify2).equalsIgnoreCase(data.getText())));
     }
@@ -620,7 +623,7 @@ public class ExistingKYCV3ViewModel extends BaseViewModel implements ExistingKYC
             if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
                 onReceivingKycRelatedData(t.getData());
                 view.lazyLoadForms();
-                if (t.getData().areAnyPicturesAvailableFromServer())
+                if (t.getData().areAnyPicturesAvailableFromServer() && isKYCSubmitted)
                 view.showTermsAndCondition();
             /*    onReceivingKycRelatedData(gateway.getMockedData());
                 view.lazyLoadForms();

app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/ExistingKYCV3Activity.java

@@ -67,6 +67,7 @@ public class ExistingKYCV3Activity extends BaseActivity implements ExistingKYCV3
     private ExistingKycTermsAndConditionFragment existingKycTermsAndConditionFragment;
     private GenericViewPagerAdapter kycViewPagerAdapter;
     private ExistingKYCV3ViewModel viewModel;
+    private static boolean isKYCSubmitted = false;
 
     public static void startActivityForResult(Activity context, boolean shouldRedirectToPennyTestScreen, String userId, String userPwd) {
         Intent intent = new Intent(context, ExistingKYCV3Activity.class);
@@ -76,7 +77,8 @@ public class ExistingKYCV3Activity extends BaseActivity implements ExistingKYCV3
         context.startActivityForResult(intent, KYC_EXISTING_FORM_REQUEST_CODE);
     }
 
-    public static void startActivity(Activity context, boolean shouldRedirectToPennyTestScreen, String userId, String userPwd) {
+    public static void startActivity(Activity context, boolean shouldRedirectToPennyTestScreen, String userId, String userPwd, boolean isKYCSubmittedKey) {
+        isKYCSubmitted = isKYCSubmittedKey;
         Intent intent = new Intent(context, ExistingKYCV3Activity.class);
         intent.putExtra(SHOULD_REDIRECT_TO_PENNY_TEST_BUNDLE_KEY, shouldRedirectToPennyTestScreen);
         intent.putExtra(USER_ID_BUNDLE_KEY, userId);
@@ -95,7 +97,7 @@ public class ExistingKYCV3Activity extends BaseActivity implements ExistingKYCV3
     }
 
     private void performDefaultAction(Bundle savedInstanceState) {
-        viewModel.getKycRelatedData();
+        viewModel.getKycRelatedData(isKYCSubmitted);
 
     }