3 files changed, 75 insertions, 4 deletions
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index a93301b34..31947cd8f 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -30,7 +30,68 @@ export function TEAM_HANDLES(serviceUrl: string) {
 }
 
 export const PROD_SUGGESTED_FOLLOWS = [
+  'christina',
+  'wesam',
+  'jim',
+  'ab',
+  'karalabe',
+  'clun',
+  'staltz',
+  'gillian',
+  'karpathy',
+  'zoink',
   'john',
+  'round',
+  'vex',
+  'umang',
+  'atroyn',
+  'poisonivy',
+  'wongmjane',
+  'lari',
+  'arunwadhwa',
+  'trav',
+  'fred',
+  'offscript',
+  'satnam',
+  'ella',
+  'caspian',
+  'spencer',
+  'nickgrossman',
+  'koji',
+  'avy',
+  'seymourstein',
+  'joelg',
+  'stig',
+  'rabble',
+  'hunterwalk',
+  'evan',
+  'aviral',
+  'tami',
+  'generativist',
+  'gord',
+  'ninjapleasedj',
+  'robotics',
+  'noahjnelson',
+  'vijay',
+  'scottbeale',
+  'daybreakjung',
+  'shelby',
+  'joel',
+  'space',
+  'rish',
+  'simon',
+  'kelly',
+  'maxbittker',
+  'sylphrenetic',
+  'caleb',
+  'jik',
+  'james',
+  'neil',
+  'tippenein',
+  'mandel',
+  'sharding',
+  'tyler',
+  'raymond',
   'visakanv',
   'saz',
   'steph',
@@ -39,12 +100,17 @@ export const PROD_SUGGESTED_FOLLOWS = [
   'weisser',
   'katherine',
   'annagat',
+  'an',
+  'kunal',
   'josh',
   'lurkshark',
   'amir',
   'amyxzh',
   'danielle',
   'jack-frazee',
+  'daniellefong',
+  'dystopiabreaker',
+  'morgan',
   'vibes',
   'cat',
   'yuriy',
@@ -63,6 +129,7 @@ export const PROD_SUGGESTED_FOLLOWS = [
   'jennijuju',
   'ian5v',
   'bnewbold',
+  'jasmine',
   'chris',
   'mtclai',
   'willscott',
diff --git a/src/state/models/feed-view.ts b/src/state/models/feed-view.ts
index ed5a32d8f..fe0943018 100644
--- a/src/state/models/feed-view.ts
+++ b/src/state/models/feed-view.ts
@@ -7,6 +7,7 @@ import {
 } from '@atproto/api'
 import AwaitLock from 'await-lock'
 import {bundleAsync} from 'lib/async/bundle'
+import sampleSize from 'lodash.samplesize'
 type FeedViewPost = AppBskyFeedFeedViewPost.Main
 type ReasonRepost = AppBskyFeedFeedViewPost.ReasonRepost
 type PostView = AppBskyFeedPost.View
@@ -425,7 +426,7 @@ export class FeedModel {
    * Check if new posts are available
    */
   async checkForLatest() {
-    if (this.hasNewLatest) {
+    if (this.hasNewLatest || this.rootStore.me.follows.isEmpty) {
       return
     }
     const res = await this._getFeed({limit: 1})
@@ -565,7 +566,10 @@ export class FeedModel {
       if (this.rootStore.me.follows.isEmpty) {
         const responses = await getMultipleAuthorsPosts(
           this.rootStore,
-          SUGGESTED_FOLLOWS(String(this.rootStore.agent.service)),
+          sampleSize(
+            SUGGESTED_FOLLOWS(String(this.rootStore.agent.service)),
+            20,
+          ),
           params.before,
           20,
         )
diff --git a/src/view/com/posts/Feed.tsx b/src/view/com/posts/Feed.tsx
index a4963e0d6..7ed6bc711 100644
--- a/src/view/com/posts/Feed.tsx
+++ b/src/view/com/posts/Feed.tsx
@@ -78,11 +78,11 @@ export const Feed = observer(function Feed({
   // =
 
   const checkWelcome = React.useCallback(async () => {
-    if (showWelcomeBanner) {
+    if (showWelcomeBanner && store.me.did) {
       await store.me.follows.fetchIfNeeded()
       setIsNewUser(store.me.follows.isEmpty)
     }
-  }, [showWelcomeBanner, store.me.follows])
+  }, [showWelcomeBanner, store.me.follows, store.me.did])
   React.useEffect(() => {
     checkWelcome()
   }, [checkWelcome])