minor bug fixes

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

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="";
     }
 

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

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

app/src/main/res/layout/fragment_verification_send_money_v2.xml

@@ -9,16 +9,16 @@
     android:scrollbars="none">
 
     <LinearLayout
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
 
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
             android:background="@drawable/bg_verification_detail_patch"
+            android:orientation="vertical"
             android:padding="@dimen/_16sdp">
 
             <com.swifttech.remit.android.common.customwidgets.GmeTextView
@@ -133,16 +133,15 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="5dp"
-                android:background="@drawable/bg_dotted"
                 android:layout_marginTop="@dimen/_12sdp"
-                />
+                android:background="@drawable/bg_dotted" />
 
 
             <com.swifttech.remit.android.common.customwidgets.GmeTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="start"
                 android:layout_marginTop="@dimen/_12sdp"
+                android:gravity="start"
                 android:text="@string/transaction_detail_text"
                 android:textColor="@color/black"
                 android:textSize="@dimen/_14ssp" />
@@ -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">
 
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
                     android:layout_width="wrap_content"
@@ -298,6 +296,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="end"
+                    android:paddingBottom="@dimen/_5sdp"
                     android:inputType="textMultiLine"
                     android:singleLine="false"
                     android:textColor="@color/black"
@@ -310,8 +309,8 @@
                 android:id="@+id/bankAcNoContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:visibility="gone">
+                android:layout_marginBottom="@dimen/_10sdp"
+                android:orientation="horizontal">
 
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
                     android:layout_width="wrap_content"
@@ -319,7 +318,7 @@
                     android:gravity="start"
                     android:paddingTop="@dimen/_8sdp"
                     android:text="@string/bank_ac_text"
-                    android:textColor="@color/dark_gray"
+                    android:textColor="@color/darkgray2"
                     android:textSize="@dimen/_11ssp" />
 
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
@@ -335,7 +334,6 @@
             </LinearLayout>
 
 
-
         </LinearLayout>
 
         <com.swifttech.remit.android.common.customwidgets.GmeTextView
@@ -344,11 +342,11 @@
             android:layout_marginTop="@dimen/_8sdp"
             android:gravity="center"
             android:maxLines="2"
-            android:visibility="gone"
             android:singleLine="false"
             android:text="@string/i_have_read_to_text"
             android:textColor="@color/darkgray2"
-            android:textSize="@dimen/_11ssp" />
+            android:textSize="@dimen/_11ssp"
+            android:visibility="gone" />
 
         <com.swifttech.remit.android.common.customwidgets.GmeTextView
             android:id="@+id/txt_user_aggreement"
@@ -356,12 +354,12 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/_5sdp"
             android:gravity="center"
-            android:visibility="gone"
             android:paddingTop="@dimen/_4sdp"
             android:paddingBottom="@dimen/_4sdp"
             android:text="@string/jme_user_aggreement_text"
             android:textColor="@color/blue"
-            android:textSize="@dimen/_11ssp" />
+            android:textSize="@dimen/_11ssp"
+            android:visibility="gone" />
 
         <com.swifttech.remit.android.common.customwidgets.GmeTextView
             android:id="@+id/txt_fraud_warning"
@@ -369,22 +367,22 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/_16sdp"
             android:gravity="center"
-            android:visibility="gone"
             android:paddingTop="@dimen/_4sdp"
             android:paddingBottom="@dimen/_4sdp"
             android:text="@string/jme_fraud_warning_text"
             android:textColor="@color/blue"
-            android:textSize="@dimen/_11ssp" />
+            android:textSize="@dimen/_11ssp"
+            android:visibility="gone" />
 
 
         <com.swifttech.remit.android.common.customwidgets.GmeButton
             android:id="@+id/exRateCalculateButton"
             style="@style/MButton"
             android:layout_gravity="center"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"
             android:layout_marginStart="@dimen/_10sdp"
+            android:layout_marginTop="20dp"
             android:layout_marginEnd="@dimen/_10sdp"
+            android:layout_marginBottom="20dp"
             android:enabled="true"
             android:text="@string/send_money_text" />
     </LinearLayout>

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"

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" />
 

app/src/main/res/values/strings.xml

@@ -192,7 +192,7 @@
     <string name="paying_amount_text">Paying Amount</string>
     <string name="exchange_rate_text">Exchange Rate</string>
     <string name="service_charge_text">Service Charge</string>
-    <string name="payout_agent_text">Payout Agent</string>
+    <string name="payout_agent_text">Payout Agent/Bank</string>
     <string name="i_have_read_to_text">I have read and agreed to</string>
     <string name="jme_user_aggreement_text">1. JME Remittance User Agreement</string>
     <string name="agree_and_send_text">Agree and Send</string>
@@ -751,7 +751,7 @@ All the configurations are done from backend web application system which allows
     <string name="save_and_next_text">Save and Next</string>
     <string name="penny_test_code_error_text">Reference code must be of 4 digit</string>
     <string name="step2_content_text">Do you have a phone number registered with  Alien Registration Card under your name?</string>
-    <string name="registration_success_message_text">Thank you for registering for Japan Money Express. We are verifying your information. Once approved, you will receive SMS.</string>
+    <string name="registration_success_message_text">Thank you for registering for Japan Money \n Express. We are verifying your information. \n  Once approved, you will receive SMS.</string>
     <string name="gps_off_text">GPS is not turned on</string>
     <string name="grant_permission_text">Please grant the required permissions.</string>
     <string name="location_not_available">Could not fetch location at the moment. Try again later.</string>
@@ -1018,6 +1018,5 @@ All the configurations are done from backend web application system which allows
     <string name="send_money_success_body_text">Please make payment of</string>
     <string name="send_money_success_footer_text">to JME within next working day to transmit this request.\nAfter payment please check notices to get JME Number for this transfer.</string>
     <string name="request_summary_text">REQUEST SUMMARY</string>
-    <string name="payout_agent_bank_text">Payout Agent/Bank</string>
     <string name="password_error_text">Password should contain atleast one number,one uppercase letter and minimum 8 Characters</string>
 </resources>