Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added firstname and lastname #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added firstname and lastname #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions backend/native/backpack-api/src/db/users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,12 +302,16 @@ const transformUser = (
*/
export const createUser = async (
username: string,
firstname: string,
lastname: string,
blockchainPublicKeys: Array<{ blockchain: Blockchain; publicKey: string }>,
waitlistId?: string | null,
referrerId?: string
): Promise<{
id: string;
username: string;
firstname: string;
lastname: string;
public_keys: { blockchain: "solana" | "ethereum"; id: number }[];
}> => {
const inviteCode = uuidv4();
Expand All @@ -329,6 +333,8 @@ export const createUser = async (
{
object: {
username: username,
firstname: firstname,
lastname: lastname,
public_keys: {
data: blockchainPublicKeys.map((b) => ({
blockchain: b.blockchain,
Expand All @@ -343,6 +349,8 @@ export const createUser = async (
{
id: true,
username: true,
firstname: true,
lastname: true,
public_keys: [
{},
{
Expand Down
4 changes: 2 additions & 2 deletions packages/app-extension/src/components/Onboarding/pages/OnboardAccount.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ export const OnboardAccount = ({
<UsernameForm
key="UsernameForm"
inviteCode={inviteCode!}
onNext={(username) => {
setOnboardingData({ username });
onNext={(username, firstname?, lastname?) => {
setOnboardingData({ username, firstname, lastname });
nextStep();
}}
/>,
Expand Down
74 changes: 70 additions & 4 deletions packages/app-extension/src/components/Onboarding/pages/UsernameForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type FormEvent, useCallback, useEffect, useState } from "react";
import { PrimaryButton,TextInput } from "@coral-xyz/react-common";
import { PrimaryButton, TextInput } from "@coral-xyz/react-common";
import { useCustomTheme } from "@coral-xyz/themes";
import { AlternateEmail } from "@mui/icons-material";
import { Box, InputAdornment } from "@mui/material";
Expand All @@ -11,9 +11,11 @@ export const UsernameForm = ({
onNext,
}: {
inviteCode: string;
onNext: (username: string) => void;
onNext: (username: string, firstname: string, lastname: string) => void;
}) => {
const [username, setUsername] = useState("");
const [firstname, setFirstname] = useState("");
const [lastname, setLastname] = useState("");
const [error, setError] = useState("");
const theme = useCustomTheme();

Expand All @@ -34,12 +36,12 @@ export const UsernameForm = ({
const json = await res.json();
if (!res.ok) throw new Error(json.message || "There was an error");

onNext(username);
onNext(username, firstname, lastname);
} catch (err: any) {
setError(err.message);
}
},
[username]
[username, firstname, lastname]
);

return (
Expand Down Expand Up @@ -104,6 +106,70 @@ export const UsernameForm = ({
</InputAdornment>
}
/>
<Box
style={{
display: "flex",
flexDirection: "row",
gap: "10px",
}}
>
<TextInput
inputProps={{
name: "firstname",
autoComplete: "off",
spellCheck: "false",
autoFocus: true,
}}
placeholder="First Name"
type="text"
value={firstname}
setValue={(e) => {
setFirstname(e.target.value.replace(/[^a-zA-Z]/g, ""));
}}
error={error ? true : false}
errorMessage={error}
startAdornment={
<InputAdornment position="start">
<AlternateEmail
style={{
color: theme.custom.colors.secondary,
fontSize: 18,
marginRight: -2,
userSelect: "none",
}}
/>
</InputAdornment>
}
/>
<TextInput
inputProps={{
name: "lastname",
autoComplete: "off",
spellCheck: "false",
autoFocus: true,
}}
placeholder="Last Name"
type="text"
value={lastname}
setValue={(e) => {
setLastname(e.target.value.replace(/[^a-zA-Z]/g, ""));
}}
error={error ? true : false}
errorMessage={error}
startAdornment={
<InputAdornment position="start">
<AlternateEmail
style={{
color: theme.custom.colors.secondary,
fontSize: 18,
marginRight: -2,
userSelect: "none",
}}
/>
</InputAdornment>
}
/>
</Box>
</Box>
<PrimaryButton label="Continue" type="submit" />
</Box>
Expand Down
9 changes: 8 additions & 1 deletion packages/recoil/src/context/OnboardingProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ export type OnboardingData = {
complete: boolean;
inviteCode: string | undefined;
username: string | null;
firstname: string | null;
lastname: string | null;
action: string;
keyringType: KeyringType | null;
blockchain: Blockchain | null;
Expand All @@ -102,6 +104,8 @@ const defaultState = {
complete: false,
inviteCode: undefined,
username: null,
firstname: null,
lastname: null,
action: "create",
keyringType: null,
blockchain: null,
Expand Down Expand Up @@ -278,7 +282,8 @@ export function OnboardingProvider({
//
const createUser = useCallback(
async (data: Partial<OnboardingData>) => {
const { inviteCode, userId, username, keyringType } = data;
const { inviteCode, userId, username, firstname, lastname, keyringType } =
data;

// If userId is provided, then we are onboarding via the recover flow.
if (userId) {
Expand Down Expand Up @@ -312,6 +317,8 @@ export function OnboardingProvider({
//
const body = JSON.stringify({
username,
firstname,
lastname,
inviteCode,
waitlistId: getWaitlistId?.(),
blockchainPublicKeys,
Expand Down