diff --git a/src/components/StarterPack/ProfileStarterPacks.tsx b/src/components/StarterPack/ProfileStarterPacks.tsx index 52028f7167..c8856329a1 100644 --- a/src/components/StarterPack/ProfileStarterPacks.tsx +++ b/src/components/StarterPack/ProfileStarterPacks.tsx @@ -9,10 +9,12 @@ import { import {AppBskyGraphDefs, AppBskyGraphGetActorStarterPacks} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' +import {useNavigation} from '@react-navigation/native' import {InfiniteData, UseInfiniteQueryResult} from '@tanstack/react-query' import {logger} from '#/logger' import {isNative, isWeb} from '#/platform/detection' +import {NavigationProp} from 'lib/routes/types' import {List, ListRef} from 'view/com/util/List' import {Text} from 'view/com/util/text/Text' import {atoms as a, useTheme} from '#/alf' @@ -130,6 +132,7 @@ export const ProfileStarterPacks = React.forwardRef< function EmptyComponent() { const {_} = useLingui() const t = useTheme() + const navigation = useNavigation() return ( @@ -150,7 +153,8 @@ function EmptyComponent() { label={_(msg`Create a starter pack`)} variant="solid" color="primary" - size="medium"> + size="medium" + onPress={() => navigation.navigate('StarterPackWizard')}> Create a starter pack diff --git a/src/screens/StarterPack/Wizard/StepDetails.tsx b/src/screens/StarterPack/Wizard/StepDetails.tsx index 3aa1b1ef7d..4d8c278a6e 100644 --- a/src/screens/StarterPack/Wizard/StepDetails.tsx +++ b/src/screens/StarterPack/Wizard/StepDetails.tsx @@ -34,7 +34,7 @@ export function StepDetails() { - Invite friends directly to follow your favorite feeds and people{' '} + Invite your friends to follow your favorite feeds and people diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx index ed0f43a464..e65a8b1010 100644 --- a/src/screens/StarterPack/Wizard/index.tsx +++ b/src/screens/StarterPack/Wizard/index.tsx @@ -56,8 +56,7 @@ import {Provider} from './State' export function Wizard({ route, }: NativeStackScreenProps) { - const params = route.params - const {name, rkey} = params + const {name, rkey} = route.params ?? {} const {currentAccount} = useSession() const {_} = useLingui() @@ -562,7 +561,7 @@ function Footer({ (state.currentStep === 'Profiles' && items.length > 1) || (state.currentStep === 'Feeds' && items.length > 0) - const textStyles = [isWeb && a.text_md] + const textStyles = [a.text_md] return ( {items.length > 0 && ( - + {items.length}/{state.currentStep === 'Profiles' ? 50 : 3} @@ -601,7 +600,7 @@ function Footer({ ))} @@ -625,12 +624,14 @@ function Footer({ ) : items.length === 1 ? ( - {getName(items[0])} is included - in your starter pack + {getName(items[0])}{' '} + is included in your starter pack ) : items.length === 2 ? ( - {getName(items[0])} + + {getName(items[0])}{' '} + and {getName(items[1])} @@ -638,8 +639,12 @@ function Footer({ ) : ( - {getName(items[0])}, - {getName(items[1])}, + + {getName(items[0])},{' '} + + + {getName(items[1])},{' '} + and {items.length - 2}{' '} are included in your starter pack @@ -652,7 +657,7 @@ function Footer({ {isEditEnabled ? (