Drop following feed settings step

src/lib/analytics/types.ts

@@ -133,8 +133,6 @@ export type TrackPropertiesMap = {
   'OnboardingV2:StepSuggestedAccounts:End': {
     selectedAccountsLength: number
   }
-  'OnboardingV2:StepFollowingFeed:Start': {}
-  'OnboardingV2:StepFollowingFeed:End': {}
   'OnboardingV2:StepAlgoFeeds:Start': {}
   'OnboardingV2:StepAlgoFeeds:End': {
     selectedPrimaryFeeds: string[]

src/screens/Onboarding/StepFollowingFeed.tsx

@@ -1,160 +0,0 @@
-import React from 'react'
-import {View} from 'react-native'
-import {useLingui} from '@lingui/react'
-import {msg, Trans} from '@lingui/macro'
-
-import {atoms as a} from '#/alf'
-import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components/icons/Chevron'
-import {FilterTimeline_Stroke2_Corner0_Rounded as FilterTimeline} from '#/components/icons/FilterTimeline'
-import {Button, ButtonIcon, ButtonText} from '#/components/Button'
-import {Text} from '#/components/Typography'
-import {Divider} from '#/components/Divider'
-import * as Toggle from '#/components/forms/Toggle'
-import {useAnalytics} from '#/lib/analytics/analytics'
-
-import {Context} from '#/screens/Onboarding/state'
-import {
-  Title,
-  Description,
-  OnboardingControls,
-} from '#/screens/Onboarding/Layout'
-import {
-  usePreferencesQuery,
-  useSetFeedViewPreferencesMutation,
-} from 'state/queries/preferences'
-import {IconCircle} from '#/components/IconCircle'
-
-export function StepFollowingFeed() {
-  const {_} = useLingui()
-  const {track} = useAnalytics()
-  const {dispatch} = React.useContext(Context)
-
-  const {data: preferences} = usePreferencesQuery()
-  const {mutate: setFeedViewPref, variables} =
-    useSetFeedViewPreferencesMutation()
-
-  const showReplies = !(
-    variables?.hideReplies ?? preferences?.feedViewPrefs.hideReplies
-  )
-  const showReposts = !(
-    variables?.hideReposts ?? preferences?.feedViewPrefs.hideReposts
-  )
-  const showQuotes = !(
-    variables?.hideQuotePosts ?? preferences?.feedViewPrefs.hideQuotePosts
-  )
-
-  const onContinue = React.useCallback(() => {
-    dispatch({type: 'next'})
-    track('OnboardingV2:StepFollowingFeed:End')
-  }, [track, dispatch])
-
-  React.useEffect(() => {
-    track('OnboardingV2:StepFollowingFeed:Start')
-  }, [track])
-
-  return (
-    // Hack for now to move the image container up
-    <View style={[a.align_start]}>
-      <IconCircle icon={FilterTimeline} style={[a.mb_2xl]} />
-
-      <Title>
-        <Trans>Your default feed is "Following"</Trans>
-      </Title>
-      <Description style={[a.mb_md]}>
-        <Trans>It shows posts from the people you follow as they happen.</Trans>
-      </Description>
-
-      <View style={[a.w_full]}>
-        <Toggle.Item
-          name="Show Replies" // no need to translate
-          label={_(msg`Show replies in Following feed`)}
-          value={showReplies}
-          onChange={() => {
-            setFeedViewPref({
-              hideReplies: showReplies,
-            })
-          }}>
-          <View
-            style={[
-              a.flex_row,
-              a.w_full,
-              a.py_lg,
-              a.justify_between,
-              a.align_center,
-            ]}>
-            <Text style={[a.text_md, a.font_bold]}>
-              <Trans>Show replies in Following</Trans>
-            </Text>
-            <Toggle.Switch />
-          </View>
-        </Toggle.Item>
-        <Divider />
-        <Toggle.Item
-          name="Show Reposts" // no need to translate
-          label={_(msg`Show re-posts in Following feed`)}
-          value={showReposts}
-          onChange={() => {
-            setFeedViewPref({
-              hideReposts: showReposts,
-            })
-          }}>
-          <View
-            style={[
-              a.flex_row,
-              a.w_full,
-              a.py_lg,
-              a.justify_between,
-              a.align_center,
-            ]}>
-            <Text style={[a.text_md, a.font_bold]}>
-              <Trans>Show reposts in Following</Trans>
-            </Text>
-            <Toggle.Switch />
-          </View>
-        </Toggle.Item>
-        <Divider />
-        <Toggle.Item
-          name="Show Quotes" // no need to translate
-          label={_(msg`Show quote-posts in Following feed`)}
-          value={showQuotes}
-          onChange={() => {
-            setFeedViewPref({
-              hideQuotePosts: showQuotes,
-            })
-          }}>
-          <View
-            style={[
-              a.flex_row,
-              a.w_full,
-              a.py_lg,
-              a.justify_between,
-              a.align_center,
-            ]}>
-            <Text style={[a.text_md, a.font_bold]}>
-              <Trans>Show quotes in Following</Trans>
-            </Text>
-            <Toggle.Switch />
-          </View>
-        </Toggle.Item>
-      </View>
-
-      <Description style={[a.mt_lg]}>
-        <Trans>You can change these settings later.</Trans>
-      </Description>
-
-      <OnboardingControls.Portal>
-        <Button
-          variant="gradient"
-          color="gradient_sky"
-          size="large"
-          label={_(msg`Continue to next step`)}
-          onPress={onContinue}>
-          <ButtonText>
-            <Trans>Continue</Trans>
-          </ButtonText>
-          <ButtonIcon icon={ChevronRight} position="right" />
-        </Button>
-      </OnboardingControls.Portal>
-    </View>
-  )
-}

src/screens/Onboarding/index.tsx

@@ -8,7 +8,6 @@ import {Context, initialState, reducer} from '#/screens/Onboarding/state'
 import {Layout, OnboardingControls} from '#/screens/Onboarding/Layout'
 import {StepInterests} from '#/screens/Onboarding/StepInterests'
 import {StepSuggestedAccounts} from '#/screens/Onboarding/StepSuggestedAccounts'
-import {StepFollowingFeed} from '#/screens/Onboarding/StepFollowingFeed'
 import {StepAlgoFeeds} from '#/screens/Onboarding/StepAlgoFeeds'
 import {StepTopicalFeeds} from '#/screens/Onboarding/StepTopicalFeeds'
 import {StepFinished} from '#/screens/Onboarding/StepFinished'
@@ -58,7 +57,6 @@ export function Onboarding() {
             {state.activeStep === 'suggestedAccounts' && (
               <StepSuggestedAccounts />
             )}
-            {state.activeStep === 'followingFeed' && <StepFollowingFeed />}
             {state.activeStep === 'algoFeeds' && <StepAlgoFeeds />}
             {state.activeStep === 'topicalFeeds' && <StepTopicalFeeds />}
             {state.activeStep === 'moderation' && <StepModeration />}

src/screens/Onboarding/state.ts

@@ -8,7 +8,6 @@ export type OnboardingState = {
   activeStep:
     | 'interests'
     | 'suggestedAccounts'
-    | 'followingFeed'
     | 'algoFeeds'
     | 'topicalFeeds'
     | 'moderation'
@@ -70,7 +69,7 @@ export type ApiResponseMap = {
 
 export const initialState: OnboardingState = {
   hasPrev: false,
-  totalSteps: 7,
+  totalSteps: 6,
   activeStep: 'interests',
   activeStepIndex: 1,
 
@@ -142,20 +141,17 @@ export function reducer(
         next.activeStep = 'suggestedAccounts'
         next.activeStepIndex = 2
       } else if (s.activeStep === 'suggestedAccounts') {
-        next.activeStep = 'followingFeed'
-        next.activeStepIndex = 3
-      } else if (s.activeStep === 'followingFeed') {
         next.activeStep = 'algoFeeds'
-        next.activeStepIndex = 4
+        next.activeStepIndex = 3
       } else if (s.activeStep === 'algoFeeds') {
         next.activeStep = 'topicalFeeds'
-        next.activeStepIndex = 5
+        next.activeStepIndex = 4
       } else if (s.activeStep === 'topicalFeeds') {
         next.activeStep = 'moderation'
-        next.activeStepIndex = 6
+        next.activeStepIndex = 5
       } else if (s.activeStep === 'moderation') {
         next.activeStep = 'finished'
-        next.activeStepIndex = 7
+        next.activeStepIndex = 6
       }
       break
     }
@@ -163,21 +159,18 @@ export function reducer(
       if (s.activeStep === 'suggestedAccounts') {
         next.activeStep = 'interests'
         next.activeStepIndex = 1
-      } else if (s.activeStep === 'followingFeed') {
+      } else if (s.activeStep === 'algoFeeds') {
         next.activeStep = 'suggestedAccounts'
         next.activeStepIndex = 2
-      } else if (s.activeStep === 'algoFeeds') {
-        next.activeStep = 'followingFeed'
-        next.activeStepIndex = 3
       } else if (s.activeStep === 'topicalFeeds') {
         next.activeStep = 'algoFeeds'
-        next.activeStepIndex = 4
+        next.activeStepIndex = 3
       } else if (s.activeStep === 'moderation') {
         next.activeStep = 'topicalFeeds'
-        next.activeStepIndex = 5
+        next.activeStepIndex = 4
       } else if (s.activeStep === 'finished') {
         next.activeStep = 'moderation'
-        next.activeStepIndex = 6
+        next.activeStepIndex = 5
       }
       break
     }