Merge branch 'develop' into toast-fixes

status-im · Jan 30, 2024 · 243db6d · 243db6d
2 parents 38a25b6 + eda9464
commit 243db6d
Show file tree

Hide file tree

Showing 36 changed files with 399 additions and 845 deletions.
diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios
@@ -78,9 +78,7 @@ pipeline {
         }
         stage('Upload') {
           steps { script {
-            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-              env.DIAWI_URL = ios.uploadToDiawi()
-            }
+            env.DIAWI_URL = ios.uploadToDiawi()
             env.PKG_URL = env.DIAWI_URL
             jenkins.setBuildDesc(IPA: env.PKG_URL)
           } }

diff --git a/doc/dependencies.md b/doc/dependencies.md
@@ -144,9 +144,9 @@ used for keycard
 used for svg icons, mostly collectibles are using svg
 TODO: updating requires a pod update on iOS
 
-## "react-native-touch-id": "^4.4.1"
+## "react-native-biometrics": "^3.0.1"
 
-used for touch-id identification
+used for biometric authentication on Android and iOS 
 
 ## "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#v8.0.7_3"
 

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -305,6 +305,8 @@ PODS:
     - glog
   - react-native-background-timer (2.2.0):
     - React
+  - react-native-biometrics (3.0.1):
+    - React-Core
   - react-native-blob-util (0.13.18):
     - React-Core
   - react-native-blur (4.3.3):
@@ -517,8 +519,6 @@ PODS:
   - SocketRocket (0.6.1)
   - SSZipArchive (2.4.3)
   - TOCropViewController (2.6.1)
-  - TouchID (4.4.1):
-    - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -548,6 +548,7 @@ DEPENDENCIES:
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
   - react-native-background-timer (from `../node_modules/react-native-background-timer`)
+  - react-native-biometrics (from `../node_modules/react-native-biometrics`)
   - react-native-blob-util (from `../node_modules/react-native-blob-util`)
   - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
   - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
@@ -603,7 +604,6 @@ DEPENDENCIES:
   - RNSVG (from `../node_modules/react-native-svg`)
   - secp256k1 (from `https://github.com/status-im/secp256k1.swift.git`)
   - SSZipArchive (= 2.4.3)
-  - TouchID (from `../node_modules/react-native-touch-id`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -669,6 +669,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/logger"
   react-native-background-timer:
     :path: "../node_modules/react-native-background-timer"
+  react-native-biometrics:
+    :path: "../node_modules/react-native-biometrics"
   react-native-blob-util:
     :path: "../node_modules/react-native-blob-util"
   react-native-blur:
@@ -778,8 +780,6 @@ EXTERNAL SOURCES:
   secp256k1:
     :git: https://github.com/status-im/secp256k1.swift.git
     :submodules: true
-  TouchID:
-    :path: "../node_modules/react-native-touch-id"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -793,7 +793,7 @@ CHECKOUT OPTIONS:
     :submodules: true
 
 SPEC CHECKSUMS:
-  boost: 64032b9e9b938fda23325e68a3771f0fabf414dc
+  boost: 57d2868c099736d80fcd648bf211b4431e51a558
   BVLinearGradient: 612a04ff38e8480291f3379ee5b5a2c571f03fe0
   CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
@@ -822,6 +822,7 @@ SPEC CHECKSUMS:
   React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba
   React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4
   react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
+  react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
   react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
   react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18
   react-native-cameraroll: 4701ae7c3dbcd3f5e9e150ca17f250a276154b35
@@ -881,7 +882,6 @@ SPEC CHECKSUMS:
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
-  TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
   Yoga: 86fed2e4d425ee4c6eab3813ba1791101ee153c6
 
 PODFILE CHECKSUM: 3f98ce893757dfa17e609ef7cd24fa41635b73a6