Skip to content

Commit 7fdcfd4

Browse files
authored
Merge branch 'main' into Refactor-Download-file-to-remove-onyx-connect
2 parents 3d65fa6 + 6782a29 commit 7fdcfd4

94 files changed

Lines changed: 1427 additions & 836 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
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009018800
118-
versionName "9.1.88-0"
117+
versionCode 1009018802
118+
versionName "9.1.88-2"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

docs/articles/expensify-classic/connections/Uber.md

Lines changed: 44 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,68 @@ title: Integrate Uber with Expensify
33
description: Learn how to connect Uber to Expensify Classic and how trip and tip expenses appear as separate entries based on Uber receipts.
44
keywords: [Uber integration, Expensify Classic, trip expense, tip expense, connect Uber, import Uber receipts]
55
---
6-
76
<div id="expensify-classic" markdown="1">
87

9-
# Connect Uber to Expensify Classic
8+
If you use Uber for business travel, you can automatically forward your ride receipts to Expensify—no manual uploads required!
9+
10+
---
11+
12+
# Connect Uber to Expensify
1013

11-
You can automatically import your Uber receipts into Expensify Classic by connecting your Uber account. If you leave a tip, Uber issues a **separate receipt** for it—so you'll see **two expenses** in Expensify: one for the trip and one for the tip.
14+
You can connect your Uber account to Expensify by enrolling in Uber for Business and choosing Expensify as your expense provider.
1215

1316
---
1417

15-
## How Uber expenses are created
18+
## Option 1: Enroll in Uber for Business and connect Expensify
1619

17-
Expensify imports expenses based on the receipts Uber sends:
20+
If you haven't yet enrolled in Uber for Business:
1821

19-
- **Trip Expense**: Created from Uber’s receipt for the base fare, taxes, and fees.
20-
- **Tip Expense**: Created from a separate receipt if you tip your driver after the ride.
22+
1. Go to **Settings > Account > Wallet**.
23+
2. Scroll down and click **Start using Uber for Business**.
24+
3. Follow the prompts to enroll and choose **Expensify** as your expense provider during setup.
2125

22-
This helps ensure each charge is clearly tracked and categorized.
26+
---
27+
28+
## Option 2: Already enrolled in Uber for Business? Just choose Expensify
29+
30+
If you’ve already enrolled in Uber for Business:
31+
32+
1. Go to **Settings > Account > Wallet**.
33+
2. Scroll to the **Ride profiles** section.
34+
3. Select **Business**.
35+
4. Under **Expense provider**, choose **Expensify**.
36+
37+
This links your Uber Business profile to Expensify for automatic receipt forwarding.
2338

2439
---
2540

26-
## How to connect your Uber account
41+
## What happens after connecting?
2742

28-
To connect your Uber account to Expensify:
43+
- Uber receipts will appear in Expensify just like SmartScanned receipts.
44+
- If you use Scheduled Submit, your Uber receipts will be added to your next report automatically.
45+
- If the ride was paid for with an Expensify Card, the Uber receipt will automatically merge with the corresponding card expense.
2946

