From 2df0e2c706761ca607c8448986465bcd471aa222 Mon Sep 17 00:00:00 2001 From: Hailey Date: Wed, 12 Jun 2024 10:19:13 -0700 Subject: [PATCH] rm navigation --- src/Navigation.tsx | 6 ------ src/lib/routes/types.ts | 2 -- src/routes.ts | 1 - src/view/com/auth/LoggedOut.tsx | 4 +++- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Navigation.tsx b/src/Navigation.tsx index 54b7cadb3e..af5d6e79a6 100644 --- a/src/Navigation.tsx +++ b/src/Navigation.tsx @@ -43,7 +43,6 @@ import HashtagScreen from '#/screens/Hashtag' import {ModerationScreen} from '#/screens/Moderation' import {ProfileKnownFollowersScreen} from '#/screens/Profile/KnownFollowers' import {ProfileLabelerLikedByScreen} from '#/screens/Profile/ProfileLabelerLikedBy' -import {LandingScreen} from '#/screens/StarterPack/Landing' import {StarterPackScreen} from '#/screens/StarterPack/Main' import {Wizard} from '#/screens/StarterPack/Wizard' import {init as initAnalytics} from './lib/analytics/analytics' @@ -322,11 +321,6 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) { getComponent={() => StarterPackScreen} options={{title: title(msg`Starter Pack`), requireAuth: true}} /> - LandingScreen} - options={{title: title(msg`Join Bluesky Today!`)}} - /> Wizard} diff --git a/src/lib/routes/types.ts b/src/lib/routes/types.ts index 300def1d75..46f9597def 100644 --- a/src/lib/routes/types.ts +++ b/src/lib/routes/types.ts @@ -43,7 +43,6 @@ export type CommonNavigatorParams = { MessagesSettings: undefined Feeds: undefined StarterPack: {name: string; rkey: string} - StarterPackLanding: {name: string; rkey: string} StarterPackWizard: { name?: string rkey?: string @@ -100,7 +99,6 @@ export type AllNavigatorParams = CommonNavigatorParams & { MessagesTab: undefined Messages: {animation?: 'push' | 'pop'} StarterPack: {name: string; rkey: string} - StarterPackLanding: {name: string; rkey: string} StarterPackWizard: { name?: string rkey?: string diff --git a/src/routes.ts b/src/routes.ts index 65d5ed28d9..26928bb1ab 100644 --- a/src/routes.ts +++ b/src/routes.ts @@ -42,7 +42,6 @@ export const router = new Router({ MessagesSettings: '/messages/settings', MessagesConversation: '/messages/:conversation', StarterPack: '/starter-pack/:name/:rkey', - StarterPackLanding: '/start/:name/:rkey', StarterPackWizard: [ '/starter-pack/create/:name/:rkey', '/starter-pack/create', diff --git a/src/view/com/auth/LoggedOut.tsx b/src/view/com/auth/LoggedOut.tsx index 6f4dac4ccd..8821295cb0 100644 --- a/src/view/com/auth/LoggedOut.tsx +++ b/src/view/com/auth/LoggedOut.tsx @@ -137,7 +137,9 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) { ) : null} - {screenState === ScreenState.S_LoginOrCreateAccount ? ( + {screenState === ScreenState.S_StarterPack ? ( + + ) : screenState === ScreenState.S_LoginOrCreateAccount ? ( { setScreenState(ScreenState.S_Login)