Merge branch 'main' into statement-close-date-be

Author: s77rt

.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

@@ -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 1009018901
+        versionName "9.1.89-1"
         // 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

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

cspell.json

@@ -52,4 +52,8 @@ However, if you encounter an error during this process, you can close the pop-up
 
 Some banks, such as Chase, may display masked or tokenized account numbers when connected via Plaid. This is a security feature implemented by the bank and does not indicate any setup error. As long as the connection was successful and you see your account listed in your **Wallet**, reimbursements should process correctly.
 
+## Why can't I add my HSBC bank account details in Singapore?
+
+You can. HSBC typically includes the **branch code** which is the final three digits of the Swift Code (HSBCSGS2XXX) in their "Account Number". If you see figures like "146172002492", please drop first 3 digit (146) which is the Branch Code.
+
 </div>

docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-Bank-Account.md

@@ -80,6 +80,10 @@ No. Expensify does not charge you to add or use a personal account. It’s inclu
 
 ## Are there countries where personal bank accounts aren’t supported?
 
-Yes. Expensify supports personal bank accounts from 190+ countries, but there’s a small number not supported. The full list of supported countries is available when adding a personal bank account. 
+Yes. Expensify supports personal bank accounts from 190+ countries, but there’s a small number not supported. The full list of supported countries is available when adding a personal bank account.
+
+## Why can't I add my HSBC bank account details in Singapore?
+
+You can. HSBC typically includes the **branch code** which is the final three digits of the Swift Code (HSBCSGS2XXX) in their "Account Number". If you see figures like "146172002492", please drop first 3 digit (146) which is the Branch Code.
 
 </div>

docs/articles/new-expensify/wallet-and-payments/Connect-a-Personal-Bank-Account.md

@@ -1,59 +1,4 @@
 ---
 layout: product
-title: Expensify Chat
+title: Inbox Overview
 ---
-
-
-# Chat
-
-Chat is the foundation of New Expensify. Every expense, expense report, workspace, or member has an associated "chat", which you can use to record additional details, or collaborate with others. Every chat has the following components:
-
-## Header
-
-This shows who you are chatting with (or what you are chatting about). You can press the header for more details on the chat, or additional actions to take upon it.
-
-## Comments
-
-The core of the chat are its comments, which come in many forms:
-
-- **Text** – Rich text messages stored securely and delivered via web, app, email, or SMS.  
-- **Images & Documents** – Insert photos, screenshots, movies, PDFs, or more, using copy/paste, drag/drop, or the attach button.  
-- **Expenses** – Share an expense in the chat, either to simply track and document it, or to submit for reimbursement.  
-- **Tasks** – Record a task, and optionally assign it to someone (or yourself!).
-
-## Actions
-
-Hover (or long press) on a comment to see additional options, including:
-
-- **React** – Throw a ♥️😂🔥 like on anything!  
-- **Reply in thread** – Go deeper by creating a new chat on any comment.  
-- **Mark unread** – Flag it for reading later, at your convenience.
-
-## Composer
-
-Use the composer at the bottom to write new messages:
-
-- **Markdown** – Format text using **bold**, *italics*, and [more](https://help.expensify.com/articles/new-expensify/chat/Send-and-format-chat-messages).  
-- **Mention** – Invite or tag anyone in the world to any chat by putting an `@` in front of their email address or phone number (e.g., **@awong@marslink.web**, or **@415-867-5309**).
-
----
-
-# Inbox
-
-The Inbox is a prioritized "to do" list, highlighting exactly what you need to do next. It consists of:
-
-## Priorities
-
-At the top of the Inbox are the most important tasks you should do first, which include:
-
-- Expense reports waiting on you  
-- Tasks assigned to you  
-- Chats that have mentioned you  
-- Anything you have pinned
-
-## Chats
-
-Beneath the priorities are a list of chats (with unread chats highlighted in bold), in one of two view modes:
-
-- **Most Recent** – Lists every chat, ordered by whichever was most recently active.  
-- **Focus** – Only lists chats with unread messages, sorted alphabetically.

help/ref/r/index.md

@@ -17,4 +17,4 @@ Already have business credit cards? You can connect them to Expensify to automat
 
 ---
 
-More details on connecting your company card program can be found here ➡️ **[Company Card Settings](https://help.expensify.com/articles/new-expensify/connect-credit-cards/Company-Card-Settings)**.
+More details on connecting your company card program can be found here ➡️ [Company Card Settings](https://help.expensify.com/articles/new-expensify/connect-credit-cards/Company-Card-Settings).