D14170.diff
No OneTemporary
Actions

Size

43 KB

Referenced Files

None

Subscribers

None

D14170.diff
View Options

	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,9 +6,9 @@

	import { PrimaryDeviceQRAuthContext } from './primary-device-q-r-auth-context.js';
	import type { QRAuthNavigationProp } from './qr-auth-navigator.react.js';
	-import RegistrationButtonContainer from '../../account/registration/registration-button-container.react.js';
	-import RegistrationContainer from '../../account/registration/registration-container.react.js';
	-import RegistrationContentContainer from '../../account/registration/registration-content-container.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';
	@@ -42,21 +42,21 @@
	}, [data, onConnect]);

	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer>
	+ <AuthContainer>
	+ <AuthContentContainer>
	<Text style={styles.header}>Connect with this device?</Text>
	<Text style={styles.body}>
	Are you sure you want to allow this device to log in to your account?
	</Text>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton
	onPress={onPressConnect}
	label="Connect"
	variant={connectingInProgress ? 'loading' : 'enabled'}
	/>
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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,9 @@
	import { Text } from 'react-native';

	import { type QRAuthNavigationProp } from './qr-auth-navigator.react.js';
	-import RegistrationButtonContainer from '../../account/registration/registration-button-container.react.js';
	-import RegistrationContainer from '../../account/registration/registration-container.react.js';
	-import RegistrationContentContainer from '../../account/registration/registration-content-container.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 {
	@@ -43,22 +43,22 @@
	}, [navigation]);

	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer>
	+ <AuthContainer>
	+ <AuthContentContainer>
	<Text style={styles.header}>Device not primary</Text>
	<Text style={styles.body}>
	This mobile device is not your primary device, and cannot be used to
	authorize new devices. Please try your other mobile device(s).
	</Text>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton
	onPress={onPressGoBack}
	label="Go back"
	variant="enabled"
	/>
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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,9 @@
	import { Text } from 'react-native';

	import type { QRAuthNavigationProp } from './qr-auth-navigator.react.js';
	-import RegistrationButtonContainer from '../../account/registration/registration-button-container.react.js';
	-import RegistrationContainer from '../../account/registration/registration-container.react.js';
	-import RegistrationContentContainer from '../../account/registration/registration-content-container.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 {
	@@ -43,17 +43,17 @@
	}, [navigation]);

	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer>
	+ <AuthContainer>
	+ <AuthContentContainer>
	<Text style={styles.header}>Device added</Text>
	<Text style={styles.body}>
	Your new device has been successfully registered!
	</Text>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton onPress={onPress} label="OK" variant="enabled" />
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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,9 @@

	import { PrimaryDeviceQRAuthContext } from './primary-device-q-r-auth-context.js';
	import type { QRAuthNavigationProp } from './qr-auth-navigator.react.js';
	-import RegistrationButtonContainer from '../../account/registration/registration-button-container.react.js';
	-import RegistrationContainer from '../../account/registration/registration-container.react.js';
	-import RegistrationContentContainer from '../../account/registration/registration-content-container.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 {
	@@ -69,15 +69,15 @@
	const styles = useStyles(unboundStyles);

	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer>
	+ <AuthContainer>
	+ <AuthContentContainer>
	<Text style={styles.header}>New device not responding</Text>
	<Text style={styles.body}>
	Has the new device successfully logged in? If not, we'd suggest
	removing it and trying again.
	</Text>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton
	onPress={onPressRemove}
	label="Remove"
	@@ -88,8 +88,8 @@
	label="Ignore"
	variant="enabled"
	/>
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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 RegistrationButtonContainer from './registration/registration-button-container.react.js';
	-import RegistrationContainer from './registration/registration-container.react.js';
	-import RegistrationContentContainer from './registration/registration-content-container.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.js';
	import LinkButton from '../components/link-button.react.js';
	import type { NavigationRoute } from '../navigation/route-names.js';
	@@ -49,14 +49,14 @@
	}, [props.navigation]);
	if (usingRestoreFlow) {
	primaryRestoreButton = (
	- <RegistrationButtonContainer>
	+ <AuthButtonContainer>
	<View style={styles.primaryRestoreButton}>
	<LinkButton
	text="Not logged in on another phone?"
	onPress={goToRestoreFlow}
	/>
	</View>
	- </RegistrationButtonContainer>
	+ </AuthButtonContainer>
	);
	}

	@@ -64,8 +64,8 @@
	const qrCodeSize = width * 0.7;

	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer>
	+ <AuthContainer>
	+ <AuthContentContainer>
	<View style={styles.container}>
	<Text style={styles.heading}>Log in to Comm</Text>
	<Text style={styles.headingSubtext}>
	@@ -93,9 +93,9 @@
	</Text>
	</View>
	</View>
	- </RegistrationContentContainer>
	+ </AuthContentContainer>
	{primaryRestoreButton}
	- </RegistrationContainer>
	+ </AuthContainer>
	);
	}

	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,9 @@
	import * as React from 'react';
	import { Text, View, Image } from 'react-native';

	-import RegistrationButtonContainer from './registration-button-container.react.js';
	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-container.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 type { RegistrationNavigationProp } from './registration-navigator.react.js';
	import PrimaryButton from '../../components/primary-button.react.js';
	import commSwooshSource from '../../img/comm-swoosh.png';
	@@ -27,8 +27,8 @@

	const styles = useStyles(unboundStyles);
	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer style={styles.scrollViewContentContainer}>
	+ <AuthContainer>
	+ <AuthContentContainer style={styles.scrollViewContentContainer}>
	<Text style={styles.header}>New Comm account</Text>
	<Text style={styles.body}>
	It looks like this is your first time logging into Comm.
	@@ -39,11 +39,11 @@
	<View style={styles.commSwooshContainer}>
	<Image source={commSwooshSource} style={styles.commSwoosh} />
	</View>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton onPress={onSubmit} label="Next" variant="enabled" />
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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,9 @@
	type UserAvatarSelection,
	} from 'lib/components/edit-user-avatar-provider.react.js';

	-import RegistrationButtonContainer from './registration-button-container.react.js';
	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-container.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 {
	@@ -174,8 +174,8 @@

	const styles = useStyles(unboundStyles);
	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer style={styles.scrollViewContentContainer}>
	+ <AuthContainer>
	+ <AuthContentContainer style={styles.scrollViewContentContainer}>
	<Text style={styles.header}>Pick an avatar</Text>
	<View style={styles.stagedAvatarSection}>
	<View style={styles.editUserAvatar}>
	@@ -187,11 +187,11 @@
	/>
	</View>
	</View>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton onPress={onProceed} label="Next" />
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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,9 @@
	useGetEthereumAccountFromSIWEResult,
	siweNonceExpired,
	} from './ethereum-utils.js';
	-import RegistrationButtonContainer from './registration-button-container.react.js';
	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-container.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 type { CoolOrNerdMode } from './registration-types.js';
	@@ -271,8 +271,8 @@

	return (
	<>
	- <RegistrationContainer>
	- <RegistrationContentContainer style={styles.scrollViewContentContainer}>
	+ <AuthContainer>
	+ <AuthContentContainer style={styles.scrollViewContentContainer}>
	<Text style={styles.header}>
	Do you want to connect an Ethereum wallet?
	</Text>
	@@ -280,8 +280,8 @@
	<View style={styles.ethereumLogoContainer}>
	<EthereumLogoDark />
	</View>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	{alreadyConnectedButton}
	<PrimaryButton
	onPress={openPanel}
	@@ -293,8 +293,8 @@
	label="Do not connect"
	variant="outline"
	/>
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	{siwePanel}
	</>
	);
	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,9 @@
	import type { BaseFCAvatarInfo } from 'lib/utils/farcaster-helpers.js';

	import { siweNonceExpired } from './ethereum-utils.js';
	-import RegistrationButtonContainer from './registration-button-container.react.js';
	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-container.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 type { CoolOrNerdMode } from './registration-types.js';
	@@ -231,12 +231,12 @@

	const connectFarcaster = React.useMemo(
	() => (
	- <RegistrationContainer>
	- <RegistrationContentContainer style={styles.scrollViewContentContainer}>
	+ <AuthContainer>
	+ <AuthContentContainer style={styles.scrollViewContentContainer}>
	<FarcasterPrompt textType="connect" />
	- </RegistrationContentContainer>
	+ </AuthContentContainer>
	<FarcasterWebView onSuccess={onSuccess} webViewState={webViewState} />
	- <RegistrationButtonContainer>
	+ <AuthButtonContainer>
	{alreadyConnectedButton}
	<PrimaryButton
	onPress={onPressConnectFarcaster}
	@@ -248,8 +248,8 @@
	label="Do not connect"
	variant="outline"
	/>
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	),
	[
	alreadyConnectedButton,
	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,9 @@
	import * as React from 'react';
	import { Text } from 'react-native';

	-import RegistrationButtonContainer from './registration-button-container.react.js';
	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-container.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 {
	@@ -63,8 +63,8 @@
	const buttonState = currentSelection ? 'enabled' : 'disabled';
	const styles = useStyles(unboundStyles);
	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer>
	+ <AuthContainer>
	+ <AuthContentContainer>
	<Text style={styles.header}>To begin, choose your fighter</Text>
	<Text style={styles.body}>
	Do you want Comm to choose reasonable defaults for you, or do you want
	@@ -99,11 +99,11 @@
	We select reasonable defaults for you.
	</Text>
	</RegistrationTile>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton onPress={onSubmit} label="Next" variant={buttonState} />
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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,8 +8,8 @@
	import { getDefaultAvatar } from 'lib/shared/avatar-utils.js';
	import type { UpdateUserAvatarRequest } from 'lib/types/avatar-types';

	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-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 { useNativeSetUserAvatar } from '../../avatars/avatar-hooks.js';
	import EmojiAvatarCreation from '../../avatars/emoji-avatar-creation.react.js';
	@@ -48,16 +48,16 @@

	const styles = useStyles(unboundStyles);
	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer style={styles.scrollViewContentContainer}>
	+ <AuthContainer>
	+ <AuthContentContainer style={styles.scrollViewContentContainer}>
	<Text style={styles.header}>Select an emoji</Text>
	<EmojiAvatarCreation
	saveAvatarCall={onSuccess}
	saveAvatarCallLoading={userAvatarSaveInProgress}
	savedEmojiAvatarFunc={savedEmojiAvatarFunc}
	/>
	- </RegistrationContentContainer>
	- </RegistrationContainer>
	+ </AuthContentContainer>
	+ </AuthContainer>
	);
	}

	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,9 @@
	import { useDispatch } from 'lib/utils/redux-utils.js';
	import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js';

	-import RegistrationButtonContainer from './registration-button-container.react.js';
	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-container.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 PrimaryButton from '../../components/primary-button.react.js';
	@@ -138,8 +138,8 @@
	const { goBack } = navigation;
	const styles = useStyles(unboundStyles);
	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer>
	+ <AuthContainer>
	+ <AuthContentContainer>
	<Text style={styles.header}>Account already exists for wallet</Text>
	<Text style={styles.body}>
	You can proceed to log in with this wallet, or go back and use a
	@@ -155,8 +155,8 @@
	</Text>
	</View>
	</View>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton
	onPress={onProceedToLogIn}
	label="Log in to account"
	@@ -167,8 +167,8 @@
	label="Use a different wallet"
	variant="outline"
	/>
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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,9 @@
	import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
	import { useIsKeyserverURLValid } from 'lib/shared/keyserver-utils.js';

	-import RegistrationButtonContainer from './registration-button-container.react.js';
	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-container.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 RegistrationTextInput from './registration-text-input.react.js';
	@@ -149,8 +149,8 @@

	const colors = useColors();
	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer>
	+ <AuthContainer>
	+ <AuthContentContainer>
	<Text style={styles.header}>Select a keyserver to join</Text>
	<Text style={styles.body}>
	Chat communities on Comm are hosted on keyservers, which are
	@@ -199,11 +199,11 @@
	/>
	</RegistrationTile>
	<View style={styles.error}>{errorText}</View>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton onPress={onSubmit} label="Next" variant={buttonState} />
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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,9 @@

	import sleep from 'lib/utils/sleep.js';

	-import RegistrationButtonContainer from './registration-button-container.react.js';
	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-container.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 RegistrationTextInput from './registration-text-input.react.js';
	@@ -184,8 +184,8 @@
	const autoFocus = Platform.OS !== 'android' && shouldAutoFocus.current;

	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer>
	+ <AuthContainer>
	+ <AuthContentContainer>
	<Text style={styles.header}>Pick a password</Text>
	<RegistrationTextInput
	value={password}
	@@ -217,15 +217,15 @@
	ref={confirmPasswordInputRef}
	/>
	<View style={styles.error}>{errorText}</View>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton
	onPress={onProceed}
	label="Next"
	variant={passwordsMatch && !passwordIsEmpty ? 'enabled' : 'disabled'}
	/>
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	diff --git a/native/account/registration/registration-button-container.react.js b/native/account/registration/registration-button-container.react.js
	--- a/native/account/registration/registration-button-container.react.js
	+++ b/native/account/registration/registration-button-container.react.js
	@@ -6,7 +6,7 @@
	type Props = {
	+children: React.Node,
	};
	-function RegistrationButtonContainer(props: Props): React.Node {
	+function AuthButtonContainer(props: Props): React.Node {
	return <View style={styles.container}>{props.children}</View>;
	}

	@@ -17,4 +17,4 @@
	},
	};

	-export default RegistrationButtonContainer;
	+export default AuthButtonContainer;
	diff --git a/native/account/registration/registration-container.react.js b/native/account/registration/registration-container.react.js
	--- a/native/account/registration/registration-container.react.js
	+++ b/native/account/registration/registration-container.react.js
	@@ -12,7 +12,7 @@
	+children: React.Node,
	+style?: ViewStyle,
	};
	-function RegistrationContainer(props: Props): React.Node {
	+function AuthContainer(props: Props): React.Node {
	const styles = useStyles(unboundStyles);
	const style = React.useMemo(
	() => [styles.container, props.style],
	@@ -33,4 +33,4 @@
	},
	};

	-export default RegistrationContainer;
	+export default AuthContainer;
	diff --git a/native/account/registration/registration-content-container.react.js b/native/account/registration/registration-content-container.react.js
	--- a/native/account/registration/registration-content-container.react.js
	+++ b/native/account/registration/registration-content-container.react.js
	@@ -11,7 +11,7 @@
	...ViewProps,
	+children: React.Node,
	};
	-function RegistrationContentContainer(props: Props): React.Node {
	+function AuthContentContainer(props: Props): React.Node {
	const { children, style, ...rest } = props;

	const headerHeight = useHeaderHeight();
	@@ -50,4 +50,4 @@
	},
	};

	-export default RegistrationContentContainer;
	+export default AuthContentContainer;
	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,9 @@

	import type { SIWEBackupSecrets } from 'lib/types/siwe-types.js';

	-import RegistrationButtonContainer from './registration-button-container.react.js';
	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-container.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 type {
	@@ -148,22 +148,22 @@
	);

	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer style={styles.scrollViewContentContainer}>
	+ <AuthContainer>
	+ <AuthContentContainer style={styles.scrollViewContentContainer}>
	<Text style={styles.header}>Finish registration</Text>
	{termsNotice}
	<View style={styles.commSwooshContainer}>
	<Image source={commSwooshSource} style={styles.commSwoosh} />
	</View>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton
	onPress={onProceed}
	label="Register"
	variant={registrationInProgress ? 'loading' : 'enabled'}
	/>
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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,9 @@

	import { type SIWEResult, SIWEMessageTypes } from 'lib/types/siwe-types.js';

	-import RegistrationButtonContainer from './registration-button-container.react.js';
	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-container.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 type {
	@@ -97,10 +97,8 @@

	return (
	<>
	- <RegistrationContainer>
	- <RegistrationContentContainer
	- style={styles.scrollViewContentContainer}
	- >
	+ <AuthContainer>
	+ <AuthContentContainer style={styles.scrollViewContentContainer}>
	<Text style={styles.header}>Encrypting your Comm backup</Text>
	<Text style={styles.body}>
	To make sure we can’t see your data, Comm encrypts your backup
	@@ -117,8 +115,8 @@
	<View style={styles.siweBackupIconContainer}>
	<Icon name="backup" size={200} style={styles.siweBackupIcon} />
	</View>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	{useExistingSignatureButton}
	<PrimaryButton
	onPress={openPanel}
	@@ -126,8 +124,8 @@
	variant={newSignatureButtonVariant}
	/>
	{onSkipButton}
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	{siwePanel}
	</>
	);
	@@ -271,8 +269,8 @@

	return (
	<>
	- <RegistrationContainer>
	- <RegistrationContentContainer style={styles.scrollViewContentContainer}>
	+ <AuthContainer>
	+ <AuthContentContainer style={styles.scrollViewContentContainer}>
	<Text style={styles.header}>Decrypting your Comm backup</Text>
	<Text style={styles.body}>
	To make sure we can’t see your data, Comm encrypts your backup using
	@@ -281,16 +279,16 @@
	<View style={styles.siweBackupIconContainer}>
	<Icon name="backup" size={200} style={styles.siweBackupIcon} />
	</View>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton
	onPress={openPanel}
	label="Decrypt with Ethereum signature"
	variant="enabled"
	/>
	<PrimaryButton onPress={onSkip} label="Skip" variant="outline" />
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	{siwePanel}
	</>
	);
	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,9 @@
	import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js';
	import { isValidEthereumAddress } from 'lib/utils/siwe-utils.js';

	-import RegistrationButtonContainer from './registration-button-container.react.js';
	-import RegistrationContainer from './registration-container.react.js';
	-import RegistrationContentContainer from './registration-content-container.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 RegistrationTextInput from './registration-text-input.react.js';
	@@ -181,8 +181,8 @@

	const shouldAutoFocus = React.useRef(!cachedSelections.username);
	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer>
	+ <AuthContainer>
	+ <AuthContentContainer>
	<Text style={styles.header}>Pick a username</Text>
	<RegistrationTextInput
	value={username}
	@@ -200,15 +200,15 @@
	onBlur={checkUsernameValidity}
	/>
	<View style={styles.error}>{errorText}</View>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<PrimaryButton
	onPress={onProceed}
	label="Next"
	variant={buttonVariant}
	/>
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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 RegistrationContainer from './registration/registration-container.react.js';
	-import RegistrationContentContainer from './registration/registration-content-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.js';
	import type { NavigationRoute } from '../navigation/route-names.js';
	import { useColors, useStyles } from '../themes/colors.js';
	@@ -34,8 +34,8 @@
	const styles = useStyles(unboundStyles);
	const colors = useColors();
	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer style={styles.scrollViewContentContainer}>
	+ <AuthContainer>
	+ <AuthContentContainer style={styles.scrollViewContentContainer}>
	<Text style={styles.header}>Restoring from backup</Text>
	<Text style={styles.section}>
	Your data is currently being restored.
	@@ -53,8 +53,8 @@
	strokeCap="round"
	/>
	</View>
	- </RegistrationContentContainer>
	- </RegistrationContainer>
	+ </AuthContentContainer>
	+ </AuthContainer>
	);
	}

	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
	@@ -4,9 +4,9 @@
	import { Text, TextInput, View } from 'react-native';

	import PromptButton from './prompt-button.react.js';
	-import RegistrationButtonContainer from './registration/registration-button-container.react.js';
	-import RegistrationContainer from './registration/registration-container.react.js';
	-import RegistrationContentContainer from './registration/registration-content-container.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';
	@@ -42,8 +42,8 @@

	const styles = useStyles(unboundStyles);
	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer>
	+ <AuthContainer>
	+ <AuthContentContainer>
	<Text style={styles.header}>Restore with password</Text>
	<RegistrationTextInput
	value={username}
	@@ -71,8 +71,8 @@
	style={styles.password}
	ref={passwordInputRef}
	/>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<View style={styles.buttonContainer}>
	<PromptButton
	text="Restore"
	@@ -80,8 +80,8 @@
	variant={areCredentialsPresent ? 'enabled' : 'disabled'}
	/>
	</View>
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	);
	}

	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
	@@ -4,9 +4,9 @@
	import { Text, View } from 'react-native';

	import PromptButton from './prompt-button.react.js';
	-import RegistrationButtonContainer from './registration/registration-button-container.react.js';
	-import RegistrationContainer from './registration/registration-container.react.js';
	-import RegistrationContentContainer from './registration/registration-content-container.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';
	@@ -55,8 +55,8 @@
	const colors = useColors();
	return (
	<>
	- <RegistrationContainer>
	- <RegistrationContentContainer style={styles.scrollViewContentContainer}>
	+ <AuthContainer>
	+ <AuthContentContainer style={styles.scrollViewContentContainer}>
	<Text style={styles.header}>Restore account</Text>
	<Text style={styles.section}>
	If you’ve lost access to your primary device, you can try recovering
	@@ -73,8 +73,8 @@
	<View style={styles.iconContainer}>
	<RestoreIcon color={colors.panelForegroundIcon} />
	</View>
	- </RegistrationContentContainer>
	- <RegistrationButtonContainer>
	+ </AuthContentContainer>
	+ <AuthButtonContainer>
	<View style={styles.buttonContainer}>
	<PromptButton
	text="Restore with Ethereum"
	@@ -89,8 +89,8 @@
	variant="enabled"
	/>
	</View>
	- </RegistrationButtonContainer>
	- </RegistrationContainer>
	+ </AuthButtonContainer>
	+ </AuthContainer>
	{siwePanel}
	</>
	);
	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 RegistrationButtonContainer from '../account/registration/registration-button-container.react.js';
	-import RegistrationContainer from '../account/registration/registration-container.react.js';
	-import RegistrationContentContainer from '../account/registration/registration-content-container.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 { useNavigateToThread } from '../chat/message-list-types.js';
	import {
	ThreadSettingsCategoryFooter,
	@@ -119,8 +119,8 @@
	'the root channel of the community.';

	return (
	- <RegistrationContainer>
	- <RegistrationContentContainer style={styles.containerPaddingOverride}>
	+ <AuthContainer>
	+ <AuthContentContainer style={styles.containerPaddingOverride}>
	<CommunityCreationKeyserverLabel />
	<ThreadSettingsCategoryHeader type="full" title="COMMUNITY INFO" />
	<View style={styles.communityNameRow}>
	@@ -154,7 +154,7 @@
	/>
	</View>
	<ThreadSettingsCategoryFooter type="full" />
	- <RegistrationButtonContainer>
	+ <AuthButtonContainer>
	<PrimaryButton
	onPress={createNewCommunity}
	label="Create community"
	@@ -164,12 +164,12 @@
	: 'enabled'
	}
	/>
	- </RegistrationButtonContainer>
	+ </AuthButtonContainer>
	<View style={styles.errorMessageContainer}>
	<Text style={styles.errorMessageText}>{errorMessage}</Text>
	</View>
	- </RegistrationContentContainer>
	- </RegistrationContainer>
	+ </AuthContentContainer>
	+ </AuthContainer>
	);
	}

File Metadata

Mime Type: text/plain
Expires: Thu, Dec 19, 6:17 AM (18 h, 11 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2675655
Default Alt Text: D14170.diff (43 KB)

D14170.diffNo OneTemporaryActions

D14170.diffView Options

File Metadata

Event Timeline

D14170.diff
No OneTemporary
Actions

D14170.diff
View Options