diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 1daa0f2b..2a200038 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/com/swifttech/remit/android/features/kycV3/presenter/KYCV3ViewModel.java b/app/src/main/java/com/swifttech/remit/android/features/kycV3/presenter/KYCV3ViewModel.java index 1f42d2cf..f5870d9e 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/kycV3/presenter/KYCV3ViewModel.java +++ b/app/src/main/java/com/swifttech/remit/android/features/kycV3/presenter/KYCV3ViewModel.java @@ -50,7 +50,6 @@ import static android.app.Activity.RESULT_OK; public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInterface { - private static final int ID_CARD_VALID_LENGTH = 14; private static final int THUMBNAIL_HEIGHT = 150; private static final int THUMBNAIL_WIDTH = 150; private final KYCV3PresenterInterface.KYCV3ViewContractInterface view; @@ -632,7 +631,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter @Override public void sendFullKYCDataUpdate() { - postKYCFormToServer(validator.getKycRelatedDataDTO().getFullFormPostData(gateway.getUserID()), () -> view.onKYCFormSubmittedSuccessfully()); + postKYCFormToServer(validator.getKycRelatedDataDTO().getFullFormPostData(gateway.getUserID()), view::onKYCFormSubmittedSuccessfully); } private void postKYCFormToServer(KYCRequestDataDTO requestDataDTO, Runnable endWithTask) { @@ -963,10 +962,11 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter } if (alternateIdNumber == null || alternateIdNumber.length() == 0) { result = false; - } else if (alternateIdNumber.length() != ID_CARD_VALID_LENGTH) { - customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError(getStringfromStringId(R.string.national_id_number_error_text)); - result = false; } +// else if (alternateIdNumber.length() != ID_CARD_VALID_LENGTH) { +// customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError(getStringfromStringId(R.string.national_id_number_error_text)); +// result = false; +// } } else if (ID_TYPE_ALIEN_REGISTRATION_CARD.equalsIgnoreCase(selectedIdType)) { @@ -977,12 +977,13 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter result = false; } if (alternateIdNumber == null || alternateIdNumber.length() == 0) { - result = false; - } else if (alternateIdNumber.length() != ID_CARD_VALID_LENGTH) { - customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError(getStringfromStringId(R.string.alien_id_number_error_text)); - result = false; } +// else if (alternateIdNumber.length() != ID_CARD_VALID_LENGTH) { +// customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError(getStringfromStringId(R.string.alien_id_number_error_text)); +// +// result = false; +// } } else if (ID_TYPE_DRIVING_LICENSE.equalsIgnoreCase(selectedIdType)) { if (alternateIdExpiryDate == null || alternateIdExpiryDate.length() == 0) { result = false; @@ -992,10 +993,11 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter } if (alternateIdNumber == null || alternateIdNumber.length() == 0) { result = false; - } else if (alternateIdNumber.length() != ID_CARD_VALID_LENGTH) { - customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError(getStringfromStringId(R.string.driving_id_number_error_text)); - result = false; } +// else if (alternateIdNumber.length() != ID_CARD_VALID_LENGTH) { +// customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError(getStringfromStringId(R.string.driving_id_number_error_text)); +// result = false; +// } } else { customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError(null); result = false; @@ -1203,7 +1205,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter idNumber = kycRelatedDataDTO.getPrimaryInformation().getAnotherIDNumber(); idType = kycRelatedDataDTO.getPrimaryInformation().getAnotherIDType(); - return idNumber != null && idNumber.length() == ID_CARD_VALID_LENGTH && idType != null && idType.length() > 0; + return idNumber != null && idType != null && idType.length() > 0; } return false; @@ -1311,16 +1313,18 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter //Sender ID may be changed after kyc submission success so need to update locally and refresh auth token if ((userId != null && userId.length() > 0) && userPwd != null && userPwd.length() > 0) getNewAccessToken(task); - else if (task != null) - task.run(); + else + view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> { + if (task != null) + task.run(); + }); + } else if (task != null) task.run(); } else - //TODO mocking success server -// view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null); - task.run(); + view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null); } @Override diff --git a/app/src/main/java/com/swifttech/remit/android/features/kycV3/view/documents/KYCDocumentFragment.java b/app/src/main/java/com/swifttech/remit/android/features/kycV3/view/documents/KYCDocumentFragment.java index dc424631..1fb109c7 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/kycV3/view/documents/KYCDocumentFragment.java +++ b/app/src/main/java/com/swifttech/remit/android/features/kycV3/view/documents/KYCDocumentFragment.java @@ -292,7 +292,7 @@ public class KYCDocumentFragment extends BaseFragment { if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED && grantResults[2] == PackageManager.PERMISSION_GRANTED) { - cameraorGalleryChooser(CAMERA_REQUEST_PASSPORT, GALLERY_REQUEST_ALTERNATE_ID); + cameraorGalleryChooser(CAMERA_REQUEST_PASSPORT, GALLERY_REQUEST_PASSPORT); } else { Snackbar.make(rootView.getRootView(), getString(R.string.permission_denied_text), Snackbar.LENGTH_LONG).show(); diff --git a/app/src/main/java/com/swifttech/remit/android/features/loginV2/presenter/LoginV2Presenter.java b/app/src/main/java/com/swifttech/remit/android/features/loginV2/presenter/LoginV2Presenter.java index 86dce5b2..5241cd66 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/loginV2/presenter/LoginV2Presenter.java +++ b/app/src/main/java/com/swifttech/remit/android/features/loginV2/presenter/LoginV2Presenter.java @@ -72,7 +72,7 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI bindView(viewBindings); getLastLoginIfAvailable(); //TODO mock valid user -// mockValidUserLogin(); + mockValidUserLogin(); return loginViewLiveData; } @@ -81,8 +81,8 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI // loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(true,null,"4d544b3132bd58cb051d2cc6dfb445ae958f618cf84ace71184d983d8921224fa415c0b754accb7b3c356eef919dd90d0742d250c3be868711de6df6ccdbc886055cca39ad12e1577a3e3c682a5ff6e63fd1eb15")); // loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO<>(true,null,"subedi.msmanoj@gmail.com")); - loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(true,null,"7697882")); - loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO<>(true,null,"testsender@nepal.com")); + loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(true,null,"4351758")); + loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO<>(true,null,"saudsinghh@gmail.com")); //// // loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO<>(true,null,"yuio")); // loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(true,null,"123456")); diff --git a/app/src/main/java/com/swifttech/remit/android/features/recipientV3/presenter/recipientlistingV3/RecipientListingV3Presenter.java b/app/src/main/java/com/swifttech/remit/android/features/recipientV3/presenter/recipientlistingV3/RecipientListingV3Presenter.java index 8f46ad09..6e9d3927 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/recipientV3/presenter/recipientlistingV3/RecipientListingV3Presenter.java +++ b/app/src/main/java/com/swifttech/remit/android/features/recipientV3/presenter/recipientlistingV3/RecipientListingV3Presenter.java @@ -141,7 +141,7 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi @Override public void onPositiveBtnPressed() { - view.showPaymentSourceSelection(availablePaymentSources); + view.redirectToSendMoney(getSendMoneyRequiredData(null)); } }, send_money_to_string); return; diff --git a/app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/presenter/SendMoneyV2Presenter.java b/app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/presenter/SendMoneyV2Presenter.java index 256bd844..4f54f71d 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/presenter/SendMoneyV2Presenter.java +++ b/app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/presenter/SendMoneyV2Presenter.java @@ -112,7 +112,7 @@ public class SendMoneyV2Presenter extends BaseViewModel implements SendMoneyV2Pr String pMode = this.selectedRecipient.getPaymentMethod().getName().toUpperCase(); String pAmount = Utils.formatCurrencyWithoutTruncatingDecimal(this.selectedRecievingAmount) + " " + selectedSendingCurrency; String exRate = this.selectedExRate; - String serviceCharge = Utils.formatCurrency(calculatedDiscountedServiceFee()) + " KRW"; + String serviceCharge = Utils.formatCurrency(calculatedDiscountedServiceFee()) +" "+ Constants.MONGOLIA_CURRENCY; String accNo = null; String pAgent = null; diff --git a/app/src/main/res/layout/fragment_kyc_customer_detail.xml b/app/src/main/res/layout/fragment_kyc_customer_detail.xml index e08d2d5f..ada41d17 100644 --- a/app/src/main/res/layout/fragment_kyc_customer_detail.xml +++ b/app/src/main/res/layout/fragment_kyc_customer_detail.xml @@ -393,6 +393,7 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 957b6f54..00c2ace4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -737,7 +737,7 @@ Try to Penny Test Select City Mongolia Bank Information - Mongolia Bank + Select Mongolia Bank Passport Information Passport Number Passport Issued Date