Skip to content

Commit 64626fa

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/fullstory-lib-upgrade
2 parents 0f99a61 + feb220c commit 64626fa

121 files changed

Lines changed: 1814 additions & 642 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/workflows/publishReactNativeAndroidArtifacts.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ on:
1818
- package.json
1919
- patches/react-native+*.patch
2020
- patches/@react-native+*.patch
21+
- patches/react-native/react-native+*.patch
22+
- patches/react-native/@react-native+*.patch
2123
- Mobile-Expensify
2224

2325
jobs:

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 1009017701
118-
versionName "9.1.77-1"
117+
versionCode 1009017702
118+
versionName "9.1.77-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"

contributingGuides/NAVIGATION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Navigation.navigate(ROUTES.HOME);
6565
// Navigation with parameters
6666
Navigation.navigate(
6767
ROUTES.SEARCH_ROOT.getRoute({
68-
query: 'type:expense status:all search',
68+
query: 'type:expense search',
6969
// additional parameters...
7070
}),
7171
);

cspell.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
"Charleson",
9999
"Checkmark",
100100
"checkmarked",
101+
"chien",
101102
"Chronos",
102103
"citi",
103104
"clawback",
@@ -136,6 +137,7 @@
136137
"deeplinks",
137138
"delegators",
138139
"delish",
140+
"describedby",
139141
"Deutsch",
140142
"devportal",
141143
"DFOLLY",
@@ -295,6 +297,7 @@
295297
"killall",
296298
"Kowalski",
297299
"Krasoń",
300+
"labelledby",
298301
"Lagertha",
299302
"laggy",
300303
"lastiPhoneLogin",

docs/articles/expensify-classic/travel/Approve-travel-expenses.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ title: Approve travel expenses
33
description: Determine how travel expenses are approved
44
---
55

6-
Travel expenses follow the same approval workflow as other expenses. Admins can configure travel expenses to be approved as soft approval, hard approval or passive approval. The approval method for in-policy and out-of-policy bookings can be managed under the **Policies** section in the **Program** menu for Expensify Travel.
6+
Travel expenses follow the same approval workflow as other expenses. Admins can configure travel expenses to be approved as soft approval, hard approval or passive approval. The approval method for in-policy and out-of-policy bookings can be managed under the **Policies** section in the **Program** menu for Expensify Travel.
7+
8+
Trip itineraries are maintained with complete booking information, ensuring accurate trip details are always available regardless of how individual expenses are handled.
79

810
- **Soft Approval**: Bookings are automatically approved as long as a manager does not decline them within 24 hours. However, this also means that if a manager does not decline the expenses, the arrangements will be booked even if they are out of policy. If a booking is declined, it is refunded based on the voiding/refund terms of the service provider.
911
- **Hard Approval**: Bookings are automatically canceled/voided and refunded if a manager does not approve them within 24 hours.

docs/articles/expensify-classic/travel/Book-With-Expensify-Travel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To book travel from the Expensify web app,
3434

3535
The traveler is emailed an itinerary of the booking. Additionally,
3636
- Their travel details are added to a Trip chat room under their primary workspace.
37-
- An expense report for the trip is created.
37+
- Travel expenses are automatically added to expense reports following your workspace's scheduled submit rules.
3838
- If booked with an Expensify Card, the trip is automatically reconciled.
3939

4040
{% include info.html %}

docs/articles/expensify-classic/travel/Edit-or-cancel-travel-arrangements.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ title: Edit or cancel travel arrangements
33
description: Modify travel arrangements booked with Expensify Travel
44
---
55

6+
Your trip itinerary is maintained with the latest booking information and can be accessed any time through your trip room.
7+
68
To edit or cancel a travel arrangement,
79
1. Click Travel in the left menu.
810
2. Click Book or Manage Travel.

docs/articles/expensify-classic/travel/Track-Travel-Analytics.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ description: Learn how Workspace Admins can access real-time employee travel ins
44
keywords: [Expensify Classic, travel analytics, duty of care, ESG report, travel spend, employee location map, travel compliance, company travel data]
55
---
66

7-
<div id="expensify-classic" markdown="1">
8-
9-
Expensify Travel gives Workspace Admins access to real-time analytics for company travel. From one dashboard, you can monitor employee safety, analyze spending trends, and ensure policy compliance.
10-
11-
With Expensify Travel analytics, you can:
7+
Expensify Travel provides comprehensive insights into company travel bookings to ensure real-time duty of care reporting and travel policy compliance. Analytics are based on complete trip-level data that remains accurate regardless of individual expense handling. These analytics help Workspace Admins:
128

139
- See global employee locations with a real-time employee location map
1410
- Analyze travel spend based on details such as trip, traveler, or carrier

docs/articles/new-expensify/expensify-card/View-and-Reconcile-Expensify-Card-Expenses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ You can export transactions from a specific date range to help with monthly reco
3232
4. Apply the following filters:
3333
- **Card**: select the applicable card feed.
3434
- **Posted date**: Set the appropriate date range (e.g., `posted<2025-02-28 AND posted>2025-02-01`)
35-
5. Alternatively, you can enter this directly in the search bar (e.g., `type:expense status:all feed:"all in cards" posted<2025-02-28 posted>2025-02-01`)
35+
5. Alternatively, you can enter this directly in the search bar (e.g., `type:expense feed:"all in cards" posted<2025-02-28 posted>2025-02-01`)
3636
6. Once filtered, click the **Export** icon in the top-right corner to download the report as a spreadsheet.
3737

3838
---

0 commit comments

Comments
 (0)