diff --git a/native/account/logged-out-modal.react.js b/native/account/logged-out-modal.react.js --- a/native/account/logged-out-modal.react.js +++ b/native/account/logged-out-modal.react.js @@ -45,7 +45,7 @@ type NavigationRoute, LoggedOutModalRouteName, RegistrationRouteName, - QRCodeSignInNavigatorRouteName, + SignInNavigatorRouteName, } from '../navigation/route-names.js'; import { useSelector } from '../redux/redux-utils.js'; import { derivedDimensionsInfoSelector } from '../selectors/dimensions-selectors.js'; @@ -428,7 +428,7 @@ const { navigate } = props.navigation; const onPressQRCodeSignIn = React.useCallback(() => { - navigate(QRCodeSignInNavigatorRouteName); + navigate(SignInNavigatorRouteName); }, [navigate]); const onPressNewRegister = React.useCallback(() => { diff --git a/native/navigation/root-navigator.react.js b/native/navigation/root-navigator.react.js --- a/native/navigation/root-navigator.react.js +++ b/native/navigation/root-navigator.react.js @@ -49,7 +49,7 @@ InviteLinkNavigatorRouteName, CommunityCreationRouteName, RolesNavigatorRouteName, - QRCodeSignInNavigatorRouteName, + SignInNavigatorRouteName, UserProfileBottomSheetNavigatorRouteName, KeyserverSelectionBottomSheetRouteName, ConnectFarcasterBottomSheetRouteName, @@ -78,7 +78,7 @@ import CustomServerModal from '../profile/custom-server-modal.react.js'; import KeyserverSelectionBottomSheet from '../profile/keyserver-selection-bottom-sheet.react.js'; import LinkedDevicesBottomSheet from '../profile/linked-devices-bottom-sheet.react.js'; -import QRCodeSignInNavigator from '../qr-code/qr-code-sign-in-navigator.react.js'; +import SignInNavigator from '../qr-code/sign-in-navigator.react.js'; import RolesNavigator from '../roles/roles-navigator.react.js'; import UserProfileBottomSheetNavigator from '../user-profile/user-profile-bottom-sheet-navigator.react.js'; @@ -214,8 +214,8 @@ options={disableGesturesScreenOptions} /> , + +navigation: SignInNavigationProp<'QRCodeScreen'>, +route: NavigationRoute<'QRCodeScreen'>, }; diff --git a/native/qr-code/qr-code-sign-in-navigator.react.js b/native/qr-code/sign-in-navigator.react.js rename from native/qr-code/qr-code-sign-in-navigator.react.js rename to native/qr-code/sign-in-navigator.react.js --- a/native/qr-code/qr-code-sign-in-navigator.react.js +++ b/native/qr-code/sign-in-navigator.react.js @@ -12,30 +12,29 @@ import type { RootNavigationProp } from '../navigation/root-navigator.react.js'; import { type ScreenParamList, - type QRCodeSignInParamList, + type SignInParamList, QRCodeScreenRouteName, } from '../navigation/route-names.js'; import { useStyles, useColors } from '../themes/colors.js'; const safeAreaEdges = ['bottom']; -export type QRCodeSignInNavigationProp< - RouteName: $Keys, -> = StackNavigationProp; +export type SignInNavigationProp> = + StackNavigationProp; const QRCodeSignInStack = createStackNavigator< ScreenParamList, - QRCodeSignInParamList, + SignInParamList, StackNavigationHelpers, >(); -type QRCodeSignInNavigatorProps = { - +navigation: RootNavigationProp<'QRCodeSignInNavigator'>, +type SignInNavigatorProps = { + +navigation: RootNavigationProp<'SignInNavigator'>, ... }; // eslint-disable-next-line no-unused-vars -function QRCodeSignInNavigator(props: QRCodeSignInNavigatorProps): React.Node { +function SignInNavigator(props: SignInNavigatorProps): React.Node { const styles = useStyles(unboundStyles); const colors = useColors(); @@ -74,4 +73,4 @@ }, }; -export default QRCodeSignInNavigator; +export default SignInNavigator;