From 8990cb9c99b86aef70e973580a7a227322099b11 Mon Sep 17 00:00:00 2001
From: Santosh Bhandary <get.santoshbhandary@gmail.com>
Date: Wed, 14 Oct 2020 21:37:12 +0545
Subject: [PATCH] oct 8 QA minor issue fixes

---
 .../features/home/view/HomeActivityV2.java    |   2 +-
 ...endMoneyV2TransactionCompleteActivity.java |   1 +
 .../activity_domestic_remit_receipt.xml       | 199 +++---------------
 .../main/res/layout/activity_register_v2.xml  |   4 +
 ...ity_send_money_v2_transaction_complete.xml |  71 ++++---
 app/src/main/res/layout/fragment_home_v2.xml  |   2 +-
 app/src/main/res/values-bn/strings.xml        |   2 +-
 app/src/main/res/values-in/strings.xml        |   2 +-
 app/src/main/res/values-km/strings.xml        |   2 +-
 app/src/main/res/values-ko/strings.xml        |   2 +-
 app/src/main/res/values-mn/strings.xml        |   2 +-
 app/src/main/res/values-my/strings.xml        |   2 +-
 app/src/main/res/values-ne/strings.xml        |   2 +-
 app/src/main/res/values-ru/strings.xml        |   2 +-
 app/src/main/res/values-si/strings.xml        |   2 +-
 app/src/main/res/values-th/strings.xml        |   2 +-
 app/src/main/res/values-ur/strings.xml        |   2 +-
 app/src/main/res/values-uz/strings.xml        |   2 +-
 app/src/main/res/values-vi/strings.xml        |   2 +-
 app/src/main/res/values/strings.xml           |  19 +-
 20 files changed, 96 insertions(+), 228 deletions(-)

diff --git a/app/src/main/java/com/swifttech/remit/android/features/home/view/HomeActivityV2.java b/app/src/main/java/com/swifttech/remit/android/features/home/view/HomeActivityV2.java
index 99f7f042..4ea4fee8 100644
--- a/app/src/main/java/com/swifttech/remit/android/features/home/view/HomeActivityV2.java
+++ b/app/src/main/java/com/swifttech/remit/android/features/home/view/HomeActivityV2.java
@@ -39,10 +39,10 @@ import com.swifttech.remit.android.features.changetxnpin.view.ChangeTxnPinActivi
 import com.swifttech.remit.android.features.customersupport.view.CustomerSupportFragment;
 import com.swifttech.remit.android.features.exrate.view.ExchangeRateActivity;
 import com.swifttech.remit.android.features.home.HomeParentViewContractV2;
-import com.swifttech.remit.android.features.home.presenter.HomeViewModel;
 import com.swifttech.remit.android.features.home.HomeViewModelFactory;
 import com.swifttech.remit.android.features.home.gateway.HomeV2Gateway;
 import com.swifttech.remit.android.features.home.presenter.HomeV2PresenterInterface;
+import com.swifttech.remit.android.features.home.presenter.HomeViewModel;
 import com.swifttech.remit.android.features.home.view.notifications.DimBackgroundView;
 import com.swifttech.remit.android.features.kyc.existingCustomer.view.ExistingKYCV3Activity;
 import com.swifttech.remit.android.features.kyc.newCustomer.view.KYCV3Activity;
diff --git a/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java b/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java
index 77949cdd..2a59a68e 100644
--- a/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java
+++ b/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java
@@ -192,6 +192,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
         payoutAmountTextView.setText(recieptData.getPAmount());
         if (isRequestedBySendMoney) {
             gmeControlNumberTextView.setVisibility(View.GONE);
+
         } else {
             gmeControlNumberTextView.setText(getString(R.string.jmeControlNum_text)+String.format(" %s", recieptData.getControlNo()));
             controlId=recieptData.getControlNo();
diff --git a/app/src/main/res/layout/activity_domestic_remit_receipt.xml b/app/src/main/res/layout/activity_domestic_remit_receipt.xml
index 98aef489..de48d40f 100644
--- a/app/src/main/res/layout/activity_domestic_remit_receipt.xml
+++ b/app/src/main/res/layout/activity_domestic_remit_receipt.xml
@@ -35,7 +35,8 @@
                     app:srcCompat="@drawable/ic_logo_check_right"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    />
 
                 <ImageView
                     android:id="@+id/imageView6"
@@ -209,16 +210,18 @@
                         android:gravity="end"
                         android:layout_height="wrap_content"
                         android:padding="10dp"
+                        android:text="sometext"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         app:txtfontName="@string/semibold" />
                 </LinearLayout>
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="5dp"
                     android:layout_below="@id/nameContainer"
-                    android:background="@color/gray" />
+                    android:background="@drawable/bg_dotted" />
 
 
 
@@ -243,12 +246,14 @@
                     tools:text="Some random name"
                     android:singleLine="true"
                     android:textColor="@color/darkgray"
-                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/_11sdp"
                     app:txtfontName="@string/semibold" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
+                    android:visibility="gone"
                     android:layout_below="@id/receiver_label"
                     android:background="@color/gray" />
 
@@ -271,12 +276,14 @@
                     android:padding="10dp"
                     tools:text="123123"
                     android:textColor="@color/darkgray"
-                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/_11sdp"
                     app:txtfontName="@string/semibold" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
+                    android:visibility="gone"
                     android:layout_below="@id/mobile_label"
                     android:background="@color/gray" />
 
@@ -294,7 +301,7 @@
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
-
+android:visibility="gone"
                         android:background="@color/gray" />
                     <LinearLayout
                     android:id="@+id/bank_container"
@@ -321,13 +328,14 @@
                     android:text=""
                     tools:text="Some thing"
                     android:textColor="@color/darkgray"
-                    android:textSize="14sp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                     app:txtfontName="@string/semibold" />
                     </LinearLayout>
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
-
+android:visibility="gone"
                         android:background="@color/gray" />
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -354,7 +362,8 @@
                             android:text=""
                             tools:text="asldkfj"
                             android:textColor="@color/darkgray"
-                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            android:textSize="@dimen/_11sdp"
                             app:txtfontName="@string/semibold"
                             />
                     </LinearLayout>
@@ -362,7 +371,7 @@
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
-
+android:visibility="gone"
                         android:background="@color/gray" />
 
                     <LinearLayout
@@ -403,6 +412,7 @@
                     android:id="@+id/total_sent_amount_divider"
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
+                    android:visibility="gone"
                     android:layout_below="@id/notForHome"
                     android:background="@color/gray" />
 
@@ -429,172 +439,11 @@
                         android:text=""
                         tools:text="10,000 KRW"
                         android:textColor="@color/darkgray"
-                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/_11sdp"
                         app:txtfontName="@string/semibold" />
                 </RelativeLayout>
-                <!--<View-->
-                    <!--android:id="@+id/bank_divider"-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="1dp"-->
-                    <!--android:layout_below="@id/total_sent_amount_layout"-->
-                    <!--android:background="@color/gray" />-->
-                <!--<LinearLayout-->
-                    <!--android:id="@+id/bank_container"-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:layout_below="@id/bank_divider">-->
-
-                    <!--<com.gmeremit.online.gmeremittance_native.common.customwidgets.GmeTextView-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="match_parent"-->
-                        <!--android:gravity="center_vertical"-->
-                        <!--android:padding="10dp"-->
-                        <!--android:text="Bank"-->
-                        <!--android:textColor="@color/darkgray"-->
-                        <!--android:textSize="14sp" />-->
-
-                    <!--<com.gmeremit.online.gmeremittance_native.common.customwidgets.GmeTextView-->
-                        <!--android:id="@+id/tv_bank_name"-->
-                        <!--android:layout_width="match_parent"-->
-                        <!--android:gravity="right"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:layout_alignParentRight="true"-->
-                        <!--android:padding="10dp"-->
-                        <!--android:text=""-->
-                        <!--tools:text="Some thing"-->
-                        <!--android:textColor="@color/darkgray"-->
-                        <!--android:textSize="14sp"-->
-                        <!--app:txtfontName="@string/semibold" />-->
-                <!--</LinearLayout>-->
-
-                <!---->
-                <!--<View-->
-                    <!--android:id="@+id/service_fee_divider"-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="1dp"-->
-                    <!--android:layout_below="@id/total_sent_amount_layout"-->
-                    <!--android:background="@color/gray" />-->
-
-                <!--<RelativeLayout-->
-                    <!--android:id="@+id/service_fee_layout"-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:layout_below="@id/service_fee_divider">-->
-
-                    <!--<com.gmeremit.online.gmeremittance_native.common.customwidgets.GmeTextView-->
-                        <!--android:id="@+id/tv_order_date_label"-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:padding="10dp"-->
-                        <!--android:text="@string/order_date_text"-->
-                        <!--android:textColor="@color/darkgray"-->
-                        <!--android:textSize="14sp" />-->
-
-                    <!--<com.gmeremit.online.gmeremittance_native.common.customwidgets.GmeTextView-->
-                        <!--android:id="@+id/tv_order_date"-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:layout_alignParentRight="true"-->
-                        <!--android:padding="10dp"-->
-                        <!--android:textColor="@color/darkgray"-->
-                        <!--android:textSize="14sp"-->
-                        <!--app:txtfontName="@string/semibold" />-->
-                <!--</RelativeLayout>-->
-
-                <!--&lt;!&ndash;&ndash;&gt;-->
-                <!--<View-->
-                    <!--android:id="@+id/exrate_divider"-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="1dp"-->
-                    <!--android:layout_below="@id/service_fee_layout"-->
-                    <!--android:background="@color/gray" />-->
-                <!--<RelativeLayout-->
-                    <!--android:id="@+id/exrate_layout"-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:layout_below="@id/exrate_divider">-->
-
-                    <!--<com.gmeremit.online.gmeremittance_native.common.customwidgets.GmeTextView-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:padding="10dp"-->
-                        <!--android:id="@+id/order_receive_lbl"-->
-                        <!--android:text="@string/order_receive_date_text"-->
-                        <!--android:textColor="@color/darkgray"-->
-                        <!--android:textSize="14sp" />-->
-
-                    <!--<com.gmeremit.online.gmeremittance_native.common.customwidgets.GmeTextView-->
-                        <!--android:id="@+id/tv_order_receive_date_text"-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:layout_alignParentRight="true"-->
-                        <!--android:padding="10dp"-->
-                        <!--android:textColor="@color/darkgray"-->
-                        <!--android:textSize="14sp"-->
-                        <!--app:txtfontName="@string/semibold" />-->
-                <!--</RelativeLayout>-->
-
-                <!--<View-->
-                    <!--android:id="@+id/total_amount_divider"-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="1dp"-->
-                    <!--android:layout_below="@id/exrate_layout"-->
-                    <!--android:background="@color/gray" />-->
-
-                <!--<RelativeLayout-->
-                    <!--android:id="@+id/order_no_text"-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:layout_below="@id/total_amount_divider">-->
-
-                    <!--<com.gmeremit.online.gmeremittance_native.common.customwidgets.GmeTextView-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:padding="10dp"-->
-                        <!--android:text="@string/order_no_text"-->
-                        <!--android:textColor="@color/darkgray"-->
-                        <!--android:textSize="14sp" />-->
-
-                    <!--<com.gmeremit.online.gmeremittance_native.common.customwidgets.GmeTextView-->
-                        <!--android:id="@+id/tv_order_no"-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:layout_alignParentRight="true"-->
-                        <!--android:padding="10dp"-->
-                        <!--android:textColor="@color/darkgray"-->
-                        <!--android:textSize="14sp"-->
-                        <!--app:txtfontName="@string/semibold" />-->
-                <!--</RelativeLayout>-->
-
-                <!--<View-->
-                    <!--android:id="@+id/order_no_text_divider"-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="1dp"-->
-                    <!--android:layout_below="@id/order_no_text"-->
-                    <!--android:background="@color/gray" />-->
-                <!--<RelativeLayout-->
-                    <!--android:layout_width="match_parent"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:layout_below="@id/order_no_text_divider">-->
-
-                    <!--<com.gmeremit.online.gmeremittance_native.common.customwidgets.GmeTextView-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:padding="10dp"-->
-                        <!--android:text="@string/order_type_text"-->
-                        <!--android:textColor="@color/darkgray"-->
-                        <!--android:textSize="14sp" />-->
-
-                    <!--<com.gmeremit.online.gmeremittance_native.common.customwidgets.GmeTextView-->
-                        <!--android:id="@+id/tv_order_type"-->
-                        <!--android:layout_width="wrap_content"-->
-                        <!--android:layout_height="wrap_content"-->
-                        <!--android:layout_alignParentRight="true"-->
-                        <!--android:padding="10dp"-->
-                        <!--android:textColor="@color/darkgray"-->
-                        <!--android:textSize="14sp"-->
-                        <!--app:txtfontName="@string/semibold" />-->
-                <!--</RelativeLayout>-->
+
             </RelativeLayout>
 
 
diff --git a/app/src/main/res/layout/activity_register_v2.xml b/app/src/main/res/layout/activity_register_v2.xml
index d36cc40a..3d144cf7 100644
--- a/app/src/main/res/layout/activity_register_v2.xml
+++ b/app/src/main/res/layout/activity_register_v2.xml
@@ -74,6 +74,7 @@
                     app:endIconMode="clear_text"
                     app:errorEnabled="true"
                     android:hint="@string/referralcode_placeholder_text"
+                    app:startIconDrawable="@drawable/icv_referal_icon"
                     >
                     <com.swifttech.remit.android.common.view.MTextInputEditText
                         android:id="@+id/referralCode_edTxt"
@@ -88,6 +89,7 @@
                     app:endIconMode="clear_text"
                     app:errorEnabled="true"
                     android:hint="@string/userid_placeholder_text"
+                    app:startIconDrawable="@drawable/icv_vd_user"
                     >
                     <com.swifttech.remit.android.common.view.MTextInputEditText
                         android:id="@+id/usernameId_edTxt"
@@ -102,6 +104,7 @@
                     style="@style/MTextInputLayoutForm"
                     app:endIconMode="password_toggle"
                     android:hint="@string/password_placeholder_text"
+                    app:startIconDrawable="@drawable/icv_vd_lock"
                     >
                     <com.swifttech.remit.android.common.view.MTextInputEditText
                         android:id="@+id/password_edTxt"
@@ -117,6 +120,7 @@
                     style="@style/MTextInputLayoutForm"
                     app:endIconMode="password_toggle"
                     android:hint="@string/password_placeholder_text"
+                    app:startIconDrawable="@drawable/icv_vd_lock"
                     >
                     <com.swifttech.remit.android.common.view.MTextInputEditText
                         android:id="@+id/confirmPassword_edTxt"
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 0c22f94a..8547ab47 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
@@ -60,47 +60,29 @@
                     android:padding="@dimen/_4sdp"
                     android:text="@string/transfer_success_text"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/_14ssp"
+                    android:textSize="@dimen/_16sdp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/logo"
                     app:txtfontName="@string/semibold" />
 
-                <com.swifttech.remit.android.common.customwidgets.GmeTextView
-                    android:id="@+id/tv_receiver_name"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_6sdp"
-                    android:layout_marginEnd="@dimen/_6sdp"
-                    android:gravity="center_horizontal"
-                    android:padding="@dimen/_1sdp"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/_12ssp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/transfer_label"
-                    app:txtfontName="@string/heavy"
-                    tools:text="Some name" />
-
-
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
                     android:id="@+id/gmeTextView8"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/_6sdp"
                     android:layout_marginTop="@dimen/_6sdp"
-                    android:layout_marginEnd="@dimen/_6sdp"
+                    android:layout_marginEnd="@dimen/commonMargin"
                     android:padding="@dimen/_1sdp"
                     android:paddingStart="@dimen/_4sdp"
                     android:paddingEnd="@dimen/_4sdp"
-                    android:text="@string/total_payout_amount_text"
+                    android:text="@string/default_currency_text"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/_12ssp"
+                    android:textSize="@dimen/_12sdp"
                     app:layout_constraintEnd_toStartOf="@+id/tv_payout_amount"
-                    app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintHorizontal_chainStyle="packed"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_receiver_name" />
+                    app:layout_constraintTop_toTopOf="@+id/tv_payout_amount" />
 
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
                     android:id="@+id/tv_payout_amount"
@@ -109,27 +91,58 @@
                     android:layout_marginEnd="@dimen/_6sdp"
                     android:padding="2dp"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/_11ssp"
-                    app:layout_constraintBaseline_toBaselineOf="@+id/gmeTextView8"
+                    android:textSize="@dimen/_25sdp"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintTop_toBottomOf="@+id/transfer_label"
                     app:layout_constraintStart_toEndOf="@+id/gmeTextView8"
                     app:txtfontName="@string/semibold"
                     tools:text="50000" />
+                <com.swifttech.remit.android.common.customwidgets.GmeTextView
+                    android:id="@+id/label_send_to"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/_6sdp"
+                    android:layout_marginEnd="@dimen/_6sdp"
+                    android:gravity="center_horizontal"
+                    android:padding="@dimen/_1sdp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/_12ssp"
+                    android:layout_marginTop="@dimen/_15sdp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_payout_amount"
+                    app:txtfontName="@string/heavy"
+                    tools:text="@string/send_to_text" />
+
+                <com.swifttech.remit.android.common.customwidgets.GmeTextView
+                    android:id="@+id/tv_receiver_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/_6sdp"
+                    android:layout_marginEnd="@dimen/_6sdp"
+                    android:gravity="center_horizontal"
+                    android:padding="@dimen/_1sdp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/_16sdp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/label_send_to"
+                    app:txtfontName="@string/heavy"
+                    tools:text="Some name" />
 
 
                 <com.swifttech.remit.android.common.customwidgets.GmeTextView
                     android:id="@+id/tv_gme_control_no"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_6sdp"
+                    android:layout_marginTop="@dimen/_15sdp"
                     android:gravity="center_horizontal"
                     android:padding="@dimen/_1sdp"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/_14ssp"
+                    android:textSize="@dimen/_12sdp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_payout_amount"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_receiver_name"
                     app:txtfontName="@string/heavy"
                     tools:text="1209389128379128" />
 
diff --git a/app/src/main/res/layout/fragment_home_v2.xml b/app/src/main/res/layout/fragment_home_v2.xml
index a2875410..b9876de9 100644
--- a/app/src/main/res/layout/fragment_home_v2.xml
+++ b/app/src/main/res/layout/fragment_home_v2.xml
@@ -178,7 +178,7 @@
                     android:layout_marginBottom="2dp"
                     android:background="@color/white"
                     android:padding="8dp"
-                    android:visibility="gone">
+                    android:visibility="visible">
 
                     <ImageView
                         android:id="@+id/penny_test_view"
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index c18b91b3..7d0bae5b 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -148,7 +148,7 @@
     <string name="transfer_success_text"> সফলভাবে প্রেরণ করা হয়েছে</string>
     <string name="transfer_success_info_text">  আপনি আপনার অর্থ সফলভাবে প্রেরণ করেছেন</string>
     <string name="total_payout_amount_text">  মোট প্রাপ্তির পরিমাণ </string>
-    <string name="gme_control_no_text"> Japan Money Express Control No </string>
+    <string name="jme_control_no_text"> Japan Money Express Control No </string>
     <string name="gme_control_security_text"> Japan Money Express Control No টি যত্ন করে সংরক্ষণ করুণ</string>
     <string name="share_party_text"> সঠিক ব্যক্তির সাথে শেয়ার করুণ</string>
     <string name="transaction_date_text"> লেনদেন এর তারিখ</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index d1fa2df5..3a97a8eb 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -164,7 +164,7 @@
     <string name="transfer_success_text">Transfer Berhasil</string>
     <string name="transfer_success_info_text">Anda telah berhasil mengirim uang anda ke</string>
     <string name="total_payout_amount_text">Jumlah Total Pembayaran</string>
-    <string name="gme_control_no_text">No. Kontrol Japan Money Express</string>
+    <string name="jme_control_no_text">No. Kontrol Japan Money Express</string>
     <string name="gme_control_security_text">Mohon simpan no. kontrol Japan Money Express dengan aman</string>
     <string name="share_party_text">Bagikan hanya dengan pihak yang berkepentingan</string>
     <string name="transaction_date_text">Tanggal Transaksi</string>
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index 182cfea9..d1996479 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -153,7 +153,7 @@
     <string name="transfer_success_text">ការផ្ទេរបានជោគជ័យ</string>
     <string name="transfer_success_info_text">លោកអ្នកបានផ្ទេរប្រាក់ដោយជោគជ័យហើយ </string>
     <string name="total_payout_amount_text">ចំនួនផ្ទេរប្រាក់សរុប</string>
-    <string name="gme_control_no_text">លេខកូដដកលុយ Japan Money Express</string>
+    <string name="jme_control_no_text">លេខកូដដកលុយ Japan Money Express</string>
     <string name="gme_control_security_text">សូមរក្សា លេខកូដដកលុយជាសម្ងាត់  </string>
     <string name="share_party_text">ចែករំលែកអោយតែអ្នកទទួលប្រាក់</string>
     <string name="transaction_date_text">កាលបរិច្ឆេទប្រតិបត្តិការ</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 15be7095..6f964618 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -157,7 +157,7 @@
 <string name="transfer_success_text">송금 성공</string>
 <string name="transfer_success_info_text">송금이 완료되었습니다. </string>
 <string name="total_payout_amount_text">총 지급액</string>
-<string name="gme_control_no_text">Japan Money Express 컨트롤 번호</string>
+<string name="jme_control_no_text">Japan Money Express 컨트롤 번호</string>
 <string name="gme_control_security_text">Japan Money Express 컨트롤 번호를 보관하십시오.</string>
 <string name="share_party_text">관계자에게만 공유하세요.</string>
 <string name="transaction_date_text">거래 일자</string>
diff --git a/app/src/main/res/values-mn/strings.xml b/app/src/main/res/values-mn/strings.xml
index 576c15ec..da2a6aec 100644
--- a/app/src/main/res/values-mn/strings.xml
+++ b/app/src/main/res/values-mn/strings.xml
@@ -152,7 +152,7 @@
     <string name="transfer_success_text">Гүйлгээ амжилттай хийгдлээ</string>
     <string name="transfer_success_info_text">Таны шилжүүлэг амжилттай хийгдлээ</string>
     <string name="total_payout_amount_text">Нийт хүлээн авах дүн</string>
-    <string name="gme_control_no_text">Japan Money Express код</string>
+    <string name="jme_control_no_text">Japan Money Express код</string>
     <string name="gme_control_security_text">Энэхүү Japan Money Express кодыг сайн хадгална уу</string>
     <string name="share_party_text">Зөвхөн хүлээн авагчтай хуваалцана уу</string>
     <string name="transaction_date_text">Шилжүүлэг хийгдсэн огноо</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 389e2bd8..fcf4a162 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -165,7 +165,7 @@
     <string name="transfer_success_text">ငွေလွှဲမှု အောင်မြင်ပါသည်</string>
     <string name="transfer_success_info_text">ထံသို့ ငွေအောင်မြင်စွာ လွှဲပြောင်းပြီးပါပြီ</string>
     <string name="total_payout_amount_text">စုစုပေါင်း လက်ခံရရှိမည့် ပမာဏ</string>
-    <string name="gme_control_no_text">GMEငွေထုတ် ကုတ်နံပါတ်</string>
+    <string name="jme_control_no_text">GMEငွေထုတ် ကုတ်နံပါတ်</string>
     <string name="gme_control_security_text">ဤ ငွေထုတ်ကုတ်နံပါတ်အား လုံခြုံစွာ သိမ်းထားပါ</string>
     <string name="share_party_text">သက်ဆိုင်သူနှင့်သာမျှ‌ေပါ</string>
     <string name="transaction_date_text">ငွေလွှဲနေ့စွဲ</string>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index d3b735dd..e0fbfff3 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -153,7 +153,7 @@
     <string name="transfer_success_text">पैसा ट्रान्स्फर भयो । </string>
     <string name="transfer_success_info_text">पैसा सफलतापूर्वक ट्रान्स्फर भयो । </string>
     <string name="total_payout_amount_text">कुल भुक्तानी रकम</string>
-    <string name="gme_control_no_text">Japan Money Express Control नम्बर</string>
+    <string name="jme_control_no_text">Japan Money Express Control नम्बर</string>
     <string name="gme_control_security_text">कृपया यो Japan Money Express Control नम्बर सुरक्षित राख्नुहोस।</string>
     <string name="share_party_text">सम्बन्धित पक्षसँग मात्र शेयर गर्नुहोला </string>
     <string name="transaction_date_text">कारोबार मिति</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index aef901c1..e8080ddd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -152,7 +152,7 @@
     <string name="transfer_success_text">Перевод завершён</string>
     <string name="transfer_success_info_text">Вы успешно перевели деньги </string>
     <string name="total_payout_amount_text">Общая сумма выплаты</string>
-    <string name="gme_control_no_text">Japan Money Express Контрольный номер</string>
+    <string name="jme_control_no_text">Japan Money Express Контрольный номер</string>
     <string name="gme_control_security_text">Пожалуйста, сохраните данный номер в безопасности.</string>
     <string name="share_party_text">Поделитесь только с заинтересованной стороной</string>
     <string name="transaction_date_text">Дата транзакции</string>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 08de3643..67d62d2f 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -142,7 +142,7 @@
     <string name="transfer_success_text">මුදල් යැවීම සාර්ථකයි</string>
     <string name="transfer_success_info_text">ඔබ ඔබේ මුදල් සාර්ථක ලෙස මාරු කර ඇත</string>
     <string name="total_payout_amount_text">මුළු ගෙවීම් ප්‍රමණය</string>
-    <string name="gme_control_no_text">Japan Money Express පාලන අංක</string>
+    <string name="jme_control_no_text">Japan Money Express පාලන අංක</string>
     <string name="gme_control_security_text">කරුණාකර මෙම Japan Money Express පාලන අංකය තබා ගන්න. ඉතා ආරක්ෂිතයි.</string>
     <string name="share_party_text">අදාළ පාර්ශව සමඟ පමණක් Share කරන්න</string>
     <string name="transaction_date_text">හුවමාරුව සිදුවූ දිනය</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 245b8a59..e45527ab 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -151,7 +151,7 @@
     <string name="transfer_success_text">โอนเงินเรียบร้อย</string>
     <string name="transfer_success_info_text">คุณได้โอนเงินไปยังผู้รับเรียบร้อยแล้ว</string>
     <string name="total_payout_amount_text">จำนวนเงินที่จะได้รับ</string>
-    <string name="gme_control_no_text">หมายเลข Japan Money Express Control No.</string>
+    <string name="jme_control_no_text">หมายเลข Japan Money Express Control No.</string>
     <string name="gme_control_security_text">กรุณาเก็บหมายเลข Japan Money Express Control No. ไว้</string>
     <string name="share_party_text">แชร์ข้อมูลนี้กับบุคคลที่เกี่ยวข้องเท่านั้น</string>
     <string name="transaction_date_text">วันที่ทำธุรกรรม</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index ee053866..b1ff8b3d 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -167,7 +167,7 @@
     <string name="transfer_success_text">کامیاب منتقلی</string>
     <string name="transfer_success_info_text">آپ نے کامیابی کے ساتھ اپنا پیسہ منتقل کردیا ہے</string>
     <string name="total_payout_amount_text">ادائیگی کی کل رقم</string>
-    <string name="gme_control_no_text">جی ایم ای کنٹرول نمبر</string>
+    <string name="jme_control_no_text">جی ایم ای کنٹرول نمبر</string>
     <string name="gme_control_security_text">براہ کرم اس Japan Money Express کنٹرول نمبر کو محفوظ رکھیں</string>
     <string name="share_party_text">صرف متعلقہ فریق کے ساتھ شیئر کریں</string>
     <string name="transaction_date_text">ٹرانزیکشن کی تاریخ</string>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index 2bd61c6c..56f86df6 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -152,7 +152,7 @@
     <string name="transfer_success_text">Muvofaqqiyatli amalga oshirildi!</string>
     <string name="transfer_success_info_text">Sizning pul jo\'natmangiz muvofaqqiyatli amalga oshirildi</string>
     <string name="total_payout_amount_text">To\'lovning umumiy miqdori</string>
-    <string name="gme_control_no_text">Japan Money Express Pulni olish uchun kod</string>
+    <string name="jme_control_no_text">Japan Money Express Pulni olish uchun kod</string>
     <string name="gme_control_security_text">Iltimos, ushbu kodni maxfiy saqlang</string>
     <string name="share_party_text">Ushbu nazorat raqamini qabul qiluvchiga yetkazing</string>
     <string name="transaction_date_text">Tranzaksiya amalga oshirilgan kun</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f7527cfe..8135625c 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -153,7 +153,7 @@
     <string name="transfer_success_text">Chuyển tiền thành công</string>
     <string name="transfer_success_info_text">Bạn đã chuyển tiền thành công đến </string>
     <string name="total_payout_amount_text">Tổng số tiền thanh toán</string>
-    <string name="gme_control_no_text">Mã số Japan Money Express</string>
+    <string name="jme_control_no_text">Mã số Japan Money Express</string>
     <string name="gme_control_security_text">Vui lòng giữ bí mật mã số Japan Money Express này</string>
     <string name="share_party_text">Chỉ chia sẻ với bên liên quan</string>
     <string name="transaction_date_text">Ngày Giao dịch</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 519caef7..2accd347 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,17 +66,17 @@
     <string name="connect_local_community_text">Connect to local community</string>
     <string name="earn_reward_point_text">Earn reward points and get surprise gifts</string>
 
-    <string name="login_title_text">Welcome To \nJapan Money Express</string>
+    <string name="login_title_text">Welcome to \n JME</string>
     <string name="login_subtitle_text">Login with your email city</string>
     <string name="login_user_id_text">User ID</string>
     <string name="user_Id_placeholder_text">Registered Email</string>
     <string name="password_text">Password</string>
     <string name="forgot_password_text">Forgot password</string>
-    <string name="new_to_jme_text">New to Japan Money Express? </string>
+    <string name="new_to_jme_text">New to JME? </string>
     <string name="login_register_here_text">Register Here</string>
     <string name="user_id_empty_error">User id cannot be empty</string>
 
-    <string name="register_title_text">Register to Japan Money Express</string>
+    <string name="register_title_text">Register to JME</string>
     <string name="register_subtitle_text">Register with your email id</string>
     <string name="create_password_text">Create Password</string>
     <string name="confirm_password_text">Confirm Password</string>
@@ -118,7 +118,7 @@
     <string name="available_balance_text">Your Available Balance</string>
     <string name="jme_wallet_no_text">JME Account No.</string>
     <string name="auto_debit_account_text">Auto Debit Account</string>
-    <string name="about_gme_text">About Japan Money Express</string>
+    <string name="about_gme_text">About JME</string>
     <string name="settings_text">Settings</string>
     <string name="logout_text">Logout</string>
     <string name="logout_confirmation_title_text">Logout</string>
@@ -192,7 +192,7 @@
     <string name="service_charge_text">Service Charge</string>
     <string name="payout_agent_text">Payout Agent</string>
     <string name="i_have_read_to_text">I have read and agreed to</string>
-    <string name="jme_user_aggreement_text">1. Japan Money Express Remittance User Agreement</string>
+    <string name="jme_user_aggreement_text">1. JME Remittance User Agreement</string>
     <string name="agree_and_send_text">Agree and Send</string>
     <string name="enter_login_password_text">Enter Your Login Password</string>
     <string name="enter_otp_password_text">Enter 4 Digit OTP Code</string>
@@ -211,10 +211,10 @@
     <string name="select_bank_first_text">Please select a bank first</string>
 
     <string name="receipt_title_text">Receipt</string>
-    <string name="transfer_success_text">Transfer Successful</string>
+    <string name="transfer_success_text">Transfer Successful!</string>
     <string name="transfer_success_info_text">You have successfully transferred your money to </string>
     <string name="total_payout_amount_text">Total Payout Amount</string>
-    <string name="gme_control_no_text">Japan Money Express Control No</string>
+    <string name="jme_control_no_text">Japan Money Express Control No</string>
     <string name="gme_control_security_text">Please keep this Japan Money Express control no. very secure.</string>
     <string name="share_party_text">Share with concerned party only</string>
     <string name="transaction_date_text">Transaction Date</string>
@@ -845,7 +845,7 @@ All the configurations are done from backend web application system which allows
     <string name="more_text">More..</string>
     <string name="enter_message_to_customer_service">Enter Message to Customer Service</string>
     <string name="select_country_text">Select Country</string>
-    <string name="register_title_text1">Register to\nJapan Money Express</string>
+    <string name="register_title_text1">Register to\nJME</string>
     <string name="default_currency_symbol">"   ¥"</string>
     <string name="na_text">"N/A"</string>
     <string name="appVersionOutOfDate_text">This version of the app is out of date and will stop working soon. To keep using GME, please install the latest update.</string>
@@ -931,7 +931,7 @@ All the configurations are done from backend web application system which allows
     <string name="residence_id_card_no_text">Residence ID Card No</string>
     <string name="enter_your_transaction_pin_text">Enter Your Transaction Pin</string>
     <string name="no_country_found_text">No Country found</string>
-    <string name="jmeControlNum_text">Japan Money Express Control No.</string>
+    <string name="jmeControlNum_text">JME Control No.</string>
     <string name="couldnotfind_terms_text">Could not find corresponding terms and Conditions</string>
     <string name="searchByCtrlNum_text">Search by control number</string>
     <string name="searchByAccNum_text">Search by account number</string>
@@ -997,4 +997,5 @@ All the configurations are done from backend web application system which allows
     <string name="employerName_text">Employer Name (Optional)</string>
     <string name="kycSubmitSucessMessage_text">Thank you for registering for Japan Money Express. We are verifying your information Once approved, you will receive SMS</string>
     <string name="transaction_text">Transaction</string>
+    <string name="send_to_text">Send to</string>
 </resources>