Skip to content

Commit 6e5dfb9

Browse files
authored
Merge branch 'main' into krishna2323/issue/61751
2 parents a973066 + a7e43b5 commit 6e5dfb9

422 files changed

Lines changed: 15325 additions & 3002 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ web/gtm.js
1414
src/libs/SearchParser/searchParser.js
1515
src/libs/SearchParser/autocompleteParser.js
1616
help/_scripts/**
17+
modules/ExpensifyNitroUtils/nitrogen/**
1718
Mobile-Expensify/**
1819
vendor

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,6 @@ react-compiler-output.txt
150150

151151
# React Native Enterprise Framework
152152
.rnef/
153+
154+
# Generated by bob (for Nitro modules)
155+
modules/*/lib/

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009016301
118-
versionName "9.1.63-1"
117+
versionCode 1009016600
118+
versionName "9.1.66-0"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

android/app/proguard-rules.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# Add any project specific keep options here:
1111
-keep class com.expensify.chat.BuildConfig { *; }
1212
-keep class com.facebook.** { *; }
13+
-keep class com.margelo.nitro.** { *; }
1314
-keep, allowoptimization, allowobfuscation class expo.modules.** { *; }
1415

1516
# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<uses-permission android:name="android.permission.INTERNET" />
66
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
77
<uses-permission android:name="android.permission.CAMERA" />
8+
<uses-permission android:name="android.permission.READ_CONTACTS" />
89
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
910
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
1011
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

assets/images/educational-illustration__multi-scan.svg

Lines changed: 380 additions & 0 deletions
Loading

assets/images/fast-track-cover.png

-56.9 KB
Binary file not shown.
Lines changed: 109 additions & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)