Merge branch 'Expensify:main' into arrow-feature-signed

.github/ISSUE_TEMPLATE/Accessibility.md

@@ -30,22 +30,26 @@ How does this affect the user?
 ## Suggested resolution:
 What can we do to fix the issue?
 
-## Platform:
+## Platforms:
 <!--- 
-Remove any platforms that aren't affected by this issue
+Check off any platforms that are affected by this issue
 --->
-Where is this issue occurring?
-
-- Web
-- iOS
-- Android
-- Desktop App
-- Mobile Web
+Which of our officially supported platforms is this issue occurring on?
+- [ ] Android / native
+- [ ] Android / Chrome
+- [ ] iOS / native
+- [ ] iOS / Safari
+- [ ] MacOS / Chrome / Safari
+- [ ] MacOS / Desktop
 
 **Version Number:**
 **Reproducible in staging?:**
 **Reproducible in production?:**
+**Email or phone of affected tester (no customers):**
+**Logs:** https://stackoverflow.com/c/expensify/questions/4856
 **Notes/Photos/Videos:** Any additional supporting documentation
+**Expensify/Expensify Issue URL:**
 **Issue reported by:**
+**Slack conversation:**
 
 [View all open jobs on GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22)

.github/ISSUE_TEMPLATE/Performance.md

@@ -23,18 +23,26 @@ Please list out the steps you think we should take to solve this issue.
 ## List any benchmarks after implementing the changes to show impacts of the proposed solution (if any)
 Note: These should be the same as the benchmarks collected before any changes.
 
-## Platform:
-Where is this issue occurring?
-
-- [ ] Web
-- [ ] iOS
-- [ ] Android
-- [ ] Desktop App
-- [ ] Mobile Web
+## Platforms:
+<!---
+Check off any platforms that are affected by this issue
+--->
+Which of our officially supported platforms is this issue occurring on?
+- [ ] Android / native
+- [ ] Android / Chrome
+- [ ] iOS / native
+- [ ] iOS / Safari
+- [ ] MacOS / Chrome / Safari
+- [ ] MacOS / Desktop
 
 **Version Number:**
+**Reproducible in staging?:**
+**Reproducible in production?:**
+**Email or phone of affected tester (no customers):**
 **Logs:** https://stackoverflow.com/c/expensify/questions/4856
 **Notes/Photos/Videos:** Any additional supporting documentation
 **Expensify/Expensify Issue URL:**
+**Issue reported by:**
+**Slack conversation:**
 
 [View all open jobs on Upwork](https://www.upwork.com/ab/jobs/search/?q=Expensify%20React%20Native&sort=recency&user_location_match=2)

.github/ISSUE_TEMPLATE/Standard.md

@@ -19,26 +19,26 @@ Describe what actually happened
 ## Workaround:
 Can the user still use Expensify without this being fixed? Have you informed them of the workaround?
 
-## Platform:
+## Platforms:
 <!---
-Remove any platforms that aren't affected by this issue
+Check off any platforms that are affected by this issue
 --->
-Where is this issue occurring?
-
-- Web
-- iOS
-- Android
-- Desktop App
-- Mobile Web
-
-**Version Number:** 
-**Reproducible in staging?:** 
-**Reproducible in production?:** 
-**Email or phone of affected tester (no customers):** 
+Which of our officially supported platforms is this issue occurring on?
+- [ ] Android / native
+- [ ] Android / Chrome
+- [ ] iOS / native
+- [ ] iOS / Safari
+- [ ] MacOS / Chrome / Safari
+- [ ] MacOS / Desktop
+
+**Version Number:**
+**Reproducible in staging?:**
+**Reproducible in production?:**
+**Email or phone of affected tester (no customers):**
 **Logs:** https://stackoverflow.com/c/expensify/questions/4856
 **Notes/Photos/Videos:** Any additional supporting documentation
-**Expensify/Expensify Issue URL:** 
-**Issue reported by:** 
-**Slack conversation:** 
+**Expensify/Expensify Issue URL:**
+**Issue reported by:**
+**Slack conversation:**
 
 [View all open jobs on GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22)

.github/PULL_REQUEST_TEMPLATE.md

@@ -70,11 +70,11 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
     - [ ] I tested this PR with a [High Traffic account](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#high-traffic-accounts) against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
 - [ ] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
 - [ ] I ran the tests on **all platforms** & verified they passed on:
-    - [ ] iOS / native
     - [ ] Android / native
-    - [ ] iOS / Safari
     - [ ] Android / Chrome
-    - [ ] MacOS / Chrome
+    - [ ] iOS / native
+    - [ ] iOS / Safari
+    - [ ] MacOS / Chrome / Safari
     - [ ] MacOS / Desktop
 - [ ] I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
 - [ ] I followed proper code patterns (see [Reviewing the code](https://github.com/Expensify/App/blob/main/contributingGuides/PR_REVIEW_GUIDELINES.md#reviewing-the-code))

.github/workflows/testBuild.yml

@@ -189,10 +189,39 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
+  web:
+    name: Build and deploy Web
+    needs: [validateActor, getBranchRef]
+    if: ${{ fromJSON(needs.validateActor.outputs.IS_TEAM_MEMBER) }}
+    env:
+      PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
+      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Configure AWS Credentials
+        uses: Expensify/App/.github/actions/composite/configureAwsCredentials@main
+        with:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+      - name: Build web for testing
+        run: npm run build-staging
+
+      - name: Build docs
+        run: npm run storybook-build
+        continue-on-error: true
+
+      - name: Deploy to S3 for internal testing
+        run: aws s3 cp --recursive --acl public-read "$GITHUB_WORKSPACE"/dist s3://ad-hoc-expensify-cash/web/"$PULL_REQUEST_NUMBER"
+
   postGithubComment:
     runs-on: ubuntu-latest
     name: Post a GitHub comment with app download links for testing
-    needs: [getBranchRef, android, ios, desktop]
+    needs: [getBranchRef, android, ios, desktop, web]
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
     steps:
@@ -216,7 +245,7 @@ jobs:
           content_ios="${content_ios//$'\n'/'%0A'}"
           content_ios="${content_ios//$'\r'/'%0D'}"
           echo "ios_paths=$content_ios" >> "$GITHUB_OUTPUT"
-      
+
       # This step removes previous comments with links connected to the PR
       - name: maintain-comment
         uses: actions-cool/maintain-one-comment@de04bd2a3750d86b324829a3ff34d47e48e16f4b
@@ -232,9 +261,12 @@ jobs:
           gh pr checkout "$PULL_REQUEST_NUMBER"
           gh pr comment --body \
           ":test_tube::test_tube: Use the links below to test this build in android and iOS. Happy testing! :test_tube::test_tube:
-          | android :robot:  | iOS :apple: | desktop :computer: |
-          | ------------- | ------------- | ------------- | 
-          | ${{fromJson(steps.set_var.outputs.android_paths).html_path}}  | ${{fromJson(steps.set_var.outputs.ios_paths).html_path}}  | https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/$PULL_REQUEST_NUMBER/NewExpensify.dmg |
-          | ![Android](https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=${{fromJson(steps.set_var.outputs.android_paths).html_path}}) | ![iOS](https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=${{fromJson(steps.set_var.outputs.ios_paths).html_path}}) | ![desktop](https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/$PULL_REQUEST_NUMBER/NewExpensify.dmg) |"
+          | android :robot:  | iOS :apple: |
+          | ------------- | ------------- |
+          | ${{fromJson(steps.set_var.outputs.android_paths).html_path}}  | ${{fromJson(steps.set_var.outputs.ios_paths).html_path}}  | 
+          | ![Android](https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=${{fromJson(steps.set_var.outputs.android_paths).html_path}}) | ![iOS](https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=${{fromJson(steps.set_var.outputs.ios_paths).html_path}}) |
+          | desktop :computer: | web :spider_web: |
+          | https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/$PULL_REQUEST_NUMBER/NewExpensify.dmg | https://$PULL_REQUEST_NUMBER.pr-testing.expensify.com |
+          | ![desktop](https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/$PULL_REQUEST_NUMBER/NewExpensify.dmg) | ![web](https://api.qrserver.com/v1/create-qr-code/?size=200x200&data=https://$(PULL_REQUEST_NUMBER).pr-testing.expensify.com) |"
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}

README.md

@@ -141,7 +141,7 @@ This is a persistent storage solution wrapped in a Pub/Sub library. In general t
 - Onyx allows other code to subscribe to changes in data, and then publishes change events whenever data is changed
 - Anything needing to read Onyx data needs to:
     1. Know what key the data is stored in (for web, you can find this by looking in the JS console > Application > IndexedDB > OnyxDB > keyvaluepairs)
-    2. Subscribe to changes of the data for a particular key or set of keys. React components use `withOnyx()` and non-React libs use `Onyx.connect()`.
+    2. Subscribe to changes of the data for a particular key or set of keys. React components use `withOnyx()` and non-React libs use `Onyx.connect()`
     3. Get initialized with the current value of that key from persistent storage (Onyx does this by calling `setState()` or triggering the `callback` with the values currently on disk as part of the connection process)
 - Subscribing to Onyx keys is done using a constant defined in `ONYXKEYS`. Each Onyx key represents either a collection of items or a specific entry in storage. For example, since all reports are stored as individual keys like `report_1234`, if code needs to know about all the reports (eg. display a list of them in the nav menu), then it would subscribe to the key `ONYXKEYS.COLLECTION.REPORT`.
 

android/app/build.gradle

@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001024003
-        versionName "1.2.40-3"
+        versionCode 1001024103
+        versionName "1.2.41-3"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

android/link-assets-manifest.json

@@ -0,0 +1,37 @@
+{
+  "migIndex": 1,
+  "data": [
+    {
+      "path": "assets/fonts/native/ExpensifyMono-Bold.otf",
+      "sha1": "6b83b1c1c0c8650f6258fd05771b4e25696c4046"
+    },
+    {
+      "path": "assets/fonts/native/ExpensifyMono-Regular.otf",
+      "sha1": "c0522536213e24609badc298ed82a6c47cdb5b20"
+    },
+    {
+      "path": "assets/fonts/native/ExpensifyNeue-Bold.otf",
+      "sha1": "c61cccfb6091f06381fa5b514272eab7105246d8"
+    },
+    {
+      "path": "assets/fonts/native/ExpensifyNeue-BoldItalic.otf",
+      "sha1": "039065b262036e708ebb5f64b236ef08cc4e8f4e"
+    },
+    {
+      "path": "assets/fonts/native/ExpensifyNeue-Italic.otf",
+      "sha1": "7ddd0652175a9f27380fc63eec4395d65ed189eb"
+    },
+    {
+      "path": "assets/fonts/native/ExpensifyNeue-Regular.otf",
+      "sha1": "57b2cdd2f4adea3fad34464248502cd4edcaadd7"
+    },
+    {
+      "path": "assets/fonts/native/ExpensifyNewKansas-Medium.otf",
+      "sha1": "b07181fac8d0602d4b18c339bdbef9589c67c9f9"
+    },
+    {
+      "path": "assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf",
+      "sha1": "00636ab2038c9690a123985b70a944c42cf65b8a"
+    }
+  ]
+}

assets/css/fonts.css

@@ -6,23 +6,23 @@
 }
 
 @font-face {
-    font-family: ExpensifyNeue-Bold;
+    font-family: ExpensifyNeue-Regular;
     font-weight: 700;
     font-style: normal;
     src: url('/fonts/ExpensifyNeue-Bold.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Bold.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyNeue-Italic;
+    font-family: ExpensifyNeue-Regular;
     font-weight: 400;
-    font-style: normal;
+    font-style: italic;
     src: url('/fonts/ExpensifyNeue-Italic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Italic.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyNeue-BoldItalic;
+    font-family: ExpensifyNeue-Regular;
     font-weight: 700;
-    font-style: normal;
+    font-style: italic;
     src: url('/fonts/ExpensifyNeue-BoldItalic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-BoldItalic.woff') format('woff');
 }
 

config/webpack/webpack.common.js

@@ -90,7 +90,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
                 {from: 'web/favicon-unread.png'},
                 {from: 'web/og-preview-image.png'},
                 {from: 'assets/css', to: 'css'},
-                {from: 'assets/fonts', to: 'fonts'},
+                {from: 'assets/fonts/web', to: 'fonts'},
                 {from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'},
                 {from: 'assets/images/shadow.png', to: 'images/shadow.png'},
                 {from: '.well-known/apple-app-site-association', to: '.well-known/apple-app-site-association', toType: 'file'},
@@ -142,13 +142,6 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
                 ],
             },
 
-            // We are importing this worker as a string by using asset/source otherwise it will default to loading via an HTTPS request later.
-            // This causes issues if we have gone offline before the pdfjs web worker is set up as we won't be able to load it from the server.
-            {
-                test: new RegExp('node_modules/pdfjs-dist/legacy/build/pdf.worker.js'),
-                type: 'asset/source',
-            },
-
             // Rule for react-native-web-webview
             {
                 test: /postMock.html$/,
@@ -196,7 +189,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
                 use: ['style-loader', 'css-loader'],
             },
             {
-                test: /\.(woff|woff2)$/i,
+                test: /\.(woff|woff2|otf)$/i,
                 type: 'asset',
             },
             {

contributingGuides/REVIEWER_CHECKLIST.md

@@ -10,11 +10,11 @@
 - [ ] I checked that screenshots or videos are included for tests on [all platforms](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
 - [ ] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
 - [ ] I verified tests pass on **all platforms** & I tested again on:
-    - [ ] iOS / native
     - [ ] Android / native
-    - [ ] iOS / Safari
     - [ ] Android / Chrome
-    - [ ] MacOS / Chrome
+    - [ ] iOS / native
+    - [ ] iOS / Safari
+    - [ ] MacOS / Chrome / Safari
     - [ ] MacOS / Desktop
 - [ ] If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
 - [ ] I verified proper code patterns were followed (see [Reviewing the code](https://github.com/Expensify/App/blob/main/contributingGuides/PR_REVIEW_GUIDELINES.md#reviewing-the-code))