Skip to content

Commit 5ebddb2

Browse files
authored
Merge branch 'Expensify:main' into krishna2323/issue/56181
2 parents 2297a90 + fbe2b76 commit 5ebddb2

Some content is hidden

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

52 files changed

+1450
-609
lines changed

.eslintrc.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,14 @@ module.exports = {
150150
{
151151
selector: ['variable', 'property'],
152152
format: ['camelCase', 'UPPER_CASE', 'PascalCase'],
153+
// This filter excludes variables and properties that start with "private_" to make them valid.
154+
//
155+
// Examples:
156+
// - "private_a" → valid
157+
// - "private_test" → valid
158+
// - "private_" → not valid
153159
filter: {
154-
regex: '^private_[a-z][a-zA-Z0-9]+$',
160+
regex: '^private_[a-z][a-zA-Z0-9]*$',
155161
match: false,
156162
},
157163
},

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ android {
110110
minSdkVersion rootProject.ext.minSdkVersion
111111
targetSdkVersion rootProject.ext.targetSdkVersion
112112
multiDexEnabled rootProject.ext.multiDexEnabled
113-
versionCode 1009009701
114-
versionName "9.0.97-1"
113+
versionCode 1009009801
114+
versionName "9.0.98-1"
115115
// Supported language variants must be declared here to avoid from being removed during the compilation.
116116
// This also helps us to not include unnecessary language variants in the APK.
117117
resConfigs "en", "es"
Lines changed: 55 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)