Merge branch 'build_release_1806' into 'dev_phase2'

update check fingerprint

See merge request !23

ios/Invest.xcodeproj/project.pbxproj

@@ -905,7 +905,7 @@
 				CODE_SIGN_ENTITLEMENTS = Invest/InvestDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = MXZ24GRH48;
 				ENABLE_BITCODE = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -914,7 +914,7 @@
 				);
 				INFOPLIST_FILE = Invest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.3;
+				MARKETING_VERSION = 2.3.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -939,11 +939,11 @@
 				CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = MXZ24GRH48;
 				INFOPLIST_FILE = Invest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.3;
+				MARKETING_VERSION = 2.3.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

src/Screens/Setting/SettingView.js

@@ -14,6 +14,8 @@ import * as Keychain from 'react-native-keychain';
 import {showLoading, hideLoading} from '../../actions/loadingAction';
 import {verifyPassword} from '../../apis/Functions/users';
 import {showAlert, TYPE} from '../../components/DropdownAlert';
+import TouchID from 'react-native-touch-id'
+
 
 const dataLanguage = [
     {
@@ -36,7 +38,19 @@ const SettingView = (props) => {
             AsyncStorage.setItem(KEY.IS_LOGIN_BY_BIOMETRY, JSON.stringify({isLoginByBiometry : false}));
             setIsEnabled(false);
         } else {
-            setVisible(true);
+            const optionalConfigObject = {
+                unifiedErrors: false, // use unified error messages (default false)
+                passcodeFallback: false // if true is passed, itwill allow isSupported to return an error if the device is not enrolled in touch id/face id etc. Otherwise, it will just tell you what method is supported, even if the user is not enrolled.  (default false)
+            }
+            TouchID.isSupported(optionalConfigObject)
+              .then(biometryType => {
+                  // Success code
+                  setVisible(true);
+              })
+              .catch(error => {
+                  // Failure code
+                  showAlert(TYPE.ERROR, I18n.t('Notification'), I18n.t('YouNotSettingBiometry', {type: biometryType =='FaceID' ? I18n.t('FaceId') : I18n.t('Fingerprint')}))
+              });
         }
     };
     const [language, setLanguage] = useState();

src/helper/i18/locales/en.js

@@ -336,5 +336,6 @@ export default {
   SearchProductCode: 'Search product code',
   IndustryGroup: 'Industry group',
   Period: 'Period',
+  YouNotSettingBiometry: 'You not setting %{type}, please setting it',
 
 };

src/helper/i18/locales/vn.js

@@ -333,4 +333,6 @@ export default {
   SearchProductCode: 'Tìm kiếm mã sản phẩm',
   IndustryGroup: 'Nhóm ngành',
   Period: 'Kỳ hạn',
+  YouNotSettingBiometry: 'Bạn chưa thiết lập %{type}, vui lòng thiết lập %{type}',
+
 };