awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-15 01:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Scott Wilson
2024-09-12 08:03:10 -07:00
parent ce9b66ef14 5150c102e6
commit 4c65e9910a
64 changed files with 1157 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/signup/EnterEmailStep.tsx
+2 -1
View File
@@ -50,7 +50,8 @@ export default function EnterEmailStep({
// If everything is correct, go to the next step
if (!emailCheckBool) {
try {
await mutateAsync({ email });
await mutateAsync({ email: email.toLowerCase() });
setEmail(email.toLowerCase())
incrementStep();
} catch (e) {
if (axios.isAxiosError(e)) {
frontend/src/components/signup/TeamInviteStep.tsx
+1 -1
View File
@@ -60,7 +60,7 @@ export default function TeamInviteStep(): JSX.Element {
placeholder="[email protected], [email protected]..."
/>
</div>
<div className="mx-auto mt-0 mt-2 flex w-full flex-row items-end justify-end text-sm md:mt-4 md:mb-2 md:min-w-[30rem] md:max-w-md">
<div className="mx-auto mt-2 flex w-full flex-row items-end justify-end text-sm md:mt-4 md:mb-2 md:min-w-[30rem] md:max-w-md">
<Button
onClick={() => {
if (serverDetails?.emailConfigured) {