Skip to content

Commit 3ceaada

Browse files
committed
Merge branch 'main' of github.com:callstack-internal/Expensify-App into eslint-9-no-unsafe-call
2 parents 5048416 + 2b1410f commit 3ceaada

55 files changed

Lines changed: 442 additions & 1065 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.

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
"react-native-localize": "^2.2.6",
189189
"react-native-nitro-modules": "0.29.4",
190190
"react-native-nitro-sqlite": "9.1.11",
191-
"react-native-onyx": "3.0.3",
191+
"react-native-onyx": "3.0.6",
192192
"react-native-pager-view": "6.9.1",
193193
"react-native-pdf": "7.0.1",
194194
"react-native-performance": "^5.1.4",

src/CONST/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5386,6 +5386,7 @@ const CONST = {
53865386
LOTTIE_VIEW_TEST_ID: 'LottieView',
53875387

53885388
DOT_INDICATOR_TEST_ID: 'DotIndicator',
5389+
ANIMATED_COLLAPSIBLE_CONTENT_TEST_ID: 'animated-collapsible-content',
53895390

53905391
CHAT_HEADER_LOADER_HEIGHT: 36,
53915392

src/ONYXKEYS.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,7 @@ const ONYXKEYS = {
598598

599599
/** Collection Keys */
600600
COLLECTION: {
601+
DOMAIN: 'domain_',
601602
DOWNLOAD: 'download_',
602603
POLICY: 'policy_',
603604
POLICY_DRAFTS: 'policyDrafts_',
@@ -1024,6 +1025,7 @@ type OnyxFormDraftValuesMapping = {
10241025
};
10251026

10261027
type OnyxCollectionValuesMapping = {
1028+
[ONYXKEYS.COLLECTION.DOMAIN]: OnyxTypes.Domain;
10271029
[ONYXKEYS.COLLECTION.DOWNLOAD]: OnyxTypes.Download;
10281030
[ONYXKEYS.COLLECTION.POLICY]: OnyxTypes.Policy;
10291031
[ONYXKEYS.COLLECTION.POLICY_DRAFTS]: OnyxTypes.Policy;

src/components/AnimatedCollapsible/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ function AnimatedCollapsible({isExpanded, children, header, duration = 300, styl
110110
<Animated.View style={[contentAnimatedStyle, contentStyle]}>
111111
{isExpanded || isRendered ? (
112112
<Animated.View
113+
testID={CONST.ANIMATED_COLLAPSIBLE_CONTENT_TEST_ID}
113114
style={styles.stickToTop}
114115
onLayout={(e) => {
115116
const height = e.nativeEvent.layout.height;

src/components/ReportSearchHeader/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function ReportSearchHeader({report, style, transactions, avatarBorderColor}: Re
2525
<View
2626
dataSet={{dragArea: false}}
2727
style={[style, styles.reportSearchHeaderBar]}
28+
testID={ReportSearchHeader.displayName}
2829
>
2930
<View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.flexGrow1, styles.justifyContentBetween, styles.overflowHidden]}>{middleContent}</View>
3031
</View>

src/components/SelectionListWithSections/Search/ActionCell.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ function ActionCell({
110110

111111
return isLargeScreenWidth ? (
112112
<Button
113+
testID={ActionCell.displayName}
113114
text={text}
114115
onPress={goToItem}
115116
small

src/components/SelectionListWithSections/Search/TotalCell.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ function TotalCell({total, currency}: TotalCellProps) {
1313

1414
return (
1515
<TextWithTooltip
16+
testID={TotalCell.displayName}
1617
shouldShowTooltip
1718
text={convertToDisplayString(total, currency)}
1819
style={[styles.optionDisplayName, styles.pre, styles.justifyContentCenter, styles.textBold, styles.textAlignRight]}

src/components/TextWithTooltip/index.native.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ import useThemeStyles from '@hooks/useThemeStyles';
44
import {getProcessedText, splitTextWithEmojis} from '@libs/EmojiUtils';
55
import type TextWithTooltipProps from './types';
66

7-
function TextWithTooltip({text, style, numberOfLines = 1, forwardedFSClass}: TextWithTooltipProps) {
7+
function TextWithTooltip({testID, text, style, numberOfLines = 1, forwardedFSClass}: TextWithTooltipProps) {
88
const styles = useThemeStyles();
99
const processedTextArray = splitTextWithEmojis(text);
1010

1111
return (
1212
<Text
13+
testID={testID}
1314
style={style}
1415
numberOfLines={numberOfLines}
1516
fsClass={forwardedFSClass}

src/components/TextWithTooltip/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ type LayoutChangeEvent = {
77
target: HTMLElement;
88
};
99

10-
function TextWithTooltip({text, shouldShowTooltip, style, numberOfLines = 1, forwardedFSClass}: TextWithTooltipProps) {
10+
function TextWithTooltip({testID, text, shouldShowTooltip, style, numberOfLines = 1, forwardedFSClass}: TextWithTooltipProps) {
1111
const [showTooltip, setShowTooltip] = useState(false);
1212

1313
return (
@@ -16,6 +16,7 @@ function TextWithTooltip({text, shouldShowTooltip, style, numberOfLines = 1, for
1616
text={text}
1717
>
1818
<Text
19+
testID={testID}
1920
style={style}
2021
numberOfLines={numberOfLines}
2122
onLayout={(e) => {

0 commit comments

Comments
 (0)