From bce5a0162579d436dcb2c9dad70bfbabbc991a7b Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Fri, 20 Sep 2024 16:01:14 -0500 Subject: [PATCH] Get real nit picky --- .../strings/__tests__/{email-typo.test.ts => email.test.ts} | 6 +++--- src/lib/strings/{email-typo.ts => email.ts} | 2 +- src/screens/Signup/StepInfo/index.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/lib/strings/__tests__/{email-typo.test.ts => email.test.ts} (88%) rename src/lib/strings/{email-typo.ts => email.ts} (83%) diff --git a/src/lib/strings/__tests__/email-typo.test.ts b/src/lib/strings/__tests__/email.test.ts similarity index 88% rename from src/lib/strings/__tests__/email-typo.test.ts rename to src/lib/strings/__tests__/email.test.ts index 42cabc1a38..4dfda658f7 100644 --- a/src/lib/strings/__tests__/email-typo.test.ts +++ b/src/lib/strings/__tests__/email.test.ts @@ -1,7 +1,7 @@ import {describe, expect, it} from '@jest/globals' import tldts from 'tldts' -import {emailTypoCheck} from '#/lib/strings/email-typo' +import {isEmailMaybeInvalid} from '#/lib/strings/email' describe('emailTypoChecker', () => { const invalidCases = [ @@ -73,10 +73,10 @@ describe('emailTypoChecker', () => { ] it.each(invalidCases)(`should be invalid: abcde@%s`, domain => { - expect(emailTypoCheck(`abcde@${domain}`, tldts)).toEqual(true) + expect(isEmailMaybeInvalid(`abcde@${domain}`, tldts)).toEqual(true) }) it.each(validCases)(`should be valid: abcde@%s`, domain => { - expect(emailTypoCheck(`abcde@${domain}`, tldts)).toEqual(false) + expect(isEmailMaybeInvalid(`abcde@${domain}`, tldts)).toEqual(false) }) }) diff --git a/src/lib/strings/email-typo.ts b/src/lib/strings/email.ts similarity index 83% rename from src/lib/strings/email-typo.ts rename to src/lib/strings/email.ts index 7d252f08eb..04b6038476 100644 --- a/src/lib/strings/email-typo.ts +++ b/src/lib/strings/email.ts @@ -3,7 +3,7 @@ import type tldts from 'tldts' const COMMON_ERROR_PATTERN = /([a-zA-Z0-9._%+-]+)@(gnail\.(co|com)|gmaill\.(co|com)|gmai\.(co|com)|gmail\.co|gmal\.(co|com)|iclod\.(co|com)|icloud\.co|outllok\.(co|com)|outlok\.(co|com)|outlook\.co|yaoo\.(co|com)|yaho\.(co|com)|yahoo\.co|yahooo\.(co|com))$/ -export function emailTypoCheck(email: string, dynamicTldts: typeof tldts) { +export function isEmailMaybeInvalid(email: string, dynamicTldts: typeof tldts) { const isIcann = dynamicTldts.parse(email).isIcann return !isIcann || COMMON_ERROR_PATTERN.test(email) } diff --git a/src/screens/Signup/StepInfo/index.tsx b/src/screens/Signup/StepInfo/index.tsx index 7be7c4fef2..2cdb4b7224 100644 --- a/src/screens/Signup/StepInfo/index.tsx +++ b/src/screens/Signup/StepInfo/index.tsx @@ -7,7 +7,7 @@ import type tldts from 'tldts' import {logEvent} from '#/lib/statsig/statsig' import {logger} from '#/logger' -import {emailTypoCheck} from 'lib/strings/email-typo' +import {isEmailMaybeInvalid} from 'lib/strings/email' import {ScreenTransition} from '#/screens/Login/ScreenTransition' import {is13, is18, useSignupContext} from '#/screens/Signup/state' import {Policies} from '#/screens/Signup/StepInfo/Policies' @@ -68,7 +68,7 @@ export function StepInfo({ const password = passwordValueRef.current if (emailChanged && tldtsRef.current) { - if (emailTypoCheck(email, tldtsRef.current)) { + if (isEmailMaybeInvalid(email, tldtsRef.current)) { prevEmailValueRef.current = email setHasWarnedEmail(true) return dispatch({