latest change to server

.idea/assetWizardSettings.xml

@@ -304,7 +304,7 @@
                           <map>
                             <entry key="assetSourceType" value="FILE" />
                             <entry key="outputName" value="ic_unread" />
-                            <entry key="sourceFile" value="$USER_HOME$/Downloads/ic_unread.svg" />
+                            <entry key="sourceFile" value="$USER_HOME$/Desktop/unread.svg" />
                           </map>
                         </option>
                       </PersistentState>

SpinnerDatePickerLib-release/build/.transforms/00c0b173d0f17e9c327968131ccbb26b.bin

@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release

SpinnerDatePickerLib-release/build/.transforms/00c0b173d0f17e9c327968131ccbb26b/jetified-SpinnerDatePickerLib-release/AndroidManifest.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tsongkha.spinnerdatepicker"
+    android:versionCode="106"
+    android:versionName="1.0.6" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="27" />
+
+    <application android:supportsRtl="true" >
+    </application>
+
+</manifest>

SpinnerDatePickerLib-release/build/.transforms/00c0b173d0f17e9c327968131ccbb26b/jetified-SpinnerDatePickerLib-release/R.txt

@@ -0,0 +1,17 @@
+int id datePickerContainer 0x7f0b0001
+int id dateRangePickerContainer 0x7f0b0002
+int id day 0x7f0b0003
+int id fromDateText 0x7f0b0004
+int id month 0x7f0b0005
+int id number_picker 0x7f0b0006
+int id parent 0x7f0b0007
+int id toDateText 0x7f0b0008
+int id year 0x7f0b0009
+int layout date_picker 0x7f0e0001
+int layout date_picker_container 0x7f0e0002
+int layout date_picker_dialog 0x7f0e0003
+int layout date_picker_dialog_container 0x7f0e0004
+int layout date_range_picker_dialog_container 0x7f0e0005
+int layout number_picker_day_month 0x7f0e0006
+int layout number_picker_year 0x7f0e0007
+int string app_name 0x7f140001

SpinnerDatePickerLib-release/build/.transforms/00c0b173d0f17e9c327968131ccbb26b/jetified-SpinnerDatePickerLib-release/res/layout/date_picker.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="270dip"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center_horizontal"
+              android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="horizontal">
+
+        <!-- Month -->
+        <NumberPicker
+            android:id="@+id/month"
+            android:layout_width="80dip"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="1dip"
+            android:layout_marginLeft="1dip"
+            android:layout_marginRight="1dip"
+            android:layout_marginStart="1dip"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            />
+
+        <!-- Day -->
+        <NumberPicker
+            android:id="@+id/day"
+            android:layout_width="80dip"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="1dip"
+            android:layout_marginLeft="1dip"
+            android:layout_marginRight="1dip"
+            android:layout_marginStart="1dip"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            />
+
+        <!-- Year -->
+        <NumberPicker
+            android:id="@+id/year"
+            android:layout_width="95dip"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="1dip"
+            android:layout_marginLeft="1dip"
+            android:layout_marginRight="1dip"
+            android:layout_marginStart="1dip"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            />
+    </LinearLayout>
+</LinearLayout>

SpinnerDatePickerLib-release/build/.transforms/00c0b173d0f17e9c327968131ccbb26b/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_container.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- Layout of date picker-->
+
+<!-- The width of this container is manually set a little bigger than the one of the children
+     contained in it. This helps to prevent rounding errors when toggling the "Show year" option -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_gravity="center_horizontal"
+              android:layout_width="270dip"
+              android:layout_height="wrap_content">
+
+    <!-- Warning: everything within the parent is removed and re-ordered depending
+         on the date format selected by the user. -->
+    <LinearLayout
+        android:id="@+id/parent"
+        android:orientation="horizontal"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+    </LinearLayout>
+</LinearLayout>

SpinnerDatePickerLib-release/build/.transforms/00c0b173d0f17e9c327968131ccbb26b/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.tsongkha.spinnerdatepicker.DatePicker xmlns:android="http://schemas.android.com/apk/res/android"
+                                           android:id="@+id/datePickerContainer"
+                                           android:layout_gravity="center_horizontal"
+                                           android:layout_width="wrap_content"
+                                           android:layout_height="wrap_content"
+                                           android:spinnersShown="true"
+                                           android:calendarViewShown="false"
+            />
+    <!--android:dialogMode="true" -->

SpinnerDatePickerLib-release/build/.transforms/00c0b173d0f17e9c327968131ccbb26b/jetified-SpinnerDatePickerLib-release/res/layout/date_picker_dialog_container.xml

@@ -0,0 +1,8 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:id="@+id/datePickerContainer"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_gravity="center_horizontal">
+
+</FrameLayout>
+

SpinnerDatePickerLib-release/build/.transforms/00c0b173d0f17e9c327968131ccbb26b/jetified-SpinnerDatePickerLib-release/res/layout/date_range_picker_dialog_container.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="wrap_content"
+    android:id="@+id/dateRangePickerContainer"
+    android:layout_height="wrap_content">
+    <TextView
+        android:layout_marginStart="25dp"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="10dp"
+        android:paddingTop="3dp"
+        android:paddingBottom="3dp"
+        android:text="From Date: "
+        android:id="@+id/fromDateText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        />
+
+
+    <TextView
+        android:layout_marginTop="5dp"
+        android:layout_marginStart="25dp"
+        android:layout_marginLeft="25dp"
+        android:paddingTop="3dp"
+        android:paddingBottom="3dp"
+        android:text="To Date: "
+        android:id="@+id/toDateText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"/>
+
+
+</LinearLayout>

SpinnerDatePickerLib-release/build/.transforms/00c0b173d0f17e9c327968131ccbb26b/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_day_month.xml

@@ -0,0 +1,12 @@
+<NumberPicker
+    android:id="@+id/number_picker"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="80dip"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="1dip"
+    android:layout_marginRight="1dip"
+    android:layout_marginStart="1dip"
+    android:layout_marginEnd="1dip"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    />

SpinnerDatePickerLib-release/build/.transforms/00c0b173d0f17e9c327968131ccbb26b/jetified-SpinnerDatePickerLib-release/res/layout/number_picker_year.xml

