Skip to content

fix: onboarding prevent upgrade existing to email and phone #3520

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix: onboarding prevent upgrade existing to email and phone #3520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbe1952
feat(onboarding): validate phone uniqueness and prevent upgrade when …
esaugomez31 Sep 17, 2025
69de3e0
feat(onboarding): validate email uniqueness and prevent upgrade when …
esaugomez31 Sep 17, 2025
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
2 changes: 1 addition & 1 deletion app/screens/email-registration-screen/email-registration-initiate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@

try {
const { data } = await setEmailMutation({
variables: { input: { email: emailInput } },
variables: { input: { email: emailInput, requireUniqueEmail: onboarding } },

Check failure on line 105 in app/screens/email-registration-screen/email-registration-initiate.tsx

View workflow job for this annotation

GitHub Actions / Check Code 

Object literal may only specify known properties, and 'requireUniqueEmail' does not exist in type 'UserEmailRegistrationInitiateInput'.
})

const errors = data?.userEmailRegistrationInitiate.errors
Expand Down
10 changes: 5 additions & 5 deletions app/screens/phone-auth-screen/phone-login-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ export const PhoneLoginInitiateScreen: React.FC<PhoneLoginInitiateScreenProps> =
theme: { colors, mode: themeMode },
} = useTheme()

const screenType = route.params.type
const phoneChannel = route.params.channel
const onboarding = route.params.onboarding

const {
userSubmitPhoneNumber,
captchaLoading,
Expand All @@ -148,14 +152,10 @@ export const PhoneLoginInitiateScreen: React.FC<PhoneLoginInitiateScreenProps> =
setCountryCode,
supportedCountries,
loadingSupportedCountries,
} = useRequestPhoneCodeLogin()
} = useRequestPhoneCodeLogin({ onboarding })

const { LL } = useI18nContext()

const screenType = route.params.type
const phoneChannel = route.params.channel
const onboarding = route.params.onboarding

const isDisabledCountryAndCreateAccount =
screenType === PhoneLoginInitiateType.CreateAccount &&
phoneInputInfo?.countryCode &&
Expand Down
8 changes: 7 additions & 1 deletion app/screens/phone-auth-screen/request-phone-code-login.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ gql`
}
`

export const useRequestPhoneCodeLogin = (): UseRequestPhoneCodeReturn => {
export const useRequestPhoneCodeLogin = (opts?: {
onboarding?: boolean
}): UseRequestPhoneCodeReturn => {
const onboarding = Boolean(opts?.onboarding)

const [status, setStatus] = useState<RequestPhoneCodeStatus>(
RequestPhoneCodeStatus.LoadingCountryCode,
)
Expand Down Expand Up @@ -192,6 +196,7 @@ export const useRequestPhoneCodeLogin = (): UseRequestPhoneCodeReturn => {
validationCode: geetestValidationData.geetestValidate,
secCode: geetestValidationData.geetestSecCode,
channel: phoneCodeChannel,
requireUniquePhone: onboarding,
} as const
resetValidationData()
logRequestAuthCode({
Expand Down Expand Up @@ -279,6 +284,7 @@ export const useRequestPhoneCodeLogin = (): UseRequestPhoneCodeReturn => {
registerCaptcha,
appCheckToken,
authUrl,
onboarding,
])

const setPhoneNumber = (number: string) => {
Expand Down
Loading