Merge remote-tracking branch 'expensify/main' into form-refactor/priv…

…ate-notes-edit-page

.github/workflows/deployExpensifyHelp.yml

@@ -1,28 +1,30 @@
-# Deploying the ExpensifyHelp Jekyll site by dynamically generating routes file
 name: Deploy ExpensifyHelp
 
 on:
- # Runs on pushes targeting the default branch
+ # Run on any push to main that has changes to the docs directory
  push:
- branches: ["main"]
-
- # Allows you to run this workflow manually from the Actions tab
+ branches:
+ - main
+ paths:
+ - 'docs/**'
+
+ # Run on any pull request (except PRs against staging or production) that has changes to the docs directory
+ pull_request:
+ types: [opened, synchronize]
+ branches-ignore: [staging, production]
+ paths:
+ - 'docs/**'
+
+ # Run on any manual trigger
  workflow_dispatch:
 
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
- contents: read
- pages: write
- id-token: write
-
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
 # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
 concurrency:
  group: "pages"
  cancel-in-progress: false
 
 jobs:
- # Build job
  build:
  runs-on: ubuntu-latest
  steps:
@@ -32,9 +34,6 @@ jobs:
  - name: Setup NodeJS
  uses: Expensify/App/.github/actions/composite/setupNode@main
 
- - name: Setup Pages
- uses: actions/configure-pages@f156874f8191504dae5b037505266ed5dda6c382
-
  - name: Create docs routes file
  run: ./.github/scripts/createDocsRoutes.sh
 
@@ -44,19 +43,18 @@ jobs:
  source: ./docs/
  destination: ./docs/_site
 
- - name: Upload artifact
- uses: actions/upload-pages-artifact@64bcae551a7b18bcb9a09042ddf1960979799187
+ - name: Deploy to Cloudflare Pages
+ uses: cloudflare/pages-action@f0a1cd58cd66095dee69bfa18fa5efd1dde93bca
+ id: deploy
  with:
- path: ./docs/_site
-
- # Deployment job
- deploy:
- environment:
- name: github-pages
- url: ${{ steps.deployment.outputs.page_url }}
- runs-on: ubuntu-latest
- needs: build
- steps:
- - name: Deploy to GitHub Pages
- id: deployment
- uses: actions/deploy-pages@af48cf94a42f2c634308b1c9dc0151830b6f190a
+ apiToken: ${{ secrets.CLOUDFLARE_PAGES_TOKEN }}
+ accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+ projectName: helpdot
+ directory: ./docs/_site
+
+ - name: Leave a comment on the PR
+ uses: actions-cool/maintain-one-comment@de04bd2a3750d86b324829a3ff34d47e48e16f4b
+ if: ${{ github.event_name == 'pull_request' }}
+ with:
+ token: ${{ secrets.OS_BOTIFY_TOKEN }}
+ body: ${{ format('A preview of your ExpensifyHelp changes have been deployed to {0} ⚡️', steps.deploy.outputs.alias) }}

.github/workflows/e2ePerformanceTests.yml

@@ -125,6 +125,9 @@ jobs:
  steps:
  - uses: actions/checkout@v3
 
+ - name: Setup Node
+ uses: Expensify/App/.github/actions/composite/setupNode@main
+
  - name: Make zip directory for everything to send to AWS Device Farm
  run: mkdir zip
 
@@ -137,7 +140,7 @@ jobs:
 
  # The downloaded artifact will be a file named "app-e2e-release.apk" so we have to rename it
  - name: Rename baseline APK
- run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-baseline.apk"
+ run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-main.apk"
 
  - name: Download delta APK
  uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
@@ -147,7 +150,7 @@ jobs:
  path: zip
 
  - name: Rename delta APK
- run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2eRelease-compare.apk"
+ run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2eRelease-delta.apk"
 
  - name: Copy e2e code into zip folder
  run: cp -r tests/e2e zip
@@ -162,44 +165,72 @@ jobs:
  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
  AWS_REGION: us-west-2
 
- - name: Schedule AWS Device Farm test run
+ - name: Schedule AWS Device Farm test run on main branch
  uses: realm/aws-devicefarm/test-application@7b9a91236c456c97e28d384c9e476035d5ea686b
+ id: schedule-awsdf-main
  with:
  name: App E2E Performance Regression Tests
  project_arn: ${{ secrets.AWS_PROJECT_ARN }}
  device_pool_arn: ${{ secrets.AWS_DEVICE_POOL_ARN }}
- app_file: zip/app-e2eRelease-baseline.apk
+ app_file: zip/app-e2eRelease-main.apk
  app_type: ANDROID_APP
  test_type: APPIUM_NODE
  test_package_file: App.zip
  test_package_type: APPIUM_NODE_TEST_PACKAGE
- test_spec_file: tests/e2e/TestSpec.yml
+ test_spec_file: tests/e2e/TestSpecMain.yml
  test_spec_type: APPIUM_NODE_TEST_SPEC
  remote_src: false
  file_artifacts: Customer Artifacts.zip
+ log_artifacts: debug.log
  cleanup: true
 
- - name: Unzip AWS Device Farm results
- if: ${{ always() }}
- run: unzip "Customer Artifacts.zip"
-
- - name: Print AWS Device Farm run results
- if: ${{ always() }}
- run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/output.md"
-
- - name: Print AWS Device Farm verbose run results
- if: ${{ always() && runner.debug != null && fromJSON(runner.debug) }}
- run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/debug.log"
-
-# TODO: Once tests are more reliable we should uncomment this
-# - name: Check if test failed, if so post the results and add the DeployBlocker label
-# run: |
-# if grep -q '🔴' ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md; then
-# gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
-# gh pr comment ${{ inputs.PR_NUMBER }} -F ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md
-# gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
-# else
-# echo '✅ no performance regression detected'
-# fi
-# env:
-# GITHUB_TOKEN: ${{ github.token }}
+ - name: Print logs if run failed
+ if: failure()
+ run: |
+ echo ${{ steps.schedule-awsdf-main.outputs.data }}
+ unzip "Customer Artifacts.zip" -d mainResults
+ cat ./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/debug.log
+
+ - name: Unzip AWS Device Farm main results
+ run: unzip "Customer Artifacts.zip" -d mainResults
+
+ - name: Delete Customer Artifacts.zip
+ run: rm "Customer Artifacts.zip"
+
+ - name: Schedule AWS Device Farm test run on delta branch
+ uses: realm/aws-devicefarm/test-application@7b9a91236c456c97e28d384c9e476035d5ea686b
+ with:
+ name: App E2E Performance Regression Tests
+ project_arn: ${{ secrets.AWS_PROJECT_ARN }}
+ device_pool_arn: ${{ secrets.AWS_DEVICE_POOL_ARN }}
+ app_file: zip/app-e2eRelease-delta.apk
+ app_type: ANDROID_APP
+ test_type: APPIUM_NODE
+ test_package_file: App.zip
+ test_package_type: APPIUM_NODE_TEST_PACKAGE
+ test_spec_file: tests/e2e/TestSpecDelta.yml
+ test_spec_type: APPIUM_NODE_TEST_SPEC
+ remote_src: false
+ file_artifacts: Customer Artifacts.zip
+ cleanup: true
+
+ - name: Unzip AWS Device Farm delta results
+ run: unzip "Customer Artifacts.zip" -d deltaResults
+
+ - name: Compare results
+ run: node tests/e2e/merge.js --mainPath ./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/main.json --deltaPath ./deltaResults//Host_Machine_Files/\$WORKING_DIRECTORY/delta.json --outputPath ./output.md
+
+ - name: Print results
+ run: cat "./output.md"
+
+ - name: Check if test failed, if so post the results and add the DeployBlocker label
+ run: |
+ if grep -q '🔴' ./output.md; then
+ gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
+ gh pr comment ${{ inputs.PR_NUMBER }} -F ./output.md
+ gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
+ else
+ echo '✅ no performance regression detected'
+ fi
+ env:
+ GITHUB_TOKEN: ${{ github.token }}

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
  multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001038708
- versionName "1.3.87-8"
+ versionCode 1001039001
+ versionName "1.3.90-1"
  }
 
  flavorDimensions "default"

assets/css/pdf.css

@@ -11,12 +11,7 @@
  border-image: url(../images/shadow.png) 9 9 repeat;
  background-color: rgba(255, 255, 255, 1);
 }
-.react-pdf__message {
- position: absolute;
- left: 50%;
- top: 50%;
- transform: translate(-50%, -50%);
-}
+
 .react-pdf__Page__annotations {
  height: 0;
 }

config/webpack/webpack.common.js

@@ -83,6 +83,8 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
  {from: 'web/favicon-unread.png'},
  {from: 'web/og-preview-image.png'},
  {from: 'web/apple-touch-icon.png'},
+ {from: 'assets/images/expensify-app-icon.svg'},
+ {from: 'web/manifest.json'},
  {from: 'assets/css', to: 'css'},
  {from: 'assets/fonts/web', to: 'fonts'},
  {from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'},

contributingGuides/OFFLINE_UX.md

@@ -104,7 +104,7 @@ This pattern greys out the submit button on a form and does not allow the form t
 
 **How to implement:** Use the `<FormAlertWithSubmitButton/>` component. This pattern should use the `API.write()` method.
 
-**Example:** Inviting new memebers to a workspace.
+**Example:** Inviting new members to a workspace.
 
 ### D - Full Page Blocking UI Pattern
 This pattern blocks the user from interacting with an entire page.