30-
1. Log in to [Expensify Classic](https://www.expensify.com).
31-
2. Go to `Settings > Account > Profile`.
32-
3. Scroll to the **Connected Accounts** section.
33-
4. Click **Connect** next to Uber.
34-
5. Log in to your Uber account and authorize the connection.
47+
---
48+
49+
# How Uber expenses are created
50+
51+
Expensify imports expenses based on the receipts Uber sends:
52+
53+
- **Trip expense:** Created from Uber’s receipt for the base fare, taxes, and fees.
54+
- **Tip expense:** Created from a separate receipt if you tip your driver after the ride.
3555

36-
Once connected, Uber receipts will automatically import after each completed trip.
56+
This helps ensure each charge is clearly tracked and categorized.
3757

3858
---
3959

40-
## Notes on Uber integration
60+
# FAQ
4161

42-
- Tip expenses may appear a few minutes after the trip expense.
43-
- Expensify will attempt to match duplicate receipts if SmartScanned or emailed separately.
62+
## Can I connect multiple Uber accounts to Expensify?
4463

45-
</div>
64+
No. Each Uber account can only be connected to one Expensify account.
65+
66+
## What happens if I delete the connection?
4667

68+
If you disconnect Uber from Expensify, future receipts will no longer be forwarded automatically. You can reconnect anytime by using either method listed above.
69+
70+
</div>

ios/NewExpensify/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.1.88.0</string>
47+
<string>9.1.88.2</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.88</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.88.0</string>
16+
<string>9.1.88.2</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.88</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.88.0</string>
16+
<string>9.1.88.2</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.1.88-0",
3+
"version": "9.1.88-2",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -46,7 +46,7 @@
4646
"test:debug": "TZ=utc NODE_OPTIONS='--inspect-brk --experimental-vm-modules' jest --runInBand",
4747
"perf-test": "NODE_OPTIONS=--experimental-vm-modules npx reassure",
4848
"typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
49-
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=330 --cache --cache-location=node_modules/.cache/eslint",
49+
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=327 --cache --cache-location=node_modules/.cache/eslint",
5050
"lint-changed": "NODE_OPTIONS=--max_old_space_size=8192 ./scripts/lintChanged.sh",
5151
"lint-watch": "npx eslint-watch --watch --changed",
5252
"shellcheck": "./scripts/shellCheck.sh",

src/CONST/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,6 @@ const CONST = {
890890
EMPTY_ARRAY,
891891
EMPTY_OBJECT,
892892
DEFAULT_NUMBER_ID,
893-
FAKE_REPORT_ID: 'FAKE_REPORT_ID',
894893
USE_EXPENSIFY_URL,
895894
EXPENSIFY_URL,
896895
EXPENSIFY_MOBILE_URL,
@@ -1463,6 +1462,8 @@ const CONST = {
14631462
ANIMATION_TIMING: {
14641463
DEFAULT_IN: 300,
14651464
DEFAULT_OUT: 200,
1465+
DEFAULT_RIGHT_DOCKED_IOS_IN: 500,
1466+
DEFAULT_RIGHT_DOCKED_IOS_OUT: 400,
14661467
FAB_IN: 350,
14671468
FAB_OUT: 200,
14681469
},

src/ONYXKEYS.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,8 @@ const ONYXKEYS = {
548548
/** Is unreported transactions loading */
549549
IS_LOADING_UNREPORTED_TRANSACTIONS: 'isLoadingUnreportedTransactions',
550550

551-
/** List of transaction IDs used when navigating to prev/next transaction when viewing it in RHP */
552-
TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS: 'transactionThreadNavigationTransactionIDs',
551+
/** List of transaction thread IDs used when navigating to prev/next transaction when viewing it in RHP */
552+
TRANSACTION_THREAD_NAVIGATION_REPORT_IDS: 'transactionThreadNavigationReportIDs',
553553

554554
/** Timestamp of the last login on iOS */
555555
NVP_LAST_ECASH_IOS_LOGIN: 'nvp_lastECashIOSLogin',
@@ -1212,7 +1212,7 @@ type OnyxValuesMapping = {
12121212
[ONYXKEYS.NVP_LAST_ECASH_ANDROID_LOGIN]: string;
12131213
[ONYXKEYS.NVP_LAST_IPHONE_LOGIN]: string;
12141214
[ONYXKEYS.NVP_LAST_ANDROID_LOGIN]: string;
1215-
[ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS]: string[];
1215+
[ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_REPORT_IDS]: string[];
12161216
[ONYXKEYS.ONBOARDING_USER_REPORTED_INTEGRATION]: OnboardingAccounting;
12171217
[ONYXKEYS.HYBRID_APP]: OnyxTypes.HybridApp;
12181218
};

0 commit comments

Comments
 (0)