diff --git a/native/account/registration/registration-button-container.react.js b/native/account/auth-components/auth-button-container.react.js rename from native/account/registration/registration-button-container.react.js rename to native/account/auth-components/auth-button-container.react.js diff --git a/native/account/registration/registration-container.react.js b/native/account/auth-components/auth-container.react.js rename from native/account/registration/registration-container.react.js rename to native/account/auth-components/auth-container.react.js diff --git a/native/account/registration/registration-content-container.react.js b/native/account/auth-components/auth-content-container.react.js rename from native/account/registration/registration-content-container.react.js rename to native/account/auth-components/auth-content-container.react.js diff --git a/native/account/qr-auth/connect-secondary-device.react.js b/native/account/qr-auth/connect-secondary-device.react.js --- a/native/account/qr-auth/connect-secondary-device.react.js +++ b/native/account/qr-auth/connect-secondary-device.react.js @@ -6,12 +6,12 @@ import { PrimaryDeviceQRAuthContext } from './primary-device-q-r-auth-context.js'; import type { QRAuthNavigationProp } from './qr-auth-navigator.react.js'; -import AuthButtonContainer from '../../account/registration/registration-button-container.react.js'; -import AuthContainer from '../../account/registration/registration-container.react.js'; -import AuthContentContainer from '../../account/registration/registration-content-container.react.js'; import PrimaryButton from '../../components/primary-button.react.js'; import { type NavigationRoute } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; export type ConnectSecondaryDeviceParams = { +data: string, diff --git a/native/account/qr-auth/qr-auth-not-primary-device.react.js b/native/account/qr-auth/qr-auth-not-primary-device.react.js --- a/native/account/qr-auth/qr-auth-not-primary-device.react.js +++ b/native/account/qr-auth/qr-auth-not-primary-device.react.js @@ -9,9 +9,6 @@ import { Text } from 'react-native'; import { type QRAuthNavigationProp } from './qr-auth-navigator.react.js'; -import AuthButtonContainer from '../../account/registration/registration-button-container.react.js'; -import AuthContainer from '../../account/registration/registration-container.react.js'; -import AuthContentContainer from '../../account/registration/registration-content-container.react.js'; import PrimaryButton from '../../components/primary-button.react.js'; import type { RootNavigationProp } from '../../navigation/root-navigator.react.js'; import { @@ -19,6 +16,9 @@ type ScreenParamList, } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; type Props = { +navigation: QRAuthNavigationProp<'QRAuthNotPrimaryDevice'>, diff --git a/native/account/qr-auth/secondary-device-connected.react.js b/native/account/qr-auth/secondary-device-connected.react.js --- a/native/account/qr-auth/secondary-device-connected.react.js +++ b/native/account/qr-auth/secondary-device-connected.react.js @@ -9,9 +9,6 @@ import { Text } from 'react-native'; import type { QRAuthNavigationProp } from './qr-auth-navigator.react.js'; -import AuthButtonContainer from '../../account/registration/registration-button-container.react.js'; -import AuthContainer from '../../account/registration/registration-container.react.js'; -import AuthContentContainer from '../../account/registration/registration-content-container.react.js'; import PrimaryButton from '../../components/primary-button.react.js'; import type { RootNavigationProp } from '../../navigation/root-navigator.react.js'; import { @@ -19,6 +16,9 @@ type ScreenParamList, } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; type Props = { +navigation: QRAuthNavigationProp<'SecondaryDeviceConnected'>, diff --git a/native/account/qr-auth/secondary-device-not-responding.react.js b/native/account/qr-auth/secondary-device-not-responding.react.js --- a/native/account/qr-auth/secondary-device-not-responding.react.js +++ b/native/account/qr-auth/secondary-device-not-responding.react.js @@ -13,9 +13,6 @@ import { PrimaryDeviceQRAuthContext } from './primary-device-q-r-auth-context.js'; import type { QRAuthNavigationProp } from './qr-auth-navigator.react.js'; -import AuthButtonContainer from '../../account/registration/registration-button-container.react.js'; -import AuthContainer from '../../account/registration/registration-container.react.js'; -import AuthContentContainer from '../../account/registration/registration-content-container.react.js'; import PrimaryButton from '../../components/primary-button.react.js'; import type { RootNavigationProp } from '../../navigation/root-navigator.react.js'; import { @@ -23,6 +20,9 @@ type ScreenParamList, } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; type Props = { +navigation: QRAuthNavigationProp<'SecondaryDeviceNotResponding'>, diff --git a/native/account/qr-code-screen.react.js b/native/account/qr-code-screen.react.js --- a/native/account/qr-code-screen.react.js +++ b/native/account/qr-code-screen.react.js @@ -10,9 +10,9 @@ import { getConfig } from 'lib/utils/config.js'; import { usingRestoreFlow } from 'lib/utils/services-utils.js'; -import AuthButtonContainer from './registration/registration-button-container.react.js'; -import AuthContainer from './registration/registration-container.react.js'; -import AuthContentContainer from './registration/registration-content-container.react.js'; +import AuthButtonContainer from './auth-components/auth-button-container.react.js'; +import AuthContainer from './auth-components/auth-container.react.js'; +import AuthContentContainer from './auth-components/auth-content-container.react.js'; import type { SignInNavigationProp } from './sign-in-navigator.react.js'; import LinkButton from '../components/link-button.react.js'; import type { NavigationRoute } from '../navigation/route-names.js'; diff --git a/native/account/registration/account-does-not-exist.react.js b/native/account/registration/account-does-not-exist.react.js --- a/native/account/registration/account-does-not-exist.react.js +++ b/native/account/registration/account-does-not-exist.react.js @@ -3,9 +3,6 @@ import * as React from 'react'; import { Text, View, Image } from 'react-native'; -import AuthButtonContainer from './registration-button-container.react.js'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import PrimaryButton from '../../components/primary-button.react.js'; import commSwooshSource from '../../img/comm-swoosh.png'; @@ -14,6 +11,9 @@ ConnectFarcasterRouteName, } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; type Props = { +navigation: RegistrationNavigationProp<'AccountDoesNotExist'>, diff --git a/native/account/registration/avatar-selection.react.js b/native/account/registration/avatar-selection.react.js --- a/native/account/registration/avatar-selection.react.js +++ b/native/account/registration/avatar-selection.react.js @@ -9,9 +9,6 @@ type UserAvatarSelection, } from 'lib/components/edit-user-avatar-provider.react.js'; -import AuthButtonContainer from './registration-button-container.react.js'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import { RegistrationContext } from './registration-context.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import { @@ -33,6 +30,9 @@ RegistrationUserAvatarCameraModalRouteName, } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; export type AvatarSelectionParams = { +userSelections: { diff --git a/native/account/registration/connect-ethereum.react.js b/native/account/registration/connect-ethereum.react.js --- a/native/account/registration/connect-ethereum.react.js +++ b/native/account/registration/connect-ethereum.react.js @@ -18,9 +18,6 @@ useGetEthereumAccountFromSIWEResult, siweNonceExpired, } from './ethereum-utils.js'; -import AuthButtonContainer from './registration-button-container.react.js'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import { RegistrationContext } from './registration-context.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import type { CoolOrNerdMode } from './registration-types.js'; @@ -36,6 +33,9 @@ import { useStyles } from '../../themes/colors.js'; import { defaultURLPrefix } from '../../utils/url-utils.js'; import EthereumLogoDark from '../../vectors/ethereum-logo-dark.react.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; import { useSIWEPanelState } from '../siwe-hooks.js'; import SIWEPanel from '../siwe-panel.react.js'; diff --git a/native/account/registration/connect-farcaster.react.js b/native/account/registration/connect-farcaster.react.js --- a/native/account/registration/connect-farcaster.react.js +++ b/native/account/registration/connect-farcaster.react.js @@ -9,9 +9,6 @@ import type { BaseFCAvatarInfo } from 'lib/utils/farcaster-helpers.js'; import { siweNonceExpired } from './ethereum-utils.js'; -import AuthButtonContainer from './registration-button-container.react.js'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import { RegistrationContext } from './registration-context.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import type { CoolOrNerdMode } from './registration-types.js'; @@ -29,6 +26,9 @@ type AlertDetails, } from '../../utils/alert-messages.js'; import Alert from '../../utils/alert.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; export type ConnectFarcasterParams = ?{ +userSelections?: { diff --git a/native/account/registration/cool-or-nerd-mode-selection.react.js b/native/account/registration/cool-or-nerd-mode-selection.react.js --- a/native/account/registration/cool-or-nerd-mode-selection.react.js +++ b/native/account/registration/cool-or-nerd-mode-selection.react.js @@ -4,9 +4,6 @@ import * as React from 'react'; import { Text } from 'react-native'; -import AuthButtonContainer from './registration-button-container.react.js'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import { RegistrationContext } from './registration-context.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import { @@ -20,6 +17,9 @@ KeyserverSelectionRouteName, } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; type Props = { +navigation: RegistrationNavigationProp<'CoolOrNerdModeSelection'>, diff --git a/native/account/registration/emoji-avatar-selection.react.js b/native/account/registration/emoji-avatar-selection.react.js --- a/native/account/registration/emoji-avatar-selection.react.js +++ b/native/account/registration/emoji-avatar-selection.react.js @@ -8,13 +8,13 @@ import { getDefaultAvatar } from 'lib/shared/avatar-utils.js'; import type { UpdateUserAvatarRequest } from 'lib/types/avatar-types'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import { useNativeSetUserAvatar } from '../../avatars/avatar-hooks.js'; import EmojiAvatarCreation from '../../avatars/emoji-avatar-creation.react.js'; import type { NavigationRoute } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; export type EmojiAvatarSelectionParams = { +usernameOrEthAddress: string, diff --git a/native/account/registration/existing-ethereum-account.react.js b/native/account/registration/existing-ethereum-account.react.js --- a/native/account/registration/existing-ethereum-account.react.js +++ b/native/account/registration/existing-ethereum-account.react.js @@ -17,9 +17,6 @@ import { useDispatch } from 'lib/utils/redux-utils.js'; import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js'; -import AuthButtonContainer from './registration-button-container.react.js'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import { RegistrationContext } from './registration-context.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import PrimaryButton from '../../components/primary-button.react.js'; @@ -34,6 +31,9 @@ appOutOfDateAlertDetails, } from '../../utils/alert-messages.js'; import Alert from '../../utils/alert.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; import { useLegacySIWEServerCall } from '../siwe-hooks.js'; export type ExistingEthereumAccountParams = SIWEResult; diff --git a/native/account/registration/keyserver-selection.react.js b/native/account/registration/keyserver-selection.react.js --- a/native/account/registration/keyserver-selection.react.js +++ b/native/account/registration/keyserver-selection.react.js @@ -8,9 +8,6 @@ import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js'; import { useIsKeyserverURLValid } from 'lib/shared/keyserver-utils.js'; -import AuthButtonContainer from './registration-button-container.react.js'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import { RegistrationContext } from './registration-context.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import RegistrationTextInput from './registration-text-input.react.js'; @@ -28,6 +25,9 @@ import { useSelector } from '../../redux/redux-utils.js'; import { useStyles, useColors } from '../../themes/colors.js'; import { defaultURLPrefix } from '../../utils/url-utils.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; type Selection = 'ashoat' | 'custom'; diff --git a/native/account/registration/password-selection.react.js b/native/account/registration/password-selection.react.js --- a/native/account/registration/password-selection.react.js +++ b/native/account/registration/password-selection.react.js @@ -6,9 +6,6 @@ import sleep from 'lib/utils/sleep.js'; -import AuthButtonContainer from './registration-button-container.react.js'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import { RegistrationContext } from './registration-context.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import RegistrationTextInput from './registration-text-input.react.js'; @@ -20,6 +17,9 @@ } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; import type { KeyPressEvent } from '../../types/react-native.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; export type PasswordSelectionParams = { +userSelections: { diff --git a/native/account/registration/registration-terms.react.js b/native/account/registration/registration-terms.react.js --- a/native/account/registration/registration-terms.react.js +++ b/native/account/registration/registration-terms.react.js @@ -6,9 +6,6 @@ import type { SIWEBackupSecrets } from 'lib/types/siwe-types.js'; -import AuthButtonContainer from './registration-button-container.react.js'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import { RegistrationContext } from './registration-context.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import type { @@ -22,6 +19,9 @@ import type { NavigationRoute } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; import Alert from '../../utils/alert.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; export type RegistrationTermsParams = { +userSelections: { diff --git a/native/account/registration/siwe-backup-message-creation.react.js b/native/account/registration/siwe-backup-message-creation.react.js --- a/native/account/registration/siwe-backup-message-creation.react.js +++ b/native/account/registration/siwe-backup-message-creation.react.js @@ -7,9 +7,6 @@ import { type SIWEResult, SIWEMessageTypes } from 'lib/types/siwe-types.js'; -import AuthButtonContainer from './registration-button-container.react.js'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import { RegistrationContext } from './registration-context.js'; import { type RegistrationNavigationProp } from './registration-navigator.react.js'; import type { @@ -24,6 +21,9 @@ } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; import Alert from '../../utils/alert.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; import { useSIWEPanelState } from '../siwe-hooks.js'; import SIWEPanel from '../siwe-panel.react.js'; diff --git a/native/account/registration/username-selection.react.js b/native/account/registration/username-selection.react.js --- a/native/account/registration/username-selection.react.js +++ b/native/account/registration/username-selection.react.js @@ -14,9 +14,6 @@ import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js'; import { isValidEthereumAddress } from 'lib/utils/siwe-utils.js'; -import AuthButtonContainer from './registration-button-container.react.js'; -import AuthContainer from './registration-container.react.js'; -import AuthContentContainer from './registration-content-container.react.js'; import { RegistrationContext } from './registration-context.js'; import type { RegistrationNavigationProp } from './registration-navigator.react.js'; import RegistrationTextInput from './registration-text-input.react.js'; @@ -28,6 +25,9 @@ PasswordSelectionRouteName, } from '../../navigation/route-names.js'; import { useStyles } from '../../themes/colors.js'; +import AuthButtonContainer from '../auth-components/auth-button-container.react.js'; +import AuthContainer from '../auth-components/auth-container.react.js'; +import AuthContentContainer from '../auth-components/auth-content-container.react.js'; export type UsernameSelectionParams = { +userSelections: { diff --git a/native/account/restore-backup-screen.react.js b/native/account/restore-backup-screen.react.js --- a/native/account/restore-backup-screen.react.js +++ b/native/account/restore-backup-screen.react.js @@ -4,8 +4,8 @@ import { Text, View } from 'react-native'; import * as Progress from 'react-native-progress'; -import AuthContainer from './registration/registration-container.react.js'; -import AuthContentContainer from './registration/registration-content-container.react.js'; +import AuthContainer from './auth-components/auth-container.react.js'; +import AuthContentContainer from './auth-components/auth-content-container.react.js'; import type { SignInNavigationProp } from './sign-in-navigator.react.js'; import type { NavigationRoute } from '../navigation/route-names.js'; import { useColors, useStyles } from '../themes/colors.js'; diff --git a/native/account/restore-password-account-screen.react.js b/native/account/restore-password-account-screen.react.js --- a/native/account/restore-password-account-screen.react.js +++ b/native/account/restore-password-account-screen.react.js @@ -3,10 +3,10 @@ import * as React from 'react'; import { Text, TextInput, View } from 'react-native'; +import AuthButtonContainer from './auth-components/auth-button-container.react.js'; +import AuthContainer from './auth-components/auth-container.react.js'; +import AuthContentContainer from './auth-components/auth-content-container.react.js'; import PromptButton from './prompt-button.react.js'; -import AuthButtonContainer from './registration/registration-button-container.react.js'; -import AuthContainer from './registration/registration-container.react.js'; -import AuthContentContainer from './registration/registration-content-container.react.js'; import RegistrationTextInput from './registration/registration-text-input.react.js'; import type { SignInNavigationProp } from './sign-in-navigator.react.js'; import type { NavigationRoute } from '../navigation/route-names.js'; diff --git a/native/account/restore-prompt-screen.react.js b/native/account/restore-prompt-screen.react.js --- a/native/account/restore-prompt-screen.react.js +++ b/native/account/restore-prompt-screen.react.js @@ -3,10 +3,10 @@ import * as React from 'react'; import { Text, View } from 'react-native'; +import AuthButtonContainer from './auth-components/auth-button-container.react.js'; +import AuthContainer from './auth-components/auth-container.react.js'; +import AuthContentContainer from './auth-components/auth-content-container.react.js'; import PromptButton from './prompt-button.react.js'; -import AuthButtonContainer from './registration/registration-button-container.react.js'; -import AuthContainer from './registration/registration-container.react.js'; -import AuthContentContainer from './registration/registration-content-container.react.js'; import type { SignInNavigationProp } from './sign-in-navigator.react'; import { useSIWEPanelState } from './siwe-hooks.js'; import SIWEPanel from './siwe-panel.react.js'; diff --git a/native/community-creation/community-configuration.react.js b/native/community-creation/community-configuration.react.js --- a/native/community-creation/community-configuration.react.js +++ b/native/community-creation/community-configuration.react.js @@ -16,9 +16,9 @@ import CommunityCreationKeyserverLabel from './community-creation-keyserver-label.react.js'; import type { CommunityCreationNavigationProp } from './community-creation-navigator.react.js'; -import AuthButtonContainer from '../account/registration/registration-button-container.react.js'; -import AuthContainer from '../account/registration/registration-container.react.js'; -import AuthContentContainer from '../account/registration/registration-content-container.react.js'; +import AuthButtonContainer from '../account/auth-components/auth-button-container.react.js'; +import AuthContainer from '../account/auth-components/auth-container.react.js'; +import AuthContentContainer from '../account/auth-components/auth-content-container.react.js'; import { useNavigateToThread } from '../chat/message-list-types.js'; import { ThreadSettingsCategoryFooter,