@@ -0,0 +1,12 @@
+<NumberPicker
+    android:id="@+id/number_picker"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="95dip"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="1dip"
+    android:layout_marginRight="1dip"
+    android:layout_marginStart="1dip"
+    android:layout_marginEnd="1dip"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    />

SpinnerDatePickerLib-release/build/.transforms/00c0b173d0f17e9c327968131ccbb26b/jetified-SpinnerDatePickerLib-release/res/values/values.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">SpinnerDatePicker</string>
+</resources>

SpinnerDatePickerLib-release/build/.transforms/129a6074928f1a7f3473e4703868dfce.bin

@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime

SpinnerDatePickerLib-release/build/.transforms/12c8da00d16892d96075b741a87cf8bf.bin

@@ -0,0 +1 @@
+i/jars/classes.jar

SpinnerDatePickerLib-release/build/.transforms/2337fd59a6801e2575375e7c44b52e7f.bin

@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime

SpinnerDatePickerLib-release/build/.transforms/27694385ca0d7bce6f3d48dd800534a0.bin

@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime.jar

SpinnerDatePickerLib-release/build/.transforms/436d6283aae588b0e7cef8e945cbda9f.bin

@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime

SpinnerDatePickerLib-release/build/.transforms/7e2e2b9949579b7979740de2195dd519.bin

@@ -0,0 +1 @@
+o/com.tsongkha.spinnerdatepicker

SpinnerDatePickerLib-release/build/.transforms/8c59e91b896f64f61fbe507eae9bd36a.bin

@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime

SpinnerDatePickerLib-release/build/.transforms/9f2a742328fab0e9a7cf31bd29133592.bin

@@ -0,0 +1 @@
+i/res

SpinnerDatePickerLib-release/build/.transforms/aaa9836c797b540d8be83d7a055895e3.bin

@@ -0,0 +1 @@
+o/com.tsongkha.spinnerdatepicker-r.txt

SpinnerDatePickerLib-release/build/.transforms/aaa9836c797b540d8be83d7a055895e3/com.tsongkha.spinnerdatepicker-r.txt

@@ -0,0 +1,18 @@
+com.tsongkha.spinnerdatepicker
+id datePickerContainer
+id dateRangePickerContainer
+id day
+id fromDateText
+id month
+id number_picker
+id parent
+id toDateText
+id year
+layout date_picker
+layout date_picker_container
+layout date_picker_dialog
+layout date_picker_dialog_container
+layout date_range_picker_dialog_container
+layout number_picker_day_month
+layout number_picker_year
+string app_name

SpinnerDatePickerLib-release/build/.transforms/ae43899336b515aee044796e4ef693fa.bin

@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release.aar

SpinnerDatePickerLib-release/build/.transforms/c34764f420f60b9fc8b3480ec975b7fc.bin

@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-api.jar

SpinnerDatePickerLib-release/build/.transforms/f5d599392485c07e3b5605c08aeb4690.bin

@@ -0,0 +1 @@
+o/jetified-SpinnerDatePickerLib-release-runtime

SpinnerDatePickerLib-release/build/.transforms/fceb60be1745e62b89f4b36453fdce21.bin

@@ -0,0 +1 @@
+i/AndroidManifest.xml

app/build.gradle

@@ -14,7 +14,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 30
         versionCode 1
-        versionName "0.0.1"
+        versionName "0.1"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [fileProvider: "com.remit.jmecustomer.fileprovider"]
@@ -96,7 +96,7 @@ android {
         }
         jme {
             signingConfig signingConfigs.debug
-            buildConfigField 'String', 'BASE_URL', '"http://211.25.249.199:9093/api/"'
+            buildConfigField 'String', 'BASE_URL', '"http://202.166.220.36:8083/api/"'
             buildConfigField 'String', 'API_VERSION', '"v1"'
             buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
             debuggable true
@@ -164,7 +164,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-vision:20.1.0'
     implementation 'com.google.android.gms:play-services-location:17.1.0'
     // Import the BoM for the Firebase platform
-    implementation platform('com.google.firebase:firebase-bom:28.4.0')
+    implementation platform('com.google.firebase:firebase-bom:29.0.1')
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-messaging'

app/src/main/java/com/remit/jmecustomer/RemitApplication.java

@@ -44,9 +44,9 @@ public class RemitApplication extends MultiDexApplication {
     }
 
     public static String getPreferredCountryCode() {
-        if (mSharedPreferences == null)
+        if (fingerPrintSharedPreference == null)
             return "en";
-        return mSharedPreferences.getString(PrefKeys.USER_PREFERRED_COUNTRY_CODE, "en");
+        return fingerPrintSharedPreference.getString(PrefKeys.USER_PREFERRED_LOCALE, "en");
 
     }
 

app/src/main/java/com/remit/jmecustomer/base/BaseActivity.java

@@ -72,8 +72,6 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter
             customAlertDialog.setMessage(param.getMessage());
             customAlertDialog.setAlertType(param.getAlertType());
             customAlertDialog.setActionListener(param.getListener());
-
-
             customAlertDialog.show(fragmentManager, "PopUpDialog");
         } catch (Exception e) {
 
@@ -153,8 +151,11 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter
     @Override
     public void showToastMessage(String message) {
         Toast toast = Toast.makeText(this, message, Toast.LENGTH_SHORT);
-        TextView v = (TextView) toast.getView().findViewById(android.R.id.message);
-        if (v != null) v.setGravity(Gravity.CENTER);
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            TextView v =  toast.getView().findViewById(android.R.id.message);
+            if (v != null) v.setGravity(Gravity.CENTER);
+        }
         toast.show();
     }
 

app/src/main/java/com/remit/jmecustomer/features/aboutscreen/view/AboutJMERemit.java

@@ -18,6 +18,7 @@ import com.remit.jmecustomer.R;
 import com.remit.jmecustomer.base.BaseActivity;
 import com.remit.jmecustomer.features.sendmoney.view.verification.TermsAndConditionV2BrowserActivity;
 import com.remit.jmecustomer.features.webbrowser.model.WebRequestModel;
+import com.remit.jmecustomer.utils.Utils;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -53,7 +54,6 @@ public class AboutJMERemit extends BaseActivity implements AboutUsPresenterInter
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about_jme);
-
         init();
     }
 
