KYC fixes

app/src/main/java/com/swifttech/remit/android/features/kyc/presenter/KYCV3ViewModel.java

@@ -195,9 +195,6 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
 
 
     private void onReceivingKycRelatedData(KYCRelatedDataDTO data) {
-
-
-//        data.setNativeCountriesList(gateway.getNativeCountryList(view.getContext()));
         data.seedInitialData();
         data.formatToUpperCase();
         this.validator = new CustomerDetailViewValidator(data);
@@ -586,23 +583,20 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
 
         @Override
         protected void onSuccess(GenericResponseDataModel<KYCRelatedDataDTO> t) {
-//            if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
-//                onReceivingKycRelatedData(t.getData());
-//                view.lazyLoadForms();
-//                if (t.getData().areAnyPicturesAvailableFromServer())
-//                    view.showDocumentDetailForm();
-//
-//            } else
-//                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
-            onReceivingKycRelatedData(gateway.getMockedData());
-            view.lazyLoadForms();
+            if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
+                onReceivingKycRelatedData(t.getData());
+                view.lazyLoadForms();
+                if (t.getData().areAnyPicturesAvailableFromServer())
+                    view.showDocumentDetailForm();
+
+            } else
+                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+
         }
 
         @Override
         public void onFailed(String message) {
-            onReceivingKycRelatedData(gateway.getMockedData());
-            view.lazyLoadForms();
-//            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
         }
 
         @Override