Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3524109
D13309.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D13309.diff
View Options
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
@@ -27,7 +27,6 @@
type AlertDetails,
} from '../../utils/alert-messages.js';
import Alert from '../../utils/alert.js';
-import { useStaffCanSee } from '../../utils/staff-utils.js';
export type ConnectFarcasterParams = ?{
+userSelections?: {
@@ -202,26 +201,11 @@
);
}, [alreadyHasConnected, onUseAlreadyConnectedAccount]);
- const staffCanSee = useStaffCanSee();
- const skipButton = React.useMemo(() => {
- if (!staffCanSee) {
- return undefined;
- }
- return (
- <PrimaryButton
- onPress={onSkip}
- label="Do not connect"
- variant="outline"
- />
- );
- }, [staffCanSee, onSkip]);
-
- const farcasterPromptTextType = staffCanSee ? 'optional' : 'required';
const connectFarcaster = React.useMemo(
() => (
<RegistrationContainer>
<RegistrationContentContainer style={styles.scrollViewContentContainer}>
- <FarcasterPrompt textType={farcasterPromptTextType} />
+ <FarcasterPrompt textType="connect" />
</RegistrationContentContainer>
<FarcasterWebView onSuccess={onSuccess} webViewState={webViewState} />
<RegistrationButtonContainer>
@@ -231,7 +215,11 @@
label={connectButtonText}
variant={connectButtonVariant}
/>
- {skipButton}
+ <PrimaryButton
+ onPress={onSkip}
+ label="Do not connect"
+ variant="outline"
+ />
</RegistrationButtonContainer>
</RegistrationContainer>
),
@@ -242,8 +230,7 @@
onPressConnectFarcaster,
onSuccess,
webViewState,
- farcasterPromptTextType,
- skipButton,
+ onSkip,
],
);
diff --git a/native/components/connect-farcaster-bottom-sheet.react.js b/native/components/connect-farcaster-bottom-sheet.react.js
--- a/native/components/connect-farcaster-bottom-sheet.react.js
+++ b/native/components/connect-farcaster-bottom-sheet.react.js
@@ -94,7 +94,7 @@
<BottomSheet ref={bottomSheetRef} onClosed={goBack}>
<View style={styles.container}>
<View style={styles.promptContainer}>
- <FarcasterPrompt textType="optional" />
+ <FarcasterPrompt textType="connect" />
</View>
<PrimaryButton
onPress={onPressConnect}
diff --git a/native/components/farcaster-prompt.react.js b/native/components/farcaster-prompt.react.js
--- a/native/components/farcaster-prompt.react.js
+++ b/native/components/farcaster-prompt.react.js
@@ -6,7 +6,7 @@
import { useStyles } from '../themes/colors.js';
import FarcasterLogo from '../vectors/farcaster-logo.react.js';
-type TextType = 'required' | 'optional' | 'disconnect';
+type TextType = 'connect' | 'disconnect';
type Props = {
+textType: TextType,
@@ -16,21 +16,14 @@
const { textType } = props;
let headerText;
- if (textType === 'required') {
- headerText = 'Connect your Farcaster account';
- } else if (textType === 'disconnect') {
+ if (textType === 'disconnect') {
headerText = 'Disconnect from Farcaster';
} else {
headerText = 'Do you want to connect your Farcaster account?';
}
let bodyText;
- if (textType === 'required') {
- bodyText =
- 'Connecting a Farcaster account is currently required. We use it to ' +
- 'boostrap your social graph, and to surface communities based on your ' +
- 'Farcaster channels.';
- } else if (textType === 'disconnect') {
+ if (textType === 'disconnect') {
bodyText = 'You can disconnect your Farcaster account at any time.';
} else {
bodyText =
diff --git a/native/profile/farcaster-account-settings.react.js b/native/profile/farcaster-account-settings.react.js
--- a/native/profile/farcaster-account-settings.react.js
+++ b/native/profile/farcaster-account-settings.react.js
@@ -100,7 +100,7 @@
onPressDisconnect,
]);
- const farcasterPromptTextType = fid ? 'disconnect' : 'optional';
+ const farcasterPromptTextType = fid ? 'disconnect' : 'connect';
const farcasterAccountSettings = React.useMemo(
() => (
<View style={styles.connectContainer}>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Dec 24, 11:25 AM (17 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2699817
Default Alt Text
D13309.diff (4 KB)
Attached To
Mode
D13309: [native] Make Farcaster login optional
Attached
Detach File
Event Timeline
Log In to Comment