Move label appeal to post dropdown (#2236)
* Move appeal from post to dropdown * Translate * Tweak copy on the appeal label modal --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com>
This commit is contained in:
parent
726bbd2b6d
commit
8df4fd4d57
6 changed files with 135 additions and 70 deletions
|
@ -62,17 +62,17 @@ export function Component(props: ReportComponentProps) {
|
|||
<Text
|
||||
type="2xl-bold"
|
||||
style={[pal.text, s.textCenter, {paddingBottom: 8}]}>
|
||||
<Trans>Appeal Decision</Trans>
|
||||
<Trans>Appeal Content Warning</Trans>
|
||||
</Text>
|
||||
<ScrollView>
|
||||
<View style={[pal.btn, styles.detailsInputContainer]}>
|
||||
<TextInput
|
||||
accessibilityLabel={_(msg`Text input field`)}
|
||||
accessibilityHint={_(
|
||||
msg`Please tell us why you think this decision was incorrect.`,
|
||||
msg`Please tell us why you think this content warning was incorrectly applied!`,
|
||||
)}
|
||||
placeholder={_(
|
||||
msg`Please tell us why you think this decision was incorrect.`,
|
||||
msg`Please tell us why you think this content warning was incorrectly applied!`,
|
||||
)}
|
||||
placeholderTextColor={pal.textLight.color}
|
||||
value={details}
|
||||
|
|
|
@ -42,7 +42,6 @@ import {useComposerControls} from '#/state/shell/composer'
|
|||
import {useModerationOpts} from '#/state/queries/preferences'
|
||||
import {Shadow, usePostShadow, POST_TOMBSTONE} from '#/state/cache/post-shadow'
|
||||
import {ThreadPost} from '#/state/queries/post-thread'
|
||||
import {LabelInfo} from '../util/moderation/LabelInfo'
|
||||
import {useSession} from '#/state/session'
|
||||
import {WhoCanReply} from '../threadgate/WhoCanReply'
|
||||
|
||||
|
@ -335,6 +334,9 @@ let PostThreadItemLoaded = ({
|
|||
postCid={post.cid}
|
||||
postUri={post.uri}
|
||||
record={record}
|
||||
showAppealLabelItem={
|
||||
post.author.did === currentAccount?.did && !isSelfLabeledPost
|
||||
}
|
||||
style={{
|
||||
paddingVertical: 6,
|
||||
paddingHorizontal: 10,
|
||||
|
@ -354,13 +356,6 @@ let PostThreadItemLoaded = ({
|
|||
includeMute
|
||||
style={styles.alert}
|
||||
/>
|
||||
{post.author.did === currentAccount?.did && !isSelfLabeledPost ? (
|
||||
<LabelInfo
|
||||
details={{uri: post.uri, cid: post.cid}}
|
||||
labels={post.labels}
|
||||
style={{marginBottom: 8}}
|
||||
/>
|
||||
) : null}
|
||||
{richText?.text ? (
|
||||
<View
|
||||
style={[
|
||||
|
|
|
@ -31,6 +31,7 @@ let PostDropdownBtn = ({
|
|||
postUri,
|
||||
record,
|
||||
style,
|
||||
showAppealLabelItem,
|
||||
}: {
|
||||
testID: string
|
||||
postAuthor: AppBskyActorDefs.ProfileViewBasic
|
||||
|
@ -38,6 +39,7 @@ let PostDropdownBtn = ({
|
|||
postUri: string
|
||||
record: AppBskyFeedPost.Record
|
||||
style?: StyleProp<ViewStyle>
|
||||
showAppealLabelItem?: boolean
|
||||
}): React.ReactNode => {
|
||||
const {hasSession, currentAccount} = useSession()
|
||||
const theme = useTheme()
|
||||
|
@ -198,6 +200,23 @@ let PostDropdownBtn = ({
|
|||
web: ['far', 'trash-can'],
|
||||
},
|
||||
},
|
||||
showAppealLabelItem && {
|
||||
label: 'separator',
|
||||
},
|
||||
showAppealLabelItem && {
|
||||
label: _(msg`Appeal content warning`),
|
||||
onPress() {
|
||||
openModal({name: 'appeal-label', uri: postUri, cid: postCid})
|
||||
},
|
||||
testID: 'postDropdownAppealBtn',
|
||||
icon: {
|
||||
ios: {
|
||||
name: 'exclamationmark.triangle',
|
||||
},
|
||||
android: 'ic_menu_report_image',
|
||||
web: 'circle-exclamation',
|
||||
},
|
||||
},
|
||||
].filter(Boolean) as NativeDropdownItem[]
|
||||
|
||||
return (
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue