From 975999ffd4507c98a77fd7b90f034f1f82b0aa7f Mon Sep 17 00:00:00 2001 From: Manan Tank Date: Fri, 26 Jan 2024 02:41:49 +0530 Subject: [PATCH 1/2] Allow uppercase email address --- .../wallet/wallets/embeddedWallet/EmbeddedWalletFormUI.tsx | 2 +- packages/react/src/wallet/wallets/magic/magicLink.tsx | 7 ++++--- packages/react/src/wallet/wallets/paper/PaperFormUI.tsx | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/react/src/wallet/wallets/embeddedWallet/EmbeddedWalletFormUI.tsx b/packages/react/src/wallet/wallets/embeddedWallet/EmbeddedWalletFormUI.tsx index 960a92e862c..a85843e94a0 100644 --- a/packages/react/src/wallet/wallets/embeddedWallet/EmbeddedWalletFormUI.tsx +++ b/packages/react/src/wallet/wallets/embeddedWallet/EmbeddedWalletFormUI.tsx @@ -127,7 +127,7 @@ export const EmbeddedWalletFormUI = (props: { name="email" type="email" errorMessage={(_input) => { - const input = _input.replace(/\+/g, ""); + const input = _input.replace(/\+/g, "").toLowerCase(); const emailRegex = /^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,})$/g; const isValidEmail = emailRegex.test(input); diff --git a/packages/react/src/wallet/wallets/magic/magicLink.tsx b/packages/react/src/wallet/wallets/magic/magicLink.tsx index 636bbbec82a..d975d6e63f7 100644 --- a/packages/react/src/wallet/wallets/magic/magicLink.tsx +++ b/packages/react/src/wallet/wallets/magic/magicLink.tsx @@ -395,7 +395,8 @@ const MagicUI: React.FC<{ name="magic-input" type={type} emptyErrorMessage={emptyErrorMessage} - errorMessage={(input) => { + errorMessage={(_input) => { + const input = _input.toLowerCase(); const isEmail = input.includes("@"); const isPhone = Number.isInteger(Number(input[input.length - 1])); @@ -474,8 +475,8 @@ function useConnectMagic() { data.type === "connect" ? {} : isEmail - ? { email: selectionData, chainId: activeChain.chainId } - : { phoneNumber: selectionData, chainId: activeChain.chainId }, + ? { email: selectionData, chainId: activeChain.chainId } + : { phoneNumber: selectionData, chainId: activeChain.chainId }, ); connected(); } catch (e) { diff --git a/packages/react/src/wallet/wallets/paper/PaperFormUI.tsx b/packages/react/src/wallet/wallets/paper/PaperFormUI.tsx index 8416086c0d8..fb580d835e8 100644 --- a/packages/react/src/wallet/wallets/paper/PaperFormUI.tsx +++ b/packages/react/src/wallet/wallets/paper/PaperFormUI.tsx @@ -79,7 +79,7 @@ export const PaperFormUI = (props: { name="email" type="email" errorMessage={(_input) => { - const input = _input.replace(/\+/g, ""); + const input = _input.replace(/\+/g, "").toLowerCase(); const emailRegex = /^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,})$/g; const isValidEmail = emailRegex.test(input); if (!isValidEmail) { From 10fee96e13b9ff7e7e3084e0e3837b1ca953dd90 Mon Sep 17 00:00:00 2001 From: Manan Tank Date: Fri, 26 Jan 2024 03:05:16 +0530 Subject: [PATCH 2/2] add changeset --- .changeset/honest-flowers-bake.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/honest-flowers-bake.md diff --git a/.changeset/honest-flowers-bake.md b/.changeset/honest-flowers-bake.md new file mode 100644 index 00000000000..204edb911d3 --- /dev/null +++ b/.changeset/honest-flowers-bake.md @@ -0,0 +1,5 @@ +--- +"@thirdweb-dev/react": patch +--- + +Allow uppercase letters in email in embeddedWallet, magicLink, paperWallet in ConnectWallet UI