Merge branch 'main' into remove-onyx-connect-in-category

Author: DylanDylann

.github/actions/javascript/proposalPoliceComment/index.js

@@ -11639,6 +11639,7 @@ async function run() {
         console.log('commentsResponse', commentsResponse);
         core.endGroup();
         let didFindDuplicate = false;
+        let originalProposal;
         for (const previousProposal of commentsResponse) {
             const isProposal = !!previousProposal.body?.includes(CONST_1.default.PROPOSAL_KEYWORD);
             const previousProposalCreatedAt = new Date(previousProposal.created_at).getTime();
@@ -11664,13 +11665,14 @@ async function run() {
                 if (similarityPercentage >= 90) {
                     console.log(`Found duplicate with ${similarityPercentage}% similarity.`);
                     didFindDuplicate = true;
+                    originalProposal = previousProposal;
                     break;
                 }
             }
         }
         if (didFindDuplicate) {
             const duplicateCheckWithdrawMessage = proposalPolice_1.default.getDuplicateCheckWithdrawMessage();
-            const duplicateCheckNoticeMessage = proposalPolice_1.default.getDuplicateCheckNoticeMessage(newProposalAuthor);
+            const duplicateCheckNoticeMessage = proposalPolice_1.default.getDuplicateCheckNoticeMessage(newProposalAuthor, originalProposal?.html_url);
             // If a duplicate proposal is detected, update the comment to withdraw it
             console.log('ProposalPolice™ withdrawing duplicated proposal...');
             await GithubUtils_1.default.octokit.issues.updateComment({
@@ -12557,8 +12559,9 @@ const PROPOSAL_POLICE_TEMPLATES = {
     getDuplicateCheckWithdrawMessage: () => {
         return '#### 🚫 Duplicated proposal withdrawn by 🤖 ProposalPolice.';
     },
-    getDuplicateCheckNoticeMessage: (proposalAuthor) => {
-        return `⚠️ @${proposalAuthor} Your proposal is a duplicate of an already existing proposal and has been automatically withdrawn to prevent spam. Please review the existing proposals before submitting a new one.`;
+    getDuplicateCheckNoticeMessage: (proposalAuthor, originalProposalURL) => {
+        const existingProposalWithURL = originalProposalURL ? `[existing proposal](${originalProposalURL})` : 'existing proposal';
+        return `⚠️ @${proposalAuthor} Your proposal is a duplicate of an already ${existingProposalWithURL} and has been automatically withdrawn to prevent spam. Please review the existing proposals before submitting a new one.`;
     },
 };
 exports["default"] = PROPOSAL_POLICE_TEMPLATES;

.github/actions/javascript/proposalPoliceComment/proposalPoliceComment.ts

@@ -4,6 +4,7 @@ import {context} from '@actions/github';
 import type {IssueCommentCreatedEvent, IssueCommentEditedEvent, IssueCommentEvent} from '@octokit/webhooks-types';
 import {format} from 'date-fns';
 import {toZonedTime} from 'date-fns-tz';
+import type {TupleToUnion} from 'type-fest';
 import {convertToNumber} from '@github/libs/ActionUtils';
 import CONST from '@github/libs/CONST';
 import GithubUtils from '@github/libs/GithubUtils';
@@ -91,6 +92,7 @@ async function run() {
         core.endGroup();
 
         let didFindDuplicate = false;
+        let originalProposal: TupleToUnion<typeof commentsResponse> | undefined;
         for (const previousProposal of commentsResponse) {
             const isProposal = !!previousProposal.body?.includes(CONST.PROPOSAL_KEYWORD);
             const previousProposalCreatedAt = new Date(previousProposal.created_at).getTime();
@@ -117,14 +119,15 @@ async function run() {
                 if (similarityPercentage >= 90) {
                     console.log(`Found duplicate with ${similarityPercentage}% similarity.`);
                     didFindDuplicate = true;
+                    originalProposal = previousProposal;
                     break;
                 }
             }
         }
 
         if (didFindDuplicate) {
             const duplicateCheckWithdrawMessage = PROPOSAL_POLICE_TEMPLATES.getDuplicateCheckWithdrawMessage();
-            const duplicateCheckNoticeMessage = PROPOSAL_POLICE_TEMPLATES.getDuplicateCheckNoticeMessage(newProposalAuthor);
+            const duplicateCheckNoticeMessage = PROPOSAL_POLICE_TEMPLATES.getDuplicateCheckNoticeMessage(newProposalAuthor, originalProposal?.html_url);
             // If a duplicate proposal is detected, update the comment to withdraw it
             console.log('ProposalPolice™ withdrawing duplicated proposal...');
             await GithubUtils.octokit.issues.updateComment({

.github/workflows/unused-styles.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
-    paths: ['src', '.github/workflows/unused-styles.yml', 'scripts/findUnusedStyles.ts']
+    paths: ['src/**', '.github/workflows/unused-styles.yml', 'scripts/findUnusedStyles.ts']
 
 concurrency:
   group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-unused-styles

Mobile-Expensify

@@ -24,6 +24,7 @@
 * [canBeMissing onyx param](#canbemissing-onyx-param)
 
 #### Additional Reading
+* [Application Philosophy](contributingGuides/philosophies/INDEX.md)
 * [API Details](contributingGuides/API.md)
 * [Offline First](contributingGuides/OFFLINE_UX.md)
 * [Contributing to Expensify](contributingGuides/CONTRIBUTING.md)
@@ -525,7 +526,7 @@ You can only build HybridApp if you have been granted access to [`Mobile-Expensi
 4. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App.
 
 
-> [!Note]  
+> [!Note]
 > #### For external agencies and C+ contributors only
 >
 > If you'd like to modify the `Mobile-Expensify` source code, it is best that you create your own fork. Then, you can swap origin of the remote repository by executing this command:
@@ -560,15 +561,15 @@ If for some reason, you need to target the standalone NewDot application, you ca
 
 ### Working with HybridApp vs Standalone NewDot
 
-Day-to-day work with **HybridApp** shouldn't differ much from working on the standalone **NewDot** repository.  
-The primary difference is that the native code, which runs React Native, is located in the following directories:  
+Day-to-day work with **HybridApp** shouldn't differ much from working on the standalone **NewDot** repository.
+The primary difference is that the native code, which runs React Native, is located in the following directories:
 
 - `./Mobile-Expensify/Android`
 - `./Mobile-Expensify/iOS`
 
 ### Important Notes:
 1. **Root Folders Do Not Affect HybridApp Builds:**
-   - Changes made to the `./android` and `./ios` folders at the root of the repository **won't affect the HybridApp build**.  
+   - Changes made to the `./android` and `./ios` folders at the root of the repository **won't affect the HybridApp build**.
 
 2. **Modifying iOS Code for HybridApp:**
    - If you need to remove `Pods`, you must do it in the **`./Mobile-Expensify/iOS`** directory.
@@ -583,23 +584,23 @@ The primary difference is that the native code, which runs React Native, is loca
 
 ### Updating the `Mobile-Expensify` Submodule
 
-The `Mobile-Expensify` directory is a **Git submodule**. This means it points to a specific commit on the `Mobile-Expensify` repository.  
+The `Mobile-Expensify` directory is a **Git submodule**. This means it points to a specific commit on the `Mobile-Expensify` repository.
 
-If you'd like to fetch the submodule while executing the `git pull` command in `Expensify/App` instead of updating it manually you can run this command in the root of the project: 
+If you'd like to fetch the submodule while executing the `git pull` command in `Expensify/App` instead of updating it manually you can run this command in the root of the project:
 
 ```
 git config submodule.recurse true
 ```
 
-> [!WARNING]  
+> [!WARNING]
 > Please, remember that the submodule will get updated automatically only after executing the `git pull` command - if you switch between branches it is still recommended to execute `git submodule update` to make sure you're working on a compatible submodule version!
 
 If you'd like to download the most recent changes from the `main` branch, please use the following command:
 ```bash
 git submodule update --remote
 ```
 
-It's important to emphasize that a git submodule is just a **regular git repository** after all. It means that you can switch branches, pull the newest changes, and execute all regular git commands within the `Mobile-Expensify` directory. 
+It's important to emphasize that a git submodule is just a **regular git repository** after all. It means that you can switch branches, pull the newest changes, and execute all regular git commands within the `Mobile-Expensify` directory.
 
 ### Adding HybridApp-related patches
 
@@ -805,7 +806,7 @@ Some pointers:
 - When working with translations that involve plural forms, it's important to handle different cases correctly.
 
   For example:
-  - zero: Used when there are no items **(optional)**. 
+  - zero: Used when there are no items **(optional)**.
   - one: Used when there's exactly one item.
   - two: Used when there's two items. **(optional)**
   - few: Used for a small number of items **(optional)**.

README.md

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018803
-        versionName "9.1.88-3"
+        versionCode 1009018915
+        versionName "9.1.89-15"
         // 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

@@ -0,0 +1,5 @@
+# Application Philosophies
+The following pages include details on how different systems are meant to be used.
+
+## Contents
+* [Routing Philosophy](contributingGuides/philosophies/ROUTING.md)

contributingGuides/philosophies/INDEX.md

@@ -0,0 +1,68 @@
+# Routing Philosophy
+Learn how URLs are constructed and used to route users through all parts of the application.
+
+[React Navigation](https://reactnavigation.org/) is the library used for all routing and navigation, so refer to its [docs](https://reactnavigation.org/docs/getting-started) to understand how the library works. This page will not focus on how routing works, but how URLs are constructed and what patterns to follow when adding new URLs.
+
+## Definitions
+- URL - The web address for every page in the app. On web, this is shown on the browser bar, and is of the format `https://new.expensify.com/<route>`
+- Route - A unique identifier of a specific location within the app's navigation hierarchy
+- Object Route - A route pointing to a specific object (eg. report, transaction, workspace, etc.)
+- Page Route - A route for a specific page (eg. settings, add bank account, etc.)
+
+This guide is based on [[PSR-1]] and [[PSR-2]].
+The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and
+"OPTIONAL" in this document are to be interpreted as described in [[RFC 2119]].
+
+## Rules
+When adding new routes, or refactoring existing routes, follow these rules:
+
+### - MUST be unique
+There are no aliases where different routes lead to the same place.
+
+### - SHOULD be short
+Aim for the shortest possible URL that is also still human readable.
+
+Exceptions:
+- When abbreviated paths are used in specific instances like `r/` (for reports) and `a/` (for accounts) for strategic purposes
+
+### - MUST use kebab-case for all parts of a URL (eg. words separated by hyphens)
+### - MUST use all lower case words
+### - MUST be defined in `ROUTES.ts`
+### - MUST convey page hierarchy
+Just like breadcrumbs, the URL should reflect the path a user has taken.
+
+Example of the paths taken to manage a workspace member:
+1. `workspaces`
+1. `workspaces/:policyID/overview`
+1. `workspaces/:policyID/members`
+1. `workspaces/:policyID/members/:memberID`
+
+### - MUST have the route parameters validated
+Since users can edit the route parameters at any time, to any value, the parameters must always be validated to ensure they are correct and the user has access.
+
+### - MUST NOT start with a slash
+### - MUST NOT contain jargon or acronyms
+### - MUST NOT contain sensitive information that could be logged by third-parties
+Internet routers and third-party-services can see and store any information in the URL. Do not put things like passwords, auth tokens, or PII (personally identifiable information).
+
+### - SHOULD NOT use query parameters
+Exceptions:
+- When a URL needs to be encoded and added to the path (eg. `?backTo=URL`, `?forwardTo=URL`)
+- When complex data needs to be part of the path (eg. `/search?q=QUERY`)
+
+### - SHOULD NOT use optional parameters
+If there are optional parameters, use two separate route definitions instead to be explicit.
+
+### - SHOULD use plural nouns when there are multiple objects that can exist
+Exceptions:
+
+- When abbreviated paths are used in specific instances like `r/` (for reports) and `a/` (for accounts) then plurality does not matter
+
+### - SHOULD use only the minimal necessary information to render the page
+Examples:
+- `r/:threadReportID` GOOD - `threadReportID` is all that is needed and all the rest of the page can be derived from that
+- `r/:parentReportID/:threadReportID` BAD - the `parentReportID` is not necessary so it just adds cruft to the URL
+
+Exceptions:
+
+- When multiple IDs are **required** to render the page.

contributingGuides/philosophies/ROUTING.md

@@ -273,6 +273,7 @@
         "Highlightable",
         "Hoverable",
         "HRMS",
+        "HSBCSGS",
         "hybridapp",
         "Hydronics",
         "iaco",