diff --git a/src/lib/api/feed/home.ts b/src/lib/api/feed/home.ts index e6bc45bea0..1bee47eb5c 100644 --- a/src/lib/api/feed/home.ts +++ b/src/lib/api/feed/home.ts @@ -45,7 +45,7 @@ export class HomeFeedAPI implements FeedAPI { this.following = new FollowingFeedAPI({agent}) this.discover = new CustomFeedAPI({ agent, - feedParams: {feed: PROD_DEFAULT_FEED('whats-hot')}, + feedParams: {feed: PROD_DEFAULT_FEED('aaactgbfpm2iy')}, }) this.userInterests = userInterests } @@ -54,7 +54,7 @@ export class HomeFeedAPI implements FeedAPI { this.following = new FollowingFeedAPI({agent: this.agent}) this.discover = new CustomFeedAPI({ agent: this.agent, - feedParams: {feed: PROD_DEFAULT_FEED('whats-hot')}, + feedParams: {feed: PROD_DEFAULT_FEED('aaactgbfpm2iy')}, userInterests: this.userInterests, }) this.usingDiscover = false diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 97a70ba7c0..e63ab9ff9d 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -61,7 +61,7 @@ export function IS_PROD_SERVICE(url?: string) { } export const PROD_DEFAULT_FEED = (rkey: string) => - `at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/${rkey}` + `at://did:plc:2zlzmv2xujgpohsvay3xhpbr/app.bsky.feed.generator/${rkey}` export const POST_IMG_MAX = { width: 2000, @@ -107,7 +107,7 @@ export const BSKY_FEED_OWNER_DIDS = [ ] export const DISCOVER_FEED_URI = - 'at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/whats-hot' + 'at://did:plc:2zlzmv2xujgpohsvay3xhpbr/app.bsky.feed.generator/aaactgbfpm2iy' export const DISCOVER_SAVED_FEED = { type: 'feed', value: DISCOVER_FEED_URI, diff --git a/src/screens/Profile/Header/Handle.tsx b/src/screens/Profile/Header/Handle.tsx index 496720e788..48be128fd7 100644 --- a/src/screens/Profile/Header/Handle.tsx +++ b/src/screens/Profile/Header/Handle.tsx @@ -26,7 +26,7 @@ export function ProfileHeaderHandle({ let ethAddress = '' if ( useResolveDidQueryResult.data && - useResolveDidQueryResult.data.alsoKnownAs[1] + useResolveDidQueryResult.data.alsoKnownAs[1] !== undefined ) { const parts = useResolveDidQueryResult.data.alsoKnownAs[1].split(':') const ethereumAddress = parts[2] diff --git a/src/screens/Profile/Header/ProfileHeaderStandard.tsx b/src/screens/Profile/Header/ProfileHeaderStandard.tsx index 62c45eb5ac..70dc2aef02 100644 --- a/src/screens/Profile/Header/ProfileHeaderStandard.tsx +++ b/src/screens/Profile/Header/ProfileHeaderStandard.tsx @@ -93,7 +93,7 @@ let ProfileHeaderStandard = ({ let fullEthAddress = '' if ( useResolveDidQueryResult.data && - useResolveDidQueryResult.data.alsoKnownAs[1] + useResolveDidQueryResult.data.alsoKnownAs[1] !== undefined ) { const parts = useResolveDidQueryResult.data.alsoKnownAs[1].split(':') const ethereumAddress = parts[2] diff --git a/src/screens/Signup/StepInfo/index.tsx b/src/screens/Signup/StepInfo/index.tsx index 2b55332584..4b9a0f3afb 100644 --- a/src/screens/Signup/StepInfo/index.tsx +++ b/src/screens/Signup/StepInfo/index.tsx @@ -6,9 +6,11 @@ import * as EmailValidator from 'email-validator' import type tldts from 'tldts' import {useAccount} from 'wagmi' +import {usePalette} from '#/lib/hooks/usePalette' import {logEvent} from '#/lib/statsig/statsig' import {isEmailMaybeInvalid} from '#/lib/strings/email' import {logger} from '#/logger' +import {TextLink} from '#/view/com/util/Link' import {WalletComponents} from '#/screens/Login/LoginWallet' import {ScreenTransition} from '#/screens/Login/ScreenTransition' import {is13, is18, useSignupContext} from '#/screens/Signup/state' @@ -51,6 +53,7 @@ export function StepInfo({ const emailValueRef = useRef(state.email) const prevEmailValueRef = useRef(state.email) const account = useAccount() + const pal = usePalette('default') const [hasWarnedEmail, setHasWarnedEmail] = React.useState(false) @@ -153,7 +156,19 @@ export function StepInfo({ {state.serviceDescription.inviteCodeRequired && ( - Invite code + Invite code needed, DM @Aer0xander on + + or + + for an invite! diff --git a/src/state/queries/preferences/index.ts b/src/state/queries/preferences/index.ts index ab866d5e2a..452ce0e2a5 100644 --- a/src/state/queries/preferences/index.ts +++ b/src/state/queries/preferences/index.ts @@ -262,7 +262,7 @@ export function useReplaceForYouWithDiscoverFeedMutation() { await agent.addSavedFeeds([ { type: 'feed', - value: PROD_DEFAULT_FEED('whats-hot'), + value: PROD_DEFAULT_FEED('aaactgbfpm2iy'), pinned: true, }, ]) diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx index 6a69b73e5e..a38f6f2bdc 100644 --- a/src/view/screens/Home.tsx +++ b/src/view/screens/Home.tsx @@ -255,7 +255,7 @@ function HomeScreenReady({ diff --git a/src/view/shell/index.web.tsx b/src/view/shell/index.web.tsx index a431bdffdf..6df03b56e1 100644 --- a/src/view/shell/index.web.tsx +++ b/src/view/shell/index.web.tsx @@ -8,6 +8,7 @@ import {useColorSchemeStyle} from '#/lib/hooks/useColorSchemeStyle' import {useWebBodyScrollLock} from '#/lib/hooks/useWebBodyScrollLock' import {NavigationProp} from '#/lib/routes/types' import {colors, s} from '#/lib/styles' +import {useSession} from '#/state/session' import {useIsDrawerOpen, useSetDrawerOpen} from '#/state/shell' import {useCloseAllActiveElements} from '#/state/util' import {UniversalWallet} from '#/view/com/util/UniversalWallet' @@ -29,6 +30,7 @@ function ShellInner() { const navigator = useNavigation() const closeAllActiveElements = useCloseAllActiveElements() const {_} = useLingui() + const {hasSession} = useSession() useWebBodyScrollLock(isDrawerOpen) @@ -50,7 +52,7 @@ function ShellInner() { - {!isDesktop && } + {hasSession && !isDesktop && } {!isDesktop && isDrawerOpen && (