Merge remote-tracking branch 'upstream/main' into KJ21-ENG/90933-admin-invite-onboarding-v3

Author: KJ21-ENG

.github/actions/composite/uploadSentrySizeAnalysis/action.yml

@@ -0,0 +1,71 @@
+name: Upload build to Sentry for size analysis
+description: |
+  Download a platform binary and upload it to Sentry for size analysis. The binary is sourced
+  from either the current workflow run's artifacts (cherry-pick prod deploys, which build natively)
+  or the matching staging GitHub Release (re-promotion prod deploys, which do not build natively).
+
+inputs:
+  platform:
+    description: "Platform label used in the GH Actions notice (e.g. 'Android' or 'iOS')"
+    required: true
+  asset-name:
+    description: "Filename of the binary on disk and as the GH Release asset (e.g. 'Expensify-release.aab')"
+    required: true
+  artifact-name:
+    description: "Name of the GH Actions artifact to download for cherry-pick deploys (e.g. 'androidBuild-artifact')"
+    required: true
+  staging-release-tag:
+    description: "Tag of the staging GH Release to download from for re-promotion deploys (e.g. '9.4.13-0-staging')"
+    required: true
+  is-cherry-pick:
+    description: "'true' when this deploy is a cherry-pick (binary is in the current run); 'false' otherwise (binary is on the staging release)"
+    required: true
+
+outputs:
+  SENTRY_URL:
+    description: URL to the Sentry size analysis for the uploaded build (empty if upload failed or quota exhausted)
+    value: ${{ steps.upload.outputs.SENTRY_URL }}
+
+runs:
+  using: composite
+  steps:
+    - name: Setup Node
+      uses: ./.github/actions/composite/setupNode
+
+    - name: Download binary from current workflow run (cherry-pick path)
+      if: ${{ inputs.is-cherry-pick == 'true' }}
+      continue-on-error: true
+      # v7
+      uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
+      with:
+        name: ${{ inputs.artifact-name }}
+        path: ./
+
+    - name: Download binary from the staging GitHub Release (re-promotion path)
+      if: ${{ inputs.is-cherry-pick != 'true' }}
+      continue-on-error: true
+      shell: bash
+      env:
+        TAG: ${{ inputs.staging-release-tag }}
+        ASSET: ${{ inputs.asset-name }}
+      run: |
+        gh release download "$TAG" --pattern "$ASSET" --output "$ASSET"
+        [ -s "$ASSET" ] || { echo "::error::Failed to obtain $ASSET from $TAG"; exit 1; }
+
+    - name: Upload to Sentry
+      id: upload
+      if: ${{ hashFiles(inputs.asset-name) != '' }}
+      continue-on-error: true
+      shell: bash
+      env:
+        ASSET: ${{ inputs.asset-name }}
+        PLATFORM: ${{ inputs.platform }}
+      run: |
+        OUTPUT=$(npx sentry-cli build upload "$ASSET" \
+          --org expensify --project app --build-configuration Release --log-level info 2>&1)
+        echo "$OUTPUT"
+        SENTRY_URL=$(echo "$OUTPUT" | grep -oE 'https://expensify\.sentry\.io/[^ )"}]+' | head -1)
+        if [ -n "$SENTRY_URL" ]; then
+          echo "::notice::${PLATFORM} Sentry size analysis: $SENTRY_URL"
+          echo "SENTRY_URL=$SENTRY_URL" >> "$GITHUB_OUTPUT"
+        fi

.github/workflows/buildAndroid.yml

@@ -35,9 +35,6 @@ on:
       ROCK_ARTIFACT_URL:
         description: URL to download the ad-hoc build artifact (adhoc only)
         value: ${{ jobs.build.outputs.ROCK_ARTIFACT_URL }}
-      SENTRY_URL:
-        description: URL to Sentry size analysis
-        value: ${{ jobs.build.outputs.SENTRY_URL }}
       AAB_FILENAME:
         description: Filename of the AAB artifact (empty if no AAB was produced)
         value: ${{ jobs.build.outputs.AAB_FILENAME }}
@@ -60,7 +57,6 @@ jobs:
     outputs:
       VERSION_CODE: ${{ steps.getAndroidVersion.outputs.VERSION_CODE }}
       ROCK_ARTIFACT_URL: ${{ steps.set-artifact-url.outputs.ARTIFACT_URL }}
-      SENTRY_URL: ${{ steps.sentry-upload.outputs.SENTRY_URL }}
       AAB_FILENAME: ${{ steps.collectArtifacts.outputs.AAB_FILENAME }}
       APK_FILENAME: ${{ steps.collectArtifacts.outputs.APK_FILENAME }}
       SOURCEMAP_FILENAME: index.android.bundle.map
@@ -195,22 +191,6 @@ jobs:
         if: ${{ inputs.variant == 'Adhoc' }}
         run: echo "ARTIFACT_URL=$ARTIFACT_URL" >> "$GITHUB_OUTPUT"
 
-      - name: Upload Android build to Sentry for size analysis
-        id: sentry-upload
-        if: ${{ inputs.variant == 'Release' && env.ARTIFACT_PATH != '' }}
-        continue-on-error: true
-        timeout-minutes: 5
-        run: |
-          OUTPUT=$(npx sentry-cli build upload "$ARTIFACT_PATH" --org expensify --project app --build-configuration Release --log-level debug 2>&1)
-          echo "$OUTPUT"
-          SENTRY_URL=$(echo "$OUTPUT" | grep -oE 'https://expensify\.sentry\.io/[^ ]+' | head -1)
-          if [ -n "$SENTRY_URL" ]; then
-            echo "::notice::Android Sentry size analysis: $SENTRY_URL"
-            echo "SENTRY_URL=$SENTRY_URL" >> "$GITHUB_OUTPUT"
-          fi
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-
       - name: Upload Gradle profile report
         if: always()
         # v6

.github/workflows/buildIOS.yml

@@ -35,9 +35,6 @@ on:
       ROCK_ARTIFACT_URL:
         description: URL to download the ad-hoc build artifact (adhoc only)
         value: ${{ jobs.build.outputs.ROCK_ARTIFACT_URL }}
-      SENTRY_URL:
-        description: URL to Sentry size analysis
-        value: ${{ jobs.build.outputs.SENTRY_URL }}
       IPA_FILENAME:
         description: Filename of the IPA artifact produced by the build
         value: ${{ jobs.build.outputs.IPA_FILENAME }}
@@ -58,7 +55,6 @@ jobs:
     outputs:
       IOS_VERSION: ${{ steps.getIOSVersion.outputs.IOS_VERSION }}
       ROCK_ARTIFACT_URL: ${{ steps.set-artifact-url.outputs.ARTIFACT_URL }}
-      SENTRY_URL: ${{ steps.sentry-upload.outputs.SENTRY_URL }}
       IPA_FILENAME: ${{ steps.set-ipa-filename.outputs.IPA_FILENAME }}
       DSYM_FILENAME: ${{ steps.set-ipa-filename.outputs.DSYM_FILENAME }}
       SOURCEMAP_FILENAME: main.jsbundle.map
@@ -244,22 +240,6 @@ jobs:
           comment-bot: false
           custom-identifier: ${{ steps.computeIdentifier.outputs.IDENTIFIER }}
 
-      - name: Upload iOS build to Sentry for size analysis
-        id: sentry-upload
-        if: ${{ inputs.variant == 'Release' && env.ARTIFACT_PATH != '' }}
-        continue-on-error: true
-        timeout-minutes: 5
-        run: |
-          OUTPUT=$(npx sentry-cli build upload "$ARTIFACT_PATH" --org expensify --project app --build-configuration Release --log-level debug 2>&1)
-          echo "$OUTPUT"
-          SENTRY_URL=$(echo "$OUTPUT" | grep -oE 'https://expensify\.sentry\.io/[^ ]+' | head -1)
-          if [ -n "$SENTRY_URL" ]; then
-            echo "::notice::iOS Sentry size analysis: $SENTRY_URL"
-            echo "SENTRY_URL=$SENTRY_URL" >> "$GITHUB_OUTPUT"
-          fi
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-
       - name: Set artifact URL output
         id: set-artifact-url
         if: ${{ inputs.variant == 'Adhoc' }}

.github/workflows/deploy.yml

@@ -918,6 +918,12 @@ jobs:
                 --target "${{ env.DEPLOY_ENV }}"; then
                 break
               fi
+
+              # A transient GitHub error during create doesn't necessarily mean the release failed; it may have been created anyway, so a later "already exists" error means it's present.
+              if gh release view "${{ needs.prep.outputs.TAG }}" --repo "${{ github.repository }}" &> /dev/null; then
+                echo "Release ${{ needs.prep.outputs.TAG }} exists despite a create error (likely a transient 502), treating as success."
+                break
+              fi
               if [[ $i -lt $CREATE_MAX_RETRIES ]]; then
                 echo "Failed to create release. Retrying in 3 seconds... ($((CREATE_MAX_RETRIES - i)) attempts left)"
                 sleep 3
@@ -999,6 +1005,68 @@ jobs:
               }]
             }
 
+  # Upload the production-bound binary to Sentry for size analysis.
+  # - Cherry-pick deploys build native in this run, so we pull the .aab/.ipa from the build artifact.
+  # - Re-promotion deploys don't build native, so we download from the matching `<TAG>-staging`
+  #   GitHub Release populated during the staging deploy of that version.
+  androidUploadSentry:
+    name: Upload Android build to Sentry for size analysis
+    needs: [prep, androidBuild, checkDeploymentSuccess]
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    if: >-
+      ${{ always()
+          && needs.prep.outputs.DEPLOY_ENV == 'production'
+          && fromJSON(needs.checkDeploymentSuccess.outputs.IS_RELEASE_READY) }}
+    continue-on-error: true
+    timeout-minutes: 10
+    outputs:
+      SENTRY_URL: ${{ steps.sentry-upload.outputs.SENTRY_URL }}
+    steps:
+      - name: Checkout
+        uses: useblacksmith/checkout@c9796daa2a4bdebdab5bd16be2c09a70cd4e1121 # v1
+
+      - name: Upload to Sentry for size analysis
+        id: sentry-upload
+        uses: ./.github/actions/composite/uploadSentrySizeAnalysis
+        env:
+          GH_TOKEN: ${{ github.token }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        with:
+          platform: Android
+          asset-name: Expensify-release.aab
+          artifact-name: androidBuild-artifact
+          staging-release-tag: ${{ needs.prep.outputs.TAG }}-staging
+          is-cherry-pick: ${{ needs.prep.outputs.IS_CHERRY_PICK }}
+
+  iosUploadSentry:
+    name: Upload iOS build to Sentry for size analysis
+    needs: [prep, iosBuild, checkDeploymentSuccess]
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    if: >-
+      ${{ always()
+          && needs.prep.outputs.DEPLOY_ENV == 'production'
+          && fromJSON(needs.checkDeploymentSuccess.outputs.IS_RELEASE_READY) }}
+    continue-on-error: true
+    timeout-minutes: 10
+    outputs:
+      SENTRY_URL: ${{ steps.sentry-upload.outputs.SENTRY_URL }}
+    steps:
+      - name: Checkout
+        uses: useblacksmith/checkout@c9796daa2a4bdebdab5bd16be2c09a70cd4e1121 # v1
+
+      - name: Upload to Sentry for size analysis
+        id: sentry-upload
+        uses: ./.github/actions/composite/uploadSentrySizeAnalysis
+        env:
+          GH_TOKEN: ${{ github.token }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        with:
+          platform: iOS
+          asset-name: Expensify.ipa
+          artifact-name: iosBuild-artifact
+          staging-release-tag: ${{ needs.prep.outputs.TAG }}-staging
+          is-cherry-pick: ${{ needs.prep.outputs.IS_CHERRY_PICK }}
+
   # Why is this necessary for CP-to-prod? Consider this scenario:
   #   1. You close a checklist and we create a new staging version `9.0.34-0` and a new checklist
   #   2. You then CP a PR to production, and in the process create `9.0.35-0`
@@ -1068,13 +1136,13 @@ jobs:
   postGithubComments:
     uses: ./.github/workflows/postDeployComments.yml
     if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_RELEASE_READY) }}
-    needs: [prep, checkDeploymentSuccess, createRelease, androidBuild, iosBuild]
+    needs: [prep, checkDeploymentSuccess, createRelease, androidBuild, iosBuild, androidUploadSentry, iosUploadSentry]
     secrets: inherit
     with:
       version: ${{ needs.prep.outputs.APP_VERSION }}
       env: ${{ needs.prep.outputs.DEPLOY_ENV }}
       android: ${{ needs.checkDeploymentSuccess.outputs.ANDROID_RESULT }}
       ios: ${{ needs.checkDeploymentSuccess.outputs.IOS_RESULT }}
       web: ${{ needs.checkDeploymentSuccess.outputs.WEB_RESULT }}
-      android_sentry_url: ${{ needs.androidBuild.outputs.SENTRY_URL }}
-      ios_sentry_url: ${{ needs.iosBuild.outputs.SENTRY_URL }}
+      android_sentry_url: ${{ needs.androidUploadSentry.outputs.SENTRY_URL }}
+      ios_sentry_url: ${{ needs.iosUploadSentry.outputs.SENTRY_URL }}

Mobile-Expensify

@@ -0,0 +1,117 @@
+/* eslint-disable */
+// @ts-nocheck
+/**
+ * CJS-compatible mock of d3-scale for Jest.
+ *
+ * d3-scale is ESM-only ("type": "module") so it cannot be require()'d in Jest's CJS runtime.
+ * Verbatim copy of the relevant parts of d3-array/src/ticks.js and d3-scale/src/linear.js.
+ */
+
+// d3-array/src/ticks.js
+const e10 = Math.sqrt(50),
+    e5 = Math.sqrt(10),
+    e2 = Math.sqrt(2);
+
+function tickSpec(start, stop, count) {
+    const step = (stop - start) / Math.max(0, count),
+        power = Math.floor(Math.log10(step)),
+        error = step / Math.pow(10, power),
+        factor = error >= e10 ? 10 : error >= e5 ? 5 : error >= e2 ? 2 : 1;
+    let i1, i2, inc;
+    if (power < 0) {
+        inc = Math.pow(10, -power) / factor;
+        i1 = Math.round(start * inc);
+        i2 = Math.round(stop * inc);
+        if (i1 / inc < start) ++i1;
+        if (i2 / inc > stop) --i2;
+        inc = -inc;
+    } else {
+        inc = Math.pow(10, power) * factor;
+        i1 = Math.round(start / inc);
+        i2 = Math.round(stop / inc);
+        if (i1 * inc < start) ++i1;
+        if (i2 * inc > stop) --i2;
+    }
+    if (i2 < i1 && 0.5 <= count && count < 2) return tickSpec(start, stop, count * 2);
+    return [i1, i2, inc];
+}
+
+function ticks(start, stop, count) {
+    ((stop = +stop), (start = +start), (count = +count));
+    if (!(count > 0)) return [];
+    if (start === stop) return [start];
+    const reverse = stop < start,
+        [i1, i2, inc] = reverse ? tickSpec(stop, start, count) : tickSpec(start, stop, count);
+    if (!(i2 >= i1)) return [];
+    const n = i2 - i1 + 1,
+        ticks = new Array(n);
+    if (reverse) {
+        if (inc < 0) for (let i = 0; i < n; ++i) ticks[i] = (i2 - i) / -inc;
+        else for (let i = 0; i < n; ++i) ticks[i] = (i2 - i) * inc;
+    } else {
+        if (inc < 0) for (let i = 0; i < n; ++i) ticks[i] = (i1 + i) / -inc;
+        else for (let i = 0; i < n; ++i) ticks[i] = (i1 + i) * inc;
+    }
+    return ticks;
+}
+
+function tickIncrement(start, stop, count) {
+    ((stop = +stop), (start = +start), (count = +count));
+    return tickSpec(start, stop, count)[2];
+}
+
+// d3-scale/src/linear.js
+function scaleLinear() {
+    let domain = [0, 1];
+
+    const scale = {
+        domain(d) {
+            if (!d) return domain;
+            domain = [...d];
+            return scale;
+        },
+        nice(count = 10) {
+            var d = domain;
+            var i0 = 0;
+            var i1 = d.length - 1;
+            var start = d[i0];
+            var stop = d[i1];
+            var prestep;
+            var step;
+            var maxIter = 10;
+
+            if (stop < start) {
+                ((step = start), (start = stop), (stop = step));
+                ((step = i0), (i0 = i1), (i1 = step));
+            }
+
+            while (maxIter-- > 0) {
+                step = tickIncrement(start, stop, count);
+                if (step === prestep) {
+                    d[i0] = start;
+                    d[i1] = stop;
+                    domain = d;
+                    return scale;
+                } else if (step > 0) {
+                    start = Math.floor(start / step) * step;
+                    stop = Math.ceil(stop / step) * step;
+                } else if (step < 0) {
+                    start = Math.ceil(start * step) / step;
+                    stop = Math.floor(stop * step) / step;
+                } else {
+                    break;
+                }
+                prestep = step;
+            }
+            return scale;
+        },
+        ticks(count = 10) {
+            var d = domain;
+            return ticks(d[0], d[d.length - 1], count);
+        },
+    };
+
+    return scale;
+}
+
+module.exports = {scaleLinear};

__mocks__/d3-scale.ts

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009041703
-        versionName "9.4.17-3"
+        versionCode 1009042102
+        versionName "9.4.21-2"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -70,7 +70,7 @@
 
 @font-face {
     font-family: Windows Segoe UI Emoji;
-    src: url('/fonts/seguiemj.ttf');
+    src: url('/fonts/seguiemj.woff2') format('woff2');
 }
 
 @font-face {