@@ -61,13 +61,11 @@ public class AboutJMERemit extends BaseActivity implements AboutUsPresenterInter
         ButterKnife.bind(this);
          aboutUsViewModelFactory = new AboutUsViewModelFactory(this);
         String version = BuildConfig.VERSION_NAME;
-        String versionCode = " (" + BuildConfig.VERSION_CODE + ")";
+      /*  String versionCode = " (" + BuildConfig.VERSION_CODE + ")";
         String server = "";
         if (!BuildConfig.BUILD_TYPE.equalsIgnoreCase("release"))
-            server = " " + BuildConfig.BUILD_TYPE;
-        txt_app_version.setText(version + versionCode + server);
-
-
+            server = " " + BuildConfig.BUILD_TYPE;*/
+        txt_app_version.setText(version);
     }
 
 
@@ -117,14 +115,14 @@ public class AboutJMERemit extends BaseActivity implements AboutUsPresenterInter
 
     @Override
     public void navigateToFaceBookPage(WebRequestModel webRequestModel) {
-        try {
-            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://page/jmeremit"));
-            startActivity(intent);
-        } catch(Exception e) {
-            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/jmeremit/")));
-        }
+        Intent facebookIntent = new Intent(Intent.ACTION_VIEW);
+        String facebookUrl = Utils.getFacebookPageURL(this);
+        facebookIntent.setData(Uri.parse(facebookUrl));
+        startActivity(facebookIntent);
     }
 
+
+
     @Override
     public void navigateToFraudGuaranteePolicy(WebRequestModel webRequestModel) {
         Intent intent= new Intent(this, TermsAndConditionV2BrowserActivity.class);

app/src/main/java/com/remit/jmecustomer/features/balancesend/presenter/BalanceSendPresenter.java

@@ -188,7 +188,7 @@ public class BalanceSendPresenter extends BaseViewModel implements BalanceSendPr
         @Override
         protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {
             if (Constants.SUCCESS_CODE_V2.equalsIgnoreCase(t.getErrorCode())) {
-                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+                view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> view.exitView());
             } else {
                 view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
             }

app/src/main/java/com/remit/jmecustomer/features/changepassNPin/presenter/ChangePassNPinViewModel.java

@@ -255,7 +255,6 @@ public class ChangePassNPinViewModel extends BaseViewModel implements ChangePass
                 view.showPopUpMessage(changePassNPInResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
         }
 
-
         @Override
         public void onFailed(String message) {
             view.showProgressBar(false, "");

app/src/main/java/com/remit/jmecustomer/features/customersupport/view/CustomerSupportFragment.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.remit.jmecustomer.R;
+import com.remit.jmecustomer.utils.Utils;
 
 
 import butterknife.BindView;
@@ -76,12 +77,10 @@ public class CustomerSupportFragment extends BottomSheetDialogFragment  {
                 break;
 
             case R.id.viewFaceBook:
-                try {
-                    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://page/jmeremit"));
-                    startActivity(intent);
-                } catch(Exception e) {
-                    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/jmeremit/")));
-                }
+                Intent facebookIntent = new Intent(Intent.ACTION_VIEW);
+                String facebookUrl = Utils.getFacebookPageURL(getActivity());
+                facebookIntent.setData(Uri.parse(facebookUrl));
+                startActivity(facebookIntent);
                 break;
 
 

app/src/main/java/com/remit/jmecustomer/features/home/presenter/HomeViewModel.java

@@ -259,8 +259,9 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter
                 if (androidAppUpdateModel.getInfo() != null && androidAppUpdateModel.getInfo().length() < 1)
                     androidAppUpdateModel.setInfo(null);
                 boolean isForceUpdate = androidAppUpdateModel.getCritical().equalsIgnoreCase("Y");
-                if (isForceUpdate)
+                if (isForceUpdate){
                     view.showUpdateScreen(androidAppUpdateModel.getBuild(), androidAppUpdateModel.getInfo(), true);
+                }
             }
         } catch (Exception e) {
             return;

app/src/main/java/com/remit/jmecustomer/features/home/view/HomeActivityV2.java

@@ -475,7 +475,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
 
     @Override
     public void showUpdateScreen(String build, String info, boolean isForceUpdate) {
-        if (!this.viewModel.shouldNotPromptAppUpdate()) {
+        if (this.viewModel.shouldNotPromptAppUpdate()==false) {
             new Handler().postDelayed(() -> {
                 Intent intent = new Intent(HomeActivityV2.this, AppUpdateActivity.class);
                 intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
@@ -483,6 +483,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
                 intent.putExtra(AppUpdateActivity.APP_PLAY_STORE_BUILD_NUMBER, build);
                 intent.putExtra(AppUpdateActivity.APP_UPDATE_IS_FORCE_UPDATE, isForceUpdate);
                 startActivityForResult(intent, APP_UPDATE_REQUEST);
+                this.viewModel.storeAppUpdateDecision(true);
             }, 500);
         }
 

app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/presenter/KYCV3ViewModel.java

@@ -185,7 +185,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
                         ) return true;
                     }
                 }else{
-                    view.showToastMessage(view.getContext().getResources().getString(R.string.provide_images_to_proceed_text));
+                    view.getCustomerDetailViewContract().showToastMessage(view.getContext().getResources().getString(R.string.provide_images_to_proceed_text));
                 }
             }
         }

app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java

@@ -212,7 +212,6 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
         ButterKnife.bind(this, view);
         init();
         performDefaultAction(savedInstanceState);
-        Log.e("===>", "KYCIDTypeFragment onViewCreated called");
     }
 
 

app/src/main/java/com/remit/jmecustomer/features/splashscreen/presenter/SplashScreenPresenter.java

@@ -45,8 +45,6 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen
                     this.languageModels = this.languageGateway.getRelatedLanguageData();
                     this.view.updateLanguageData(languageModels);
                     String appVersion = getStringfromStringId(R.string.app_version_text) + " " + BuildConfig.VERSION_NAME;
-                    if (!BuildConfig.BUILD_TYPE.equalsIgnoreCase("release"))
-                        appVersion = appVersion + " (" + BuildConfig.BUILD_TYPE + ")";
                     this.view.showAppVersion(appVersion);
                 }
             }

