Merge branch 'main' into ts/NewForm

yli121 · Jan 22, 2024 · 673e83a · 673e83a
2 parents 91a1125 + b542031
commit 673e83a
Show file tree

Hide file tree

Showing 87 changed files with 2,321 additions and 5,599 deletions.
diff --git a/.github/actions/composite/buildAndroidAPKDelta/action.yml b/.github/actions/composite/buildAndroidAPKDelta/action.yml
diff --git a/...ions/composite/buildAndroidAPK/action.yml → ...s/composite/buildAndroidE2EAPK/action.yml b/...ions/composite/buildAndroidAPK/action.yml → ...s/composite/buildAndroidE2EAPK/action.yml
@@ -1,16 +1,35 @@
-name: Build an Android apk
+name: Build an Android apk for e2e tests
 description: Build an Android apk for an E2E test build and upload it as an artifact
 
 inputs:
   ARTIFACT_NAME:
     description: The name of the workflow artifact where the APK should be uploaded
     required: true
+  PACKAGE_SCRIPT_NAME:
+    description: The name of the npm script to run to build the APK
+    required: true
+  APP_OUTPUT_PATH:
+    description: The path to the built APK
+    required: true
+  MAPBOX_SDK_DOWNLOAD_TOKEN:
+    description: The token to use to download the MapBox SDK
+    required: true
 
 runs:
   using: composite
   steps:
+    - name: Configure MapBox SDK
+      run: ./scripts/setup-mapbox-sdk.sh ${{ inputs.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+      shell: bash
+
     - uses: Expensify/App/.github/actions/composite/setupNode@main
 
+    - name: Setup Java
+      uses: actions/setup-java@v3
+      with:
+        distribution: "oracle"
+        java-version: "17"
+
     - uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
       with:
         ruby-version: "2.7"
@@ -19,11 +38,11 @@ runs:
     - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
 
     - name: Build APK
-      run: npm run android-build-e2e
+      run: npm run ${{ inputs.PACKAGE_SCRIPT_NAME }}
       shell: bash
 
     - name: Upload APK
       uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05
       with:
         name: ${{ inputs.ARTIFACT_NAME }}
-        path: android/app/build/outputs/apk/e2e/release/app-e2e-release.apk
+        path: ${{ inputs.APP_OUTPUT_PATH }}
diff --git a/.github/workflows/e2ePerformanceTests.yml b/.github/workflows/e2ePerformanceTests.yml
@@ -30,47 +30,28 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      # - name: Check if there's an existing artifact for this baseline
-      #   id: checkForExistingArtifact
-      #   uses: xSAVIKx/artifact-exists-action@3c5206b1411c0d2fc0840f56b7140646933d9d6a
-      #   with:
-      #     name: baseline-apk-${{ steps.getMostRecentRelease.outputs.VERSION }}
-
-      # - name: Skip build if there's already an existing artifact for the baseline
-      #   if: ${{ fromJSON(steps.checkForExistingArtifact.outputs.exists) }}
-      #   run: echo 'APK for baseline ${{ steps.getMostRecentRelease.outputs.VERSION }} already exists, reusing existing build'
-
-      # - name: Checkout "Baseline" commit (last release)
-      #   if: ${{ !fromJSON(steps.checkForExistingArtifact.outputs.exists) }}
-      #   run: |
-      #     git fetch origin tag ${{ steps.getMostRecentRelease.outputs.VERSION }} --no-tags --depth=1
-      #     git switch --detach ${{ steps.getMostRecentRelease.outputs.VERSION }}
-
-      - name: Checkout latest main commit (TODO temporary until new version is released)
-        run: git switch --detach main
-
-      - uses: ./.github/actions/composite/setupNode
-
-      - uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
+      - name: Check if there's an existing artifact for this baseline
+        id: checkForExistingArtifact
+        uses: xSAVIKx/artifact-exists-action@3c5206b1411c0d2fc0840f56b7140646933d9d6a
         with:
-          ruby-version: "2.7"
-          bundler-cache: true
-
-      - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
+          name: baseline-apk-${{ steps.getMostRecentRelease.outputs.VERSION }}
 
-      - name: Configure MapBox SDK
-        run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+      - name: Skip build if there's already an existing artifact for the baseline
+        if: ${{ fromJSON(steps.checkForExistingArtifact.outputs.exists) }}
+        run: echo 'APK for baseline ${{ steps.getMostRecentRelease.outputs.VERSION }} already exists, reusing existing build'
 
-      - name: Build APK
-        run: npm run android-build-e2e
-        shell: bash
+      - name: Checkout "Baseline" commit (last release)
+        if: ${{ !fromJSON(steps.checkForExistingArtifact.outputs.exists) }}
+        run: |
+          git fetch origin tag ${{ steps.getMostRecentRelease.outputs.VERSION }} --no-tags --depth=1
+          git switch --detach ${{ steps.getMostRecentRelease.outputs.VERSION }}
 
-      - name: Upload APK
-        uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05
+      - uses: ./.github/actions/composite/buildAndroidE2EAPK
         with:
-          name: baseline-apk-${{ steps.getMostRecentRelease.outputs.VERSION }}
-          path: android/app/build/outputs/apk/e2e/release/app-e2e-release.apk
-
+          ARTIFACT_NAME: baseline-apk-${{ steps.getMostRecentRelease.outputs.VERSION }}
+          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 }}
 
   buildDelta:
     runs-on: ubuntu-latest-xl
