From 6f44abee35437e4cd51b3f60819f1b6017e6df34 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Thu, 24 Apr 2025 11:46:23 -0500 Subject: [PATCH] Verification UI tweaks (#8276) * Prevent issuing verifications for users without display names * Wait for success before closing, show errors * Update icons * WIP adjust size * Adjust check size in feeds * Add back unused icon * Format --- assets/icons/verifiedCheck.svg | 2 +- assets/icons/verifierCheck.svg | 2 +- src/components/Prompt.tsx | 4 +- src/components/icons/VerifiedCheck.tsx | 4 +- src/components/icons/VerifierCheck.tsx | 4 +- .../verification/VerificationCreatePrompt.tsx | 80 +++++++++++++------ src/view/com/util/PostMeta.tsx | 4 +- 7 files changed, 66 insertions(+), 34 deletions(-) diff --git a/assets/icons/verifiedCheck.svg b/assets/icons/verifiedCheck.svg index f76955ac82..d66a9926f5 100644 --- a/assets/icons/verifiedCheck.svg +++ b/assets/icons/verifiedCheck.svg @@ -1 +1 @@ - + diff --git a/assets/icons/verifierCheck.svg b/assets/icons/verifierCheck.svg index 71158eb132..d49b37ee2a 100644 --- a/assets/icons/verifierCheck.svg +++ b/assets/icons/verifierCheck.svg @@ -1 +1 @@ - + diff --git a/src/components/Prompt.tsx b/src/components/Prompt.tsx index ed8c15f156..f21c98ff86 100644 --- a/src/components/Prompt.tsx +++ b/src/components/Prompt.tsx @@ -52,9 +52,7 @@ export function Outer({ + style={[gtMobile ? {width: 400} : a.w_full]}> {children} diff --git a/src/components/icons/VerifiedCheck.tsx b/src/components/icons/VerifiedCheck.tsx index 9299eb6e34..9d0aa9158d 100644 --- a/src/components/icons/VerifiedCheck.tsx +++ b/src/components/icons/VerifiedCheck.tsx @@ -18,12 +18,12 @@ export const VerifiedCheck = React.forwardRef(function LogoImpl( width={size} height={size} style={[style]}> - + ) diff --git a/src/components/icons/VerifierCheck.tsx b/src/components/icons/VerifierCheck.tsx index 7c3a0149d1..143c24b971 100644 --- a/src/components/icons/VerifierCheck.tsx +++ b/src/components/icons/VerifierCheck.tsx @@ -22,13 +22,13 @@ export const VerifierCheck = React.forwardRef(function LogoImpl( fill={fill} fillRule="evenodd" clipRule="evenodd" - d="M8.792 1.54a4.11 4.11 0 0 1 6.416 0 4.128 4.128 0 0 0 3.146 1.54c2.616.04 4.544 2.5 4 5.1a4.277 4.277 0 0 0 .777 3.462c1.6 2.104.912 5.17-1.427 6.36a4.21 4.21 0 0 0-2.177 2.774c-.62 2.584-3.408 3.948-5.781 2.83a4.092 4.092 0 0 0-3.492 0c-2.373 1.118-5.16-.246-5.78-2.83a4.21 4.21 0 0 0-2.178-2.775c-2.34-1.19-3.028-4.256-1.427-6.36a4.277 4.277 0 0 0 .776-3.46c-.543-2.602 1.385-5.06 4.001-5.1a4.128 4.128 0 0 0 3.146-1.54Z" + d="M8.792 1.615a4.154 4.154 0 0 1 6.416 0 4.154 4.154 0 0 0 3.146 1.515 4.154 4.154 0 0 1 4 5.017 4.154 4.154 0 0 0 .777 3.404 4.154 4.154 0 0 1-1.427 6.255 4.153 4.153 0 0 0-2.177 2.73 4.154 4.154 0 0 1-5.781 2.784 4.154 4.154 0 0 0-3.492 0 4.154 4.154 0 0 1-5.78-2.784 4.154 4.154 0 0 0-2.178-2.73A4.154 4.154 0 0 1 .87 11.551a4.154 4.154 0 0 0 .776-3.404A4.154 4.154 0 0 1 5.646 3.13a4.154 4.154 0 0 0 3.146-1.515Z" /> ) diff --git a/src/components/verification/VerificationCreatePrompt.tsx b/src/components/verification/VerificationCreatePrompt.tsx index 39ac6dbf61..eb57d7c36e 100644 --- a/src/components/verification/VerificationCreatePrompt.tsx +++ b/src/components/verification/VerificationCreatePrompt.tsx @@ -1,15 +1,19 @@ -import {useCallback} from 'react' +import {useCallback, useState} from 'react' import {View} from 'react-native' -import {msg} from '@lingui/macro' +import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {logger} from '#/logger' import {useModerationOpts} from '#/state/preferences/moderation-opts' import {useVerificationCreateMutation} from '#/state/queries/verification/useVerificationCreateMutation' import * as Toast from '#/view/com/util/Toast' -import {atoms as a} from '#/alf' +import {atoms as a, useBreakpoints} from '#/alf' +import {Admonition} from '#/components/Admonition' +import {Button, ButtonIcon, ButtonText} from '#/components/Button' import {type DialogControlProps} from '#/components/Dialog' +import * as Dialog from '#/components/Dialog' import {VerifiedCheck} from '#/components/icons/VerifiedCheck' +import {Loader} from '#/components/Loader' import * as ProfileCard from '#/components/ProfileCard' import * as Prompt from '#/components/Prompt' import type * as bsky from '#/types/bsky' @@ -22,19 +26,22 @@ export function VerificationCreatePrompt({ profile: bsky.profile.AnyProfileView }) { const {_} = useLingui() + const {gtMobile} = useBreakpoints() const moderationOpts = useModerationOpts() - const {mutateAsync: create} = useVerificationCreateMutation() + const {mutateAsync: create, isPending} = useVerificationCreateMutation() + const [error, setError] = useState(``) const onConfirm = useCallback(async () => { try { await create({profile}) Toast.show(_(msg`Successfully verified`)) + control.close() } catch (e) { - Toast.show(_(msg`Failed to create a verification`), 'xmark') + setError(_(msg`Verification failed, please try again.`)) logger.error('Failed to create a verification', { safeMessage: e, }) } - }, [_, profile, create]) + }, [_, profile, create, control]) return ( @@ -47,24 +54,51 @@ export function VerificationCreatePrompt({ {_(msg`This action can be undone at any time.`)} - - {moderationOpts ? ( - - - - - ) : null} + + {moderationOpts ? ( + + + + + ) : null} + + {error && ( + + {error} + + )} + + + {profile.displayName ? ( + + + + + ) : ( + + + This user does not have a display name, and therefore cannot be + verified. + + + )} - - - - + + ) } diff --git a/src/view/com/util/PostMeta.tsx b/src/view/com/util/PostMeta.tsx index d5af322367..fd8e3a38bd 100644 --- a/src/view/com/util/PostMeta.tsx +++ b/src/view/com/util/PostMeta.tsx @@ -107,11 +107,11 @@ let PostMeta = (opts: PostMetaOpts): React.ReactNode => { a.pl_2xs, a.self_center, { - marginTop: platform({web: -1, ios: -1, android: -2}), + marginTop: platform({web: 0, ios: 0, android: -1}), }, ]}>