app/src/main/java/com/remit/jmecustomer/features/userprofile/view/ProfileActivity.java

@@ -47,10 +47,17 @@ public class ProfileActivity extends BaseActivity implements UserProfilePresente
     @BindView(R.id.tv_wallet_number)
     JmeTextView tvWalletNumber;
 
+    @BindView(R.id.tv_wallet_number_value)
+    JmeTextView tvWalletNumberValue;
+
     @BindView(R.id.tv_yearly_remaining)
     JmeTextView tv_yearly_remaining;
     @BindView(R.id.tv_referral)
     JmeTextView tv_referral;
+
+    @BindView(R.id.tv_referral_value)
+    JmeTextView tv_referral_value;
+
     private UserProfilePresenterV2 viewModel;
 
 
@@ -83,11 +90,9 @@ public class ProfileActivity extends BaseActivity implements UserProfilePresente
 //        if(bankName!=null&&bankName.length()>0)
 //            bankName=" - "+bankName;
         String gmeWalletNo=getString(R.string.jme_wallet_no_text);
-        tvWalletNumber.setText(Html.fromHtml(gmeWalletNo + "<b><font color='#0C2169'> <br>" + walletNumber + "</font></b>"));
+        tvWalletNumber.setText(gmeWalletNo);
+        tvWalletNumberValue.setText(walletNumber);
     }
-
-
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -125,10 +130,9 @@ public class ProfileActivity extends BaseActivity implements UserProfilePresente
         String referralCodeTitle=getString(R.string.memberShipId_text);
 
 //        tv_referral.setText(String.format("%s\n%s", referralCodeTitle, referralCode));
-        tv_referral.setText(Html.fromHtml(referralCodeTitle + "<b><font color='#0C2169'> <br>" + referralCode + "</font></b>"));
-
-
-
+//        tv_referral.setText(Html.fromHtml(referralCodeTitle + "<b><font color='#0C2169'> <br>" + referralCode + "</font></b>"));
+        tv_referral.setText(referralCodeTitle);
+        tv_referral_value.setText(referralCode);
     }
 
     @Override

app/src/main/java/com/remit/jmecustomer/utils/Constants.java

