forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Merge branch 'main' of github.com:bluesky-social/social-app into main
+21
-12
+1
-1
src/screens/Onboarding/StepAlgoFeeds/index.tsx
+1
-1
src/screens/Onboarding/StepAlgoFeeds/index.tsx
···
119
119
<FeedCard config={PRIMARY_FEEDS[0]} />
120
120
<Text
121
121
style={[a.text_md, a.pt_4xl, a.pb_lg, t.atoms.text_contrast_700]}>
122
-
<Trans>Or you can try our "Discover" algorithm:</Trans>
122
+
<Trans>You can also try our "Discover" algorithm:</Trans>
123
123
</Text>
124
124
<FeedCard config={PRIMARY_FEEDS[1]} />
125
125
</Toggle.Group>
+3
-3
src/screens/Onboarding/StepSuggestedAccounts/index.tsx
+3
-3
src/screens/Onboarding/StepSuggestedAccounts/index.tsx
···
129
129
<IconCircle icon={At} style={[a.mb_2xl]} />
130
130
131
131
<Title>
132
-
<Trans>Here are some accounts for your to follow</Trans>
132
+
<Trans>Here are some accounts for you to follow</Trans>
133
133
</Title>
134
134
<Description>
135
135
{state.interestsStepResults.selectedInterests.length ? (
136
136
<Trans>Based on your interest in {interestsText}</Trans>
137
137
) : (
138
-
<Trans>These are popular accounts you might like.</Trans>
138
+
<Trans>These are popular accounts you might like:</Trans>
139
139
)}
140
140
</Description>
141
141
···
171
171
color="gradient_sky"
172
172
size="large"
173
173
label={_(
174
-
msg`Follow selected accounts and continue to then next step`,
174
+
msg`Follow selected accounts and continue to the next step`,
175
175
)}
176
176
onPress={handleContinue}>
177
177
<ButtonText>
+12
-5
src/view/com/post-thread/PostThreadItem.tsx
+12
-5
src/view/com/post-thread/PostThreadItem.tsx
···
40
40
import {useLanguagePrefs} from '#/state/preferences'
41
41
import {useComposerControls} from '#/state/shell/composer'
42
42
import {useModerationOpts} from '#/state/queries/preferences'
43
+
import {useOpenLink} from '#/state/preferences/in-app-browser'
43
44
import {Shadow, usePostShadow, POST_TOMBSTONE} from '#/state/cache/post-shadow'
44
45
import {ThreadPost} from '#/state/queries/post-thread'
45
46
import {useSession} from '#/state/session'
···
701
702
}) {
702
703
const pal = usePalette('default')
703
704
const {_} = useLingui()
705
+
const openLink = useOpenLink()
706
+
const onTranslatePress = React.useCallback(
707
+
() => openLink(translatorUrl),
708
+
[openLink, translatorUrl],
709
+
)
704
710
return (
705
711
<View style={[s.flexRow, s.mt2, s.mb10]}>
706
712
<Text style={pal.textLight}>{niceDate(post.indexedAt)}</Text>
707
713
{needsTranslation && (
708
714
<>
709
715
<Text style={pal.textLight}> · </Text>
710
-
<Link href={translatorUrl} title={_(msg`Translate`)}>
711
-
<Text style={pal.link}>
712
-
<Trans>Translate</Trans>
713
-
</Text>
714
-
</Link>
716
+
<Text
717
+
style={pal.link}
718
+
title={_(msg`Translate`)}
719
+
onPress={onTranslatePress}>
720
+
<Trans>Translate</Trans>
721
+
</Text>
715
722
</>
716
723
)}
717
724
</View>
+5
-3
src/view/com/util/forms/PostDropdownBtn.tsx
+5
-3
src/view/com/util/forms/PostDropdownBtn.tsx
···
1
1
import React, {memo} from 'react'
2
-
import {Linking, StyleProp, View, ViewStyle} from 'react-native'
2
+
import {StyleProp, View, ViewStyle} from 'react-native'
3
3
import Clipboard from '@react-native-clipboard/clipboard'
4
4
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
5
5
import {
···
24
24
import {useMutedThreads, useToggleThreadMute} from '#/state/muted-threads'
25
25
import {useLanguagePrefs} from '#/state/preferences'
26
26
import {useHiddenPosts, useHiddenPostsApi} from '#/state/preferences'
27
+
import {useOpenLink} from '#/state/preferences/in-app-browser'
27
28
import {logger} from '#/logger'
28
29
import {msg} from '@lingui/macro'
29
30
import {useLingui} from '@lingui/react'
···
61
62
const postDeleteMutation = usePostDeleteMutation()
62
63
const hiddenPosts = useHiddenPosts()
63
64
const {hidePost} = useHiddenPostsApi()
65
+
const openLink = useOpenLink()
64
66
65
67
const rootUri = record.reply?.root?.uri || postUri
66
68
const isThreadMuted = mutedThreads.includes(rootUri)
···
111
113
}, [_, richText])
112
114
113
115
const onOpenTranslate = React.useCallback(() => {
114
-
Linking.openURL(translatorUrl)
115
-
}, [translatorUrl])
116
+
openLink(translatorUrl)
117
+
}, [openLink, translatorUrl])
116
118
117
119
const onHidePost = React.useCallback(() => {
118
120
hidePost({uri: postUri})