IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Minor kyc related fixes

master
Preyea Regmi 4 years ago
parent
44fa34f582
commit
13c09eefc4
8 changed files with 30 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 40
      app/src/main/java/com/swifttech/remit/android/features/kycV3/presenter/KYCV3ViewModel.java
  3. 2
      app/src/main/java/com/swifttech/remit/android/features/kycV3/view/documents/KYCDocumentFragment.java
  4. 6
      app/src/main/java/com/swifttech/remit/android/features/loginV2/presenter/LoginV2Presenter.java
  5. 2
      app/src/main/java/com/swifttech/remit/android/features/recipientV3/presenter/recipientlistingV3/RecipientListingV3Presenter.java
  6. 2
      app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/presenter/SendMoneyV2Presenter.java
  7. 1
      app/src/main/res/layout/fragment_kyc_customer_detail.xml
  8. 2
      app/src/main/res/values/strings.xml

BIN
.idea/caches/build_file_checksums.ser
View File

40
app/src/main/java/com/swifttech/remit/android/features/kycV3/presenter/KYCV3ViewModel.java
View File

@ -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

2
app/src/main/java/com/swifttech/remit/android/features/kycV3/view/documents/KYCDocumentFragment.java
View File

@ -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();

6
app/src/main/java/com/swifttech/remit/android/features/loginV2/presenter/LoginV2Presenter.java
View File

@ -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"));

2
app/src/main/java/com/swifttech/remit/android/features/recipientV3/presenter/recipientlistingV3/RecipientListingV3Presenter.java
View File

@ -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;

2
app/src/main/java/com/swifttech/remit/android/features/sendmoneyV2/presenter/SendMoneyV2Presenter.java
View File

@ -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;

1
app/src/main/res/layout/fragment_kyc_customer_detail.xml
View File

@ -393,6 +393,7 @@
<com.swifttech.remit.android.common.view.MTextInputLayout
android:visibility="gone"
android:id="@+id/anotherExpiryDateWrapper"
android:hint="@string/another_id_expiry_date_text"
style="@style/MTextInputLayoutFormDropDown"
app:errorEnabled="true">

2
app/src/main/res/values/strings.xml
View File

@ -737,7 +737,7 @@
<string name="step3_sub_title_text">Try to Penny Test</string>
<string name="select_city_text">Select City</string>
<string name="korea_bank_infornation_text">Mongolia Bank Information</string>
<string name="korea_bank_placeholder_text">Mongolia Bank</string>
<string name="korea_bank_placeholder_text">Select Mongolia Bank</string>
<string name="passport_information_text">Passport Information</string>
<string name="passport_number_text">Passport Number</string>
<string name="passport_issue_date_text">Passport Issued Date</string>

Write Preview
Loading…
Cancel
Save