Skip to content

Commit 0bbb452

Browse files
committed
Merge branch 'main' into collectioneur/fix-confirm-modal-exit-animation
2 parents f97e542 + 65f13bd commit 0bbb452

37 files changed

Lines changed: 259 additions & 171 deletions

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=280 --cache --cache-location=node_modules/.cache/eslint",
49+
"lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=278 --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/components/FloatingActionButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ function FloatingActionButton({onPress, onLongPress, isActive, accessibilityLabe
136136
onPress={toggleFabAction}
137137
onLongPress={longPressFabAction}
138138
role={role}
139-
shouldUseHapticsOnLongPress={false}
139+
shouldUseHapticsOnLongPress
140140
testID="floating-action-button"
141141
>
142142
<Animated.View style={[styles.floatingActionButton, {borderRadius}, isLHBVisible && styles.floatingActionButtonSmall, animatedStyle]}>

src/components/Modal/BaseModal.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import type ReanimatedModalProps from './ReanimatedModal/types';
3333
import type BaseModalProps from './types';
3434
import type {FocusTrapOptions} from './types';
3535

36-
const REANIMATED_MODAL_TYPES: Array<ValueOf<typeof CONST.MODAL.MODAL_TYPE>> = [CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED, CONST.MODAL.MODAL_TYPE.FULLSCREEN];
36+
const REANIMATED_MODAL_TYPES: Array<ValueOf<typeof CONST.MODAL.MODAL_TYPE>> = [CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED, CONST.MODAL.MODAL_TYPE.FULLSCREEN, CONST.MODAL.MODAL_TYPE.POPOVER];
3737

3838
type ModalComponentProps = (ReactNativeModalProps | ReanimatedModalProps) & {
3939
type?: ValueOf<typeof CONST.MODAL.MODAL_TYPE>;
@@ -165,8 +165,10 @@ function BaseModal(
165165

166166
const {sidePanelOffset} = useSidePanel();
167167
const sidePanelStyle = !shouldUseReanimatedModal && shouldApplySidePanelOffset && !isSmallScreenWidth ? {paddingRight: sidePanelOffset.current} : undefined;
168-
const sidePanelReanimatedStyle =
169-
shouldUseReanimatedModal && shouldApplySidePanelOffset && !isSmallScreenWidth ? {transform: [{translateX: Animated.multiply(sidePanelOffset.current, -1)}]} : undefined;
168+
const sidePanelAnimatedStyle =
169+
(shouldUseReanimatedModal || type === CONST.MODAL.MODAL_TYPE.POPOVER) && shouldApplySidePanelOffset && !isSmallScreenWidth
170+
? {transform: [{translateX: Animated.multiply(sidePanelOffset.current, -1)}]}
171+
: undefined;
170172
const keyboardStateContextValue = useKeyboardState();
171173

172174
const [modalOverlapsWithTopSafeArea, setModalOverlapsWithTopSafeArea] = useState(false);
@@ -459,7 +461,7 @@ function BaseModal(
459461
>
460462
<Animated.View
461463
onLayout={onViewLayout}
462-
style={[styles.defaultModalContainer, modalContainerStyle, modalPaddingStyles, !isVisible && styles.pointerEventsNone, sidePanelReanimatedStyle]}
464+
style={[styles.defaultModalContainer, modalContainerStyle, modalPaddingStyles, !isVisible && styles.pointerEventsNone, sidePanelAnimatedStyle]}
463465
ref={ref}
464466
>
465467
<ColorSchemeWrapper>{children}</ColorSchemeWrapper>

0 commit comments

Comments
 (0)