Skip to content

Commit adab045

Browse files
committed
Merge branch 'main' into fix/68494
2 parents 987e56c + a774255 commit adab045

109 files changed

Lines changed: 2884 additions & 1430 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

__mocks__/react-native-onyx.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type ConnectionCallbackParams<TKey extends OnyxKey> = Parameters<ConnectionCallb
2222

2323
const reactNativeOnyxMock: ReactNativeOnyxMock = {
2424
...Onyx,
25-
connect: <TKey extends OnyxKey>(mapping: ConnectOptions<TKey>) => {
25+
connectWithoutView: <TKey extends OnyxKey>(mapping: ConnectOptions<TKey>) => {
2626
const callback = (...params: ConnectionCallbackParams<TKey>) => {
2727
if (connectCallbackDelay > 0) {
2828
setTimeout(() => {
@@ -32,7 +32,7 @@ const reactNativeOnyxMock: ReactNativeOnyxMock = {
3232
(mapping.callback as (...args: ConnectionCallbackParams<TKey>) => void)?.(...params);
3333
}
3434
};
35-
return Onyx.connect({
35+
return Onyx.connectWithoutView({
3636
...mapping,
3737
callback,
3838
});
@@ -41,4 +41,5 @@ const reactNativeOnyxMock: ReactNativeOnyxMock = {
4141
};
4242

4343
export default reactNativeOnyxMock;
44+
// eslint-disable-next-line
4445
export {withOnyx, useOnyx};

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 1009019404
118-
versionName "9.1.94-4"
117+
versionCode 1009019501
118+
versionName "9.1.95-1"
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/philosophies/INDEX.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "S
55
"OPTIONAL" are to be interpreted as described in [RFC 2119](https://datatracker.ietf.org/doc/html/rfc2119).
66

77
## Contents
8-
* [Offline Philosophy](contributingGuides/philosophies/OFFLINE.md)
9-
* [Routing Philosophy](contributingGuides/philosophies/ROUTING.md)
8+
* [Offline Philosophy](/contributingGuides/philosophies/OFFLINE.md)
9+
* [Routing Philosophy](/contributingGuides/philosophies/ROUTING.md)

docs/articles/new-expensify/reports-and-expenses/Using-Search-on-the-Reports-Page.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@ The **To-do** section surfaces key report actions so you can:
1818
- Submit expenses waiting on you
1919
- Approve reports that need your review
2020
- Pay approved reports ready for reimbursement
21+
- Export finalized reports to accounting platforms
2122

2223
These shortcuts are personalized based on your role and workspace configuration, helping you process reports in batches without manually building advanced searches.
2324

25+
![An image of the Search function on the Reports page on New Expensify]({{site.url}}/assets/images/export.png){:width="100%"}
26+
2427
---
2528

2629
# How to Use Search Shortcuts
@@ -31,6 +34,7 @@ Depending on your role, you’ll see shortcuts like:
3134
- **Submit** – Reports you’ve drafted and need to submit.
3235
- **Approve** – Reports awaiting your review.
3336
- **Pay** – Reports ready for reimbursement.
37+
- **Export** – Reports ready for accounting export (e.g., to QuickBooks).
3438

3539
---
3640

@@ -52,6 +56,10 @@ Depending on your role, you’ll see shortcuts like:
5256
- See **Pay** for reports ready to reimburse.
5357
- See a celebratory message (e.g., “All reports paid!”) when cleared.
5458

59+
### Admins (Exports)
60+
- See **Export** for reports eligible for accounting export (e.g., to QuickBooks Online).
61+
- Filter uses `exported:never` to show only unexported reports.
62+
5563
---
5664

5765
# Best Practices
@@ -64,7 +72,7 @@ Depending on your role, you’ll see shortcuts like:
6472

6573
# FAQ
6674

67-
## What if I don't see the Submit, Approve, or Pay options?
75+
## What if I don't see the Submit, Approve, Pay or Export options?
6876

6977
These search shortcuts only appear when:
7078
- You have reports that require those actions.
@@ -77,6 +85,6 @@ Not yet. The **Workspace filter** is currently single-select. Multi-workspace su
7785
## What is the difference between Explore and To-do?
7886

7987
- **Explore** = General browsing (e.g., Expenses, Chats)
80-
- **To-do** = Personalized actions based on your role (e.g., Submit, Approve, Pay)
88+
- **To-do** = Personalized actions based on your role (e.g., Submit, Approve, Pay, Export)
8189

8290
</div>

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.1.94</string>
26+
<string>9.1.95</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.1.94.4</string>
47+
<string>9.1.95.1</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.1.94</string>
14+
<string>9.1.95</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.94.4</string>
16+
<string>9.1.95.1</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.1.94</string>
14+
<string>9.1.95</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.94.4</string>
16+
<string>9.1.95.1</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.1.94-4",
3+
"version": "9.1.95-1",
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=259 --cache --cache-location=node_modules/.cache/eslint",
49+
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=249 --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",
@@ -129,7 +129,7 @@
129129
"date-fns-tz": "^3.2.0",
130130
"dom-serializer": "^0.2.2",
131131
"domhandler": "^4.3.0",
132-
"expensify-common": "2.0.147",
132+
"expensify-common": "2.0.156",
133133
"expo": "53.0.7",
134134
"expo-asset": "^11.1.2",
135135
"expo-av": "^15.1.5",

0 commit comments

Comments
 (0)