Merge branch 'TrustDock' into external/dev

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.remit.jmecustomer"
         minSdkVersion 24
         targetSdkVersion 31
-        versionCode 14
-        versionName "1.1"
+        versionCode 15
+        versionName "1.2"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [fileProvider: "com.remit.jmecustomer.fileprovider"]
@@ -133,21 +133,21 @@ android {
             buildConfigField 'String', 'SecretKey', '"QRK2UM0Q"'
             // TrustDock
             // UAT
-//            buildConfigField 'String', 'TrustDockAuthorizationId', '"SC5ra2f1GDqMaAVZX289bpuH"'
-//            buildConfigField 'String', 'TrustDockNativeAppSdkToken', '"rbTme8F4whfAZBuSQcN5gUXr"'
-//            buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"b1da18ee-fabe-42f0-b7f6-0d375e1f505d"'
-//            buildConfigField 'String', 'SelfieVerificationPlanId', '"ee46f7fd-3988-49cd-a972-1056e498302f"'
-//            buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"9390019a-d41f-42a8-b044-0f41a9825847"'
-//            buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"f8d1f271-7c95-43bf-bdf8-f84ebe96671d"'
-//            buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.test.trustdock.io/v2/verifications"'
+            buildConfigField 'String', 'TrustDockAuthorizationId', '"SC5ra2f1GDqMaAVZX289bpuH"'
+            buildConfigField 'String', 'TrustDockNativeAppSdkToken', '"rbTme8F4whfAZBuSQcN5gUXr"'
+            buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"b1da18ee-fabe-42f0-b7f6-0d375e1f505d"'
+            buildConfigField 'String', 'SelfieVerificationPlanId', '"ee46f7fd-3988-49cd-a972-1056e498302f"'
+            buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"9390019a-d41f-42a8-b044-0f41a9825847"'
+            buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"f8d1f271-7c95-43bf-bdf8-f84ebe96671d"'
+            buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.test.trustdock.io/v2/verifications"'
             // PROD
-            buildConfigField 'String', 'TrustDockAuthorizationId', '"gC8ULGtvqiwkMqTx4NzQexLL"'
-            buildConfigField 'String', 'TrustDockNativeAppSdkToken', '"KYyzZzDyneU6P9CTe8ZaveyK"'
-            buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"17f3f05f-f436-41f0-8b1c-434ee2b5e6ec"'
-            buildConfigField 'String', 'SelfieVerificationPlanId', '"295735e5-022b-44b8-8c35-59604c425daa"'
-            buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"039cfef5-0248-44c4-8464-25baef241f05"'
-            buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"6eaba29b-3f40-469d-9a7e-afb33252b10e"'
-            buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.trustdock.io/v2/verifications"'
+//            buildConfigField 'String', 'TrustDockAuthorizationId', '"gC8ULGtvqiwkMqTx4NzQexLL"'
+//            buildConfigField 'String', 'TrustDockNativeAppSdkToken', '"KYyzZzDyneU6P9CTe8ZaveyK"'
+//            buildConfigField 'String', 'ResidenceCardWithNFCPlanId', '"17f3f05f-f436-41f0-8b1c-434ee2b5e6ec"'
+//            buildConfigField 'String', 'SelfieVerificationPlanId', '"295735e5-022b-44b8-8c35-59604c425daa"'
+//            buildConfigField 'String', 'ResidenceCardWithoutNFCPlanId', '"039cfef5-0248-44c4-8464-25baef241f05"'
+//            buildConfigField 'String', 'DrivingLicenseWithNFCPlanId', '"6eaba29b-3f40-469d-9a7e-afb33252b10e"'
+//            buildConfigField 'String', 'TrustDockVerificationUrl', '"https://api.trustdock.io/v2/verifications"'
             //
             debuggable true
             minifyEnabled false
@@ -242,8 +242,8 @@ dependencies {
 
     implementation 'androidx.biometric:biometric:1.1.0'
 
-    //implementation 'io.trustdock.sdk:verification-sandbox-full:2.7.2'
-    implementation 'io.trustdock.sdk:verification-full:2.7.4'
+    implementation 'io.trustdock.sdk:verification-sandbox-full:2.7.4'
+    //implementation 'io.trustdock.sdk:verification-full:2.7.4'
 
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
 
@@ -255,18 +255,18 @@ dependencies {
 allprojects {
     repositories {
         maven {
-            //PROD
-            url "https://native-app-sdk-repository.trustdock.io/android/release/content/repositories"
-            credentials {
-                username = "japanremit-1039"
-                password = "9sAWcB6ce3GSumTT"
-            }
-            //UAT
-//            url "https://native-app-sdk-repository.test.trustdock.io/android/release/content/repositories"
+//            //PROD
+//            url "https://native-app-sdk-repository.trustdock.io/android/release/content/repositories"
 //            credentials {
 //                username = "japanremit-1039"
-//                password = "sHRf5Sf7S3r5Q4Hz"
+//                password = "9sAWcB6ce3GSumTT"
 //            }
+            // UAT
+            url "https://native-app-sdk-repository.test.trustdock.io/android/release/content/repositories"
+            credentials {
+                username = "japanremit-1039"
+                password = "sHRf5Sf7S3r5Q4Hz"
+            }
         }
         maven { url 'https://raw.githubusercontent.com/iProov/android/master/maven/' }
     }

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

@@ -234,6 +234,16 @@
                     app:txtfontName="@string/regular" />
 
             </LinearLayout>
+
+            <com.remit.jmecustomer.common.customwidgets.JmeTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/text_normal"
+                android:gravity="bottom"
+                android:text="@string/saveButtonInfo_text"
+                android:textSize="@dimen/_12ssp"
+                app:txtfontName="@string/regular" />
+
             <com.remit.jmecustomer.common.customwidgets.GmeButton
                 android:id="@+id/btn_submit1"
                 style="@style/MButton"