From 45f1ab2766e2f5208f4be0a2b883bf10c21ad8e6 Mon Sep 17 00:00:00 2001 From: Santosh Bhandary Date: Thu, 1 Jul 2021 14:39:13 +0545 Subject: [PATCH] Native country not selected on add beneficiary case solved with Autocomplete Text underline problem solved --- app/src/main/AndroidManifest.xml | 1 + .../features/home/view/HomeFragmentV2.java | 2 +- .../adapter/RecipientListingV3RvAdapter.java | 5 +++ .../RecipientAddV3ContractInterface.java | 1 + .../RecipientDetailValidatorV3.java | 1 + .../RecipientPresenterInterface.java | 2 ++ .../add/RecipientAddV3ViewModel.java | 5 +-- .../edit/RecipientEditV3ViewModel.java | 4 +-- .../BeneficiaryAddEditV3Fragment.java | 10 ++++++ .../RecipientListingV3Activity.java | 35 ++++++++++++++++++- .../SendMoneyTransactionCompleteModel.java | 14 ++++++++ ...ndMoneyTransactionCompleteV2Presenter.java | 5 +++ ...ansactionCompleteV2PresenterInterface.java | 4 ++- .../view/SendMoneyRequestSummaryActivity.java | 11 ++++++ ...endMoneyV2TransactionCompleteActivity.java | 22 ++++++------ .../remit/jmecustomer/utils/Constants.java | 1 + ...ity_send_money_v2_transaction_complete.xml | 2 ++ .../layout/fragment_beneficiary_add_edit.xml | 10 ++++++ .../fragment_beneficiary_add_edit_v3.xml | 12 ++++++- .../layout/fragment_ccdi_send_money_v2.xml | 2 ++ ...existing_customer_registration_request.xml | 1 + .../fragment_existing_kyc_customer_detail.xml | 5 +++ .../layout/fragment_kyc_customer_detail.xml | 5 +++ app/src/main/res/values/strings.xml | 2 ++ 24 files changed, 143 insertions(+), 19 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1c948e3a..876fb11a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="com.swifttech.remit.jmecustomer"> + diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java index 2db3f026..bfed5693 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java @@ -260,7 +260,7 @@ public class HomeFragmentV2 extends BaseFragment implements } else if (notificationView instanceof ChangePinNPassNotificationView) { homeViewModel.showChangePinNPassScreen(); } else if (notificationView instanceof EmailNotVerifiedView) { - homeViewModel.showVerifyEmailDialog(); + homeViewModel.requestForOtp(); } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/adapter/RecipientListingV3RvAdapter.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/adapter/RecipientListingV3RvAdapter.java index a437fc20..c9399a50 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/adapter/RecipientListingV3RvAdapter.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/adapter/RecipientListingV3RvAdapter.java @@ -43,6 +43,7 @@ public class RecipientListingV3RvAdapter extends RecyclerView.Adapter{ + showDeleteConfirmationDialog(data.get(holder.getAdapterPosition())); if(listener!=null) listener.proceedToDeleteRecipient(data.get(holder.getAdapterPosition())); }); @@ -124,6 +125,10 @@ public class RecipientListingV3RvAdapter extends RecyclerView.Adapter recievedData) { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java index 0d7b372f..563dec7e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientAddV3ContractInterface.java @@ -52,6 +52,7 @@ public interface RecipientAddV3ContractInterface extends BaseContractInterface void updateValueToWidgetSelectedPaymentMethod(String description); void showCountrySelectionView(boolean visiblity); + void showNativeCountrySelectionView(boolean visiblity); void showPaymentSelectionView(boolean visiblity); void updateValidationRuleToWidgetPaymentMethodSelection(boolean visiblity); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java index a39b8ca1..21601882 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java @@ -1019,6 +1019,7 @@ public class RecipientDetailValidatorV3 { view.getRecipientAddEditV3ContractInterface().updateValidationRuleToWidgetNativeCountry(isFieldRequired, EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), rule.getMaxFieldLengthInt())); + view.getRecipientAddEditV3ContractInterface().showNativeCountrySelectionView(isFieldRequired); if (isFieldRequired) { if (checkStringNotEmpty(recipientInfo.getNativeCountry()) || rule.isOptional()) rule.updateValidity(true); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java index 56605508..159c0c54 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java @@ -98,4 +98,6 @@ public interface RecipientPresenterInterface extends BasePresenterInterface { void onNativeCountryServiceSelected(NativeCountry selectedNativeCountry); + void getDynamicValidationAndDropDownList(String countryId, String serviceType); + } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java index 41cafa09..85d9b936 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java @@ -89,8 +89,8 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel { ); } - - private void getDynamicValidationAndDropDownList(String countryId, String serviceTypeId) { + @Override + public void getDynamicValidationAndDropDownList(String countryId, String serviceTypeId) { compositeDisposable.add( this.gateway.getDynamicValidationRules(gateway.getAuth(), gateway.getUserID(), countryId, serviceTypeId) .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) @@ -248,6 +248,7 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel { @Override protected void onSuccess(GenericResponseDataModel t) { if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { + validator.updateDynamicValidationModel(t.getData()); applyValidationRulesToView(t.getData().getValidationRuleList()); validator.validateAll(); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java index 141fe69b..ed848e3a 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java @@ -161,8 +161,8 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel { .subscribeWith(new CountryServiceObserver()) ); } - - private void getDynamicValidationAndDropDownList(String countryId, String serviceType) { + @Override + public void getDynamicValidationAndDropDownList(String countryId, String serviceType) { compositeDisposable.add( this.gateway.getDynamicValidationRules(gateway.getAuth(), gateway.getUserIDNumber(), countryId, serviceType) .delay(500, TimeUnit.MILLISECONDS) diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java index d9cbd1c8..1f6293f9 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/BeneficiaryAddEditV3Fragment.java @@ -169,6 +169,16 @@ public class BeneficiaryAddEditV3Fragment extends BaseFragment implements Recipi } + @Override + public void showNativeCountrySelectionView(boolean visiblity) { + if(visiblity){ + binding.recieverNativeCountryViewContainer.setVisibility(View.VISIBLE); + }else{ + binding.recieverNativeCountryViewContainer.setVisibility(GONE); + } + + } + @Override public void showPaymentSelectionView(boolean visiblity) { if (visiblity) diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java index f0e0ff17..1ec5bf33 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java @@ -1,16 +1,20 @@ package com.swifttech.remit.jmecustomer.features.recipientmanagement.view.recipientlistingV3; +import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.EditText; import android.widget.FrameLayout; +import androidx.appcompat.app.AlertDialog; import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.CollapsingToolbarLayout; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.swifttech.remit.jmecustomer.R; import com.swifttech.remit.jmecustomer.base.BaseActivity; import com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView; @@ -254,7 +258,7 @@ public class RecipientListingV3Activity extends BaseActivity @Override public void proceedToDeleteRecipient(ReceiverInfoV3Model receiverInfoV3Model) { - presenter.deleteRecipient(receiverInfoV3Model.getReceiverId()); + showBeneficiaryDeleteConfirmDialog(receiverInfoV3Model); } @@ -293,4 +297,33 @@ public class RecipientListingV3Activity extends BaseActivity presenter.searchForReciever(text); } } + + private void showBeneficiaryDeleteConfirmDialog(ReceiverInfoV3Model receiverInfoV3Model) { + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this); + + builder.setTitle(getString(R.string.delete_beneficiary_title_text)) + + .setMessage(getString(R.string.delete_beneficiary_confirmation_text)) + .setPositiveButton(getString(R.string.yes_text), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { +// changeLocaleTest(); + presenter.deleteRecipient(receiverInfoV3Model.getReceiverId()); + } + }) + .setNegativeButton(getString(R.string.no_text), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + dialogInterface.dismiss(); + } + }); + + AlertDialog alert = builder.create(); + alert.show(); + alert.setCancelable(true); + alert.getButton(DialogInterface.BUTTON_POSITIVE).setAllCaps(false); + alert.getButton(DialogInterface.BUTTON_NEGATIVE).setAllCaps(false); + alert.getButton(DialogInterface.BUTTON_NEGATIVE).setTextColor(ContextCompat.getColor(this, R.color.black)); + alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(ContextCompat.getColor(this, R.color.colorPrimary)); + } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteModel.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteModel.java index 7f2682ca..ec397b16 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteModel.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/model/SendMoneyTransactionCompleteModel.java @@ -103,6 +103,12 @@ public class SendMoneyTransactionCompleteModel { @SerializedName("note") @Expose private String note; + + @SerializedName("tranStatus") + @Expose + private String tranStatus; + + public String getControlNo() { return controlNo; } @@ -462,4 +468,12 @@ public class SendMoneyTransactionCompleteModel { public void setNote(String note) { this.note = note; } + + public String getTranStatus() { + return tranStatus; + } + + public void setTranStatus(String tranStatus) { + this.tranStatus = tranStatus; + } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2Presenter.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2Presenter.java index 996bd95f..0ce630d7 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2Presenter.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2Presenter.java @@ -52,6 +52,11 @@ public class SendMoneyTransactionCompleteV2Presenter extends BasePresenter imple SendMoneyTransactionCompleteModel data = sendMoneyTransactionCompleteV2ResponseBody.getData(); if(sendMoneyTransactionCompleteV2ResponseBody.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { + if(!data.getTranStatus().equalsIgnoreCase(Constants.CANCEL)){ + view.showCancelActive(true); + }else{ + view.showCancelActive(false); + } view.showReceiptData(data); if("Y".equalsIgnoreCase(data.getShowPartnerLogo())) { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java index a183a234..ff60a5e2 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java @@ -13,9 +13,11 @@ public interface SendMoneyTransactionCompleteV2PresenterInterface extends BasePr interface SendMoneyTransactionCompleteV2PresenterInterfaceV2ContractInterface extends BaseContractInterface { - void showReceiptData(SendMoneyTransactionCompleteModel recieptData); + void showReceiptData(SendMoneyTransactionCompleteModel receiptData); void showPartnerInfo(boolean action,String partnerText,String partnerLogoUrl,String note); + void showCancelActive(boolean isActive); + } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java index ea6cf97e..42310a37 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java @@ -256,6 +256,17 @@ public class SendMoneyRequestSummaryActivity extends BaseActivity implements Se } } + @Override + public void showCancelActive(boolean isActive) { + if(isActive){ + btnSubmit.setVisibility(View.VISIBLE); + ammendmentOperationViewContainer.setVisibility(View.GONE); + }else{ + btnSubmit.setVisibility(View.GONE); + ammendmentOperationViewContainer.setVisibility(View.VISIBLE); + } + } + @Override public void onClick(View v) { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java index 82c97240..9e1393f3 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java @@ -121,7 +121,6 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme try { transactionId = getIntent().getStringExtra(SEND_MONEY_TID_BUNDLE_KEY); isRequestedBySendMoney = getIntent().getBooleanExtra(IS_TRANSACTION_DETAIL_REQUEST_FROM_SEND_MONEY_BUNDLE_KEY, false); - prepareForm(); if (!isRequestedBySendMoney) { controlId = getIntent().getStringExtra(SEND_MONEY_CONTROL_NO_BUNDLE_KEY); } @@ -138,16 +137,6 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme } - private void prepareForm() { - if (isRequestedBySendMoney) { - btnSubmit.setVisibility(View.VISIBLE); - ammendmentOperationViewContainer.setVisibility(View.GONE); - } else { - btnSubmit.setVisibility(View.GONE); - ammendmentOperationViewContainer.setVisibility(View.VISIBLE); - } - } - private void getReceiptData() { this.presenter.getReceiptData(transactionId); this.cancel.setVisibility(View.GONE); @@ -252,6 +241,17 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme } } + @Override + public void showCancelActive(boolean isActive) { + if(isActive){ + btnSubmit.setVisibility(View.VISIBLE); + ammendmentOperationViewContainer.setVisibility(View.GONE); + }else{ + btnSubmit.setVisibility(View.GONE); + ammendmentOperationViewContainer.setVisibility(View.VISIBLE); + } + } + @Override public void onClick(View v) { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/Constants.java b/app/src/main/java/com/swifttech/remit/jmecustomer/utils/Constants.java index 271c1622..672f4a50 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/Constants.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/utils/Constants.java @@ -56,5 +56,6 @@ public class Constants { public static String REQUEST_FOR_REG_VALUE="REGISTER"; public static String REQUEST_FOR_REC_VALUE="RECEIVER"; public static String RECEIVER_ID_KEY="receiverId"; + public static String CANCEL="Cancel"; } diff --git a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml index d659ab04..2ccc3d5c 100644 --- a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml +++ b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml @@ -535,6 +535,7 @@ android:layout_marginBottom="30dp" android:enabled="true" android:text="@string/done_text" + android:visibility="gone" android:textAllCaps="false" android:textColor="@color/white" android:textSize="@dimen/_12ssp" /> @@ -544,6 +545,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" + android:visibility="gone" android:layout_marginBottom="30dp" android:orientation="horizontal" android:weightSum="1"> diff --git a/app/src/main/res/layout/fragment_beneficiary_add_edit.xml b/app/src/main/res/layout/fragment_beneficiary_add_edit.xml index c2a7b10a..3370efcd 100644 --- a/app/src/main/res/layout/fragment_beneficiary_add_edit.xml +++ b/app/src/main/res/layout/fragment_beneficiary_add_edit.xml @@ -76,6 +76,7 @@ @@ -92,6 +93,7 @@ @@ -106,6 +108,7 @@ @@ -119,6 +122,7 @@ @@ -347,6 +351,7 @@ @@ -379,6 +384,7 @@ @@ -393,6 +399,7 @@ @@ -459,6 +466,7 @@ @@ -473,6 +481,7 @@ @@ -515,6 +524,7 @@ diff --git a/app/src/main/res/layout/fragment_beneficiary_add_edit_v3.xml b/app/src/main/res/layout/fragment_beneficiary_add_edit_v3.xml index d7eea198..94cd7d2b 100644 --- a/app/src/main/res/layout/fragment_beneficiary_add_edit_v3.xml +++ b/app/src/main/res/layout/fragment_beneficiary_add_edit_v3.xml @@ -76,6 +76,7 @@ @@ -92,6 +93,7 @@ @@ -106,6 +108,7 @@ @@ -119,6 +122,7 @@ @@ -347,6 +351,7 @@ @@ -379,6 +384,7 @@ @@ -393,6 +399,7 @@ @@ -459,6 +466,7 @@ @@ -468,7 +476,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:visibility="visible"> + android:visibility="gone"> diff --git a/app/src/main/res/layout/fragment_ccdi_send_money_v2.xml b/app/src/main/res/layout/fragment_ccdi_send_money_v2.xml index 27adcd9b..fc33a576 100644 --- a/app/src/main/res/layout/fragment_ccdi_send_money_v2.xml +++ b/app/src/main/res/layout/fragment_ccdi_send_money_v2.xml @@ -41,6 +41,7 @@ @@ -55,6 +56,7 @@ diff --git a/app/src/main/res/layout/fragment_existing_customer_registration_request.xml b/app/src/main/res/layout/fragment_existing_customer_registration_request.xml index f1f86e79..63f8ce12 100644 --- a/app/src/main/res/layout/fragment_existing_customer_registration_request.xml +++ b/app/src/main/res/layout/fragment_existing_customer_registration_request.xml @@ -77,6 +77,7 @@ diff --git a/app/src/main/res/layout/fragment_existing_kyc_customer_detail.xml b/app/src/main/res/layout/fragment_existing_kyc_customer_detail.xml index 099090c4..84937d97 100644 --- a/app/src/main/res/layout/fragment_existing_kyc_customer_detail.xml +++ b/app/src/main/res/layout/fragment_existing_kyc_customer_detail.xml @@ -70,6 +70,7 @@ @@ -125,6 +126,7 @@ @@ -165,6 +167,7 @@ @@ -196,6 +199,7 @@ @@ -213,6 +217,7 @@ 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 71cc20d0..b1b2f675 100644 --- a/app/src/main/res/layout/fragment_kyc_customer_detail.xml +++ b/app/src/main/res/layout/fragment_kyc_customer_detail.xml @@ -70,6 +70,7 @@ @@ -128,6 +129,7 @@ @@ -177,6 +179,7 @@ @@ -208,6 +211,7 @@ @@ -226,6 +230,7 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e182cfe6..3d45e346 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1053,4 +1053,6 @@ All the configurations are done from backend web application system which allows Specify Id Type CCDI Invalid Purpose of Remittance + Are you sure, You want to delete beneficiary? + Delete Beneficiary