diff --git a/app/src/main/java/com/swifttech/remit/android/features/kyc/newCustomer/presenter/KYCV3ViewModel.java b/app/src/main/java/com/swifttech/remit/android/features/kyc/newCustomer/presenter/KYCV3ViewModel.java
index 720a114c..0caabea7 100644
--- a/app/src/main/java/com/swifttech/remit/android/features/kyc/newCustomer/presenter/KYCV3ViewModel.java
+++ b/app/src/main/java/com/swifttech/remit/android/features/kyc/newCustomer/presenter/KYCV3ViewModel.java
@@ -1036,7 +1036,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
if ((userId != null && userId.length() > 0) && userPwd != null && userPwd.length() > 0)
getNewAccessToken(task);
else if (task != null)
- view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> {
+ view.showPopUpMessage(view.getContext().getResources().getString(R.string.registration_success_message_text), CustomAlertDialog.AlertType.SUCCESS, alertType -> {
if (task != null)
task.run();
});
diff --git a/app/src/main/java/com/swifttech/remit/android/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java b/app/src/main/java/com/swifttech/remit/android/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java
index 4a52afb2..cf4c75a4 100644
--- a/app/src/main/java/com/swifttech/remit/android/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java
+++ b/app/src/main/java/com/swifttech/remit/android/features/security/auth/RemitTxnPinPromptBottomSheetDialog.java
@@ -96,7 +96,6 @@ public class RemitTxnPinPromptBottomSheetDialog extends BottomSheetDialogFragmen
ButterKnife.bind(this, v);
init();
performDefaultAction();
-
return v;
}
@@ -127,7 +126,7 @@ public class RemitTxnPinPromptBottomSheetDialog extends BottomSheetDialogFragmen
private void init() {
compositeDisposable = new CompositeDisposable();
- otpView.setInputType(InputType.TYPE_NULL);
+// otpView.setInputType(InputType.TYPE_NULL);
enteredPin="";
}
diff --git a/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyRequestSummaryActivity.java b/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyRequestSummaryActivity.java
index e4c93d74..0ca7f578 100644
--- a/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyRequestSummaryActivity.java
+++ b/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyRequestSummaryActivity.java
@@ -186,7 +186,7 @@ public class SendMoneyRequestSummaryActivity extends BaseActivity implements Se
String middlName = recieptData.getRMiddleName() == null || recieptData.getRMiddleName().equalsIgnoreCase(" ") ? "" : recieptData.getRMiddleName() + " ";
String name = recieptData.getRFirstName() + " " + middlName + recieptData.getRLastName();
- payoutAmountTextView.setText(recieptData.getPAmount());
+ payoutAmountTextView.setText(recieptData.getPayOutAmount());
if (isRequestedBySendMoney) {
gmeControlNumberTextView.setVisibility(View.GONE);
txv_note.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/verification/VerificationSendMoneyFragment.java b/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/verification/VerificationSendMoneyFragment.java
index a3b0e7bf..c194b601 100644
--- a/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/verification/VerificationSendMoneyFragment.java
+++ b/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/verification/VerificationSendMoneyFragment.java
@@ -150,6 +150,8 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View
{
bankAcNoContainer.setVisibility(View.VISIBLE);
txt_bankAcNo.setText(verificationViewModel.getBankAcNo());
+ }else{
+ bankAcNoContainer.setVisibility(View.GONE);
}
String pAgent=verificationViewModel.getpAgent();
diff --git a/app/src/main/res/drawable/bg_verification_detail_patch.9.png b/app/src/main/res/drawable/bg_verification_detail_patch.9.png
index 598d44b6..0cb1083a 100644
Binary files a/app/src/main/res/drawable/bg_verification_detail_patch.9.png and b/app/src/main/res/drawable/bg_verification_detail_patch.9.png differ
diff --git a/app/src/main/res/layout/fragment_verification_send_money_v2.xml b/app/src/main/res/layout/fragment_verification_send_money_v2.xml
index 6710eacc..9f51bec2 100644
--- a/app/src/main/res/layout/fragment_verification_send_money_v2.xml
+++ b/app/src/main/res/layout/fragment_verification_send_money_v2.xml
@@ -9,16 +9,16 @@
android:scrollbars="none">
+ android:background="@drawable/bg_dotted" />
@@ -280,9 +279,8 @@
android:id="@+id/pAgentContainerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
-
- android:paddingTop="@dimen/_8sdp">
+ android:paddingTop="@dimen/_8sdp"
+ android:orientation="horizontal">
+ android:layout_marginBottom="@dimen/_10sdp"
+ android:orientation="horizontal">
-
+ android:textSize="@dimen/_11ssp"
+ android:visibility="gone" />
+ android:textSize="@dimen/_11ssp"
+ android:visibility="gone" />
+ android:textSize="@dimen/_11ssp"
+ android:visibility="gone" />
diff --git a/app/src/main/res/layout/gme_txn_pin_prompt_modal.xml b/app/src/main/res/layout/gme_txn_pin_prompt_modal.xml
index 88849f1e..4708cf5e 100644
--- a/app/src/main/res/layout/gme_txn_pin_prompt_modal.xml
+++ b/app/src/main/res/layout/gme_txn_pin_prompt_modal.xml
@@ -51,7 +51,7 @@
android:layout_gravity="center"
android:layout_marginTop="@dimen/_10sdp"
android:inputType="numberPassword"
- android:textColor="@color/darkgray"
+ android:textColor="@color/colorAccent"
app:itemCount="6"
app:layout_constraintBottom_toTopOf="@+id/constraintLayout3"
app:lineColor="@color/colorPrimary"
diff --git a/app/src/main/res/layout/send_money_request_summary_layout.xml b/app/src/main/res/layout/send_money_request_summary_layout.xml
index d32ea4ef..73fe4685 100644
--- a/app/src/main/res/layout/send_money_request_summary_layout.xml
+++ b/app/src/main/res/layout/send_money_request_summary_layout.xml
@@ -355,7 +355,7 @@
android:layout_height="wrap_content"
android:gravity="left"
android:padding="@dimen/_8sdp"
- android:text="@string/payout_agent_bank_text"
+ android:text="@string/payout_agent_text"
android:textColor="@color/darkgray"
android:textSize="@dimen/_11ssp" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e95e086d..4e79cf04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -192,7 +192,7 @@
Paying Amount
Exchange Rate
Service Charge
- Payout Agent
+ Payout Agent/Bank
I have read and agreed to
1. JME Remittance User Agreement
Agree and Send
@@ -751,7 +751,7 @@ All the configurations are done from backend web application system which allows
Save and Next
Reference code must be of 4 digit
Do you have a phone number registered with Alien Registration Card under your name?
- Thank you for registering for Japan Money Express. We are verifying your information. Once approved, you will receive SMS.
+ Thank you for registering for Japan Money \n Express. We are verifying your information. \n Once approved, you will receive SMS.
GPS is not turned on
Please grant the required permissions.
Could not fetch location at the moment. Try again later.
@@ -1018,6 +1018,5 @@ All the configurations are done from backend web application system which allows
Please make payment of
to JME within next working day to transmit this request.\nAfter payment please check notices to get JME Number for this transfer.
REQUEST SUMMARY
- Payout Agent/Bank
Password should contain atleast one number,one uppercase letter and minimum 8 Characters