Skip to content

Commit ce87f43

Browse files
committed
Merge branch 'main' into add-Unicode-custom-emojis
2 parents 55f7488 + 58229fe commit ce87f43

297 files changed

Lines changed: 6722 additions & 4974 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.grad
1313
/* Fullstory settings */
1414
fullstory {
1515
org 'o-1WN56P-na1'
16-
enabledVariants 'production'
16+
enabledVariants 'all'
1717
logcatLevel 'debug'
1818
recordOnStart false
1919
}
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009017600
118-
versionName "9.1.76-0"
117+
versionCode 1009017800
118+
versionName "9.1.78-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/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ buildscript {
3232
classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
3333
classpath("com.google.firebase:perf-plugin:1.4.1")
3434
// Fullstory integration
35-
classpath ("com.fullstory:gradle-plugin-local:1.52.0")
35+
classpath ("com.fullstory:gradle-plugin-local:1.61.0")
3636

3737
// NOTE: Do not place your application dependencies here; they belong
3838
// in the individual module build.gradle files

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.

0 commit comments

Comments
 (0)