chrisryn/requestarr
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore(deps): update react to 18 (#2943)

Browse Source
This commit is contained in:
Ryan Cohen
2022-08-18 17:05:58 +09:00
committed by GitHub
parent 72d7a3477f
commit e5d8c93ab8
164 changed files with 982 additions and 915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
View File

@@ -51,7 +51,7 @@ const messages = defineMessages({
validationDiscordId: 'You must provide a valid Discord user ID',
});
const UserGeneralSettings: React.FC = () => {
const UserGeneralSettings = () => {
const intl = useIntl();
const { addToast } = useToasts();
const { locale, setLocale } = useLocale();
@@ -221,9 +221,11 @@ const UserGeneralSettings: React.FC = () => {
}
/>
</div>
{errors.displayName && touched.displayName && (
<div className="error">{errors.displayName}</div>
)}
{errors.displayName &&
touched.displayName &&
typeof errors.displayName === 'string' && (
<div className="error">{errors.displayName}</div>
)}
</div>
</div>
<div className="form-row">
@@ -232,17 +234,15 @@ const UserGeneralSettings: React.FC = () => {
{currentUser?.id === user?.id && (
<span className="label-tip">
{intl.formatMessage(messages.discordIdTip, {
FindDiscordIdLink: function FindDiscordIdLink(msg) {
return (
<a
href="https://support.discord.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID-"
target="_blank"
rel="noreferrer"
>
{msg}
</a>
);
},
FindDiscordIdLink: (msg: React.ReactNode) => (
<a
href="https://support.discord.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID-"
target="_blank"
rel="noreferrer"
>
{msg}
</a>
),
})}
</span>
)}
@@ -251,9 +251,11 @@ const UserGeneralSettings: React.FC = () => {
<div className="form-input-field">
<Field id="discordId" name="discordId" type="text" />
</div>
{errors.discordId && touched.discordId && (
<div className="error">{errors.discordId}</div>
)}
{errors.discordId &&
touched.discordId &&
typeof errors.discordId === 'string' && (
<div className="error">{errors.discordId}</div>
)}
</div>
</div>
<div className="form-row">