Skip to content

Commit fa62839

Browse files
authored
Merge branch 'Expensify:main' into downgradeBlock
2 parents 73ce4e3 + b7d429f commit fa62839

81 files changed

Lines changed: 1112 additions & 438 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

docs/articles/expensify-classic/connections/Travel-receipt-integrations.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ Expensify offers pre-built integrations with **Bolt Work, SpotHero, Grab, and KA
6262

6363
---
6464

65+
## Delta for Business
66+
67+
1. Log in to your [Delta Business](https://businessmanagement.delta.com/agentlogin.html) Admin account.
68+
2. Go to Settings > Expense Providers, select Expensify, and follow the instructions listed on page.
69+
3. Once the connection is established, the status for Expensify on the Expense Providers page will change from Pending to Connected, and all incoming data from Delta Business will be routed to Expensify.
70+
71+
---
72+
6573
# KAYAK for Business
6674

6775
## Admin Setup

package-lock.json

Lines changed: 4 additions & 4 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
@@ -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=281 --cache --cache-location=node_modules/.cache/eslint",
49+
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=274 --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",
@@ -187,7 +187,7 @@
187187
"react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#07d60d78d4772d47afd7a744940fc6b6d1881806",
188188
"react-native-plaid-link-sdk": "11.11.0",
189189
"react-native-qrcode-svg": "6.3.14",
190-
"react-native-reanimated": "3.19.0",
190+
"react-native-reanimated": "3.19.1",
191191
"react-native-release-profiler": "^0.2.1",
192192
"react-native-render-html": "6.3.1",
193193
"react-native-safe-area-context": "5.4.0",
Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11

22
# `react-native-reanimated` patches
33

4-
### [react-native-reanimated+3.19.0+001+catch-all-exceptions-on-stoi.patch](react-native-reanimated+3.19.0+001+catch-all-exceptions-on-stoi.patch)
4+
### [react-native-reanimated+3.19.1+001+catch-all-exceptions-on-stoi.patch](react-native-reanimated+3.19.1+001+catch-all-exceptions-on-stoi.patch)
55

66
- Reason: Reanimated wasn't able to catch an exception here, so the catch clause was broadened.
77
- Upstream PR/issue: 🛑
88
- E/App issue: 🛑
99
- PR Introducing Patch: [Upgrade to React Native 0.76](https://github.com/Expensify/App/pull/51475)
1010

11-
### [react-native-reanimated+3.19.0+002+dontWhitelistTextProp.patch](react-native-reanimated+3.19.0+002+dontWhitelistTextProp.patch)
11+
### [react-native-reanimated+3.19.1+002+dontWhitelistTextProp.patch](react-native-reanimated+3.19.1+002+dontWhitelistTextProp.patch)
1212

1313
- Reason: In Expensify `text` prop in a JS prop and not in native code. Recheck if this is still needed when migrating to v4.
1414
- Upstream PR/issue: 🛑
1515
- E/App issue: 🛑
1616
- PR Introducing Patch: [NR 0.75 upgrade](https://github.com/Expensify/App/pull/45289)
1717

18-
### [react-native-reanimated+3.19.0+003+hybrid-app.patch](react-native-reanimated+3.19.0+003+hybrid-app.patch)
19-
20-
- Reason: Fixes IOS build crash due to not finding `package.json`.
21-
- Upstream PR/issue: 🛑
22-
- E/App issue: 🛑
23-
- PR Introducing Patch: [Upgrade to React Native 0.76](https://github.com/Expensify/App/pull/51475)

patches/react-native-reanimated/react-native-reanimated+3.19.0+003+hybrid-app.patch

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

patches/react-native-reanimated/react-native-reanimated+3.19.0+001+catch-all-exceptions-on-stoi.patch renamed to patches/react-native-reanimated/react-native-reanimated+3.19.1+001+catch-all-exceptions-on-stoi.patch

File renamed without changes.

patches/react-native-reanimated/react-native-reanimated+3.19.0+002+dontWhitelistTextProp.patch renamed to patches/react-native-reanimated/react-native-reanimated+3.19.1+002+dontWhitelistTextProp.patch

File renamed without changes.

src/ROUTES.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Refer to ./contributingGuides/philosophies/ROUTING.md for information on how to construct routes.
55
*/
66
import type {TupleToUnion, ValueOf} from 'type-fest';
7+
import type {UpperCaseCharacters} from 'type-fest/source/internal';
78
import type {SearchQueryString} from './components/Search/types';
89
import type CONST from './CONST';
910
import type {IOUAction, IOUType} from './CONST';
@@ -1265,7 +1266,7 @@ const ROUTES = {
12651266
},
12661267
WORKSPACE_AVATAR: {
12671268
route: 'workspaces/:policyID/avatar',
1268-
getRoute: (policyID: string) => `workspaces/${policyID}/avatar` as const,
1269+
getRoute: (policyID: string, fallbackLetter?: UpperCaseCharacters) => `workspaces/${policyID}/avatar${fallbackLetter ? `?letter=${fallbackLetter}` : ''}` as const,
12691270
},
12701271
WORKSPACE_JOIN_USER: {
12711272
route: 'workspaces/:policyID/join',

src/components/ConfirmModal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ function ConfirmModal({
174174
shouldEnableNewFocusManagement={shouldEnableNewFocusManagement}
175175
restoreFocusType={restoreFocusType}
176176
shouldHandleNavigationBack={shouldHandleNavigationBack}
177+
shouldUseReanimatedModal
177178
>
178179
<ConfirmContent
179180
title={title}

0 commit comments

Comments
 (0)