ekyc issue fixes

app/src/main/java/com/remit/jmecustomer/base/PrefKeys.java

@@ -71,4 +71,6 @@ public class PrefKeys {
     public static String REWARD_POINTS = "REWARD_POINTS";
     public static String SELECTED_NATIONALITY = "SELECTED_NATIONALITY";
     public static String USE_NFC = "USE_NFC";
+
+    public static String MEMBERSHIP_ID = "MEMBERSHIP_ID";
 }

app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt

@@ -35,7 +35,9 @@ import com.bumptech.glide.signature.ObjectKey
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.remit.jmecustomer.R
+import com.remit.jmecustomer.RemitApplication
 import com.remit.jmecustomer.base.BaseFragment
+import com.remit.jmecustomer.base.PrefKeys
 import com.remit.jmecustomer.common.customwidgets.CurrencyFormatterTextWatcher
 import com.remit.jmecustomer.common.customwidgets.CustomAlertDialog
 import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog
@@ -244,6 +246,8 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
 
     fun displayUserInfo(body: HomeViewRelatedDTOV2) {
         binding.tvAccNo.text = body.referralCode
+        RemitApplication.getStorage().edit()
+            .putString(PrefKeys.MEMBERSHIP_ID, body.referralCode).apply()
         binding.tvAvlBalance.text = body.availableBalance + " " + "JPY"
         try {
             (requireActivity() as HomeActivityV3).binding.toolbarHead.tvProfileName.text =

app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3ViewModel.java

@@ -1039,23 +1039,26 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
 
 
         public boolean validateAdditionalIdType(IDTextDTO data) {
-            if (data != null) {
-                if (kycRelatedDataDTO.getPersonalInformation() == null)
-                    kycRelatedDataDTO.setPersonalInformation(new PersonalInfoDTO());
+            if (getKycSelectedOption().getType().equals("MKYC")) {
+                if (data != null) {
+                    if (kycRelatedDataDTO.getPersonalInformation() == null)
+                        kycRelatedDataDTO.setPersonalInformation(new PersonalInfoDTO());
 
-                kycRelatedDataDTO.getPersonalInformation().setAdditionalIdType(data.getId());
-                if (kycRelatedDataDTO.getPersonalInformation().isAdditionalIdTypeValid()) {
                     kycRelatedDataDTO.getPersonalInformation().setAdditionalIdType(data.getId());
-                    customerDetailLiveData.getAdditionalIdTypeLiveData().setValue(new FormInputStateDTO<>(true, null, null));
-                    return true;
+                    if (kycRelatedDataDTO.getPersonalInformation().isAdditionalIdTypeValid()) {
+                        kycRelatedDataDTO.getPersonalInformation().setAdditionalIdType(data.getId());
+                        customerDetailLiveData.getAdditionalIdTypeLiveData().setValue(new FormInputStateDTO<>(true, null, null));
+                        return true;
+                    } else {
+                        customerDetailLiveData.getAdditionalIdTypeLiveData().setValue(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.invalidAdditionalIdType_text), null));
+                        return false;
+                    }
                 } else {
                     customerDetailLiveData.getAdditionalIdTypeLiveData().setValue(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.invalidAdditionalIdType_text), null));
                     return false;
                 }
-            } else {
-                customerDetailLiveData.getAdditionalIdTypeLiveData().setValue(new FormInputStateDTO<>(false, view.getContext().getResources().getString(R.string.invalidAdditionalIdType_text), null));
-                return false;
             }
+            return true;
         }
 
         boolean validateOccupation(IDTextDTO data) {

app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java

@@ -222,10 +222,11 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
     private PublishSubject<Boolean> sideIdLoadedSubject;
     private PublishSubject<Boolean> additionalIdLoadedSubject;
     private PublishSubject<Boolean> additionalIdBackLoadedSubject;
-    private Activity kYCV4Activity;
 
     private KYCV4ViewModel kycv4ViewModel;
 
+    private Activity kYCV4Activity = null;
+
     public static KYCIDTypeFragment newInstance() {
         KYCIDTypeFragment kycidTypeFragment = new KYCIDTypeFragment();
         return kycidTypeFragment;
@@ -246,6 +247,7 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
 
 
     private void init() {
+        kYCV4Activity = getActivity();
         kycv3ViewModel = new ViewModelProvider(requireActivity()).get(KYCV3ViewModel.class);
     }
 
@@ -863,8 +865,11 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
             public void onCanceled(@NotNull TrustdockVerificationException e) {
                 try {
                     Intrinsics.checkNotNullParameter(e, "e");
+                    if (kYCV4Activity != null)
+                        ShowConfirmModal();
                 } catch (Exception exception) {
-
+                    if (kYCV4Activity != null)
+                        ShowConfirmModal();
                 }
             }
         };
@@ -947,4 +952,27 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
     public void showHideAdditionalBack(Boolean isBackRequired) {
         //@Todo
     }
+
+    public void ShowConfirmModal() {
+        try {
+            if (kYCV4Activity != null) {
+                AlertDialog.Builder alert = new AlertDialog.Builder(kYCV4Activity);
+                alert.setTitle("Info - " + RemitApplication.getStorage().getString(PrefKeys.MEMBERSHIP_ID, ""));
+                alert.setMessage("The selected EKYC process was unsuccessful. Kindly choose another KYC option from dashboard.");
+                alert.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (kYCV4Activity != null) {
+                            kYCV4Activity.finish();
+                        }
+                    }
+                });
+                alert.show();
+            } else
+                ShowConfirmModal();
+        } catch (Exception ex) {
+            ShowConfirmModal();
+        }
+    }
 }

app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/personal/CustomerDetailFragment.java

@@ -10,6 +10,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -31,6 +32,7 @@ import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3PresenterIn
 import com.remit.jmecustomer.features.kyc.newCustomer.presenter.KYCV3ViewModel;
 import com.remit.jmecustomer.features.newkyc.newCustomer.model.IDTextDTO;
 import com.remit.jmecustomer.utils.RxUtils;
+import com.remit.jmecustomer.utils.Utils;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/com/remit/jmecustomer/features/newkyc/newCustomer/model/KYCRelatedDataDTO.java

@@ -212,7 +212,7 @@ public class KYCRelatedDataDTO {
         if (registrationType.equals("EKYC")) {
             return new KYCRequestDataDTO("0", userId, getPersonalInformation(), null, registrationType, trustDockId);
         } else {
-            return new KYCRequestDataDTO("0", userId, getPersonalInformation(), getPictures().getPictureForSubmit(), registrationType, trustDockId);
+            return new KYCRequestDataDTO("0", userId, getPersonalInformation(), null, registrationType, trustDockId);
 
         }
     }