Merge branch 'main' into fix/27165-after-revert

Expensify · Oct 20, 2023 · 808f9da · 808f9da
2 parents 7dfeba7 + 69119aa
commit 808f9da
Show file tree

Hide file tree

Showing 131 changed files with 3,678 additions and 1,763 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -37,10 +37,12 @@ module.exports = {
     overrides: [
         {
             files: ['*.js', '*.jsx', '*.ts', '*.tsx'],
+            plugins: ['react'],
             rules: {
                 'rulesdir/no-multiple-onyx-in-file': 'off',
                 'rulesdir/onyx-props-must-have-default': 'off',
                 'react-native-a11y/has-accessibility-hint': ['off'],
+                'react/jsx-no-constructed-context-values': 'error',
                 'react-native-a11y/has-valid-accessibility-descriptors': [
                     'error',
                     {

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001038701
-        versionName "1.3.87-1"
+        versionCode 1001038708
+        versionName "1.3.87-8"
     }
 
     flavorDimensions "default"

diff --git a/assets/images/bankicons/american-express.svg b/assets/images/bankicons/american-express.svg
diff --git a/assets/images/bankicons/bank-of-america.svg b/assets/images/bankicons/bank-of-america.svg
diff --git a/assets/images/bankicons/bb-t.svg b/assets/images/bankicons/bb-t.svg