resolve conflicts

Author: luacmartins

.eslintignore

@@ -14,5 +14,6 @@ web/gtm.js
 src/libs/SearchParser/searchParser.js
 src/libs/SearchParser/autocompleteParser.js
 help/_scripts/**
+modules/ExpensifyNitroUtils/nitrogen/**
 Mobile-Expensify/**
 vendor

.github/workflows/deploy.yml

@@ -273,7 +273,7 @@ jobs:
               attachments: [{
                 color: "#DB4545",
                 pretext: `<!subteam^S4TJJ3PSL>`,
-                text: `💥 Android HybridApp production <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|deploy run> failed. Please <https://stackoverflowteams.com/c/expensify/questions/5738|manually submit> ${{ needs.prep.outputs.APP_VERSION }} in the <https://play.google.com/console/u/0/developers/8765590895836334604/app/4974129597497161901/releases/overview|Google Play Store>. 💥 But first check the workflow, it's likely that the release was successful and <https://github.com/Expensify/Expensify/issues/488492|this error> is occuring)`,
+                text: `💥 Android HybridApp production <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|deploy run> failed. Please <https://stackoverflowteams.com/c/expensify/questions/5738|manually submit> ${{ needs.prep.outputs.APP_VERSION }} in the <https://play.google.com/console/u/0/developers/8765590895836334604/app/4974129597497161901/releases/overview|Google Play Store> 💥`,
               }]
             }
         env:

.gitignore

@@ -150,3 +150,6 @@ react-compiler-output.txt
 
 # React Native Enterprise Framework
 .rnef/
+
+# Generated by bob (for Nitro modules)
+modules/*/lib/

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009016300
-        versionName "9.1.63-0"
+        versionCode 1009016400
+        versionName "9.1.64-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -10,6 +10,7 @@
 # Add any project specific keep options here:
 -keep class com.expensify.chat.BuildConfig { *; }
 -keep class com.facebook.** { *; }
+-keep class com.margelo.nitro.** { *; }
 -keep, allowoptimization, allowobfuscation class expo.modules.** { *; }
 
 # Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).

android/app/proguard-rules.pro

@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

android/app/src/main/AndroidManifest.xml

@@ -316,6 +316,7 @@
         "mapboxgl",
         "marcaaron",
         "Marcin",
+        "margelo",
         "Marqeta",
         "mateusz",
         "McAfee",
@@ -689,6 +690,9 @@
         "ios/GoogleService-Info-DEV.plist",
         "ios/AirshipConfig.plist",
         "Mobile-Expensify",
+        "modules/ExpensifyNitroUtils/nitrogen/**",
+        "modules/ExpensifyNitroUtils/android/build.gradle",
+        "modules/ExpensifyNitroUtils/android/src/main/cpp/**",
         "src/TIMEZONES.ts",
         "tests/unit/EmojiTest.ts",
         "tests/unit/FastSearchTest.ts",