A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
refactor(app): replace nested ternaries in the username modal
Hampusd5ac90c3c071
diff --git a/fluxer_app/src/features/user/components/modals/FluxerTagChangeModal.tsx b/fluxer_app/src/features/user/components/modals/FluxerTagChangeModal.tsxindex c6e0c83f7..3d1a1b90a 100644--- a/fluxer_app/src/features/user/components/modals/FluxerTagChangeModal.tsx+++ b/fluxer_app/src/features/user/components/modals/FluxerTagChangeModal.tsx@@ -36,7 +36,7 @@ import {UserPremiumTypes} from '@fluxer/constants/src/UserConstants';import {msg} from '@lingui/core/macro';import {Trans, useLingui} from '@lingui/react/macro';import {observer} from 'mobx-react-lite';-import {useCallback, useEffect, useRef} from 'react';+import {type ReactNode, useCallback, useEffect, useRef} from 'react';import {Controller, useForm} from 'react-hook-form';const USERNAME_ALREADY_TAKEN_DESCRIPTOR = msg({@@ -192,23 +192,187 @@ export const FluxerTagChangeModal = observer(({user}: FluxerTagChangeModalProps)const hasPendingDiscriminatorChange = hasNonLifetimePremium && selectedDiscriminator !== user.discriminator;const shouldShowPremiumDiscriminatorWarning =hasNonLifetimePremium && (user.premiumDiscriminator || hasPendingDiscriminatorChange);- const premiumExpiresAtLabel = hasNonLifetimePremium- ? user.premiumUntil- ? getFormattedDateTime(user.premiumUntil)- : null- : null;+ const premiumExpiresAtLabel =+ hasNonLifetimePremium && user.premiumUntil ? getFormattedDateTime(user.premiumUntil) : null;+ const formLabel = i18n._(CHANGE_USERNAME_FORM_DESCRIPTOR);+ const header = (+ <Modal.Header+ title={i18n._(CHANGE_YOUR_USERNAME_DESCRIPTOR)}+ data-flx="user.fluxer-tag-change-modal.modal-header"+ />+ );+ const usernameError = (form.formState.errors.username || form.formState.errors.discriminator) && (+ <div className={styles.errorBox} role="alert" data-flx="user.fluxer-tag-change-modal.error-box">+ {form.formState.errors.username?.message || form.formState.errors.discriminator?.message}+ </div>+ );+ const usernameInput = (+ <div className={styles.usernameInput} data-flx="user.fluxer-tag-change-modal.username-input">+ <Controller+ name="username"+ control={form.control}+ render={({field}) => (+ <Input+ data-flx="user.fluxer-tag-change-modal.input.text"+ {...field}+ ref={usernameRef}+ autoComplete="username"+ aria-label={i18n._(USERNAME_DESCRIPTOR)}+ placeholder={EXAMPLE_FLUXER_TAG}+ required={true}+ type="text"+ />+ )}+ data-flx="user.fluxer-tag-change-modal.controller"+ />+ </div>+ );+ let discriminatorInput: ReactNode = null;+ if (!usernameOnly) {+ if (!hasCustomDiscriminator && showPremium) {+ discriminatorInput = (+ <Tooltip+ text={i18n._(GET_TO_CUSTOMIZE_YOUR_TAG_OR_KEEP_IT_DESCRIPTOR, {+ premiumProductName: PREMIUM_PRODUCT_NAME,+ })}+ data-flx="user.fluxer-tag-change-modal.tooltip"+ >+ <div+ className={styles.discriminatorInputDisabled}+ data-flx="user.fluxer-tag-change-modal.discriminator-input-disabled"+ >+ <Input+ data-flx="user.fluxer-tag-change-modal.input.set-value.text"+ {...form.register('discriminator')}+ aria-label={i18n._(TAG_DESCRIPTOR)}+ maxLength={4}+ placeholder="0000"+ required={true}+ type="text"+ disabled={true}+ onChange={(e) => {+ const value = e.target.value.replace(/\D/g, '');+ form.setValue('discriminator', value);+ }}+ />+ <FocusRing offset={-2} data-flx="user.fluxer-tag-change-modal.focus-ring">+ <button+ type="button"+ onClick={() => {+ PremiumModalCommands.open();+ }}+ className={styles.discriminatorOverlay}+ aria-label={i18n._(GET_PREMIUM_DESCRIPTOR, {premiumProductName: PREMIUM_PRODUCT_NAME})}+ data-flx="user.fluxer-tag-change-modal.discriminator-overlay.open.button"+ />+ </FocusRing>+ </div>+ </Tooltip>+ );+ } else if (!hasCustomDiscriminator) {+ discriminatorInput = (+ <Tooltip+ text={i18n._(CUSTOM_DISCRIMINATORS_ARE_NOT_AVAILABLE_ON_THIS_INSTANCE_DESCRIPTOR)}+ data-flx="user.fluxer-tag-change-modal.tooltip--2"+ >+ <div+ className={styles.discriminatorInputDisabled}+ data-flx="user.fluxer-tag-change-modal.discriminator-input-disabled--2"+ >+ <Input+ data-flx="user.fluxer-tag-change-modal.input.set-value.text--2"+ {...form.register('discriminator')}+ aria-label={i18n._(TAG_DESCRIPTOR)}+ maxLength={4}+ placeholder="0000"+ required={true}+ type="text"+ disabled={true}+ onChange={(e) => {+ const value = e.target.value.replace(/\D/g, '');+ form.setValue('discriminator', value);+ }}+ />+ </div>+ </Tooltip>+ );+ } else {+ discriminatorInput = (+ <Input+ data-flx="user.fluxer-tag-change-modal.input.set-value.text--3"+ {...form.register('discriminator', {+ validate: (value) =>+ isVisionaryDiscriminator0000Blocked({+ showPremium,+ isVisionary,+ discriminator: value,+ })+ ? i18n._(THE_0000_TAG_IS_RESERVED_FOR_VISIONARY_SUBSCRIBERS_DESCRIPTOR)+ : true,+ })}+ aria-label={i18n._(TAG_DESCRIPTOR)}+ maxLength={4}+ placeholder="0000"+ required={true}+ type="text"+ disabled={false}+ onChange={(e) => {+ const value = e.target.value.replace(/\D/g, '');+ form.setValue('discriminator', value, {shouldValidate: true});+ }}+ />+ );+ }+ }+ const usernameRules = (+ <UsernameValidationRules+ username={form.watch('username')}+ data-flx="user.fluxer-tag-change-modal.username-validation-rules"+ />+ );+ let premiumWarningContent: ReactNode = null;+ if (shouldShowPremiumDiscriminatorWarning) {+ if (hasPendingDiscriminatorChange && premiumExpiresAtLabel) {+ premiumWarningContent = (+ <Trans>+ If you save this username, your tag will reroll randomly when your {PREMIUM_PRODUCT_NAME} expires on{' '}+ <strong data-flx="user.fluxer-tag-change-modal.strong">{premiumExpiresAtLabel}</strong>, unless it renews.+ </Trans>+ );+ } else if (hasPendingDiscriminatorChange) {+ premiumWarningContent = (+ <Trans>+ If you save this username, your tag will reroll randomly when your {PREMIUM_PRODUCT_NAME} expires, unless it+ renews.+ </Trans>+ );+ } else if (premiumExpiresAtLabel) {+ premiumWarningContent = (+ <Trans>+ You changed your tag while on {PREMIUM_PRODUCT_NAME}. It will reroll randomly when your {PREMIUM_PRODUCT_NAME}{' '}+ expires on <strong data-flx="user.fluxer-tag-change-modal.strong--2">{premiumExpiresAtLabel}</strong>, unless+ it renews.+ </Trans>+ );+ } else {+ premiumWarningContent = (+ <Trans>+ You changed your tag while on {PREMIUM_PRODUCT_NAME}. It will reroll randomly when your {PREMIUM_PRODUCT_NAME}{' '}+ expires, unless it renews.+ </Trans>+ );+ }+ }+return (<Modal.Root size="small" centered initialFocusRef={usernameRef} data-flx="user.fluxer-tag-change-modal.modal-root"><Formform={form}onSubmit={handleSubmit}- aria-label={i18n._(CHANGE_USERNAME_FORM_DESCRIPTOR)}+ aria-label={formLabel}data-flx="user.fluxer-tag-change-modal.form.submit">- <Modal.Header- title={i18n._(CHANGE_YOUR_USERNAME_DESCRIPTOR)}- data-flx="user.fluxer-tag-change-modal.modal-header"- />+ {header}<Modal.Content data-flx="user.fluxer-tag-change-modal.modal-content"><Modal.ContentLayout data-flx="user.fluxer-tag-change-modal.modal-content-layout"><Modal.Description data-flx="user.fluxer-tag-change-modal.modal-description">@@ -221,31 +385,9 @@ export const FluxerTagChangeModal = observer(({user}: FluxerTagChangeModalProps)<span className={styles.fluxerTagLabel} data-flx="user.fluxer-tag-change-modal.fluxer-tag-label"><Trans>Username</Trans></span>- {(form.formState.errors.username || form.formState.errors.discriminator) && (- <div className={styles.errorBox} role="alert" data-flx="user.fluxer-tag-change-modal.error-box">- {form.formState.errors.username?.message || form.formState.errors.discriminator?.message}- </div>- )}+ {usernameError}<div className={styles.fluxerTagInputRow} data-flx="user.fluxer-tag-change-modal.fluxer-tag-input-row">- <div className={styles.usernameInput} data-flx="user.fluxer-tag-change-modal.username-input">- <Controller- name="username"- control={form.control}- render={({field}) => (- <Input- data-flx="user.fluxer-tag-change-modal.input.text"- {...field}- ref={usernameRef}- autoComplete="username"- aria-label={i18n._(USERNAME_DESCRIPTOR)}- placeholder={EXAMPLE_FLUXER_TAG}- required={true}- type="text"- />- )}- data-flx="user.fluxer-tag-change-modal.controller"- />- </div>+ {usernameInput}{!usernameOnly && (<span className={styles.separator} data-flx="user.fluxer-tag-change-modal.separator">#@@ -256,137 +398,19 @@ export const FluxerTagChangeModal = observer(({user}: FluxerTagChangeModalProps)className={styles.discriminatorInput}data-flx="user.fluxer-tag-change-modal.discriminator-input">- {!hasCustomDiscriminator ? (- showPremium ? (- <Tooltip- text={i18n._(GET_TO_CUSTOMIZE_YOUR_TAG_OR_KEEP_IT_DESCRIPTOR, {- premiumProductName: PREMIUM_PRODUCT_NAME,- })}- data-flx="user.fluxer-tag-change-modal.tooltip"- >- <div- className={styles.discriminatorInputDisabled}- data-flx="user.fluxer-tag-change-modal.discriminator-input-disabled"- >- <Input- data-flx="user.fluxer-tag-change-modal.input.set-value.text"- {...form.register('discriminator')}- aria-label={i18n._(TAG_DESCRIPTOR)}- maxLength={4}- placeholder="0000"- required={true}- type="text"- disabled={true}- onChange={(e) => {- const value = e.target.value.replace(/\D/g, '');- form.setValue('discriminator', value);- }}- />- <FocusRing offset={-2} data-flx="user.fluxer-tag-change-modal.focus-ring">- <button- type="button"- onClick={() => {- PremiumModalCommands.open();- }}- className={styles.discriminatorOverlay}- aria-label={i18n._(GET_PREMIUM_DESCRIPTOR, {premiumProductName: PREMIUM_PRODUCT_NAME})}- data-flx="user.fluxer-tag-change-modal.discriminator-overlay.open.button"- />- </FocusRing>- </div>- </Tooltip>- ) : (- <Tooltip- text={i18n._(CUSTOM_DISCRIMINATORS_ARE_NOT_AVAILABLE_ON_THIS_INSTANCE_DESCRIPTOR)}- data-flx="user.fluxer-tag-change-modal.tooltip--2"- >- <div- className={styles.discriminatorInputDisabled}- data-flx="user.fluxer-tag-change-modal.discriminator-input-disabled--2"- >- <Input- data-flx="user.fluxer-tag-change-modal.input.set-value.text--2"- {...form.register('discriminator')}- aria-label={i18n._(TAG_DESCRIPTOR)}- maxLength={4}- placeholder="0000"- required={true}- type="text"- disabled={true}- onChange={(e) => {- const value = e.target.value.replace(/\D/g, '');- form.setValue('discriminator', value);- }}- />- </div>- </Tooltip>- )- ) : (- <Input- data-flx="user.fluxer-tag-change-modal.input.set-value.text--3"- {...form.register('discriminator', {- validate: (value) =>- isVisionaryDiscriminator0000Blocked({- showPremium,- isVisionary,- discriminator: value,- })- ? i18n._(THE_0000_TAG_IS_RESERVED_FOR_VISIONARY_SUBSCRIBERS_DESCRIPTOR)- : true,- })}- aria-label={i18n._(TAG_DESCRIPTOR)}- maxLength={4}- placeholder="0000"- required={true}- type="text"- disabled={false}- onChange={(e) => {- const value = e.target.value.replace(/\D/g, '');- form.setValue('discriminator', value, {shouldValidate: true});- }}- />- )}+ {discriminatorInput}</div>)}</div><div className={styles.validationBox} data-flx="user.fluxer-tag-change-modal.validation-box">- <UsernameValidationRules- username={form.watch('username')}- data-flx="user.fluxer-tag-change-modal.username-validation-rules"- />+ {usernameRules}</div>{shouldShowPremiumDiscriminatorWarning && (<WarningAlertclassName={styles.premiumDiscriminatorWarning}data-flx="user.fluxer-tag-change-modal.premium-discriminator-warning">- {hasPendingDiscriminatorChange ? (- premiumExpiresAtLabel ? (- <Trans>- If you save this username, your tag will reroll randomly when your {PREMIUM_PRODUCT_NAME}{' '}- expires on{' '}- <strong data-flx="user.fluxer-tag-change-modal.strong">{premiumExpiresAtLabel}</strong>, unless- it renews.- </Trans>- ) : (- <Trans>- If you save this username, your tag will reroll randomly when your {PREMIUM_PRODUCT_NAME}{' '}- expires, unless it renews.- </Trans>- )- ) : premiumExpiresAtLabel ? (- <Trans>- You changed your tag while on {PREMIUM_PRODUCT_NAME}. It will reroll randomly when your{' '}- {PREMIUM_PRODUCT_NAME} expires on{' '}- <strong data-flx="user.fluxer-tag-change-modal.strong--2">{premiumExpiresAtLabel}</strong>, unless- it renews.- </Trans>- ) : (- <Trans>- You changed your tag while on {PREMIUM_PRODUCT_NAME}. It will reroll randomly when your{' '}- {PREMIUM_PRODUCT_NAME} expires, unless it renews.- </Trans>- )}+ {premiumWarningContent}</WarningAlert>)}{!usernameOnly && !hasCustomDiscriminator && (