diff --git a/src/screens/StarterPack/Wizard/StepDetails.tsx b/src/screens/StarterPack/Wizard/StepDetails.tsx index 55e3a37df9..9d81a324b4 100644 --- a/src/screens/StarterPack/Wizard/StepDetails.tsx +++ b/src/screens/StarterPack/Wizard/StepDetails.tsx @@ -5,6 +5,7 @@ import {useLingui} from '@lingui/react' import {useProfileQuery} from 'state/queries/profile' import {useSession} from 'state/session' +import {ScreenTransition} from '#/screens/Login/ScreenTransition' import {useWizardState} from '#/screens/StarterPack/Wizard/State' import {atoms as a} from '#/alf' import * as TextField from '#/components/forms/TextField' @@ -22,49 +23,51 @@ export function StepDetails() { }) return ( - - - - - - - Invites, but personal - - - - Create a starter pack to invite new users to Bluesky and give them - your favorite feeds and follows. - - - - - {_(msg`Name`)} - dispatch({type: 'SetName', name: text})} - /> - - - {_(msg`Description`)} - + + + + + + + + Invites, but personal + + + + Create a starter pack to invite new users to Bluesky and give them + your favorite feeds and follows. + + + + + {_(msg`Name`)} - dispatch({type: 'SetDescription', description: text}) - } - multiline - style={{minHeight: 150}} + value={state.name} + onChangeText={text => dispatch({type: 'SetName', name: text})} /> - + + + {_(msg`Description`)} + + + dispatch({type: 'SetDescription', description: text}) + } + multiline + style={{minHeight: 150}} + /> + + - + ) } diff --git a/src/screens/StarterPack/Wizard/StepFeeds.tsx b/src/screens/StarterPack/Wizard/StepFeeds.tsx index 69bdf0f6ec..1d57421867 100644 --- a/src/screens/StarterPack/Wizard/StepFeeds.tsx +++ b/src/screens/StarterPack/Wizard/StepFeeds.tsx @@ -10,6 +10,7 @@ import { } from 'state/queries/feed' import {SearchInput} from 'view/com/util/forms/SearchInput' import {List} from 'view/com/util/List' +import {ScreenTransition} from '#/screens/Login/ScreenTransition' import {useWizardState} from '#/screens/StarterPack/Wizard/State' import {atoms as a} from '#/alf' import {Loader} from '#/components/Loader' @@ -53,7 +54,7 @@ export function StepFeeds() { } return ( - <> + } /> - + ) } diff --git a/src/screens/StarterPack/Wizard/StepProfiles.tsx b/src/screens/StarterPack/Wizard/StepProfiles.tsx index ac8ae37ad6..fb95a2ba3e 100644 --- a/src/screens/StarterPack/Wizard/StepProfiles.tsx +++ b/src/screens/StarterPack/Wizard/StepProfiles.tsx @@ -8,6 +8,7 @@ import {useProfileFollowsQuery} from 'state/queries/profile-follows' import {useSession} from 'state/session' import {SearchInput} from 'view/com/util/forms/SearchInput' import {List} from 'view/com/util/List' +import {ScreenTransition} from '#/screens/Login/ScreenTransition' import {useWizardState} from '#/screens/StarterPack/Wizard/State' import {atoms as a} from '#/alf' import {Loader} from '#/components/Loader' @@ -42,7 +43,7 @@ export function StepProfiles() { } return ( - <> + } /> - + ) } diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx index ac60326564..cc2cffc5e7 100644 --- a/src/screens/StarterPack/Wizard/index.tsx +++ b/src/screens/StarterPack/Wizard/index.tsx @@ -221,17 +221,21 @@ function WizardInner() { isWeb && [a.py_md], ]}> - {state.currentStep !== 'Details' && ( - dispatch({type: 'Back'})} - hitSlop={HITSLOP_10} - accessibilityRole="button" - accessibilityLabel={_(msg`Back`)} - accessibilityHint={_(msg`Go back to the previous step`)}> - - - )} + { + if (state.currentStep === 'Details') { + navigation.goBack() + } else { + dispatch({type: 'Back'}) + } + }}> + + {uiStrings.header}