fix conflict

Expensify · Jan 31, 2024 · 3ebb157 · 3ebb157
2 parents d6fed2b + 49fbaa0
commit 3ebb157
Show file tree

Hide file tree

Showing 208 changed files with 4,373 additions and 42,259 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001043202
-        versionName "1.4.32-2"
+        versionCode 1001043400
+        versionName "1.4.34-0"
     }
 
     flavorDimensions "default"

diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
@@ -11,6 +11,15 @@
 -keep class com.expensify.chat.BuildConfig { *; }
 -keep, allowoptimization, allowobfuscation class expo.modules.** { *; }
 
+# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
+-keep,allowobfuscation,allowshrinking interface retrofit2.Call
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
+
+# With R8 full mode generic signatures are stripped for classes that are not
+# kept. Suspend functions are wrapped in continuations where the type argument
+# is used.
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
 # Added from auto-generated missingrules.txt to allow build to succeed
 -dontwarn com.onfido.javax.inject.Inject
 -dontwarn javax.lang.model.element.Element

diff --git a/assets/animations/Update.lottie b/assets/animations/Update.lottie
diff --git a/assets/images/eReceiptIcon.svg b/assets/images/eReceiptIcon.svg
diff --git a/assets/images/new-expensify.svg b/assets/images/new-expensify.svg
diff --git a/config/webpack/webpack.desktop.js b/config/webpack/webpack.desktop.js
@@ -54,15 +54,6 @@ module.exports = (env) => {
                     loader: 'babel-loader',
                     exclude: /node_modules/,
                 },
-                {
-                    test: /react-native-onyx/,
-                    use: {
-                        loader: 'babel-loader',
-                        options: {
-                            presets: ['@babel/preset-react'],
-                        },
-                    },
-                },
             ],
         },
     };

diff --git a/contributingGuides/FORMS.md b/contributingGuides/FORMS.md
@@ -161,7 +161,7 @@ function validate(values) {
             errors = ErrorUtils.addErrorMessage(errors, 'firstName', 'personalDetails.error.hasInvalidCharacter');
         }
 
-        if (ValidationUtils.doesContainReservedWord(values.firstName, CONST.DISPLAY_NAME.RESERVED_FIRST_NAMES)) {
+        if (ValidationUtils.doesContainReservedWord(values.firstName, CONST.DISPLAY_NAME.RESERVED_NAMES)) {
             errors = ErrorUtils.addErrorMessage(errors, 'firstName', 'personalDetails.error.containsReservedWord');
         }
 

diff --git a/docs/_data/_routes.yml b/docs/_data/_routes.yml
@@ -118,7 +118,3 @@ platforms:
         icon: /assets/images/money-into-wallet.svg
         description: Whether you submit an expense report or an invoice, find out here how to ensure a smooth and timely payback process every time.
 
-      - href: workspace-and-domain-settings
-        title: Workspace & Domain Settings
-        icon: /assets/images/shield.svg
-        description: Discover how to set up and manage your workspace, define user permissions, and implement domain-level rules.
diff --git a/docs/articles/expensify-classic/getting-started/Employees.md b/docs/articles/expensify-classic/getting-started/Employees.md