Merge branch 'main' into fix/34112-wrong-scroll-location

.github/actions/composite/buildAndroidE2EAPK/action.yml

@@ -14,6 +14,24 @@ inputs:
   MAPBOX_SDK_DOWNLOAD_TOKEN:
     description: The token to use to download the MapBox SDK
     required: true
+  PATH_ENV_FILE:
+    description: The path to the .env file to use for the build
+    required: true
+  EXPENSIFY_PARTNER_NAME:
+    description: The name of the Expensify partner to use for the build
+    required: true
+  EXPENSIFY_PARTNER_PASSWORD:
+    description: The password of the Expensify partner to use for the build
+    required: true
+  EXPENSIFY_PARTNER_USER_ID:
+    description: The user ID of the Expensify partner to use for the build
+    required: true
+  EXPENSIFY_PARTNER_USER_SECRET:
+    description: The user secret of the Expensify partner to use for the build
+    required: true
+  EXPENSIFY_PARTNER_PASSWORD_EMAIL:
+    description: The email address of the Expensify partner to use for the build
+    required: true
 
 runs:
   using: composite
@@ -37,9 +55,24 @@ runs:
 
     - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
 
+    - name: Append environment variables to env file
+      shell: bash
+      run: |
+        echo "EXPENSIFY_PARTNER_NAME=${EXPENSIFY_PARTNER_NAME}" >> ${{ inputs.PATH_ENV_FILE }}
+        echo "EXPENSIFY_PARTNER_PASSWORD=${EXPENSIFY_PARTNER_PASSWORD}" >> ${{ inputs.PATH_ENV_FILE }}
+        echo "EXPENSIFY_PARTNER_USER_ID=${EXPENSIFY_PARTNER_USER_ID}" >> ${{ inputs.PATH_ENV_FILE }}
+        echo "EXPENSIFY_PARTNER_USER_SECRET=${EXPENSIFY_PARTNER_USER_SECRET}" >> ${{ inputs.PATH_ENV_FILE }}
+        echo "EXPENSIFY_PARTNER_PASSWORD_EMAIL=${EXPENSIFY_PARTNER_PASSWORD_EMAIL}" >> ${{ inputs.PATH_ENV_FILE }}
+
     - name: Build APK
       run: npm run ${{ inputs.PACKAGE_SCRIPT_NAME }}
       shell: bash
+      env:
+        EXPENSIFY_PARTNER_NAME: ${{ inputs.EXPENSIFY_PARTNER_NAME }}
+        EXPENSIFY_PARTNER_PASSWORD: ${{ inputs.EXPENSIFY_PARTNER_PASSWORD }}
+        EXPENSIFY_PARTNER_USER_ID: ${{ inputs.EXPENSIFY_PARTNER_USER_ID }}
+        EXPENSIFY_PARTNER_USER_SECRET: ${{ inputs.EXPENSIFY_PARTNER_USER_SECRET }}
+        EXPENSIFY_PARTNER_PASSWORD_EMAIL: ${{ inputs.EXPENSIFY_PARTNER_PASSWORD_EMAIL }}
 
     - name: Upload APK
       uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05

.github/scripts/createHelpRedirects.sh

@@ -41,13 +41,13 @@ while read -r line; do
 
     # Basic sanity checking to make sure that the source and destination are in expected
     # subdomains.
-    if ! [[ $SOURCE_URL =~ ^https://community\.expensify\.com ]]; then
-        error "Found source URL that is not a community URL: $SOURCE_URL"
+    if ! [[ $SOURCE_URL =~ ^https://(community|help)\.expensify\.com ]]; then
+        error "Found source URL that is not a communityDot or helpDot URL: $SOURCE_URL"
         exit 1
     fi
 
-    if ! [[ $DEST_URL =~ ^https://help\.expensify\.com ]]; then
-        error "Found destination URL that is not a help URL: $DEST_URL"
+    if ! [[ $DEST_URL =~ ^https://(help|use)\.expensify\.com ]]; then
+        error "Found destination URL that is not a helpDot or useDot URL: $DEST_URL"
         exit 1
     fi
 

.github/workflows/e2ePerformanceTests.yml

@@ -52,6 +52,12 @@ jobs:
           PACKAGE_SCRIPT_NAME: android-build-e2e
           APP_OUTPUT_PATH: android/app/build/outputs/apk/e2e/release/app-e2e-release.apk
           MAPBOX_SDK_DOWNLOAD_TOKEN: ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+          EXPENSIFY_PARTNER_NAME: ${{ secrets.EXPENSIFY_PARTNER_NAME }}
+          EXPENSIFY_PARTNER_PASSWORD: ${{ secrets.EXPENSIFY_PARTNER_PASSWORD }}
+          EXPENSIFY_PARTNER_USER_ID: ${{ secrets.EXPENSIFY_PARTNER_USER_ID }}
+          EXPENSIFY_PARTNER_USER_SECRET: ${{ secrets.EXPENSIFY_PARTNER_USER_SECRET }}
+          EXPENSIFY_PARTNER_PASSWORD_EMAIL: ${{ secrets.EXPENSIFY_PARTNER_PASSWORD_EMAIL }}
+          PATH_ENV_FILE: tests/e2e/.env.e2e
 
   buildDelta:
     runs-on: ubuntu-latest-xl
@@ -114,6 +120,12 @@ jobs:
           PACKAGE_SCRIPT_NAME: android-build-e2edelta
           APP_OUTPUT_PATH: android/app/build/outputs/apk/e2edelta/release/app-e2edelta-release.apk
           MAPBOX_SDK_DOWNLOAD_TOKEN: ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+          EXPENSIFY_PARTNER_NAME: ${{ secrets.EXPENSIFY_PARTNER_NAME }}
+          EXPENSIFY_PARTNER_PASSWORD: ${{ secrets.EXPENSIFY_PARTNER_PASSWORD }}
+          EXPENSIFY_PARTNER_USER_ID: ${{ secrets.EXPENSIFY_PARTNER_USER_ID }}
+          EXPENSIFY_PARTNER_USER_SECRET: ${{ secrets.EXPENSIFY_PARTNER_USER_SECRET }}
+          EXPENSIFY_PARTNER_PASSWORD_EMAIL: ${{ secrets.EXPENSIFY_PARTNER_PASSWORD_EMAIL }}
+          PATH_ENV_FILE: tests/e2e/.env.e2edelta
 
   runTestsInAWS:
     runs-on: ubuntu-latest

.github/workflows/reassurePerformanceTests.yml

@@ -33,6 +33,7 @@ jobs:
           npx reassure --baseline
           git switch --force --detach -
           git merge --no-commit --allow-unrelated-histories "$BASELINE_BRANCH" -X ours
+          git checkout --ours .
           npm install --force
           npx reassure --branch
 

.nvmrc

@@ -1 +1 @@
-20.9.0
+20.10.0

README.md

@@ -58,6 +58,7 @@ If you're using another operating system, you will need to ensure `mkcert` is in
 ## Running the iOS app 📱
 For an M1 Mac, read this [SO](https://stackoverflow.com/questions/64901180/how-to-run-cocoapods-on-apple-silicon-m1) for installing cocoapods.
 
+* If you haven't already, install Xcode tools and make sure to install the optional "iOS Platform" package as well. This installation may take awhile.
 * Install project gems, including cocoapods, using bundler to ensure everyone uses the same versions. In the project root, run: `bundle install`
     * If you get the error `Could not find 'bundler'`, install the bundler gem first: `gem install bundler` and try again.
     * If you are using MacOS and get the error `Gem::FilePermissionError` when trying to install the bundler gem, you're likely using system Ruby, which requires administrator permission to modify. To get around this, install another version of Ruby with a version manager like [rbenv](https://github.com/rbenv/rbenv#installation).

android/app/build.gradle

@@ -71,7 +71,7 @@ project.ext.envConfigFiles = [
 /**
  * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
  */
-def enableProguardInReleaseBuilds = false
+def enableProguardInReleaseBuilds = true
 
 /**
  * The preferred build flavor of JavaScriptCore (JSC)
@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001043107
-        versionName "1.4.31-7"
+        versionCode 1001043202
+        versionName "1.4.32-2"
     }
 
     flavorDimensions "default"
@@ -152,8 +152,9 @@ android {
         }
         release {
             productFlavors.production.signingConfig signingConfigs.release
+            shrinkResources enableProguardInReleaseBuilds
             minifyEnabled enableProguardInReleaseBuilds
-            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
 
             signingConfig null
             // buildTypes take precedence over productFlavors when it comes to the signing configuration,

android/app/proguard-rules.pro

@@ -8,5 +8,31 @@
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
--keep class com.facebook.hermes.unicode.** { *; }
--keep class com.facebook.jni.** { *; }
+-keep class com.expensify.chat.BuildConfig { *; }
+-keep, allowoptimization, allowobfuscation class expo.modules.** { *; }
+
+# Added from auto-generated missingrules.txt to allow build to succeed
+-dontwarn com.onfido.javax.inject.Inject
+-dontwarn javax.lang.model.element.Element
+-dontwarn javax.lang.model.type.TypeMirror
+-dontwarn javax.lang.model.type.TypeVisitor
+-dontwarn javax.lang.model.util.SimpleTypeVisitor7
+-dontwarn net.sf.scuba.data.Gender
+-dontwarn net.sf.scuba.smartcards.CardFileInputStream
+-dontwarn net.sf.scuba.smartcards.CardService
+-dontwarn net.sf.scuba.smartcards.CardServiceException
+-dontwarn org.jmrtd.AccessKeySpec
+-dontwarn org.jmrtd.BACKey
+-dontwarn org.jmrtd.BACKeySpec
+-dontwarn org.jmrtd.PACEKeySpec
+-dontwarn org.jmrtd.PassportService
+-dontwarn org.jmrtd.lds.CardAccessFile
+-dontwarn org.jmrtd.lds.PACEInfo
+-dontwarn org.jmrtd.lds.SecurityInfo
+-dontwarn org.jmrtd.lds.icao.DG15File
+-dontwarn org.jmrtd.lds.icao.DG1File
+-dontwarn org.jmrtd.lds.icao.MRZInfo
+-dontwarn org.jmrtd.protocol.AAResult
+-dontwarn org.jmrtd.protocol.BACResult
+-dontwarn org.jmrtd.protocol.PACEResult
+-dontwarn org.spongycastle.jce.provider.BouncyCastleProvider

android/app/src/main/res/raw/keep.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@mipmap/ic_launcher, @drawable/bootsplash*, @drawable/alert_background,
+        @drawable/ic_launcher*, @drawable/ic_notification*, @drawable/picker_background,
+        @drawable/rn_edit_text_material" />

android/settings.gradle

@@ -17,14 +17,5 @@ apply from: file("../node_modules/@react-native-community/cli-platform-android/n
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
 
-includeBuild('../node_modules/react-native') {
-    dependencySubstitution {
-        substitute(module("com.facebook.react:react-android")).using(project(":packages:react-native:ReactAndroid"))
-        substitute(module("com.facebook.react:react-native")).using(project(":packages:react-native:ReactAndroid"))
-        substitute(module("com.facebook.react:hermes-android")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
-        substitute(module("com.facebook.react:hermes-engine")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
-    }
-}
-
 apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
-useExpoModules()
+useExpoModules()

contributingGuides/CONTRIBUTING.md

@@ -123,7 +123,7 @@ Additionally if you want to discuss an idea with the open source community witho
     ```
 11. [Open a pull request](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork), and make sure to fill in the required fields.
 12. An Expensify engineer and a member from the Contributor-Plus team will be assigned to your pull request automatically to review.
-13. Daily updates on weekdays are highly recommended. If you know you won’t be able to provide updates for > 1 week, please comment on the PR or issue how long you plan to be out so that we may plan accordingly. We understand everyone needs a little vacation here and there. Any issue that doesn't receive an update for 1 full week may be considered abandoned and the original contract terminated.
+13. Daily updates on weekdays are highly recommended. If you know you won’t be able to provide updates within 48 hours, please comment on the PR or issue stating how long you plan to be out so that we may plan accordingly. We understand everyone needs a little vacation here and there. Any issue that doesn't receive an update for 5 days (including weekend days) may be considered abandoned and the original contract terminated.
 
 #### Submit your pull request for final review
 14. When you are ready to submit your pull request for final review, make sure the following checks pass:

docs/articles/expensify-classic/workspace-and-domain-settings/Budgets.md

@@ -44,7 +44,7 @@ Expensify’s Budgets feature allows you to:
 
 {% include faq-begin.md %}
 ## Can I import budgets as a CSV? 
-At this time, you cannot import budgets via CSV since we don’t import categories or tags from direct accounting integrations.
+At this time, you cannot import budgets via CSV.
 
 ## When will I be notified as a budget is hit?
 Notifications are sent twice: