Skip to content

Commit d5c7265

Browse files
committed
Merge branch 'main' into fix/66424-part-11
2 parents bcbd62b + f0b9ae0 commit d5c7265

199 files changed

Lines changed: 6431 additions & 3563 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.

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 1009034302
115-
versionName "9.3.43-2"
114+
versionCode 1009034801
115+
versionName "9.3.48-1"
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"

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ buildscript {
3030
classpath("com.facebook.react:react-native-gradle-plugin")
3131
classpath("com.google.gms:google-services:4.3.4")
3232
// Fullstory integration
33-
classpath ("com.fullstory:gradle-plugin-local:1.64.2")
33+
classpath ("com.fullstory:gradle-plugin-local:1.68.3")
3434

3535
// NOTE: Do not place your application dependencies here; they belong
3636
// in the individual module build.gradle files

contributingGuides/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ We hire and pay external contributors via [Upwork.com](https://www.upwork.com).
5050

5151
Please add your Upwork profile link in your GitHub Bio to help ensure prompt payment. If you're using Slack or Expensify for discussions, please add your Upwork profile link **and** your GitHub username in your Slack Title and Expensify Status.
5252

53-
Payment for your contributions will be made no less than 7 days after the pull request is deployed to production to allow for [regression](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions) testing. If you have not received payment after 8 days of the PR being deployed to production, and there are no [regressions](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions), please add a comment to the issue mentioning the BugZero team member (Look for the melvin-bot "Triggered auto assignment to... (`Bug`)" to see who this is).
53+
Payment for your contributions will be made no less than 7 days after the pull request is deployed to production to allow for [regression](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions) testing. If you have not received payment after 8 days of the PR being deployed to production, and there are no [regressions](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions), please add a comment to the issue mentioning the team member assigned to pay (Look for the melvin-bot "Triggered auto assignment to... (`Awaiting Payment`)" to see who this is).
5454

5555
New contributors are limited to working on one job at a time, **do not submit proposals for new jobs until your first PR has been merged**. Experienced contributors may work on numerous jobs simultaneously.
5656

cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,7 @@
776776
"Uncapitalize",
777777
"uncategorized",
778778
"Undelete",
779+
"unflushed",
779780
"unheld",
780781
"unhold",
781782
"uninstallations",

docs/articles/expensify-classic/connect-credit-cards/Manage-Company-Cards.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ A CSV upload is a manual method for importing credit card transactions into Expe
9494
# Assign Cards: How do I assign cards to employees?
9595
1. Go to **Settings > Domains > [Domain Name] > Company Cards**.
9696
2. Select the card feed from the dropdown list.
97-
3. Click **Assign New Cards** and select the employee’s email and card number.
97+
3. Click **Assign New Cards**, enter the member's email address and select the card number.
9898
4. (Optional) Set a transaction start date.
9999
5. Click **Assign** to complete the process.
100100

@@ -149,24 +149,24 @@ For businesses using accounting integrations like QuickBooks or NetSuite, connec
149149

150150
# FAQ
151151

152-
## Missing Transactions: Why aren’t all transactions appearing?
152+
## Why are some transactions missing?
153153
Transactions may take up to 24 hours to post. Update the card feed or check the Reconciliation Dashboard to review transaction data.
154154

155155
- **Reconciliation Dashboard**: Navigate to **Settings > Domains > [Domain Name] > Company Cards > Reconciliation** to identify missing or unapproved expenses within a specific timeframe.
156156
- **Common Issues**: Ensure the transaction date range is correct. If gaps persist, contact Concierge to request a historical data update.
157157

158-
## Direct vs. Commercial Feeds: Which option is better?
158+
## Which is better, a direct bank connection or commercial card feed?
159159
Commercial feeds are more stable and reliable but require setup by your bank. Direct connections are easier to set up but may experience occasional disruptions.
160160

161-
## CSV Upload Errors: What should I do if my upload fails?
161+
## What should I do if my CSV upload fails or results in an error?
162162
Ensure the file includes the required fields and matches the formatting guidelines. Use Expensify’s [CSV template](https://s3-us-west-1.amazonaws.com/concierge-responses-expensify-com/uploads%2F1594908368712-Best+Example+CSV+for+Domains.csv) for reference.
163163

164-
## Unassigning Cards: What happens when I unassign a card?
164+
## What happens when I unassign a card?
165165
Unassigning a card deletes all draft or unreported expenses linked to it. Submitted or processed expenses remain unaffected.
166166

167-
## Connection Issues: Why is my card connection broken?
167+
## Why is my card connection broken?
168168
Check for changes to bank credentials, security questions, or login details. Update the information in Expensify and re-establish the connection via **Fix Card**.
169169

170-
## Historical Data: How far back can I import transactions?
170+
## How far back can I import transactions?
171171
Most banks provide 30-90 days of historical data. Older transactions can be imported using the CSV upload method.
172172

docs/articles/expensify-classic/connections/certinia/Troubleshooting/Export-Errors/Overview.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/articles/expensify-classic/connections/quickbooks-online/Troubleshooting/Connection-errors/Overview.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/articles/expensify-classic/expensify-card/Unlimited-Virtual-Cards.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,35 @@
11
---
2-
title: Unlimited Virtual Cards
2+
title: Unlimited Virtual Cards
33
description: Learn about virtual cards and how they help businesses improve efficiency and gain better control over company spending.
44
keywords: [Expensify Classic, Expensify Card, virtual card]
5+
internalScope: Audience is Domain Admins. Covers issuing, editing, and terminating unlimited virtual cards. Does not cover physical Expensify Card setup or smart limit cards.
56
---
67

7-
Domain Admins can issue an **unlimited number of virtual cards** with either a fixed or monthly limit for specific purchases or recurring subscriptions (e.g., Marketing, Advertising, Travel, AWS, etc.).
8+
Domain Admins can issue an unlimited number of virtual cards with either a fixed or monthly limit for specific purchases or recurring subscriptions (e.g., Marketing, Advertising, Travel, AWS, etc.).
89

910
Virtual cards are ideal for businesses that need control over spending as Domain Admins can set individual spending limits for each virtual card.
1011

12+
# Unlimited Virtual Cards
13+
1114
**Use virtual cards if your company needs:**
1215
- One card per vendor or subscription
1316
- Cards for one-time purchases with a fixed amount
1417
- Cards for events or trips
1518
- Cards with a low limit that renews monthly
1619

17-
Admins can name each card for easy tracking and organization. This makes categorizing expenses in the Expensify platform simple.
20+
Domain Admins can name each card for easy tracking and organization. This makes categorizing expenses in the Expensify platform simple.
1821

1922
---
2023

21-
# Set up Virtual Cards
24+
## How to set up virtual cards
2225

23-
After upgrading to the Expensify Card, domain admins can issue virtual cards to any employee with an email matching your company domain. Once assigned, the virtual card will appear under the card's assigned name.
26+
After upgrading to the Expensify Card, Domain Admins can issue virtual cards to any member by entering their email address. Once assigned, the virtual card will appear under the card's assigned name.
2427

2528
**To assign a virtual card:**
2629
1. Go to **Settings** > **Domains** > [**Company Cards**](https://www.expensify.com/domain_companycards).
2730
2. Click **Issue Virtual Cards**.
2831
3. Enter a card name (e.g., "Google Ads").
29-
4. Select a domain member to assign the card to.
32+
4. Enter the email address of the member you want to assign the card to.
3033
5. Set a card limit.
3134
6. Choose **Limit Type** (Fixed or Monthly).
3235
7. Click **Issue Card**.
@@ -35,9 +38,9 @@ After upgrading to the Expensify Card, domain admins can issue virtual cards to
3538

3639
---
3740

38-
# Edit Virtual Cards
41+
## How to edit virtual cards
3942

40-
Domain admins can edit the details of any virtual card on the [Company Cards](https://www.expensify.com/domain_companycards) page.
43+
Domain Admins can edit the details of any virtual card on the [Company Cards](https://www.expensify.com/domain_companycards) page.
4144

4245
**To edit a virtual card:**
4346
1. Click the **Edit** button next to the card.
@@ -46,7 +49,7 @@ Domain admins can edit the details of any virtual card on the [Company Cards](ht
4649

4750
---
4851

49-
# Terminate a Virtual Card
52+
## How to terminate a virtual card
5053

5154
Admins can terminate a virtual card by setting the limit to **$0**.
5255

docs/articles/new-expensify/concierge-ai/Expense-Assistant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Some expense actions are not currently supported in chat, but may be added in th
9999
- Attaching a receipt to an existing transaction via chat
100100
- Tagging expenses based on past behavior
101101

102-
If you request these actions, Concierge will notify you that the feature is not yet available."
102+
If you request these actions, Concierge will notify you that the feature is not yet available.
103103

104104
---
105105

0 commit comments

Comments
 (0)