@@ -127,27 +108,12 @@ jobs:
       - name: Checkout "delta ref"
         run: git checkout ${{ steps.getDeltaRef.outputs.DELTA_REF }}
 
-      - name: Configure MapBox SDK
-        run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
-
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
-
-      - uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
-        with:
-          ruby-version: "2.7"
-          bundler-cache: true
-
-      - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
-
-      - name: Build APK
-        run: npm run android-build-e2edelta
-        shell: bash
-
-      - name: Upload APK
-        uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05
+      - uses: ./.github/actions/composite/buildAndroidE2EAPK
         with:
-          name: delta-apk-${{ steps.getDeltaRef.outputs.DELTA_REF }}
-          path: android/app/build/outputs/apk/e2edelta/release/app-e2edelta-release.apk
+          ARTIFACT_NAME: delta-apk-${{ steps.getDeltaRef.outputs.DELTA_REF }}
+          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 }}
 
   runTestsInAWS:
     runs-on: ubuntu-latest

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 1001042701
-        versionName "1.4.27-1"
+        versionCode 1001042900
+        versionName "1.4.29-0"
     }
 
     flavorDimensions "default"

diff --git a/docs/articles/expensify-classic/expensify-card/Dispute-A-Transaction.md b/docs/articles/expensify-classic/expensify-card/Dispute-A-Transaction.md
@@ -3,7 +3,7 @@ title: Expensify Card - Transaction Disputes & Fraud
 description: Learn how to dispute an Expensify Card transaction. 
 ---
 # Overview
-When using your Expensify Card, you may come across transaction errors, which can include things like:
+When using your Expensify Visa® Commercial Card, you may come across transaction errors, which can include things like:
 - Unrecognized, unauthorized, or fraudulent charges.
 - Transactions of an incorrect amount.
 - Duplicate charges for a single transaction.
@@ -44,7 +44,7 @@ You don't need to categorize your dispute; we'll handle that. However, this may
 To ensure the dispute process goes smoothly, please:
 - Provide detailed information about the disputed charge, including why you're disputing it, what occurred, and any steps you've taken to address the issue.
 - If you recognize the merchant but not the charge, and you've transacted with them before, contact the merchant directly, as it may be a non-fraudulent error.
-- Include supporting documentation like receipts or cancellation confirmations when submitting your dispute to enhance the likelihood of a favorable resolution.
+- Include supporting documentation like receipts or cancellation confirmations when submitting your dispute to enhance the likelihood of a favorable resolution (not required but highly recommended).
 
 {% include faq-begin.md %}
 
@@ -54,7 +54,7 @@ Real-time push notifications alert you of every card charge upfront, helping ide
 Expensify cardholders can dispute suspicious transactions directly via Concierge, either within the Expensify app or by emailing [[email protected]](mailto:[email protected]). Cardholders can also cancel their Expensify Card anytime within our platform.
 
 ## **How long does the dispute process take?**
-The dispute process can take a few days to a few months. It depends on the type of dispute.
+The dispute process generally takes up to 90 days. It depends on the type of dispute. 
 
 ## **Can I cancel a dispute?**
 Contact Concierge if you've filed a dispute and want to cancel it. You might do this if you recognize a previously reported unauthorized charge or if the merchant has already resolved the issue.

diff --git a/...getting-started/playbooks/Expensify-Playbook-For-US-Based-VC-Backed-Startups.md b/...getting-started/playbooks/Expensify-Playbook-For-US-Based-VC-Backed-Startups.md
@@ -80,7 +80,7 @@ For an efficiency-focused company, we recommend setting up [Scheduled Submit](ht
 4. You’ll notice *Scheduled Submit* is located directly under *Report Basics*
 5. Choose *Daily*
 
-Between Expensify's SmartScan technology, direct corporate card feed import, automatic categorization, and [DoubleCheck](https://community.expensify.com/discussion/5738/deep-dive-how-does-concierge-receipt-audit-work) features, your employees shouldn't need to do anything more than swipe their Expensify Card or scan their receipt.
+Between Expensify's SmartScan technology, direct corporate card feed import, automatic categorization, and [DoubleCheck](https://community.expensify.com/discussion/5738/deep-dive-how-does-concierge-receipt-audit-work) features, your employees shouldn't need to do anything more than swipe their Expensify Visa® Commercial Card or scan their receipt.
 
 Scheduled Submit will ensure all expenses are submitted automatically. Any expenses that do not fall within the rules you’ve set up for your policy will be escalated to you for manual review.
 
@@ -155,7 +155,7 @@ The Expensify Card has many benefits for your company. Two in particular are wor
 ### If you don't have a corporate card, use the Expensify Card
 Expensify provides a corporate card with the following features:
 
-- Up to 2% cash back (within the US)
+- Up to 2% cash back (Applies to USD purchases only)
 - [SmartLimits](https://community.expensify.com/discussion/4851/deep-dive-what-are-unapproved-expense-limits#latest)
 - Unlimited Virtual Cards - single-purpose cards with a fixed or monthly limit for specific company purchases
 - A stable, unbreakable connection (third-party bank feeds can run into connectivity issues)

diff --git a/docs/redirects.csv b/docs/redirects.csv
@@ -25,3 +25,8 @@ https://community.expensify.com/discussion/5194/how-to-assign-a-vacation-delegat
 https://community.expensify.com/discussion/5190/how-to-individually-assign-a-vacation-delegate-from-account-settings,https://help.expensify.com/articles/expensify-classic/manage-employees-and-report-approvals/Vacation-Delegate
 https://community.expensify.com/discussion/5274/how-to-set-up-an-adp-indirect-integration-with-expensify,https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/ADP
 https://community.expensify.com/discussion/5776/how-to-create-mileage-expenses-in-expensify,https://help.expensify.com/articles/expensify-classic/get-paid-back/Distance-Tracking#gsc.tab=0
+https://community.expensify.com/discussion/7385/how-to-enable-two-factor-authentication-in-your-account,https://help.expensify.com/articles/expensify-classic/account-settings/Account-Details#gsc.tab=0
+https://community.expensify.com/discussion/5124/how-to-add-your-name-and-photo-to-your-account,https://help.expensify.com/articles/expensify-classic/account-settings/Account-Details#gsc.tab=0
+https://community.expensify.com/discussion/5149/how-to-manage-your-devices-in-expensify,https://help.expensify.com/articles/expensify-classic/account-settings/Account-Details#gsc.tab=0
+https://community.expensify.com/discussion/4432/how-to-add-a-secondary-login,https://help.expensify.com/articles/expensify-classic/account-settings/Account-Details#gsc.tab=0
+https://community.expensify.com/discussion/6794/how-to-change-your-email-in-expensify,https://help.expensify.com/articles/expensify-classic/account-settings/Account-Details#gsc.tab=0
diff --git a/index.js b/index.js
@@ -2,11 +2,9 @@
  * @format
  */
 import {AppRegistry} from 'react-native';
-import {enableLegacyWebImplementation} from 'react-native-gesture-handler';
 import App from './src/App';
 import Config from './src/CONFIG';
 import additionalAppSetup from './src/setup';
 
-enableLegacyWebImplementation(true);
 AppRegistry.registerComponent(Config.APP_NAME, () => App);
 additionalAppSetup();
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.27</string>
+	<string>1.4.29</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.27.1</string>
+	<string>1.4.29.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.27</string>
+	<string>1.4.29</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.27.1</string>
+	<string>1.4.29.0</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.27</string>
+	<string>1.4.29</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.27.1</string>
+	<string>1.4.29.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1158,7 +1158,7 @@ PODS:
   - react-native-airship (15.3.1):
     - AirshipFrameworkProxy (= 2.1.1)
     - React-Core
-  - react-native-blob-util (0.17.3):
+  - react-native-blob-util (0.19.6):
     - React-Core
   - react-native-cameraroll (5.4.0):
     - React-Core
@@ -1399,7 +1399,7 @@ PODS:
     - React-Core
   - RNFS (2.20.0):
     - React-Core
-  - RNGestureHandler (2.14.0):
+  - RNGestureHandler (2.14.1):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1901,7 +1901,7 @@ SPEC CHECKSUMS:
   React-logger: 66b168e2b2bee57bd8ce9e69f739d805732a5570
   React-Mapbuffer: 9ee041e1d7be96da6d76a251f92e72b711c651d6
   react-native-airship: 6ded22e4ca54f2f80db80b7b911c2b9b696d9335
-  react-native-blob-util: 99f4d79189252f597fe0d810c57a3733b1b1dea6
+  react-native-blob-util: d8fa1a7f726867907a8e43163fdd8b441d4489ea
   react-native-cameraroll: 8ffb0af7a5e5de225fd667610e2979fc1f0c2151
   react-native-config: 7cd105e71d903104e8919261480858940a6b9c0e
   react-native-document-picker: 69ca2094d8780cfc1e7e613894d15290fdc54bba
@@ -1951,7 +1951,7 @@ SPEC CHECKSUMS:
   RNFBPerf: 389914cda4000fe0d996a752532a591132cbf3f9
   RNFlashList: 4b4b6b093afc0df60ae08f9cbf6ccd4c836c667a
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
-  RNGestureHandler: 61bfdfc05db9b79dd61f894dcd29d3dcc6db3c02
+  RNGestureHandler: 25b969a1ffc806b9f9ad2e170d4a3b049c6af85e
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: 6f638ec002aa6e906a6f766d69cd45f968d98e64
@@ -1967,7 +1967,7 @@ SPEC CHECKSUMS:
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2
   VisionCamera: 7d13aae043ffb38b224a0f725d1e23ca9c190fe7
-  Yoga: 13c8ef87792450193e117976337b8527b49e8c03
+  Yoga: e64aa65de36c0832d04e8c7bd614396c77a80047
 
 PODFILE CHECKSUM: 0ccbb4f2406893c6e9f266dc1e7470dcd72885d2