Skip to content

Commit 8889f68

Browse files
committed
Merge branch 'main' into youssef_concierge_anywhere_report_context
2 parents 36087f0 + f042439 commit 8889f68

397 files changed

Lines changed: 10294 additions & 3198 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/authorChecklist/categories/newComponentCategory.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,7 @@ function detectReactComponent(code: string, filename: string): boolean | undefin
6565
// eslint-disable-next-line @typescript-eslint/naming-convention
6666
ClassDeclaration(path) {
6767
const {superClass} = path.node as unknown as SuperClassType;
68-
if (
69-
superClass &&
70-
((superClass.object && superClass.object.name === 'React' && isComponentOrPureComponent(superClass.property.name)) || isComponentOrPureComponent(superClass.name))
71-
) {
68+
if (superClass && ((superClass.object?.name === 'React' && isComponentOrPureComponent(superClass.property.name)) || isComponentOrPureComponent(superClass.name))) {
7269
isReactComponent = true;
7370
path.stop();
7471
}

.github/libs/CONST.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const CONST = {
1818
INTERNAL_QA: 'InternalQA',
1919
HELP_WANTED: 'Help Wanted',
2020
CP_STAGING: 'CP Staging',
21+
DAILY: 'Daily',
2122
},
2223
STATE: {
2324
OPEN: 'open',

.github/tsconfig.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
{
22
"compilerOptions": {
3-
"module": "commonjs",
4-
"moduleResolution": "node",
3+
"module": "node16",
4+
"moduleResolution": "node16",
55
"target": "ES2023",
66
"types": ["node"],
7-
"allowSyntheticDefaultImports": true,
8-
"esModuleInterop": true,
9-
"downlevelIteration": true,
10-
"baseUrl": ".",
117
"paths": {
128
"@assets/*": ["../assets/*"],
139
"@components/*": ["../src/components/*"],

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 1009036017
115-
versionName "9.3.60-17"
114+
versionCode 1009036101
115+
versionName "9.3.61-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"

cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,7 @@
887887
"Crédit",
888888
"Danske",
889889
"Depósitos",
890+
"effectful",
890891
"Erste",
891892
"Générale",
892893
"Geral",

docs/articles/new-expensify/connections/quickbooks-desktop/Connect-to-QuickBooks-Desktop.md

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
11
---
2-
title: QuickBooks Desktop
2+
title: Connect to QuickBooks Desktop
33
description: Easily connect Expensify to QuickBooks Desktop for streamlined expense management and accounting.
4-
keywords: [New Expensify, QuickBooks Desktop, Web Connector, accounting integration, expense management]
4+
keywords: [New Expensify, QuickBooks Desktop, Web Connector, accounting integration, expense management, reuse existing connection]
5+
internalScope: Audience is Workspace Admins. Covers connecting QuickBooks Desktop to Expensify and reusing existing connections, does not cover configuring export or coding settings.
56
order: 1
67
---
78

9+
# Connect to QuickBooks Desktop
810

911
QuickBooks Desktop is accounting software designed for small and medium-sized businesses. Connecting Expensify to QuickBooks Desktop streamlines your expense management and accounting workflows.
1012

1113
To connect QuickBooks Desktop to Expensify, you must log in as an Admin in QuickBooks Desktop. Make sure **the company file you want to connect to is the only one open**.
1214

1315
---
1416

15-
# Step 1: Start the Setup in Expensify
17+
## How to reuse an existing QuickBooks Desktop connection
18+
19+
If you already have QuickBooks Desktop connected to another workspace, you can reuse that existing connection instead of setting up a new one.
20+
21+
1. From the navigation tabs (on the left on web, and at the bottom on mobile), select **Workspaces**
22+
2. Choose the workspace you want to connect to
23+
3. Click **More features** in the left-hand menu
24+
4. In the **Integrate** section, toggle on **Accounting**
25+
5. Click **Accounting** in the left-hand menu
26+
6. Click **Set up** next to QuickBooks Desktop
27+
7. Select the workspace with the existing QuickBooks Desktop connection you want to reuse
28+
29+
The connection and its settings will be imported to your new workspace.
30+
31+
To create a new connection instead, click **Create new connection** and follow the steps below.
32+
33+
---
34+
35+
## How to create a new QuickBooks Desktop connection
1636

1737
1. From the navigation tabs (on the left on web, and at the bottom on mobile), select **Workspaces**
1838
2. Choose the workspace you want to connect to
@@ -27,7 +47,7 @@ To connect QuickBooks Desktop to Expensify, you must log in as an Admin in Quick
2747

2848
---
2949

30-
# Step 2: Install and Launch the Web Connector
50+
## How to install and launch the Web Connector for QuickBooks Desktop
3151

3252
1. Download the Web Connector and follow the installation instructions
3353
2. Open the Web Connector
@@ -37,7 +57,7 @@ To connect QuickBooks Desktop to Expensify, you must log in as an Admin in Quick
3757

3858
---
3959

40-
# Step 3: Authorize and Finalize the Connection
60+
## How to authorize and finalize the QuickBooks Desktop connection
4161

4262
1. In QuickBooks Desktop, select **Yes, always allow access, even when QuickBooks is not running**, then click **Continue**
4363
2. Click **OK**, then click **Yes**
@@ -70,6 +90,10 @@ Expensify follows [Intuit’s service discontinuation policy](https://quickbooks
7090

7191
Yes. You can install one connector per company file. Multiple connectors can run from the same computer. Just ensure you're logged into the correct company file before syncing.
7292

93+
## Can I reuse an existing QuickBooks Desktop connection on a new workspace?
94+
95+
Yes. If you already have QuickBooks Desktop connected to another workspace where you are a Workspace Admin, Expensify will offer to reuse that existing connection when you set up QuickBooks Desktop on a new workspace.
96+
7397
## Can I export negative expenses?
7498

7599
Yes, in general. However:

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ If you are creating expenses on a Workspace:
9898

9999
[Learn how to manage distance rates as a Workspace Admin](/articles/new-expensify/reports-and-expenses/Managing-Distance-Rates)
100100

101-
### Distance expenses created for personal tracking
101+
### Distance expenses created outside of a Workspace
102102

103-
If you're creating expenses outside of a Workspace:
103+
If you're creating a distance expense outside of a Workspace (e.g., in a DM chat or Your space):
104104

105-
- Expensify sets a default rate based on your payment currency.
106-
- Example: For USD, the rate is based on the current IRS reimbursement rate and uses miles.
107-
- Distance default rates are updated annually.
108-
109-
**Note:** Only Workspace Admins can set a custom distance rate. It's not possible to set a custom distance rate for personal expenses outside of a Workspace.
105+
- **DM chats:** Expensify sets a default rate based on your payment currency (e.g., the current IRS rate for USD). It is not possible to set a custom distance rate for these expenses.
106+
- **Your space (tracking for personal use):**
107+
- **If you have a default Workspace:** The distance rates from your default Workspace are automatically applied. You can tap the **Rate** field to choose a different rate from that Workspace.
108+
- **If you have multiple Workspaces but no default:** You'll be prompted to select a Workspace first, and then you can choose from that Workspace's available rates.
109+
- **If you don't have a group Workspace:** Expensify sets a default rate based on your payment currency (e.g., the current IRS rate for USD). When you tap the **Rate** field, you'll be guided through creating a Workspace with a custom distance rate.
110110

111111
---
112112

@@ -133,7 +133,7 @@ Yes! You can edit the expense before it is approved. To learn how to edit an exp
133133

134134
## Can I update the Distance expense unit or rate?
135135

136-
The distance unit and rate can only be updated by a Workspace Admin on the Workspace. It is not possible to adjust the distance rate or unit at the expense level.
136+
The distance unit and rate can only be updated by a Workspace Admin on the Workspace. It is not possible to adjust the distance rate or unit at the expense level.
137137

138138
## What happens if a Distance expense is moved to a different Workspace?
139139

eslint.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ const config = defineConfig([
446446
],
447447
'@typescript-eslint/prefer-find': 'off',
448448
'@typescript-eslint/prefer-includes': 'off',
449+
'@typescript-eslint/prefer-optional-chain': 'off',
449450
'@typescript-eslint/prefer-nullish-coalescing': [
450451
'error',
451452
{

ios/NewExpensify/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<key>CFBundlePackageType</key>
2424
<string>APPL</string>
2525
<key>CFBundleShortVersionString</key>
26-
<string>9.3.60</string>
26+
<string>9.3.61</string>
2727
<key>CFBundleSignature</key>
2828
<string>????</string>
2929
<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.3.60.17</string>
47+
<string>9.3.61.1</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

0 commit comments

Comments
 (0)