5 files changed, 15 insertions, 35 deletions
diff --git a/src/view/com/auth/SplashScreen.web.tsx b/src/view/com/auth/SplashScreen.web.tsx
index bb2ac3ef8..22b328582 100644
--- a/src/view/com/auth/SplashScreen.web.tsx
+++ b/src/view/com/auth/SplashScreen.web.tsx
@@ -5,7 +5,6 @@ import {TextLink} from '../util/Link'
 import {ErrorBoundary} from 'view/com/util/ErrorBoundary'
 import {s, colors} from 'lib/styles'
 import {usePalette} from 'lib/hooks/usePalette'
-import {useStores} from 'state/index'
 import {CenteredView} from '../util/Views'
 import {isMobileWeb} from 'platform/detection'
 
@@ -17,11 +16,6 @@ export const SplashScreen = ({
   onPressCreateAccount: () => void
 }) => {
   const pal = usePalette('default')
-  const store = useStores()
-
-  const onPressWaitlist = React.useCallback(() => {
-    store.shell.openModal({name: 'waitlist'})
-  }, [store])
 
   return (
     <CenteredView style={[styles.container, pal.view]}>
@@ -59,21 +53,6 @@ export const SplashScreen = ({
               <Text style={[pal.text, styles.btnLabel]}>Sign In</Text>
             </TouchableOpacity>
           </View>
-          <Text
-            type="xl"
-            style={[styles.notice, pal.textLight]}
-            lineHeight={1.3}>
-            Bluesky will launch soon.{' '}
-            <TouchableOpacity
-              onPress={onPressWaitlist}
-              // TODO: web accessibility
-              accessibilityRole="button">
-              <Text type="xl" style={pal.link}>
-                Join the waitlist
-              </Text>
-            </TouchableOpacity>{' '}
-            to try the beta before it's publicly available.
-          </Text>
         </ErrorBoundary>
       </View>
       <Footer />
diff --git a/src/view/com/auth/create/Step2.tsx b/src/view/com/auth/create/Step2.tsx
index 86338bbd5..2865191c4 100644
--- a/src/view/com/auth/create/Step2.tsx
+++ b/src/view/com/auth/create/Step2.tsx
@@ -51,9 +51,8 @@ export const Step2 = observer(({model}: {model: CreateAccountModel}) => {
             accessibilityRole="button"
             accessibilityLabel="Waitlist"
             accessibilityHint="Opens Bluesky waitlist form">
-            <Text style={pal.link}>Join the waitlist</Text>
-          </TouchableWithoutFeedback>{' '}
-          to try the beta before it's publicly available.
+            <Text style={pal.link}>Join the waitlist.</Text>
+          </TouchableWithoutFeedback>
         </Text>
       ) : (
         <>
diff --git a/src/view/com/modals/Waitlist.tsx b/src/view/com/modals/Waitlist.tsx
index 7cc78a35f..6ddcc7779 100644
--- a/src/view/com/modals/Waitlist.tsx
+++ b/src/view/com/modals/Waitlist.tsx
@@ -58,15 +58,15 @@ export function Component({}: {}) {
   }
 
   return (
-    <View
-      style={[styles.container, {backgroundColor: pal.colors.backgroundLight}]}>
+    <View style={[styles.container, pal.view]}>
       <View style={[styles.innerContainer, pal.view]}>
         <Text type="title-xl" style={[styles.title, pal.text]}>
           Join the waitlist
         </Text>
         <Text type="lg" style={[styles.description, pal.text]}>
-          Bluesky will launch soon. Join the waitlist to try the beta before
-          it's publicly available.
+          Bluesky uses invites to build a healthier community. If you don't know
+          anybody with an invite, you can sign up for the waitlist and we'll
+          send one soon.
         </Text>
         <TextInput
           style={[styles.textInput, pal.borderDark, pal.text, s.mb10, s.mt10]}
diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx
index 41459cfa5..b633e0e1c 100644
--- a/src/view/screens/Home.tsx
+++ b/src/view/screens/Home.tsx
@@ -36,13 +36,17 @@ export const HomeScreen = withAuthRequired(
     const pagerRef = React.useRef<PagerRef>(null)
     const [selectedPage, setSelectedPage] = React.useState(0)
     const [customFeeds, setCustomFeeds] = React.useState<PostsFeedModel[]>([])
+    const [requestedCustomFeeds, setRequestedCustomFeeds] = React.useState<
+      string[]
+    >([])
 
     React.useEffect(() => {
       const {pinned} = store.me.savedFeeds
+
       if (
         isEqual(
           pinned.map(p => p.uri),
-          customFeeds.map(f => (f.params as GetCustomFeed.QueryParams).feed),
+          requestedCustomFeeds,
         )
       ) {
         // no changes
@@ -57,12 +61,15 @@ export const HomeScreen = withAuthRequired(
       }
       pagerRef.current?.setPage(0)
       setCustomFeeds(feeds)
+      setRequestedCustomFeeds(pinned.map(p => p.uri))
     }, [
       store,
       store.me.savedFeeds.pinned,
       customFeeds,
       setCustomFeeds,
       pagerRef,
+      requestedCustomFeeds,
+      setRequestedCustomFeeds,
     ])
 
     useFocusEffect(
diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx
index ef0d8e46c..6fbd777fb 100644
--- a/src/view/shell/desktop/RightNav.tsx
+++ b/src/view/shell/desktop/RightNav.tsx
@@ -27,12 +27,7 @@ export const DesktopRightNav = observer(function DesktopRightNav() {
               SANDBOX. Posts and accounts are not permanent.
             </Text>
           </View>
-        ) : (
-          <Text type="md" style={[pal.textLight, styles.messageLine]}>
-            Welcome to Bluesky! This is a beta application that's still in
-            development.
-          </Text>
-        )}
+        ) : undefined}
         <View style={[s.flexRow]}>
           <TextLink
             type="md"