From b753de349fd6fd78e1edda20ee3d42755ea2c268 Mon Sep 17 00:00:00 2001 From: Nichole Martinez <101313323+nicholemnl@users.noreply.github.com> Date: Tue, 22 Mar 2022 09:34:54 +0800 Subject: [PATCH] resolve conflict from rebase develop --- package-lock.json | 8 ++------ package.json | 2 -- screens/AuthScreenController.ts | 5 +++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index d0fdf876..91107a42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,8 +53,6 @@ "react-native-securerandom": "^1.0.0", "react-native-simple-markdown": "^1.1.0", "react-native-svg": "12.1.1", - "react-native-system-setting": "^1.7.6", - "react-native-unimodules": "^0.14.10", "react-native-vector-icons": "^8.1.0", "xstate": "^4.26.0" }, @@ -45942,13 +45940,11 @@ } }, "react-native-system-setting": { - "version": "1.7.6", - "resolved": "https://registry.npmjs.org/react-native-system-setting/-/react-native-system-setting-1.7.6.tgz", + "version": "https://registry.npmjs.org/react-native-system-setting/-/react-native-system-setting-1.7.6.tgz", "integrity": "sha512-nBnIK5Xnyu8XRRA3BMzRI54oYlSBKc0oOTQdZOCEeOvn4ltS1nk2shj/vtMQe6khXvuhai3vIc+g7DcsOcr5+w==" }, "react-native-unimodules": { - "version": "0.14.10", - "resolved": "https://registry.npmjs.org/react-native-unimodules/-/react-native-unimodules-0.14.10.tgz", + "version": "https://registry.npmjs.org/react-native-unimodules/-/react-native-unimodules-0.14.10.tgz", "integrity": "sha512-QpNyxdK81qtu9Y2omj7QRAnfoOGzDUC3iFCHwjFDew7J2KMn7RvlMs6hBj3lFTcee60TRB6gUY69lFL+DpPBFQ==", "requires": { "@unimodules/core": "~7.1.2", diff --git a/package.json b/package.json index 8795354f..ff45ae33 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,6 @@ "react-native-securerandom": "^1.0.0", "react-native-simple-markdown": "^1.1.0", "react-native-svg": "12.1.1", - "react-native-system-setting": "^1.7.6", - "react-native-unimodules": "^0.14.10", "react-native-vector-icons": "^8.1.0", "xstate": "^4.26.0" }, diff --git a/screens/AuthScreenController.ts b/screens/AuthScreenController.ts index 06976992..e8aa3eef 100644 --- a/screens/AuthScreenController.ts +++ b/screens/AuthScreenController.ts @@ -18,10 +18,11 @@ export function useAuthScreen(props: RootRouteProps) { console.log('-------> biometrics response', response); setHasBiometric(response); const available = await LocalAuthentication.supportedAuthenticationTypesAsync(); - console.log('-------> biometrics available', available); + console.log('-------> biometrics supported', available); const enrolled = await LocalAuthentication.isEnrolledAsync(); console.log('-------> biometrics enrolled', enrolled); - + const enrollLevel = await LocalAuthentication.getEnrolledLevelAsync(); + console.log('-------> biometrics enrollLevel', enrollLevel); })(); }, [])