[🐴] NUX (#4062)
* remove type assertion * DMs NUX * delete button for testing * tweak styles and copy * rm log * style tweaks * reduce amount of words * Fix not showing on first load * Spacing tweaks --------- Co-authored-by: Eric Bailey <git@esb.lol>zio/stable
parent
115041f4bf
commit
dd0f57e3e3
|
@ -0,0 +1,172 @@
|
||||||
|
import React, {useCallback, useEffect} from 'react'
|
||||||
|
import {View} from 'react-native'
|
||||||
|
import {ChatBskyActorDeclaration} from '@atproto/api'
|
||||||
|
import {msg, Trans} from '@lingui/macro'
|
||||||
|
import {useLingui} from '@lingui/react'
|
||||||
|
|
||||||
|
import {useUpdateActorDeclaration} from '#/state/queries/messages/actor-declaration'
|
||||||
|
import {useProfileQuery} from '#/state/queries/profile'
|
||||||
|
import {useSession} from '#/state/session'
|
||||||
|
import * as Toast from '#/view/com/util/Toast'
|
||||||
|
import {atoms as a, useTheme, web} from '#/alf'
|
||||||
|
import {Button, ButtonText} from '#/components/Button'
|
||||||
|
import * as Dialog from '#/components/Dialog'
|
||||||
|
import * as Toggle from '#/components/forms/Toggle'
|
||||||
|
import {Message_Stroke2_Corner0_Rounded} from '#/components/icons/Message'
|
||||||
|
import {Text} from '#/components/Typography'
|
||||||
|
|
||||||
|
export function MessagesNUX() {
|
||||||
|
const control = Dialog.useDialogControl()
|
||||||
|
|
||||||
|
const {currentAccount} = useSession()
|
||||||
|
const {data: profile} = useProfileQuery({
|
||||||
|
did: currentAccount!.did,
|
||||||
|
})
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (profile && typeof profile.associated?.chat === 'undefined') {
|
||||||
|
const timeout = setTimeout(() => {
|
||||||
|
control.open()
|
||||||
|
}, 1000)
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
clearTimeout(timeout)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [profile, control])
|
||||||
|
|
||||||
|
if (!profile) return null
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog.Outer control={control}>
|
||||||
|
<Dialog.Handle />
|
||||||
|
<DialogInner chatDeclation={profile.associated?.chat} />
|
||||||
|
</Dialog.Outer>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function DialogInner({
|
||||||
|
chatDeclation,
|
||||||
|
}: {
|
||||||
|
chatDeclation?: ChatBskyActorDeclaration.Record
|
||||||
|
}) {
|
||||||
|
const control = Dialog.useDialogContext()
|
||||||
|
const {_} = useLingui()
|
||||||
|
const t = useTheme()
|
||||||
|
const {mutate: updateDeclaration} = useUpdateActorDeclaration({
|
||||||
|
onError: () => {
|
||||||
|
Toast.show(_(msg`Failed to update settings`))
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const onSelectItem = useCallback(
|
||||||
|
(keys: string[]) => {
|
||||||
|
const key = keys[0]
|
||||||
|
if (!key) return
|
||||||
|
updateDeclaration(key as 'all' | 'none' | 'following')
|
||||||
|
},
|
||||||
|
[updateDeclaration],
|
||||||
|
)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!chatDeclation) {
|
||||||
|
updateDeclaration('following')
|
||||||
|
}
|
||||||
|
}, [chatDeclation, updateDeclaration])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog.ScrollableInner
|
||||||
|
label={_(msg`Introducing Direct Messages`)}
|
||||||
|
style={web({maxWidth: 440})}>
|
||||||
|
<View style={a.gap_xl}>
|
||||||
|
<View style={[a.align_center, a.pt_sm, a.pb_xs]}>
|
||||||
|
<Message_Stroke2_Corner0_Rounded width={64} />
|
||||||
|
<Text style={[a.text_2xl, a.font_bold, a.text_center, a.mt_md]}>
|
||||||
|
<Trans>Direct messages are here!</Trans>
|
||||||
|
</Text>
|
||||||
|
<Text style={[a.text_md, a.text_center, a.mt_sm]}>
|
||||||
|
<Trans>Privately chat with other users.</Trans>
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
a.gap_xs,
|
||||||
|
a.border,
|
||||||
|
a.overflow_hidden,
|
||||||
|
a.rounded_sm,
|
||||||
|
t.atoms.border_contrast_low,
|
||||||
|
]}>
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
a.p_md,
|
||||||
|
a.border_b,
|
||||||
|
t.atoms.bg_contrast_25,
|
||||||
|
t.atoms.border_contrast_low,
|
||||||
|
]}>
|
||||||
|
<Text style={[a.text_sm, a.font_bold]}>
|
||||||
|
<Trans>Who can message you?</Trans>
|
||||||
|
</Text>
|
||||||
|
<Text
|
||||||
|
style={[
|
||||||
|
a.mt_xs,
|
||||||
|
a.text_sm,
|
||||||
|
a.italic,
|
||||||
|
t.atoms.text_contrast_medium,
|
||||||
|
]}>
|
||||||
|
<Trans>You can change this at any time.</Trans>
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
<View style={[a.px_md, a.py_xs]}>
|
||||||
|
<Toggle.Group
|
||||||
|
label={_(msg`Who can message you?`)}
|
||||||
|
type="radio"
|
||||||
|
values={[chatDeclation?.allowIncoming ?? 'following']}
|
||||||
|
onChange={onSelectItem}>
|
||||||
|
<View>
|
||||||
|
<Toggle.Item
|
||||||
|
name="all"
|
||||||
|
label={_(msg`Everyone`)}
|
||||||
|
style={[a.justify_between, a.py_sm, a.rounded_2xs]}>
|
||||||
|
<Toggle.LabelText>
|
||||||
|
<Trans>Everyone</Trans>
|
||||||
|
</Toggle.LabelText>
|
||||||
|
<Toggle.Radio />
|
||||||
|
</Toggle.Item>
|
||||||
|
<Toggle.Item
|
||||||
|
name="following"
|
||||||
|
label={_(msg`Users I follow`)}
|
||||||
|
style={[a.justify_between, a.py_sm, a.rounded_2xs]}>
|
||||||
|
<Toggle.LabelText>
|
||||||
|
<Trans>Users I follow</Trans>
|
||||||
|
</Toggle.LabelText>
|
||||||
|
<Toggle.Radio />
|
||||||
|
</Toggle.Item>
|
||||||
|
<Toggle.Item
|
||||||
|
name="none"
|
||||||
|
label={_(msg`No one`)}
|
||||||
|
style={[a.justify_between, a.py_sm, a.rounded_2xs]}>
|
||||||
|
<Toggle.LabelText>
|
||||||
|
<Trans>No one</Trans>
|
||||||
|
</Toggle.LabelText>
|
||||||
|
<Toggle.Radio />
|
||||||
|
</Toggle.Item>
|
||||||
|
</View>
|
||||||
|
</Toggle.Group>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
<Button
|
||||||
|
label={_(msg`Start chatting`)}
|
||||||
|
accessibilityHint={_(msg`Close modal`)}
|
||||||
|
size="medium"
|
||||||
|
color="primary"
|
||||||
|
variant="solid"
|
||||||
|
onPress={() => control.close()}>
|
||||||
|
<ButtonText>
|
||||||
|
<Trans>Get started</Trans>
|
||||||
|
</ButtonText>
|
||||||
|
</Button>
|
||||||
|
</View>
|
||||||
|
<Dialog.Close />
|
||||||
|
</Dialog.ScrollableInner>
|
||||||
|
)
|
||||||
|
}
|
|
@ -17,6 +17,7 @@ import {CenteredView} from '#/view/com/util/Views'
|
||||||
import {atoms as a, useBreakpoints, useTheme} from '#/alf'
|
import {atoms as a, useBreakpoints, useTheme} from '#/alf'
|
||||||
import {Button, ButtonIcon, ButtonText} from '#/components/Button'
|
import {Button, ButtonIcon, ButtonText} from '#/components/Button'
|
||||||
import {DialogControlProps, useDialogControl} from '#/components/Dialog'
|
import {DialogControlProps, useDialogControl} from '#/components/Dialog'
|
||||||
|
import {MessagesNUX} from '#/components/dms/MessagesNUX'
|
||||||
import {NewChat} from '#/components/dms/NewChat'
|
import {NewChat} from '#/components/dms/NewChat'
|
||||||
import {useRefreshOnFocus} from '#/components/hooks/useRefreshOnFocus'
|
import {useRefreshOnFocus} from '#/components/hooks/useRefreshOnFocus'
|
||||||
import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus'
|
import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus'
|
||||||
|
@ -131,6 +132,7 @@ export function MessagesScreen({navigation, route}: Props) {
|
||||||
if (conversations.length < 1) {
|
if (conversations.length < 1) {
|
||||||
return (
|
return (
|
||||||
<View style={a.flex_1}>
|
<View style={a.flex_1}>
|
||||||
|
<MessagesNUX />
|
||||||
{gtMobile ? (
|
{gtMobile ? (
|
||||||
<CenteredView sideBorders>
|
<CenteredView sideBorders>
|
||||||
<DesktopHeader
|
<DesktopHeader
|
||||||
|
@ -165,6 +167,7 @@ export function MessagesScreen({navigation, route}: Props) {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={a.flex_1}>
|
<View style={a.flex_1}>
|
||||||
|
<MessagesNUX />
|
||||||
{!gtMobile && (
|
{!gtMobile && (
|
||||||
<ViewHeader
|
<ViewHeader
|
||||||
title={_(msg`Messages`)}
|
title={_(msg`Messages`)}
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
import React, {useCallback} from 'react'
|
import React, {useCallback} from 'react'
|
||||||
import {View} from 'react-native'
|
import {View} from 'react-native'
|
||||||
import {AppBskyActorDefs} from '@atproto/api'
|
|
||||||
import {msg, Trans} from '@lingui/macro'
|
import {msg, Trans} from '@lingui/macro'
|
||||||
import {useLingui} from '@lingui/react'
|
import {useLingui} from '@lingui/react'
|
||||||
import {NativeStackScreenProps} from '@react-navigation/native-stack'
|
import {NativeStackScreenProps} from '@react-navigation/native-stack'
|
||||||
import {UseQueryResult} from '@tanstack/react-query'
|
|
||||||
|
|
||||||
import {CommonNavigatorParams} from '#/lib/routes/types'
|
import {CommonNavigatorParams} from '#/lib/routes/types'
|
||||||
import {useGate} from '#/lib/statsig/statsig'
|
import {useGate} from '#/lib/statsig/statsig'
|
||||||
|
@ -30,7 +28,7 @@ export function MessagesSettingsScreen({}: Props) {
|
||||||
const {currentAccount} = useSession()
|
const {currentAccount} = useSession()
|
||||||
const {data: profile} = useProfileQuery({
|
const {data: profile} = useProfileQuery({
|
||||||
did: currentAccount!.did,
|
did: currentAccount!.did,
|
||||||
}) as UseQueryResult<AppBskyActorDefs.ProfileViewDetailed, Error>
|
})
|
||||||
const {preferences, setPref} = useBackgroundNotificationPreferences()
|
const {preferences, setPref} = useBackgroundNotificationPreferences()
|
||||||
|
|
||||||
const {mutate: updateDeclaration} = useUpdateActorDeclaration({
|
const {mutate: updateDeclaration} = useUpdateActorDeclaration({
|
||||||
|
|
|
@ -21,9 +21,9 @@ export function useUpdateActorDeclaration({
|
||||||
if (!currentAccount) throw new Error('Not logged in')
|
if (!currentAccount) throw new Error('Not logged in')
|
||||||
// TODO(sam): remove validate: false once PDSes have the new lexicon
|
// TODO(sam): remove validate: false once PDSes have the new lexicon
|
||||||
const result = await getAgent().api.com.atproto.repo.putRecord({
|
const result = await getAgent().api.com.atproto.repo.putRecord({
|
||||||
|
repo: currentAccount.did,
|
||||||
collection: 'chat.bsky.actor.declaration',
|
collection: 'chat.bsky.actor.declaration',
|
||||||
rkey: 'self',
|
rkey: 'self',
|
||||||
repo: currentAccount.did,
|
|
||||||
validate: false,
|
validate: false,
|
||||||
record: {
|
record: {
|
||||||
$type: 'chat.bsky.actor.declaration',
|
$type: 'chat.bsky.actor.declaration',
|
||||||
|
@ -62,3 +62,23 @@ export function useUpdateActorDeclaration({
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// for use in the settings screen for testing
|
||||||
|
export function useDeleteActorDeclaration() {
|
||||||
|
const {currentAccount} = useSession()
|
||||||
|
const {getAgent} = useAgent()
|
||||||
|
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: async () => {
|
||||||
|
if (!currentAccount) throw new Error('Not logged in')
|
||||||
|
// TODO(sam): remove validate: false once PDSes have the new lexicon
|
||||||
|
const result = await getAgent().api.com.atproto.repo.deleteRecord({
|
||||||
|
repo: currentAccount.did,
|
||||||
|
collection: 'chat.bsky.actor.declaration',
|
||||||
|
rkey: 'self',
|
||||||
|
validate: false,
|
||||||
|
})
|
||||||
|
return result
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
|
@ -26,6 +26,7 @@ import {
|
||||||
useInAppBrowser,
|
useInAppBrowser,
|
||||||
useSetInAppBrowser,
|
useSetInAppBrowser,
|
||||||
} from '#/state/preferences/in-app-browser'
|
} from '#/state/preferences/in-app-browser'
|
||||||
|
import {useDeleteActorDeclaration} from '#/state/queries/messages/actor-declaration'
|
||||||
import {useClearPreferencesMutation} from '#/state/queries/preferences'
|
import {useClearPreferencesMutation} from '#/state/queries/preferences'
|
||||||
import {RQKEY as RQKEY_PROFILE} from '#/state/queries/profile'
|
import {RQKEY as RQKEY_PROFILE} from '#/state/queries/profile'
|
||||||
import {useProfileQuery} from '#/state/queries/profile'
|
import {useProfileQuery} from '#/state/queries/profile'
|
||||||
|
@ -305,6 +306,8 @@ export function SettingsScreen({}: Props) {
|
||||||
Toast.show(_(msg`Legacy storage cleared, you need to restart the app now.`))
|
Toast.show(_(msg`Legacy storage cleared, you need to restart the app now.`))
|
||||||
}, [_])
|
}, [_])
|
||||||
|
|
||||||
|
const {mutate: onPressDeleteChatDeclaration} = useDeleteActorDeclaration()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={s.hContentRegion} testID="settingsScreen">
|
<View style={s.hContentRegion} testID="settingsScreen">
|
||||||
<ExportCarDialog control={exportCarControl} />
|
<ExportCarDialog control={exportCarControl} />
|
||||||
|
@ -826,6 +829,16 @@ export function SettingsScreen({}: Props) {
|
||||||
<Trans>Reset preferences state</Trans>
|
<Trans>Reset preferences state</Trans>
|
||||||
</Text>
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
<TouchableOpacity
|
||||||
|
style={[pal.view, styles.linkCardNoIcon]}
|
||||||
|
onPress={() => onPressDeleteChatDeclaration()}
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel={_(msg`Delete chat declaration record`)}
|
||||||
|
accessibilityHint={_(msg`Deletes the chat declaration record`)}>
|
||||||
|
<Text type="lg" style={pal.text}>
|
||||||
|
<Trans>Delete chat declaration record</Trans>
|
||||||
|
</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[pal.view, styles.linkCardNoIcon]}
|
style={[pal.view, styles.linkCardNoIcon]}
|
||||||
onPress={onPressResetOnboarding}
|
onPress={onPressResetOnboarding}
|
||||||
|
|
Loading…
Reference in New Issue