better handling

src/screens/Onboarding/StepFinished.tsx

@@ -83,14 +83,26 @@ export function StepFinished() {
         (async () => {
           // Interests need to get saved first, then we can write the feeds to prefs
           await agent.setInterestsPref({tags: selectedInterests})
-          if (starterPack?.feeds?.length) {
+          if (starterPack) {
-            await agent.addSavedFeeds(
+            if (starterPack.feeds?.length) {
-              starterPack.feeds.map(f => ({
+              await agent.addSavedFeeds(
-                type: 'feed',
+                starterPack.feeds.map(f => ({
-                value: f.uri,
+                  type: 'feed',
-                pinned: true,
+                  value: f.uri,
-              })),
+                  pinned: true,
-            )
+                })),
+              )
+              setCurrentStarterPack({
+                uri: '',
+                initialFeed: starterPack.feeds?.[0].uri,
+              })
+            } else {
+              setCurrentStarterPack({
+                uri: '',
+                initialFeed: 'following',
+              })
+            }
+            addUsedStarterPack(makeStarterPackLink(starterPack))
           }
         })(),
         (async () => {
@@ -135,17 +147,12 @@ export function StepFinished() {
         })(),
         requestNotificationsPermission('AfterOnboarding'),
       ])
-
-      if (currentStarterPack && starterPack) {
-        setCurrentStarterPack({
-          ...currentStarterPack,
-          initialFeed: starterPack?.feeds?.[0].uri ?? 'following',
-        })
-        addUsedStarterPack(makeStarterPackLink(starterPack))
-      }
     } catch (e: any) {
       logger.info(`onboarding: bulk save failed`)
       logger.error(e)
+      // If there was an error encountered, we need to just clear the starter pack so we don't break things for subsequent
+      // app restarts
+      setCurrentStarterPack(undefined)
       // don't alert the user, just let them into their account
     }
 
@@ -177,8 +184,8 @@ export function StepFinished() {
     currentStarterPack,
     state,
     requestNotificationsPermission,
-    setCurrentStarterPack,
     addUsedStarterPack,
+    setCurrentStarterPack,
   ])
 
   React.useEffect(() => {

src/view/screens/Home.tsx

@@ -105,13 +105,10 @@ function HomeScreenReady({
     let initialIndex = selectedIndex
     if (currentStarterPack?.initialFeed) {
       if (currentStarterPack.initialFeed === 'following') {
-        initialIndex = allFeeds.findIndex(f => f === 'following')
+        initialIndex = 1
-      } else {
+      } else if (allFeeds.length >= 3) {
-        initialIndex = allFeeds.findIndex(
+        initialIndex = 2
-          f => f === `feedgen|${currentStarterPack.initialFeed}`,
+      } else if (initialIndex === -1) {
-        )
-      }
-      if (initialIndex === -1) {
         initialIndex = 0
       }
       setCurrentStarterPack(undefined)