Skip to content

Commit 528391d

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix/95364
2 parents 1068576 + 330740f commit 528391d

450 files changed

Lines changed: 11894 additions & 3741 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/javascript/isDeployChecklistLocked/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9228,6 +9228,9 @@ const CONST = {
92289228
VALIDATE_ACCOUNT: 'validate_account',
92299229
REVEAL_CARD_DETAILS: 'reveal_card_details',
92309230
REGISTER_AUTHENTICATION_KEY: 'register_authentication_key',
9231+
REPLACE_CARD: 'replace_card',
9232+
SHIP_CARD: 'ship_card',
9233+
REPORT_CARD_FRAUD: 'report_card_fraud',
92319234
},
92329235
EXPENSIFY_CARD: {
92339236
FEED_NAME: 'Expensify Card',

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009045401
115-
versionName "9.4.54-1"
114+
versionCode 1009045500
115+
versionName "9.4.55-0"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

config/eslint/eslint.seatbelt.tsv

Lines changed: 12 additions & 50 deletions
Large diffs are not rendered by default.

cspell.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,6 +1031,8 @@
10311031
"useblacksmith",
10321032
"usernotifications",
10331033
"utilise",
1034+
"vcfanzfav",
1035+
"vcfcitibank",
10341036
"vcpu",
10351037
"verticalanchor",
10361038
"victoryaxis",

docs/articles/new-expensify/ai-agents/Create-Agent-Rules.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,21 @@ Deleting an Agent rule stops RuleBot from enforcing that rule on future report a
117117

118118
---
119119

120+
## How to remove RuleBot from a workspace
121+
122+
RuleBot enforces your Agent rules, so while a workspace still has Agent rules, RuleBot can't be removed, have its role changed, or be deleted. If you attempt any of these actions while Agent rules exist, Expensify blocks the action and shows a message prompting you to delete the Agent rules first.
123+
124+
The following actions are blocked while the workspace still has Agent rules:
125+
126+
- Removing RuleBot from the workspace using **Remove from workspace** (from the **Members** list or RuleBot's member details page).
127+
- Changing RuleBot's role to **Member** or **Auditor**. Promoting RuleBot to a **Workspace Admin** is still allowed.
128+
- Deleting the RuleBot agent using **Delete agent** on the **Agents** page.
129+
- Closing the RuleBot account.
130+
131+
To remove, demote, or delete RuleBot:
132+
133+
1. Delete every Agent rule in the workspace by following the steps to [delete an Agent rule](#how-to-delete-an-agent-rule) above.
134+
2. Once no Agent rules remain, remove RuleBot from the workspace, change its role, or delete the agent as needed.
120135
## How to review Agent rule changes in the #admins room
121136

122137
Whenever an Agent rule is added, updated, or deleted, Expensify records a system message in your workspace's **#admins** room so admins have a visible history of the change.
@@ -152,6 +167,10 @@ When evaluating a report, RuleBot can review the 50 most recent report actions,
152167

153168
No. RuleBot is created automatically when you add your first Agent rule and is managed by Expensify.
154169

170+
## Why can't I remove RuleBot from the workspace?
171+
172+
RuleBot enforces your Agent rules, so it can't be removed, demoted, or deleted while the workspace still has Agent rules. Delete every Agent rule in the workspace first, and then you can remove RuleBot, change its role, or delete the agent.
173+
155174
## Where can I see a history of Agent rule changes?
156175

157176
In the workspace's #admins room. Expensify posts a system message there each time an Agent rule is added, updated, or deleted.

docs/articles/new-expensify/ai-agents/Create-and-Use-Custom-Agents.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ When you click **New agent**, the **New agent** screen opens. From here you can
5252
6. Review the auto-generated profile image and display name. If needed, you can edit these later.
5353
7. Click **Create agent**.
5454

55-
After saving, the new agent appears in your **Agents** list with **Edit**, **Chat**, and **Copilot** buttons.
55+
After you click **Create agent**, you're taken directly to a direct message (DM) with the new agent, where its welcome message appears once it arrives. The new agent also appears in your **Agents** list with **Edit**, **Chat**, and **Copilot** buttons.
5656

5757
![The Agents page in Account settings, showing the New agent button and a list of created agents]({{site.url}}/assets/images/ExpensiHelp-CustomAgents-1.png){:width="100%"}
5858

@@ -62,6 +62,7 @@ After saving, the new agent appears in your **Agents** list with **Edit**, **Cha
6262

6363
After you create an agent:
6464

65+
- You're taken directly to a DM with the agent, where its welcome message appears once it arrives.
6566
- A new Expensify account is created for the agent.
6667
- You become the agent's owner.
6768
- You're automatically added as a full-access Copilot on the agent's account.

docs/articles/new-expensify/chat/Prioritize-and-Pin-Chats.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,41 @@ description: Learn how to customize the order of your chats using pinning and me
44
keywords: [New Expensify, chat inbox, reorder chats, pinned messages, focus mode, priority mode, chat display]
55
---
66

7+
# Prioritize and Pin Chats
8+
79
Customize your Expensify chat inbox to stay focused on what matters most. To organize your messages, you can pin key conversations to the top and choose between two display modes.
810

911
---
1012

11-
# Ways to Organize Your Inbox
13+
## How to organize your Inbox
1214

1315
- **Pin**: Keep important chats at the top of your inbox for quick access.
14-
- **Priority Mode**: Choose how your chats are sorted:
15-
- **Most Recent** – Displays all chats sorted by the most recent activity. Pinned chats remain at the top.
16+
- **Priority mode**: Choose how your chats are sorted:
17+
- **Most recent** – Displays all chats sorted by the most recent activity. Pinned chats remain at the top.
1618
- **#focus** – Displays only unread and pinned chats, sorted alphabetically.
1719

1820
---
1921

20-
# Pin or Unpin a Chat
22+
## How to pin and unpin a chat
2123

2224
**To pin a chat:**
2325
- Right-click the chat in your inbox and select **Pin**.
2426
- Or, you can click into the chat, click on the member's profile image, and select **Pin**.
2527

2628
To unpin a chat, repeat the same action and select **Unpin**.
2729

28-
📌 **Note:** Pinned chats always appear at the top of your inbox.
30+
**Note:** Pinned chats always appear at the top of your inbox.
2931

3032
---
3133

32-
# Change Priority Mode
34+
## How to change priority mode
3335

3436
To adjust how chats are sorted in your inbox:
3537

3638
1. In the navigation tabs (on the left on web, and at the bottom on mobile), go to **Account > Preferences**.
37-
2. Click or tap **Priority Mode**.
38-
3. Select either **#focus** or **Most Recent**.
39+
2. Click or tap **Priority mode**.
40+
3. Select either **#focus** or **Most recent**.
41+
4. Click or tap **Save**.
3942

40-
🧠 **Note:** Choose **#focus** for a distraction-free inbox with only unread and pinned chats, or stick with **Most Recent** to see everything chronologically.
43+
**Note:** Choose **#focus** for a distraction-free inbox with only unread and pinned chats, or stick with **Most recent** to see everything chronologically. The change is applied only after you tap **Save**.
4144

docs/articles/new-expensify/getting-started/Navigating-New-Expensify.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,19 +152,21 @@ Paid Workspace Admins may have dedicated support contacts assigned to their acco
152152
4. Below **Concierge**, look for your assigned support contacts.
153153
5. Click a contact to open a direct message with them.
154154

155-
If your Account Manager has a scheduling link set up, a **Book a call** button also appears next to them here. See **How to book a call with your Account Manager** below for details.
155+
If a support contact has a scheduling link set up, a **Book a call** button also appears next to them here. This works for your Account Manager, Partner Manager, and Guide. Learn [how to book a call with your support contact](#how-to-book-a-call-with-your-support-contact) below.
156156

157157
---
158158

159-
## How to book a call with your Account Manager
159+
## How to book a call with your support contact
160160

161-
If your Account Manager has a scheduling link set up, you can book a call with them directly using the **Book a call** button. Clicking **Book a call** opens your Account Manager's calendar in a new tab so you can pick a time. The button appears in these places:
161+
If your Account Manager, Partner Manager, or Guide has a scheduling link set up, you can book a call with them directly using the **Book a call** button. Clicking **Book a call** opens that person's calendar in a new tab so you can pick a time. The button appears in these places:
162162

163-
- On the **Help** page, next to your Account Manager.
164-
- In the header of your direct message with your Account Manager.
163+
- On the **Help** page, next to each support contact that has a scheduling link (Account Manager, Partner Manager, or Guide).
164+
- In the header of your direct message with that support contact.
165165
- In the header of your **Concierge** chat.
166166

167-
The **Book a call** button only appears if your Account Manager has a scheduling link configured. If you don't see it, you can still message your Account Manager directly or ask **Concierge** to help schedule a call.
167+
In **Concierge**, only one **Book a call** button appears at a time, even if more than one of your support contacts has a scheduling link.
168+
169+
The **Book a call** button only appears if the support contact has a scheduling link configured. If you don't see it, you can still message the support contact directly or ask **Concierge** to help schedule a call.
168170

169171
---
170172

@@ -247,7 +249,7 @@ Account Managers are typically assigned to accounts with subscriptions that incl
247249

248250
## Why don't I see the Book a call button?
249251

250-
You'll only see the **Book a call** button if you have an assigned Account Manager who has a scheduling link configured. If either isn't set up, the button won't appear.
252+
You'll only see the **Book a call** button if you have an assigned support contact (Account Manager, Partner Manager, or Guide) who has a scheduling link configured. If no support contact is assigned or none has a scheduling link set up, the button won't appear. In **Concierge**, only one **Book a call** button shows at a time.
251253

252254
## Are there keyboard shortcuts for opening reports or workspaces?
253255

docs/articles/new-expensify/reports-and-expenses/Approve-Expenses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ As the assigned approver, you can reject an entire expense report to return it t
131131

132132
## What happens after a report is rejected
133133

134-
- **Rejected to the submitter**: The report moves back to Draft. The submitter must fix any issues and manually resubmit — rejected reports are skipped during scheduled submit.
134+
- **Rejected to the submitter**: The report moves back to Draft. The submitter must fix any issues and manually resubmit — rejected reports are skipped when Submissions is enabled.
135135
- **Rejected to a previous approver**: The report stays Outstanding and prior approvals are preserved, so it won't restart the entire approval workflow.
136136

137137
---

0 commit comments

Comments
 (0)