Skip to content

Commit 47fdb69

Browse files
MelvinBotmkhutornyi
andcommitted
Merge remote-tracking branch 'origin/main' into claude-fixCategoryFilterScrollJump
Co-authored-by: mkhutornyi <mkhutornyi@users.noreply.github.com>
2 parents 71ee5be + 49a404b commit 47fdb69

302 files changed

Lines changed: 5698 additions & 2473 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.

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009036502
115-
versionName "9.3.65-2"
114+
versionCode 1009036506
115+
versionName "9.3.65-6"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

assets/images/bank-lock.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/images/bot.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

config/eslint/eslint.config.mjs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,16 @@ const config = defineConfig([
269269
'@typescript-eslint/max-params': ['error', {max: 10}],
270270
'@typescript-eslint/naming-convention': [
271271
'error',
272+
{
273+
selector: ['variable', 'property'],
274+
format: null,
275+
// Allow __esModule because it is a well-known interop property injected by bundlers
276+
// (e.g. Babel/Webpack) and sometimes required by library internals (e.g. react-native-skia).
277+
filter: {
278+
regex: '^__esModule$',
279+
match: true,
280+
},
281+
},
272282
{
273283
selector: ['variable', 'property'],
274284
format: ['camelCase', 'UPPER_CASE', 'PascalCase'],

config/eslint/eslint.seatbelt.tsv

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
"../../src/components/RadioButtonWithLabel.tsx" "no-restricted-syntax" 1
117117
"../../src/components/Reactions/AddReactionBubble.tsx" "react-hooks/refs" 1
118118
"../../src/components/Reactions/MiniQuickEmojiReactions.tsx" "react-hooks/refs" 1
119-
"../../src/components/ReimbursementAccountLoadingIndicator.tsx" "@typescript-eslint/no-deprecated" 1
120119
"../../src/components/ReportActionItem/MoneyRequestReceiptView.tsx" "react-hooks/set-state-in-effect" 1
121120
"../../src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx" "react-hooks/preserve-manual-memoization" 2
122121
"../../src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx" "react-hooks/refs" 1
@@ -279,7 +278,7 @@
279278
"../../src/libs/actions/Policy/PerDiem.ts" "no-restricted-syntax" 1
280279
"../../src/libs/actions/Policy/Plan.ts" "no-restricted-syntax" 1
281280
"../../src/libs/actions/Policy/Policy.ts" "no-restricted-syntax" 10
282-
"../../src/libs/actions/Policy/Policy.ts" "rulesdir/no-onyx-connect" 4
281+
"../../src/libs/actions/Policy/Policy.ts" "rulesdir/no-onyx-connect" 3
283282
"../../src/libs/actions/Policy/ReportField.ts" "no-restricted-syntax" 4
284283
"../../src/libs/actions/Policy/Rules.ts" "no-restricted-syntax" 3
285284
"../../src/libs/actions/Policy/Tag.ts" "no-restricted-syntax" 4

0 commit comments

Comments
 (0)