@@ -51,9 +51,9 @@ public class Constants {
 
     public static String TERMS_N_CONDITIONS_KEY="keyTermsAndConditions";
     public static String JME_TERMS_N_CONDITIONS="https://www.japanremit.com/Website/TermsAndConditions";
-    public static String JME_REGISTER_TERMS="http://211.25.249.199:9093/Document/TermsAndConditions/CustomerReg_TermsAndConditions.html";
-    public static String JME_BENEFICIARY_TERMS="http://211.25.249.199:9093/Document/TermsAndConditions/BeneReg_TermsAndConditions.html";
-    public static String JME_TRANSACTION_TERMS="http://211.25.249.199:9093/Document/TermsAndConditions/Trx_TermsAndConditions.html";
+    public static String JME_REGISTER_TERMS="https://mobile.japanremit.com:8443/Document/TermsAndConditions/CustomerReg_TermsAndConditions.html";
+    public static String JME_BENEFICIARY_TERMS="https://mobile.japanremit.com:8443/Document/TermsAndConditions/BeneReg_TermsAndConditions.html";
+    public static String JME_TRANSACTION_TERMS="https://mobile.japanremit.com:8443/Document/TermsAndConditions/Trx_TermsAndConditions.html";
 
     public static String USER_ID_KEY="userId";
     public static String OTP_KEY="OTP";

app/src/main/java/com/remit/jmecustomer/utils/Utils.java

@@ -576,6 +576,22 @@ public class Utils {
         return "";
     }
 
+    public static String getFacebookPageURL(Context context) {
+          String FACEBOOK_URL = "https://www.facebook.com/jmeremit";
+          String FACEBOOK_PAGE_ID = "jmeremit";
+        PackageManager packageManager = context.getPackageManager();
+        try {
+            int versionCode = packageManager.getPackageInfo("com.facebook.katana", 0).versionCode;
+            if (versionCode >= 3002850) { //newer versions of fb app
+                return "fb://facewebmodal/f?href=" + FACEBOOK_URL;
+            } else { //older versions of fb app
+                return "fb://page/" + FACEBOOK_PAGE_ID;
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            return FACEBOOK_URL;
+        }
+    }
+
 
 
 }

app/src/main/java/com/remit/jmecustomer/utils/https/API_URL.java

@@ -22,7 +22,7 @@ public class API_URL {
     public static final String SIGN_IN_V2 =  BuildConfig.API_VERSION+"/users/access-code";
 
     public static final String SIGN_UP_NEW_REGISTRATION = BuildConfig.API_VERSION+"/mobile/newUserRegister";
-    public static final String SIGN_UP_EXISTING_REQUEST = BuildConfig.API_VERSION+"/mobile/oldUserAccessRequest ";
+    public static final String SIGN_UP_EXISTING_REQUEST = BuildConfig.API_VERSION+"/mobile/oldUserAccessRequest";
     public static final String SIGN_UP_EXISTING_SUBMIT = BuildConfig.API_VERSION+"/mobile/oldUserRegister";
     public static final String RESET_PASSWORD_V2 = BuildConfig.API_VERSION+"/mobile/passwordReset";
     public static final String KYC_RELATED_DATA_V2 = BuildConfig.API_VERSION+"/mobile/loadform/kyc";
@@ -103,10 +103,10 @@ public class API_URL {
     public static final String BALANCE_REQ_INIT = BuildConfig.API_VERSION +"initBalanaceTransfer ";
     public static final String BALANCE_SEND_CONFIRM = BuildConfig.API_VERSION +"confirmBalanceTransferRequest";
     public static final String BALANCE_SEND_PERFORM = BuildConfig.API_VERSION +"performBalanceTransferRequest";
-    public static final String REGISTER_OTP_REQUEST = BuildConfig.API_VERSION + "/mobile/requestOTP ";
-    public static final String REGISTER_OTP_SUBMIT = BuildConfig.API_VERSION + "/mobile/submitOTP ";
+    public static final String REGISTER_OTP_REQUEST = BuildConfig.API_VERSION + "/mobile/requestOTP";
+    public static final String REGISTER_OTP_SUBMIT = BuildConfig.API_VERSION + "/mobile/submitOTP";
     public static final String SEARCH_CASH_PICKUP_BY_CONTROL_NO = BuildConfig.API_VERSION + "/mobile/searchTxnByControlNumber ";
-    public static final String REDEEM_CASH_PICKUP = BuildConfig.API_VERSION + "/mobile/redeemCashPayment ";
+    public static final String REDEEM_CASH_PICKUP = BuildConfig.API_VERSION + "/mobile/redeemCashPayment";
     public static final String REQUEST_FOR_BANK_DEPOSIT =BuildConfig.API_VERSION + "/mobile/withdrawWalletRequest" ;
     public static final String PROCEED_FOR_BANK_DEPOSIT = BuildConfig.API_VERSION + "/mobile/withdrawFromWallet";
     public static final String CHANGE_PIN = BuildConfig.API_VERSION + "/mobile/changeTxnPin";

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

@@ -92,14 +92,14 @@
         android:padding="@dimen/_8sdp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
+
         <com.remit.jmecustomer.common.customwidgets.JmeTextView
-            android:text="@string/use_fingerprint_text"
             android:id="@+id/fingerprintScannerTxtView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:txtfontName="@string/regular"
+            android:text="@string/tap_to_login_using_finger_text"
             android:textColor="@color/bluebg"
-            />
+            app:txtfontName="@string/regular" />
     </com.facebook.shimmer.ShimmerFrameLayout>
 </LinearLayout>
 

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

@@ -1,89 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:background="@color/background_gray"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/background_gray">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        >
-        <include layout="@layout/layout_sendmoney_toolbar"/>
+        android:orientation="vertical">
+
+        <include layout="@layout/layout_sendmoney_toolbar" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="10dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingBottom="10dp">
+
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="226dp"
                 android:layout_margin="10dp"
                 android:background="@drawable/ic_rounded_background_red_coloured">
+
                 <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/profile_image"
                     android:layout_width="70dp"
                     android:layout_height="70dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginRight="2dp"
                     android:layout_centerHorizontal="true"
-                    />
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="2dp" />
+
                 <ImageView
                     android:id="@+id/text_profile_image"
                     android:layout_width="70dp"
                     android:layout_height="70dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginRight="2dp"
                     android:layout_centerHorizontal="true"
-                    />
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="2dp" />
+
                 <ImageView
-                    android:visibility="invisible"
                     android:id="@+id/iv_uploadImage"
-                    android:layout_toRightOf="@id/profile_image"
-                    android:layout_marginLeft="-26dp"
-                    android:padding="10dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignBottom="@id/profile_image"
-                    app:srcCompat="@drawable/ic_profile_camera"
-                    />
+                    android:layout_marginLeft="-26dp"
+                    android:layout_toRightOf="@id/profile_image"
+                    android:padding="10dp"
+                    android:visibility="invisible"
+                    app:srcCompat="@drawable/ic_profile_camera" />
+
                 <ImageView
                     android:id="@+id/iv_edit_profile"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/icv_vd_edit_white"
-                    android:visibility="invisible"
                     android:layout_alignParentRight="true"
-                    android:padding="14dp"/>
+                    android:padding="14dp"
+                    android:visibility="invisible"
+                    app:srcCompat="@drawable/icv_vd_edit_white" />
+
                 <com.remit.jmecustomer.common.customwidgets.JmeTextView
                     android:id="@+id/tv_user_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/profile_image"
                     android:layout_centerHorizontal="true"
-                    android:textSize="@dimen/text_large"
-                    app:txtfontName="@string/semibold"
                     android:padding="6dp"
-                    android:textColor="@color/white"/>
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/text_large"
+                    app:txtfontName="@string/semibold" />
+
                 <com.remit.jmecustomer.common.customwidgets.JmeTextView
                     android:id="@+id/tv_phone_number"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tv_user_name"
                     android:layout_centerHorizontal="true"
-                    android:textSize="@dimen/text_medium"
                     android:padding="4dp"
-                    android:textColor="@color/white"/>
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/text_medium" />
+
                 <com.remit.jmecustomer.common.customwidgets.JmeTextView
                     android:id="@+id/tv_email"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tv_phone_number"
                     android:layout_centerHorizontal="true"
-                    android:textSize="@dimen/text_medium"
                     android:padding="4dp"
-                    android:textColor="@color/white"/>
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/text_medium" />
                 <!--<ImageView-->
                 <!--jmecustomer:id="@+id/iv_change_password"-->
                 <!--jmecustomer:layout_width="wrap_content"-->
@@ -94,46 +100,47 @@
                 <!--jmecustomer:src="@drawable/ic_change_password"/>-->
 
 
-
             </RelativeLayout>
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/ic_rectangle_white_corners"
                 android:layout_margin="6dp"
-                android:visibility="gone"
-                android:padding="8dp">
+                android:background="@drawable/ic_rectangle_white_corners"
+                android:padding="8dp"
+                android:visibility="gone">
+
                 <ImageView
                     android:id="@+id/verify_image"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
-                    app:srcCompat="@drawable/icv_kyc_non_verified_userstatus"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    app:srcCompat="@drawable/icv_kyc_non_verified_userstatus" />
+
                 <com.remit.jmecustomer.common.customwidgets.JmeTextView
                     android:id="@+id/verify_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="14sp"
+                    android:layout_toRightOf="@id/verify_image"
                     android:paddingLeft="10dp"
-                    android:paddingBottom="2dp"
                     android:paddingTop="4dp"
-                    android:layout_toRightOf="@id/verify_image"
+                    android:paddingBottom="2dp"
+                    android:text="@string/verify_your_profile_text"
                     android:textColor="@color/colorAccent"
-                    android:text="@string/verify_your_profile_text"/>
+                    android:textSize="14sp" />
+
                 <com.remit.jmecustomer.common.customwidgets.JmeTextView
-                    android:layout_below="@id/verify_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="10sp"
+                    android:layout_below="@id/verify_label"
+                    android:layout_toRightOf="@id/verify_image"
                     android:paddingLeft="10dp"
                     android:paddingTop="2dp"
                     android:paddingRight="4dp"
-                    android:layout_toRightOf="@id/verify_image"
+                    android:text="@string/verify_account_text"
                     android:textColor="@color/darkgray"
-                    android:text="@string/verify_account_text"/>
-
+                    android:textSize="10sp" />
             </RelativeLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -141,6 +148,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
+                android:paddingBottom="@dimen/_10sdp"
                 android:background="@drawable/ic_rectangle_white_extra_corners">
 
                 <com.remit.jmecustomer.common.customwidgets.JmeTextView
@@ -148,7 +156,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginTop="13dp"
+                    android:layout_marginTop="@dimen/_10sdp"
                     android:padding="2dp"
                     android:text="@string/available_balance_text"
                     android:textColor="@color/black"
@@ -183,34 +191,49 @@
                     android:id="@+id/tv_wallet_number"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="3dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginBottom="13dp"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:layout_marginStart="@dimen/_10sdp"
-                    android:gravity="right"
-                    android:textColor="@color/darkgray2"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="@dimen/_10sdp"
+                    android:gravity="left"
+                    android:padding="2dp"
+                    android:textColor="@color/black"
                     android:textSize="@dimen/text_small"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tv_wallet_no" />
 
+                <com.remit.jmecustomer.common.customwidgets.JmeTextView
+                    android:id="@+id/tv_wallet_number_value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:gravity="left"
+                    android:textColor="@color/blue"
+                    android:textSize="24sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_wallet_number" />
+
                 <com.remit.jmecustomer.common.customwidgets.JmeTextView
                     android:id="@+id/tv_referral"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="3dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginStart="@dimen/_10sdp"
-                    android:layout_marginBottom="13dp"
-                    android:gravity="right"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:textColor="@color/darkgray2"
+                    android:layout_marginStart="10dp"
+                    android:gravity="left"
+                    android:padding="2dp"
+                    android:layout_marginTop="@dimen/_10sdp"
+                    android:textColor="@color/black"
                     android:textSize="@dimen/text_small"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_wallet_number" />
+                    app:layout_constraintTop_toBottomOf="@+id/tv_wallet_number_value" />
 
+                <com.remit.jmecustomer.common.customwidgets.JmeTextView
+                    android:id="@+id/tv_referral_value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:gravity="left"
+                    android:textColor="@color/blue"
+                    android:textSize="24sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_referral" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -218,9 +241,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
+                android:background="@drawable/ic_rectangle_white_extra_corners"
                 android:paddingBottom="10dp"
-                android:visibility="gone"
-                android:background="@drawable/ic_rectangle_white_extra_corners">
+                android:visibility="gone">
 
                 <com.remit.jmecustomer.common.customwidgets.JmeTextView
                     android:id="@+id/tv_yearly_remaining_label"
@@ -228,8 +251,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginTop="13dp"
-                    android:padding="2dp"
                     android:gravity="start"
+                    android:padding="2dp"
                     android:text="@string/remaining_limit_text"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_small"
@@ -241,14 +264,14 @@
                     android:id="@+id/tv_yearly_remaining"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="13dp"
                     android:text="0"
                     android:textColor="@color/blue"
                     android:textSize="24sp"
-                    android:layout_marginBottom="13dp"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_yearly_remaining_label"
                     app:layout_constraintBaseline_toBaselineOf="@+id/tv_yearly_remaining_currency"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="@+id/tv_yearly_remaining_label"
-                    app:layout_constraintBottom_toBottomOf="parent"/>
+                    app:layout_constraintTop_toBottomOf="@+id/tv_yearly_remaining_label" />
 
                 <com.remit.jmecustomer.common.customwidgets.JmeTextView
                     android:id="@+id/tv_yearly_remaining_currency"
@@ -263,8 +286,6 @@
                     app:layout_constraintTop_toBottomOf="@+id/tv_yearly_remaining_label" />
 
 
-
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
 

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

@@ -124,7 +124,7 @@
                 android:paddingStart="21dp"
                 android:paddingEnd="21dp"
                 android:paddingTop="16dp"
-                android:text="@string/fingerprint_auth_text"
+                android:text="@string/login_biometric_setup_text"
                 android:textColor="@color/darkgray"
                 android:textSize="14sp" />
 

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

@@ -238,7 +238,6 @@
                     android:inputType="textMultiLine|number"
                     android:maxLength="11"
                     android:padding="@dimen/_4sdp"
-
                     android:singleLine="false"
                     android:textColor="@color/black"
                     android:textSize="@dimen/_20ssp"
@@ -521,7 +520,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/existing_user_register_txt"
-            tools:text=" 2.2.3 " />
+            tools:text=" 0.0.3 " />
 
 
 

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

@@ -158,6 +158,7 @@
                         android:inputType="text"
                         app:endIconMode="clear_text"
                         app:errorEnabled="true"
+                        android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ "
                         app:maxLengthLimiter="100" />
                 </com.remit.jmecustomer.common.view.MTextInputLayout>
 
@@ -174,6 +175,7 @@
                         android:inputType="text"
                         app:endIconMode="clear_text"
                         app:errorEnabled="true"
+                        android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ "
                         app:maxLengthLimiter="50" />
                 </com.remit.jmecustomer.common.view.MTextInputLayout>
 
@@ -190,6 +192,7 @@
                         style="@style/MTextInputEditText"
                         android:inputType="text"
                         app:endIconMode="clear_text"
+                        android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ "
                         app:errorEnabled="true"
                         app:maxLengthLimiter="50" />
                 </com.remit.jmecustomer.common.view.MTextInputLayout>
@@ -207,6 +210,7 @@
                         android:inputType="text"
                         app:endIconMode="clear_text"
                         app:errorEnabled="true"
+                        android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ "
                         app:maxLengthLimiter="50" />
                 </com.remit.jmecustomer.common.view.MTextInputLayout>
 
@@ -223,7 +227,6 @@
                         android:inputType="text"
                         app:endIconMode="clear_text"
                         app:errorEnabled="true"
-
                         app:maxLengthLimiter="60" />
                 </com.remit.jmecustomer.common.view.MTextInputLayout>
 

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

@@ -59,7 +59,7 @@
                 style="@style/MTextInputEditText"
                 android:inputType="phone"
                 android:imeOptions="actionNext"
-                android:maxLength="14"
+                android:maxLength="10"
                 android:digits="0123456789"
                 />
 

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

@@ -109,7 +109,7 @@
                     style="@style/MTextInputEditText"
                     android:inputType="phone"
                     android:digits="0123456789"
-                    android:maxLength="14"
+                    android:maxLength="10"
                     android:imeOptions="actionNext"
                     />
             </com.remit.jmecustomer.common.view.MTextInputLayout>

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

@@ -112,7 +112,7 @@
                     style="@style/MTextInputEditText"
                     android:inputType="phone"
                     android:digits="0123456789"
-                    android:maxLength="14"
+                    android:maxLength="10"
                     android:imeOptions="actionNext"
                     />
             </com.remit.jmecustomer.common.view.MTextInputLayout>

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

@@ -37,7 +37,7 @@
                 style="@style/MTextInputEditText"
                 android:inputType="phone"
                 android:imeOptions="actionDone"
-                android:maxLength="14"
+                android:maxLength="10"
                 android:digits="0123456789"
                 />
         </com.remit.jmecustomer.common.view.MTextInputLayout>

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

@@ -444,7 +444,7 @@
 
     <!--Splash Screen-->
     <string name="new_user_text">নতুন ব্যবহারকারী</string>
-    <string name="existing_jme_users_without_app_login">অ্যাপ লগইন ছাড়াই বিদ্যমান জেএমই ব্যবহারকারীরা</string>
+    <string name="existing_jme_users_without_app_login"><u>অ্যাপ লগইন ছাড়াই বিদ্যমান জেএমই ব্যবহারকারীরা</u></string>
     <string name="earn_reward_point_text">পুরষ্কার পয়েন্ট উপার্জন করুন এবং আকর্ষণীয় পুরস্কার পান</string>
     <string name="connect_local_community_text">স্থানীয় Community-এর সাথে যুক্ত হোন</string>
     <string name="hassle_free_transfer_text">আপনার প্রিয়জনকে টাকা পাঠান</string>
@@ -553,4 +553,6 @@
     <string name="fraud_guarantee_policy1_text">জালিয়াতি নিশ্চয়োতার নীতি</string>
     <string name="exit_text">বের হন</string>
     <string name="info_text">তথ্য</string>
+    <string name="login_biometric_setup_text">ফিঙ্গারপ্রিন্ট প্রমাণীকরণ</string>
+    <string name="tap_to_login_using_finger_text">আঙুলের ছাপ ব্যবহার করুন</string>
 </resources>

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

@@ -441,7 +441,7 @@
 
     <!--Splash Screen-->
     <string name="new_user_text">新規ユーザー</string>
-    <string name="existing_jme_users_without_app_login">既存のJMEユーザーでアプリにログインしていない方</string>
+    <string name="existing_jme_users_without_app_login"><u>既存のJMEユーザーでアプリにログインしていない方</u></string>
     <string name="earn_reward_point_text">ポイントを貯めて、サプライズギフトをもらいましょう</string>
     <string name="connect_local_community_text">地域社会とつながる</string>
     <string name="hassle_free_transfer_text">大切な人にお金を送る</string>
@@ -533,21 +533,24 @@
     <string name="load_more_text">もっと見る</string>
     <string name="verify_email_text">Eメールアドレスの確認</string>
     <string name="verify_email_detail_text">ここをクリックして、あなたのメールアドレスを確認してください。</string>
-    <string name="deviceNotCompForBiometric">Your Mobile is not compatiable for biometric login</string>
-    <string name="change_txn_pass_detail">Please click here to change your Login Password</string>
-    <string name="biometricSecurityUpdateRequired_text">Biometric security update required</string>
-    <string name="fingerPrintEnrolledSucessfully_text">Fingerprint Enrolled Sucessfully</string>
-    <string name="prompt_info_use_app_password">Use app password</string>
-    <string name="label_use_pin">Use PIN</string>
-    <string name="biometric_prompt_description">Please put your finger on your fingerprint sensor in order to validate</string>
-    <string name="prompt_info_dismiss">Dismiss</string>
-    <string name="enter_your_password_to_setup_fingerprint">Enter your password to setup fingerprint</string>
-    <string name="memberShipId_text">Membership ID</string>
-    <string name="jme_membership_id_text">JME Membership ID</string>
-    <string name="balance_with_jme_text">Balance with JME</string>
-    <string name="fraud_guarantee_policy_text"><u>Fraud Guarantee Policy</u></string>
-    <string name="fraud_guarantee_policy1_text">Fraud Guarantee Policy</string>
-    <string name="exit_text">Exit</string>
-    <string name="info_text">Info</string>
+
+    <string name="deviceNotCompForBiometric">あなたの携帯電話は、生体認証ログインに対応していません。</string>
+    <string name="change_txn_pass_detail">ログインパスワードの変更はこちらをクリックしてください。</string>
+    <string name="biometricSecurityUpdateRequired_text">生体認証のセキュリティのアップデートが必要です。</string>
+    <string name="fingerPrintEnrolledSucessfully_text">指紋が正常に登録されました。</string>
+    <string name="prompt_info_use_app_password">アプリのパスワードを使ってください。</string>
+    <string name="label_use_pin">PINを使ってください。</string>
+    <string name="biometric_prompt_description">指紋センサーに指を当てて認証してください。</string>
+    <string name="prompt_info_dismiss">解除</string>
+    <string name="enter_your_password_to_setup_fingerprint">指紋認証を設定するためのパスワードを入力してください。</string>
+    <string name="memberShipId_text">メンバーID</string>
+    <string name="jme_membership_id_text">JMEメンバーID</string>
+    <string name="balance_with_jme_text">JMEとのバランス</string>
+    <string name="fraud_guarantee_policy_text"><u>不正行為の保証について</u></string>
+    <string name="fraud_guarantee_policy1_text">不正行為の保証について</string>
+    <string name="exit_text">出口</string>
+    <string name="info_text">情報</string>
+    <string name="login_biometric_setup_text">指紋認証</string>
+    <string name="tap_to_login_using_finger_text">指紋認証を使用</string>
 
 </resources>

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

@@ -69,7 +69,7 @@
     <string name="currentPin_text">हालको PIN</string>
     <string name="newPin_text">नयाँ PIN</string>
     <string name="confirmNewPin_text">नयाँ PIN सुनिश्चित गर्नुहोस्</string>
-    <string name="save_password_text">पासवर्ड सेभ गर्नुहोस्</string>
+    <string name="save_password_text">सेभ गर्नुहोस्</string>
     <string name="processing_request_text">यहाँको अनुरोध प्रशोधन हुँदैछ</string>
     <string name="pin_empty_error_txt">PIN खाली हुन सक्दैन</string>
     <string name="password_error_text">पासवर्ड कम्तिमा आठ शब्दको हुन पर्छ । (एक विशेष शब्द, एक अपरकेस, एक नम्बर, एक संख्या, एक लोअरकेस चाहिन्छ, (उदाहरण : jaP@n181)</string>
@@ -163,13 +163,13 @@
     <string name="sideIdSample_text">परिचय पत्रको साइडको नमूना</string>
     <string name="permission_denied_text">अनुमति अस्वीकृत भयो</string>
     <string name="selectFile_text">फाइल चयन गर्नुहोस्</string>
-    <string name="primaryIdDocuments_text">प्राथमिक परिचय पत्र कागजातहरू</string>
+    <string name="primaryIdDocuments_text">प्राथमिक परिचय पत्रको कागजातहरू</string>
     <string name="front_id_text">परिचय पत्रको अगाडि</string>
     <string name="view_sample_text">नमूना हेर्नुहोस्</string>
     <string name="pleaseProvideFrontPhoto_text">कृपया परिचय पत्रको अगाडिको फोटो प्रदान गर्नुहोस्</string>
-    <string name="backId_text">पछाडि परिचय पत्र </string>
+    <string name="backId_text">परिचय पत्रको पछाडि</string>
     <string name="provideBackIdPhoto_text">परिचय पत्रको पछाडिको फोटो प्रदान गर्नुहोस्</string>
-    <string name="sideId_text">साइड  परिचय पत्र</string>
+    <string name="sideId_text">परिचय पत्रको साइड</string>
     <string name="provideSideFacingIdPhoto_text">कृपया साइड बाट  परिचय पत्र  फोटो प्रदान गर्नुहोस्।</string>
     <string name="save_and_next_text">सेभ गरेर अगाडी बढ्नुहोस्</string>
     <string name="kyc_photo_upload_dialog_title">तस्बिर थप्नुहोस</string>
@@ -447,7 +447,7 @@
 
     <!--Splash Screen-->
     <string name="new_user_text">नयाँ प्रयोगकर्ता</string>
-    <string name="existing_jme_users_without_app_login">अनुप्रयोग लग-इन बिना JME प्रयोगकर्ता अवस्थित छ</string>
+    <string name="existing_jme_users_without_app_login"><u>अनुप्रयोग लग-इन बिना JME प्रयोगकर्ता अवस्थित छ</u></string>
     <string name="earn_reward_point_text">इनाम अंकहरू कमाउनुहोस् र आकर्षक उपहारहरू पाउनुहोस्</string>
     <string name="connect_local_community_text">स्थानीय समुदायमा सामेल हुनुहोस्</string>
     <string name="hassle_free_transfer_text">आफ्नो प्रियजनहरूलाई पैसा पठाउनुहोस्</string>
@@ -551,4 +551,6 @@
     <string name="fraud_guarantee_policy1_text">धोखा ग्यारेन्टी नीति</string>
     <string name="exit_text">बाहिर निस्कनुहोस्</string>
     <string name="info_text">जानकारी</string>
+    <string name="login_biometric_setup_text">औँठा छाप प्रमाणीकरण</string>
+    <string name="tap_to_login_using_finger_text">औँठा छाप प्रयोग गर्नुहोस्</string>
 </resources>

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

@@ -549,5 +549,7 @@
     <string name="fraud_guarantee_policy1_text"></string>
     <string name="exit_text">Thoát</string>
     <string name="info_text">Thông tin</string>
+    <string name="login_biometric_setup_text">Xác thực vân tay</string>
+    <string name="tap_to_login_using_finger_text">Sử dụng vân tay</string>
 
 </resources>

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

@@ -223,7 +223,7 @@
     <string name="id_information_text">ID Information</string>
     <string name="id_type_text">ID Type</string>
     <string name="visa_status_text">Visa Status</string>
-    <string name="saveButtonInfo_text">Name, Nationality, Address and Sex are stated in the personal identification document submitted here. 名前、国籍、住所、誕生日、性別等の項目は確認書類記載内容の通りです。</string>
+    <string name="saveButtonInfo_text">Name, Nationality, Address and Sex are stated in the personal identification document submitted here.</string>
     <string name="new_registration_title_text">Registration Process</string>
     <string name="step1_sub_title_text">Personal Information</string>
     <string name="documents_text">Documents</string>
@@ -575,7 +575,7 @@
     <string name="enter_your_password_to_setup_fingerprint">Enter your password to setup fingerprint</string>
     <string name="memberShipId_text">Membership ID </string>
 
-    <!--not submitted to client-->
+
     <string name="jme_membership_id_text">JME Membership ID</string>
     <string name="balance_with_jme_text">Balance with JME</string>
     <string name="fraud_guarantee_policy_text"><u>Fraud Guarantee Policy</u></string>
@@ -583,4 +583,8 @@
     <string name="exit_text">Exit</string>
     <string name="info_text">Info</string>
 
+    <!--not submitted to client-->
+    <string name="login_biometric_setup_text">Login Biometric Setup</string>
+    <string name="tap_to_login_using_finger_text">Tap to login using fingerprint</string>
+
 </resources>

app/src/main/res/xml/network_security_config.xml

@@ -2,8 +2,9 @@
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">gmeuat.gmeremit.com</domain>
+        <domain includeSubdomains="true">mobile.japanremit.com</domain>
         <domain includeSubdomains="true">203.223.132.110</domain>
         <domain includeSubdomains="true">103.139.152.11</domain>
-        <domain includeSubdomains="true">211.25.249.199</domain>
+        <domain includeSubdomains="true">202.166.220.36</domain>
     </domain-config>
 </network-security-config>

build.gradle

@@ -11,7 +11,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.0'
         classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }