Fix conflicts

.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

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 1001043106
-        versionName "1.4.31-6"
+        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()

docs/articles/expensify-classic/billing-and-subscriptions/Receipt-Breakdown.md

@@ -16,16 +16,16 @@ Your receipt is broken up into multiple sections that include:
 The top section will show the total amount you paid as the billing owner of Expensify workspaces and give you a breakdown of price per member. Every member of your workspace(s) gets to store data, review data, and access free features like Expensify Chat. Thus, we show the total price and then use all of the members across all of the workspaces you own to calculate the price per member. Further down in the receipt, and in this article, we break down the members who generated billable activity.
 
 ## How-to reduce your bill and get paid to use Expensify
-Chances are you can actually get paid to use Expensify with the Expensify Card. In this section of the receipt, we outline how much money you're leaving on the table by not using the Expensify Card. You can click `Get started` to connect with your account manager (if you have one) or Concierge, both of whom can help get you started with the card. 
-                                                                                                                                                                                                                                                                         
+Chances are you can actually get paid to use Expensify with the Expensify Card. In this section of the receipt, we outline how much money you're leaving on the table by not using the Expensify Card. You can click `Get started` to connect with your account manager (if you have one) or Concierge, both of whom can help get you started with the card.  
+
 _Note: Currently, we offer Expensify Cards to companies with USD bank accounts._ 
 
 ## How-to understand your billing breakdown 
 Your receipt will have a detailed breakdown of activity and discounts across all workspaces. Here's a description of items that may appear on your bill:
 - [Number of] Inactive workspace members @ $0.00
   - All inactive members from any of your workspaces.
 - [Number of] Chat-only members @ $0.00 
-  - Any workspace members who chatted but didn't generate any other billable activity. Learn more about [chatting for free.](https://help.expensify.com/articles/new-expensify/getting-started/chat/Everything-About-Chat) 
+  - Any workspace members who chatted but didn't generate any other billable activity. Learn more about [chatting for free.](https://help.expensify.com/articles/new-expensify/chat/Introducing-Expensify-Chat) 
 - [Number of] Annual Control members @ $18.00
   - Any members included in your annual subscription on the Control plan. 
 - [Number of] Pay-per-use Control members @ $36.00
@@ -37,9 +37,9 @@ Your receipt will have a detailed breakdown of activity and discounts across all
 - [Number of] Free members @ $0.00
   - All members across any of your Free workspaces.
 - X% Expensify Card discount with $Y spend
-  - This shows the % discount you're getting based on total spend across your Expensify Cards. This is only available in the US.
+  - This shows the % discount you're getting based on total approved spend across your Expensify Cards. This is only available in the US.
 - X% Expensify Card cash back credit for $Y spend
-  - The amount of cash back you've earned based on total spend across your Expensify Cards. This is only available in the US.
+  - The amount of cash back you've earned based on total approved spend across your Expensify Cards. This is only available in the US.
 - 50% ExpensifyApproved! partner discount
   - If you're part of an accounting firm, you get an additional discount for being our partner. [Learn more about our ExpensifyApproved! accountants program.](https://use.expensify.com/accountants-program) 
 - Total 

docs/articles/expensify-classic/expensify-card/Set-Up-the-Card-for-Your-Company.md

@@ -58,7 +58,7 @@ Applying for or using the Expensify Card will never have any positive or negativ
 
 ## How much does the Expensify Card cost?
 
-The Expensify Card is a free corporate card, and no fees are associated with it. In addition, if you use the Expensify Card, you can save money on your Expensify subscription.
+The Expensify Card is a free corporate card, and no fees are associated with it. In addition, if you use the Expensify Card, you can save money on your Expensify subscription (based on how much of your approved spend occurs on the Expensify Card, compared with other approved spend, in each month).
 
 ## If I have staff outside the US, can they use the Expensify Card?