Merge branch 'Expensify:main' into fix/issue-29899

.github/ISSUE_TEMPLATE/Standard.md

@@ -42,45 +42,8 @@ Which of our officially supported platforms is this issue occurring on?
 - [ ] MacOS: Desktop
 
 ## Screenshots/Videos
-<details>
-<summary>Android: Native</summary>
 
-<!-- add screenshots or videos here -->
-
-</details>
-
-<details>
-<summary>Android: mWeb Chrome</summary>
-
-<!-- add screenshots or videos here -->
-
-</details>
-
-<details>
-<summary>iOS: Native</summary>
-
-<!-- add screenshots or videos here -->
-
-</details>
-
-<details>
-<summary>iOS: mWeb Safari</summary>
-
-<!-- add screenshots or videos here -->
-
-</details>
-
-<details>
-<summary>MacOS: Chrome / Safari</summary>
-
-<!-- add screenshots or videos here -->
-
-</details>
-
-<details>
-<summary>MacOS: Desktop</summary>
-
-<!-- add screenshots or videos here -->
+Add any screenshot/video evidence
 
 </details>
 

.github/workflows/cherryPick.yml

@@ -41,6 +41,7 @@ jobs:
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
       - name: Set up git for OSBotify
+        id: setupGitForOSBotify
         uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
@@ -119,7 +120,7 @@ jobs:
              **Important:** There may be conflicts that GitHub is not able to detect, so please _carefully_ review this pull request before approving."
           gh pr edit --add-assignee "${{ github.actor }},${{ steps.getCPMergeCommit.outputs.MERGE_ACTOR }}"
         env:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
 
       - name: "Announces a CP failure in the #announce Slack room"
         uses: 8398a7/action-slack@v3

.github/workflows/e2ePerformanceTests.yml

@@ -183,6 +183,7 @@ jobs:
           file_artifacts: Customer Artifacts.zip
           log_artifacts: debug.log
           cleanup: true
+          timeout: 5400
 
       - name: Print logs if run failed
         if: failure()
@@ -213,6 +214,7 @@ jobs:
           remote_src: false
           file_artifacts: Customer Artifacts.zip
           cleanup: true
+          timeout: 5400
 
       - name: Unzip AWS Device Farm delta results
         run: unzip "Customer Artifacts.zip" -d deltaResults

.github/workflows/finishReleaseCycle.yml

@@ -34,13 +34,13 @@ jobs:
             echo "IS_DEPLOYER=false" >> "$GITHUB_OUTPUT"
           fi
         env:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
 
       - name: Reopen and comment on issue (not a team member)
         if: ${{ !fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) }}
         uses: Expensify/App/.github/actions/javascript/reopenIssueWithComment@main
         with:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
           COMMENT: |
             Sorry, only members of @Expensify/Mobile-Deployers can close deploy checklists.
@@ -51,14 +51,14 @@ jobs:
         id: checkDeployBlockers
         uses: Expensify/App/.github/actions/javascript/checkDeployBlockers@main
         with:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
 
       - name: Reopen and comment on issue (has blockers)
         if: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) && fromJSON(steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS || 'false') }}
         uses: Expensify/App/.github/actions/javascript/reopenIssueWithComment@main
         with:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
           COMMENT: |
             This issue either has unchecked items or has not yet been marked with the `:shipit:` emoji of approval.

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001039400
-        versionName "1.3.94-0"
+        versionCode 1001039602
+        versionName "1.3.96-2"
     }
 
     flavorDimensions "default"

assets/css/fonts.css

@@ -54,6 +54,11 @@
     src: url('/fonts/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'),  url('/fonts/ExpensifyNewKansas-MediumItalic.woff') format('woff');
 }
 
+@font-face {
+    font-family: Windows Segoe UI Emoji;
+    src: url('/fonts/seguiemj.ttf');
+}
+
 * {
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;