Merge branch 'main' into fix/54089

Expensify · Dec 25, 2024 · f689929 · f689929
2 parents 72a038c + ad99c20
commit f689929
Show file tree

Hide file tree

Showing 228 changed files with 4,090 additions and 5,602 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -14,4 +14,3 @@ web/gtm.js
 src/libs/SearchParser/searchParser.js
 src/libs/SearchParser/autocompleteParser.js
 help/_scripts/**
-modules/**
diff --git a/.github/workflows/testBuildHybrid.yml b/.github/workflows/testBuildHybrid.yml
@@ -1,4 +1,4 @@
-name: Build and deploy hybrid apps for testing
+name: Build and deploy hybird apps for testing
 
 on:
   workflow_dispatch:

diff --git a/Mobile-Expensify b/Mobile-Expensify
diff --git a/README.md b/README.md
@@ -500,7 +500,7 @@ It's important to emphasise that a git submodule is just a **regular git reposit
 > #### For external contributors
 >
 > If you'd like to modify the `Mobile-Expensify` source code, it is best that you create your own fork. Then, you can swap origin of the remote repository by executing this command:
-> 
+>
 > `cd Mobile-Expensify && git remote set-url origin <YOUR_FORK_URL>`
 >
 > This way, you'll attach the submodule to your fork repository.

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009007704
-        versionName "9.0.77-4"
+        versionCode 1009007802
+        versionName "9.0.78-2"
         // 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"

diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
@@ -10,7 +10,6 @@
 # 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).

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -5,7 +5,6 @@
     <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" />

diff --git a/assets/images/buildings.svg b/assets/images/buildings.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__building.svg b/assets/images/simple-illustrations/simple-illustration__building.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__buildings.svg b/assets/images/simple-illustrations/simple-illustration__buildings.svg