Simplifies email validation

antonis · antonis · commit b9235f2b07cc · 2024-12-10T20:41:07.000+02:00
diff --git a/packages/core/src/js/feedback/FeedbackForm.tsx b/packages/core/src/js/feedback/FeedbackForm.tsx
@@ -39,7 +39,7 @@ export class FeedbackForm extends React.Component<FeedbackFormProps, FeedbackFor
       return;
     }
 
-    if (config.isEmailRequired && !this._isValidEmail(trimmedEmail)) {
+    if ((config.isEmailRequired || trimmedEmail.length > 0) && !this._isValidEmail(trimmedEmail)) {
       Alert.alert(text.errorTitle, text.emailError);
       return;
     }
@@ -115,7 +115,7 @@ export class FeedbackForm extends React.Component<FeedbackFormProps, FeedbackFor
   }
 
   private _isValidEmail = (email: string): boolean => {
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
     return emailRegex.test(email);
   };
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export class FeedbackForm extends React.Component<FeedbackFormProps, FeedbackFor`
`39`	`39`	`return;`
`40`	`40`	`}`
`41`	`41`
`42`		`- if (config.isEmailRequired && !this._isValidEmail(trimmedEmail)) {`
	`42`	`+ if ((config.isEmailRequired \|\| trimmedEmail.length > 0) && !this._isValidEmail(trimmedEmail)) {`
`43`	`43`	`Alert.alert(text.errorTitle, text.emailError);`
`44`	`44`	`return;`
`45`	`45`	`}`
`@@ -115,7 +115,7 @@ export class FeedbackForm extends React.Component<FeedbackFormProps, FeedbackFor`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`private _isValidEmail = (email: string): boolean => {`
`118`		`- const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;`
	`118`	`+ const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/`
`119`	`119`	`return emailRegex.test(email);`
`120`	`120`	`};`
`121`	`121`	`}`