Skip to content

Commit a67f947

Browse files
committed
Merge branch 'main' into war-in/send-hybridAppSettings-in-native-method
2 parents 64bcc69 + e8ee21b commit a67f947

259 files changed

Lines changed: 5581 additions & 4646 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.

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ module.exports = {
230230
'rulesdir/no-multiple-onyx-in-file': 'off',
231231
'rulesdir/prefer-underscore-method': 'off',
232232
'rulesdir/prefer-import-module-contents': 'off',
233+
'rulesdir/no-beta-handler': 'error',
233234

234235
// React and React Native specific rules
235236
'react-native-a11y/has-accessibility-hint': ['off'],

.github/workflows/publishReactNativeAndroidArtifacts.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ on:
1818
- package.json
1919
- patches/react-native+*.patch
2020
- patches/@react-native+*.patch
21+
- patches/react-native/react-native+*.patch
22+
- patches/react-native/@react-native+*.patch
2123
- Mobile-Expensify
2224

2325
jobs:

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 1009017409
118-
versionName "9.1.74-9"
117+
versionCode 1009017701
118+
versionName "9.1.77-1"
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"

assets/images/integrationicons/export/microsoft-dynamics-icon.svg

Lines changed: 0 additions & 25 deletions
This file was deleted.

assets/images/integrationicons/export/netsuite-icon.svg

Lines changed: 0 additions & 25 deletions
This file was deleted.

assets/images/integrationicons/export/netsuite-oracle-icon.svg

Lines changed: 0 additions & 30 deletions
This file was deleted.

assets/images/integrationicons/export/oracle-icon.svg

Lines changed: 0 additions & 28 deletions
This file was deleted.

assets/images/integrationicons/export/qbo-icon.svg

Lines changed: 0 additions & 25 deletions
This file was deleted.

assets/images/integrationicons/export/sage-intacct-icon.svg

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)