aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

[MM-44161] Show both validation messages when adding new server if both fields are invalid (#2104) (#2105)

Browse source 
(cherry picked from commit 2e740d60bd)

Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
This commit is contained in:
Mattermost Build 2022-05-12 18:05:07 +02:00 committed by GitHub
parent 585e7a1b29
commit 316d4d2714
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/renderer/components/NewTeamModal.tsx
View file

@ -125,7 +125,13 @@ export default class NewTeamModal extends React.PureComponent<Props, State> {
const urlError = this.getTeamUrlValidationError(); const urlError = this.getTeamUrlValidationError();
if (nameError && urlError) { if (nameError && urlError) {
return 'Name and URL are required.'; return (
<>
{nameError}
<br/>
{urlError}
</>
);
} else if (nameError) { } else if (nameError) {
return nameError; return nameError;
} else if (urlError) { } else if (urlError) {