Skip to content

Commit 6adfbf2

Browse files
authored
Merge pull request #35305 from tienifr/ts-migration/25218
2 parents 29ad878 + 5a835eb commit 6adfbf2

File tree

11 files changed

+480
-630
lines changed

11 files changed

+480
-630
lines changed

src/ONYXKEYS.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ type OnyxFormValuesMapping = {
416416
[ONYXKEYS.FORMS.MONEY_REQUEST_AMOUNT_FORM]: FormTypes.Form;
417417
[ONYXKEYS.FORMS.MONEY_REQUEST_DATE_FORM]: FormTypes.Form;
418418
[ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM]: FormTypes.MoneyRequestHoldReasonForm;
419-
[ONYXKEYS.FORMS.NEW_CONTACT_METHOD_FORM]: FormTypes.Form;
419+
[ONYXKEYS.FORMS.NEW_CONTACT_METHOD_FORM]: FormTypes.NewContactMethodForm;
420420
[ONYXKEYS.FORMS.WAYPOINT_FORM]: FormTypes.Form;
421421
[ONYXKEYS.FORMS.SETTINGS_STATUS_SET_FORM]: FormTypes.Form;
422422
[ONYXKEYS.FORMS.SETTINGS_STATUS_CLEAR_DATE_FORM]: FormTypes.Form;

src/components/MagicCodeInput.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,4 +430,4 @@ function MagicCodeInput(
430430
MagicCodeInput.displayName = 'MagicCodeInput';
431431

432432
export default forwardRef(MagicCodeInput);
433-
export type {MagicCodeInputHandle};
433+
export type {AutoCompleteVariant, MagicCodeInputHandle};

src/components/Pressable/PressableWithFeedback.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React, {forwardRef, useState} from 'react';
22
import type {StyleProp, ViewStyle} from 'react-native';
33
import type {AnimatedStyle} from 'react-native-reanimated';
44
import OpacityView from '@components/OpacityView';
5+
import type {Color} from '@styles/theme/types';
56
import variables from '@styles/variables';
67
import GenericPressable from './GenericPressable';
78
import type {PressableRef} from './GenericPressable/types';
@@ -27,6 +28,9 @@ type PressableWithFeedbackProps = PressableProps & {
2728

2829
/** Whether the view needs to be rendered offscreen (for Android only) */
2930
needsOffscreenAlphaCompositing?: boolean;
31+
32+
/** The color of the underlay that will show through when the Pressable is active. */
33+
underlayColor?: Color;
3034
};
3135

3236
function PressableWithFeedback(

src/libs/Navigation/types.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,15 @@ type SettingsNavigatorParamList = {
9292
[SCREENS.SETTINGS.PROFILE.DATE_OF_BIRTH]: undefined;
9393
[SCREENS.SETTINGS.PROFILE.ADDRESS]: undefined;
9494
[SCREENS.SETTINGS.PROFILE.ADDRESS_COUNTRY]: undefined;
95-
[SCREENS.SETTINGS.PROFILE.CONTACT_METHODS]: undefined;
96-
[SCREENS.SETTINGS.PROFILE.CONTACT_METHOD_DETAILS]: undefined;
97-
[SCREENS.SETTINGS.PROFILE.NEW_CONTACT_METHOD]: undefined;
95+
[SCREENS.SETTINGS.PROFILE.CONTACT_METHODS]: {
96+
backTo: Routes;
97+
};
98+
[SCREENS.SETTINGS.PROFILE.CONTACT_METHOD_DETAILS]: {
99+
contactMethod: string;
100+
};
101+
[SCREENS.SETTINGS.PROFILE.NEW_CONTACT_METHOD]: {
102+
backTo: Routes;
103+
};
98104
[SCREENS.SETTINGS.PREFERENCES.ROOT]: undefined;
99105
[SCREENS.SETTINGS.PREFERENCES.PRIORITY_MODE]: undefined;
100106
[SCREENS.SETTINGS.PREFERENCES.LANGUAGE]: undefined;

0 commit comments

Comments
 (0)