diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-06-08 17:32:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-08 17:32:29 -0400 |
| commit | 946b1be53189487e860f37e1b422c69bb44cf0c8 (patch) | |
| tree | c85bb7622afc6d64cd7254455a46c4dca2f79cb8 | |
| parent | ea088da1304a9ba345b75aab9184f7e8d928a4ac (diff) | |
| parent | 17d41145a0791d2687c7f4abd934b83c008e6f12 (diff) | |
Merge pull request #459 from hsalhab/tma-762-remove-website-bug
[TMA-762] Fix clear website doesn't update field in profile
| -rw-r--r-- | src/constants/regex.ts | 2 | ||||
| -rw-r--r-- | src/screens/profile/EditProfile.tsx | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/constants/regex.ts b/src/constants/regex.ts index 61523203..f934185d 100644 --- a/src/constants/regex.ts +++ b/src/constants/regex.ts @@ -36,7 +36,7 @@ export const nameRegex: RegExp = /^[A-Za-z'\-,. ]{2,20}$/; * - match alphanumerics, and special characters used in URLs */ export const websiteRegex: RegExp = - /^$|^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,50}\.[a-zA-Z0-9()]{2,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]{0,35})$/; + /^$|^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,50}\.[a-zA-Z0-9()]{2,6}\b([-a-zA-Z0-9()@:%_+.~#?&\/=]{0,35})$/; /** * The website regex has the following constraints diff --git a/src/screens/profile/EditProfile.tsx b/src/screens/profile/EditProfile.tsx index 26802e45..765bbf01 100644 --- a/src/screens/profile/EditProfile.tsx +++ b/src/screens/profile/EditProfile.tsx @@ -305,14 +305,13 @@ const EditProfile: React.FC<EditProfileProps> = ({route, navigation}) => { type: 'image/jpg', }); } - if (form.website) { - if (form.isValidWebsite) { - request.append('website', form.website); - } else { - setForm({...form, attemptedSubmit: false}); - setTimeout(() => setForm({...form, attemptedSubmit: true})); - invalidFields = true; - } + + if (form.isValidWebsite) { + request.append('website', form.website); + } else { + setForm({...form, attemptedSubmit: false}); + setTimeout(() => setForm({...form, attemptedSubmit: true})); + invalidFields = true; } if (form.bio) { |