[INJIMOB-3372]: [Develop] Target sdk version updated to 35 (#2047)

* [INJIMOB-3372]: Update targetSdkVersion to 35 and upgrading kotlin and gradle versions (#2040) Signed-off-by: balachandarg-tw <balachandar.g@thoughtworks.com> * [INJIMOB-3372]: Update `react-native-screens` version to 3.33.0 for targetSdkVersion crash fix (#2043) Signed-off-by: balachandarg-tw <balachandar.g@thoughtworks.com> * [INJIMOB-3372] refactor: sync package-lock (#2044) Signed-off-by: KiruthikaJeyashankar <kiruthikavjshankar@gmail.com> Co-authored-by: KiruthikaJeyashankar <kiruthikavjshankar@gmail.com> Signed-off-by: balachandarg-tw <balachandar.g@thoughtworks.com> * [INJIMOB-3372]: Update read me Signed-off-by: balachandarg-tw <balachandar.g@thoughtworks.com> --------- Signed-off-by: balachandarg-tw <balachandar.g@thoughtworks.com> Signed-off-by: KiruthikaJeyashankar <kiruthikavjshankar@gmail.com> Co-authored-by: KiruthikaJeyashankar <kiruthikavjshankar@gmail.com>
2026-01-06 20:23:52 -05:00 · 2025-08-13 14:58:57 +05:30
parent 0a7c9e3477
commit 0a62157716
7 changed files with 108 additions and 35 deletions
--- a/.talismanrc
+++ b/.talismanrc
@@ -2,7 +2,7 @@ fileignoreconfig:
  - filename: package.json
    checksum: 5b4fcb5ddc7cc96cc2d1733b544d56ea66e88cdab995a1052fbf9ac0e9c2dc21
  - filename: package-lock.json
-    checksum: 8925d62a7011241371e295553f7bbe1af468c7f3f4d051436a30c8885a12d0a5
+    checksum: 1885743d6ee2727f5f5b175db599676232f549b12e3ec94efc7c050f7a61b8d7
  - filename: lib/jsonld-signatures/suites/ed255192018/ed25519.ts
    checksum: 493b6e31144116cb612c24d98b97d8adcad5609c0a52c865a6847ced0a0ddc3a
  - filename: components/PasscodeVerify.tsx
--- a/README.md
+++ b/README.md
@@ -23,13 +23,13 @@ Be sure to have the following build tools installed before proceeding:
 ### Android

 - [Java 17](https://openjdk.org/projects/jdk/17/)
- [Gradle 8.2](https://gradle.org/install/)
- [Android SDK](https://developer.android.com/)
+- [Gradle 8.6](https://gradle.org/install/)
+- [Android SDK](https://developer.android.com/). Make sure to install Android SDK Build-Tools - `35.0.0` from SDK Manager.
 - minSdkVersion = 24
- compileSdkVersion = 34
- targetSdkVersion = 34
+- compileSdkVersion = 35
+- targetSdkVersion = 35
 - ndkVersion = 21.4.7075529
- kotlinVersion = 1.9.0
+- kotlinVersion = 1.9.22

 ### iOS

@@ -40,7 +40,7 @@ Be sure to have the following build tools installed before proceeding:

 ## Configuring the Environment

-If you ever want to use something in your local environment based on your customization and in need of using environment files other than default (.env), you can add some variables to your .env.local file. 
+If you ever want to use something in your local environment based on your customization and in need of using environment files other than default (.env), you can add some variables to your .env.local file.
 Create a `.env.local` file using `.env` as your template in your root directory :

 ```
@@ -75,8 +75,8 @@ Note: Alternative to building and running app via react native CLI, it can be bu
 4.1 and above) and the app can be built and run from there.

 More info here:
- [Build your app using Android Studio](https://developer.android.com/studio/run)

+- [Build your app using Android Studio](https://developer.android.com/studio/run)

 ## Building & Running for iOS

@@ -87,25 +87,28 @@ More info here:
 - [React Native - Publishing to the App Store](https://reactnative.dev/docs/publishing-to-app-store)
 - [Apple Developer - Distributing Your App for Beta Testing and Releases](https://developer.apple.com/documentation/xcode/distributing-your-app-for-beta-testing-and-releases)

-### Note 
+### Note

-When application is built via IDE, metro need to be started manually (For instance, if building app via XCode open metro manually, as metro hook has been removed from building via XCode - [reference](https://github.com/facebook/react-native/issues/42173#issuecomment-1921091973)). 
+When application is built via IDE, metro need to be started manually (For instance, if building app via XCode open metro manually, as metro hook has been removed from building via XCode - [reference](https://github.com/facebook/react-native/issues/42173#issuecomment-1921091973)).
 However, if app is built via npm commands, metro starts automatically (For instance, `npm run android:mosip` or `npm run ios`)

 ## Known Issues

 - **Terminal Configuration Error**
-   
+
  When attempting to build the application using certain terminals via npm commands, you may encounter the following error:

-    ```
-    Cannot start server in new windows because no terminal app was specified, use --terminal to specify, or start a dev server manually by running npm start or yarn start in other terminal window.
-    ```
-  **Cause:** 
-    - This issue occurs due to missing or incorrect terminal configuration or environment settings.
-  
+  ```
+  Cannot start server in new windows because no terminal app was specified, use --terminal to specify, or start a dev server manually by running npm start or yarn start in other terminal window.
+  ```
+
+  **Cause:**
+
+  - This issue occurs due to missing or incorrect terminal configuration or environment settings.
+
  **Workaround:**
-  - Start the development server manually by running `npm start` in a separate terminal window. 
+
+  - Start the development server manually by running `npm start` in a separate terminal window.

 ## Contributions

--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,13 +2,13 @@

 buildscript {
    ext {
-        buildToolsVersion = "33.0.0"
+        buildToolsVersion = "35.0.0"
        minSdkVersion = 24
-        compileSdkVersion = 34
-        targetSdkVersion = 34
+        compileSdkVersion = 35
+        targetSdkVersion = 35
        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
        ndkVersion = "21.4.7075529"
-        kotlinVersion = "1.9.0"
+        kotlinVersion = "1.9.22"
    }
    repositories {
        google()
@@ -17,7 +17,7 @@ buildscript {
        mavenLocal()
    }
    dependencies {
-        classpath("com.android.tools.build:gradle:8.2")
+        classpath("com.android.tools.build:gradle:8.4.0")
        classpath("com.facebook.react:react-native-gradle-plugin")
        classpath("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3")
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
@@ -27,7 +27,7 @@ buildscript {

 // @generated begin expo-camera-import - expo prebuild (DO NOT MODIFY) sync-f244f4f3d8bf7229102e8f992b525b8602c74770
 def expoCameraMavenPath = new File(["node", "--print", "require.resolve('expo-camera/package.json')"].execute(null, rootDir).text.trim(), "../android/maven")
-allprojects { repositories { 
+allprojects { repositories {
    maven{url("https://central.sonatype.com/repository/maven-snapshots/")}
    maven { url(expoCameraMavenPath) }
    mavenCentral()
@@ -42,5 +42,5 @@ allprojects { repositories {
        }
    }
    }
-} 
-// @generated end expo-camera-import
+}
+// @generated end expo-camera-import
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/package-lock.json
+++ b/package-lock.json
@@ -90,7 +90,7 @@
        "react-native-restart": "^0.0.24",
        "react-native-rsa-native": "^2.0.5",
        "react-native-safe-area-context": "4.10.5",
-        "react-native-screens": "3.31.1",
+        "react-native-screens": "3.33.0",
        "react-native-securerandom": "^1.0.1",
        "react-native-shimmer-placeholder": "^2.0.9",
        "react-native-spinkit": "^1.5.1",
@@ -9794,6 +9794,7 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "license": "ISC",
      "peer": true
    },
    "node_modules/abort-controller": {
@@ -10101,6 +10102,7 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
      "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
+      "license": "MIT",
      "peer": true,
      "engines": {
        "node": ">=0.10.0"
@@ -10300,6 +10302,7 @@
      "version": "3.2.6",
      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "license": "MIT",
      "peer": true
    },
    "node_modules/async-each": {
@@ -13094,6 +13097,7 @@
      "version": "4.6.3",
      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
      "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
+      "license": "MIT",
      "peer": true,
      "engines": {
        "node": "*"
@@ -13461,6 +13465,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
      "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
+      "license": "MIT",
      "peer": true,
      "engines": {
        "node": ">=0.10.0"
@@ -14698,6 +14703,7 @@
      "version": "0.4.14",
      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
      "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==",
+      "license": "MIT",
      "peer": true
    },
    "node_modules/eventemitter3": {
@@ -14947,6 +14953,7 @@
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "homedir-polyfill": "^1.0.1"
@@ -15893,6 +15900,7 @@
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz",
      "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "detect-file": "^1.0.0",
@@ -15908,6 +15916,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "expand-tilde": "^2.0.2",
@@ -15924,6 +15933,7 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "license": "MIT",
      "peer": true,
      "engines": {
        "node": ">= 0.10"
@@ -16011,6 +16021,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "for-in": "^1.0.1"
@@ -16407,6 +16418,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "global-prefix": "^1.0.1",
@@ -16421,6 +16433,7 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "expand-tilde": "^2.0.2",
@@ -16437,6 +16450,7 @@
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "license": "ISC",
      "peer": true,
      "dependencies": {
        "isexe": "^2.0.0"
@@ -16547,6 +16561,7 @@
      "version": "1.6.1",
      "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz",
      "integrity": "sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "dateformat": "~4.6.2",
@@ -16574,6 +16589,7 @@
      "version": "1.4.3",
      "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz",
      "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "grunt-known-options": "~2.0.0",
@@ -16593,6 +16609,7 @@
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "license": "ISC",
      "peer": true,
      "dependencies": {
        "abbrev": "1",
@@ -16623,6 +16640,7 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
      "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
+      "license": "MIT",
      "peer": true,
      "engines": {
        "node": ">=0.10.0"
@@ -16632,6 +16650,7 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
      "integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "colors": "~1.1.2",
@@ -16647,6 +16666,7 @@
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz",
      "integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "chalk": "~4.1.0",
@@ -16660,6 +16680,7 @@
      "version": "4.3.0",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "color-convert": "^2.0.1"
@@ -16675,6 +16696,7 @@
      "version": "4.1.2",
      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "ansi-styles": "^4.1.0",
@@ -16691,6 +16713,7 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "color-name": "~1.1.4"
@@ -16703,12 +16726,14 @@
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT",
      "peer": true
    },
    "node_modules/grunt-legacy-log-utils/node_modules/has-flag": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
      "peer": true,
      "engines": {
        "node": ">=8"
@@ -16718,6 +16743,7 @@
      "version": "7.2.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "has-flag": "^4.0.0"
@@ -16730,6 +16756,7 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz",
      "integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "async": "~3.2.0",
@@ -16748,6 +16775,7 @@
      "version": "1.0.10",
      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "sprintf-js": "~1.0.2"
@@ -16758,6 +16786,7 @@
      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "license": "ISC",
      "peer": true,
      "dependencies": {
        "fs.realpath": "^1.0.0",
@@ -16778,6 +16807,7 @@
      "version": "0.6.3",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -16790,6 +16820,7 @@
      "version": "3.14.1",
      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "argparse": "^1.0.7",
@@ -16803,6 +16834,7 @@
      "version": "3.0.8",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
      "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
+      "license": "ISC",
      "peer": true,
      "dependencies": {
        "brace-expansion": "^1.1.7"
@@ -17062,6 +17094,7 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "parse-passwd": "^1.0.0"
@@ -17410,6 +17443,7 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
      "integrity": "sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==",
+      "license": "MIT",
      "peer": true
    },
    "node_modules/invariant": {
@@ -17440,6 +17474,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "is-relative": "^1.0.0",
@@ -17896,6 +17931,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "is-unc-path": "^1.0.0"
@@ -18003,6 +18039,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "unc-path-regex": "^0.1.2"
@@ -21005,6 +21042,7 @@
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz",
      "integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "extend": "^3.0.2",
@@ -21024,6 +21062,7 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
      "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "detect-file": "^1.0.0",
@@ -21931,6 +21970,7 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "kind-of": "^6.0.2"
@@ -23164,6 +23204,7 @@
      "version": "3.0.6",
      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
      "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
+      "license": "ISC",
      "peer": true,
      "dependencies": {
        "abbrev": "1"
@@ -23429,6 +23470,7 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
      "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "array-each": "^1.0.1",
@@ -23444,6 +23486,7 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "license": "MIT",
      "peer": true,
      "engines": {
        "node": ">=0.10.0"
@@ -23497,6 +23540,7 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
      "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "for-own": "^1.0.0",
@@ -23900,6 +23944,7 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
      "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "is-absolute": "^1.0.0",
@@ -23937,6 +23982,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
+      "license": "MIT",
      "peer": true,
      "engines": {
        "node": ">=0.10.0"
@@ -24241,6 +24287,7 @@
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
      "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "path-root-regex": "^0.1.0"
@@ -24253,6 +24300,7 @@
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
      "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
+      "license": "MIT",
      "peer": true,
      "engines": {
        "node": ">=0.10.0"
@@ -25148,6 +25196,7 @@
      "version": "16.13.1",
      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz",
      "integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "loose-envify": "^1.1.0",
@@ -25163,6 +25212,7 @@
      "version": "0.19.1",
      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
      "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "loose-envify": "^1.1.0",
@@ -25679,9 +25729,10 @@
      }
    },
    "node_modules/react-native-screens": {
-      "version": "3.31.1",
-      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.31.1.tgz",
-      "integrity": "sha512-8fRW362pfZ9y4rS8KY5P3DFScrmwo/vu1RrRMMx0PNHbeC9TLq0Kw1ubD83591yz64gLNHFLTVkTJmWeWCXKtQ==",
+      "version": "3.33.0",
+      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.33.0.tgz",
+      "integrity": "sha512-3bKeT/kS1g/6XqraBqjDtyyci35LDeDIHMoko74o+Z5p1oLEi697GWFVwsG272FF0iuOullUbuRNzCcEfRBASQ==",
+      "license": "MIT",
      "dependencies": {
        "react-freeze": "^1.0.0",
        "warn-once": "^0.1.0"
@@ -26569,6 +26620,7 @@
      "version": "0.7.1",
      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "resolve": "^1.9.0"
@@ -26828,6 +26880,7 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "expand-tilde": "^2.0.0",
@@ -29692,6 +29745,7 @@
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "license": "MIT",
      "peer": true,
      "engines": {
        "node": ">=0.10.0"
@@ -29701,6 +29755,7 @@
      "version": "3.3.6",
      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz",
      "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "sprintf-js": "^1.1.1",
@@ -29714,6 +29769,7 @@
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "license": "BSD-3-Clause",
      "peer": true
    },
    "node_modules/undici": {
@@ -30168,6 +30224,7 @@
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+      "license": "MIT",
      "peer": true,
      "dependencies": {
        "homedir-polyfill": "^1.0.1"
@@ -49663,9 +49720,9 @@
      "requires": {}
    },
    "react-native-screens": {
-      "version": "3.31.1",
-      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.31.1.tgz",
-      "integrity": "sha512-8fRW362pfZ9y4rS8KY5P3DFScrmwo/vu1RrRMMx0PNHbeC9TLq0Kw1ubD83591yz64gLNHFLTVkTJmWeWCXKtQ==",
+      "version": "3.33.0",
+      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.33.0.tgz",
+      "integrity": "sha512-3bKeT/kS1g/6XqraBqjDtyyci35LDeDIHMoko74o+Z5p1oLEi697GWFVwsG272FF0iuOullUbuRNzCcEfRBASQ==",
      "requires": {
        "react-freeze": "^1.0.0",
        "warn-once": "^0.1.0"
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
    "react-native-restart": "^0.0.24",
    "react-native-rsa-native": "^2.0.5",
    "react-native-safe-area-context": "4.10.5",
-    "react-native-screens": "3.31.1",
+    "react-native-screens": "3.33.0",
    "react-native-securerandom": "^1.0.1",
    "react-native-shimmer-placeholder": "^2.0.9",
    "react-native-spinkit": "^1.5.1",
--- a/patches/expo-modules-core+1.12.26.patch
+++ b/patches/expo-modules-core+1.12.26.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/permissions/PermissionsService.kt b/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/permissions/PermissionsService.kt
+index ae0a811..519ce3f 100644
+--- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/permissions/PermissionsService.kt
+++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/permissions/PermissionsService.kt
+@@ -163,7 +163,7 @@ open class PermissionsService(val context: Context) : InternalModule, Permission
+   override fun isPermissionPresentInManifest(permission: String): Boolean {
+     try {
+       context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_PERMISSIONS)?.run {
+-        return requestedPermissions.contains(permission)
+        return requestedPermissions.orEmpty().contains(permission)
+       }
+       return false
+     } catch (e: PackageManager.NameNotFoundException) {