aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/routes/onboarding/OnboardingStackNavigator.tsx3
-rw-r--r--src/routes/onboarding/OnboardingStackScreen.tsx6
-rw-r--r--src/screens/onboarding/InvitationCodeVerification.tsx13
-rw-r--r--src/screens/onboarding/PasswordResetRequest.tsx3
-rw-r--r--src/screens/onboarding/PasswordVerification.tsx (renamed from src/screens/onboarding/Verification.tsx)91
-rw-r--r--src/screens/onboarding/index.ts2
-rw-r--r--src/types/types.ts8
7 files changed, 22 insertions, 104 deletions
diff --git a/src/routes/onboarding/OnboardingStackNavigator.tsx b/src/routes/onboarding/OnboardingStackNavigator.tsx
index 7d8a751a..4726a47d 100644
--- a/src/routes/onboarding/OnboardingStackNavigator.tsx
+++ b/src/routes/onboarding/OnboardingStackNavigator.tsx
@@ -1,5 +1,4 @@
import {createStackNavigator} from '@react-navigation/stack';
-import {VerificationScreenType} from '../../types';
export type OnboardingStackParams = {
InvitationCodeVerification: {userId: string; username: string};
@@ -9,8 +8,8 @@ export type OnboardingStackParams = {
OnboardingStepTwo: {firstName: string; lastName: string; phone: string};
PasswordReset: {value: string};
PasswordResetRequest: undefined;
+ PasswordVerification: {id: string};
PhoneVerification: {firstName: string; lastName: string; phone: string};
- Verification: {id: string; screenType: VerificationScreenType};
WelcomeScreen: undefined;
};
diff --git a/src/routes/onboarding/OnboardingStackScreen.tsx b/src/routes/onboarding/OnboardingStackScreen.tsx
index 5e1de2dd..339c3d0d 100644
--- a/src/routes/onboarding/OnboardingStackScreen.tsx
+++ b/src/routes/onboarding/OnboardingStackScreen.tsx
@@ -7,8 +7,8 @@ import {
OnboardingStepTwo,
PasswordReset,
PasswordResetRequest,
+ PasswordVerification,
PhoneVerification,
- Verification,
WelcomeScreen,
} from '../../screens';
import OnboardingStepOne from '../../screens/onboarding/OnboardingStepOne';
@@ -52,8 +52,8 @@ const Onboarding: React.FC = () => {
}}
/>
<OnboardingStack.Screen
- name="Verification"
- component={Verification}
+ name="PasswordVerification"
+ component={PasswordVerification}
options={{
...modalStyle,
}}
diff --git a/src/screens/onboarding/InvitationCodeVerification.tsx b/src/screens/onboarding/InvitationCodeVerification.tsx
index 6bc0ac9d..d84b2ba2 100644
--- a/src/screens/onboarding/InvitationCodeVerification.tsx
+++ b/src/screens/onboarding/InvitationCodeVerification.tsx
@@ -1,7 +1,7 @@
import AsyncStorage from '@react-native-community/async-storage';
import {RouteProp} from '@react-navigation/native';
import {StackNavigationProp} from '@react-navigation/stack';
-import React, {useContext} from 'react';
+import React from 'react';
import {Alert, KeyboardAvoidingView, StyleSheet, View} from 'react-native';
import {Text} from 'react-native-animatable';
import {
@@ -27,7 +27,6 @@ import {
import {OnboardingStackParams} from '../../routes';
import {BackgroundGradientType} from '../../types';
import {SCREEN_WIDTH, userLogin} from '../../utils';
-import {ChatContext} from '../../App';
type InvitationCodeVerificationRouteProp = RouteProp<
OnboardingStackParams,
@@ -59,7 +58,6 @@ const InvitationCodeVerification: React.FC<InvitationCodeVerificationProps> = ({
setValue,
});
const dispatch = useDispatch();
- const {chatClient} = useContext(ChatContext);
const handleInvitationCodeVerification = async () => {
if (value.length === 6) {
@@ -200,10 +198,6 @@ const styles = StyleSheet.create({
flexDirection: 'row',
justifyContent: 'space-around',
},
- noInviteCode: {
- flexDirection: 'row',
- justifyContent: 'center',
- },
youveBeenAddedLabel: {
marginVertical: '5%',
width: SCREEN_WIDTH * 0.8,
@@ -213,11 +207,6 @@ const styles = StyleSheet.create({
fontWeight: '500',
marginBottom: '10%',
},
- inviteCodeLink: {
- color: 'white',
- fontSize: 18,
- textDecorationLine: 'underline',
- },
});
export default InvitationCodeVerification;
diff --git a/src/screens/onboarding/PasswordResetRequest.tsx b/src/screens/onboarding/PasswordResetRequest.tsx
index a63eae81..8a891bbb 100644
--- a/src/screens/onboarding/PasswordResetRequest.tsx
+++ b/src/screens/onboarding/PasswordResetRequest.tsx
@@ -74,9 +74,8 @@ const PasswordResetRequest: React.FC<PasswordResetRequestProps> = ({
handlePasswordResetRequest(form.value),
);
if (success) {
- navigation.navigate('Verification', {
+ navigation.navigate('PasswordVerification', {
id: form.value,
- screenType: VerificationScreenType.Password,
});
}
} else {
diff --git a/src/screens/onboarding/Verification.tsx b/src/screens/onboarding/PasswordVerification.tsx
index dda18364..6bda37a7 100644
--- a/src/screens/onboarding/Verification.tsx
+++ b/src/screens/onboarding/PasswordVerification.tsx
@@ -21,7 +21,6 @@ import {
ArrowButton,
Background,
LoadingIndicator,
- RegistrationWizard,
SubmitButton,
} from '../../components';
import {codeRegex} from '../../constants';
@@ -33,18 +32,16 @@ import {OnboardingStackParams} from '../../routes';
import {
handlePasswordCodeVerification,
handlePasswordResetRequest,
- sendOtp,
- verifyOtp,
} from '../../services';
-import {BackgroundGradientType, VerificationScreenType} from '../../types';
+import {BackgroundGradientType} from '../../types';
type VerificationScreenRouteProp = RouteProp<
OnboardingStackParams,
- 'Verification'
+ 'PasswordVerification'
>;
type VerificationScreenNavigationProp = StackNavigationProp<
OnboardingStackParams,
- 'Verification'
+ 'PasswordVerification'
>;
interface VerificationProps {
route: VerificationScreenRouteProp;
@@ -58,39 +55,16 @@ const Verification: React.FC<VerificationProps> = ({route, navigation}) => {
value,
setValue,
});
- const {id, screenType} = route.params;
- const isPhoneVerification = screenType === VerificationScreenType.Phone;
+ const {id} = route.params;
- const handlePhoneVerification = async () => {
- const success = await trackPromise(verifyOtp(id, value));
- if (success) {
- navigation.navigate('RegistrationTwo', {phone: id});
- }
- };
-
- const handlePasswordVerification = async () => {
- const success = await trackPromise(
- handlePasswordCodeVerification(id, value),
- );
- if (success) {
- navigation.navigate('PasswordReset', {value: id});
- }
- };
-
- /**
- * Sends the verify_otp request upon tapping the Verify button.
- * If successful, it navigates to the respected page.
- */
const handleVerification = async () => {
if (codeRegex.test(value)) {
try {
- switch (screenType) {
- case VerificationScreenType.Phone:
- handlePhoneVerification();
- break;
- case VerificationScreenType.Password:
- handlePasswordVerification();
- break;
+ const success = await trackPromise(
+ handlePasswordCodeVerification(id, value),
+ );
+ if (success) {
+ navigation.navigate('PasswordReset', {value: id});
}
} catch (error) {
console.log(error);
@@ -106,34 +80,19 @@ const Verification: React.FC<VerificationProps> = ({route, navigation}) => {
*/
const handleResend = async () => {
try {
- switch (screenType) {
- case VerificationScreenType.Phone:
- trackPromise(sendOtp(id));
- break;
- case VerificationScreenType.Password:
- trackPromise(handlePasswordResetRequest(id));
- break;
- }
+ trackPromise(handlePasswordResetRequest(id));
} catch (error) {
console.log(error);
Alert.alert(ERROR_SOMETHING_WENT_WRONG);
}
};
- const handleGoBack = () => {
- switch (screenType) {
- case VerificationScreenType.Phone:
- navigation.navigate('RegistrationOne');
- break;
- case VerificationScreenType.Password:
- navigation.navigate('PasswordResetRequest');
- break;
- }
- };
-
const Footer = () => (
<View style={styles.footer}>
- <ArrowButton direction="backward" onPress={() => handleGoBack()} />
+ <ArrowButton
+ direction="backward"
+ onPress={() => navigation.navigate('PasswordResetRequest')}
+ />
</View>
);
@@ -142,16 +101,9 @@ const Verification: React.FC<VerificationProps> = ({route, navigation}) => {
centered
style={styles.container}
gradientType={BackgroundGradientType.Light}>
- {isPhoneVerification ? (
- <RegistrationWizard style={styles.wizard} step="three" />
- ) : (
- <React.Fragment />
- )}
<KeyboardAvoidingView
behavior="padding"
- style={
- isPhoneVerification ? styles.form : styles.formPasswordVerification
- }>
+ style={styles.formPasswordVerification}>
<Text style={styles.formHeader}>Enter 6 digit code</Text>
<Text style={styles.description}>
We sent a 6 digit verification code to the phone number you provided.
@@ -200,16 +152,6 @@ const styles = StyleSheet.create({
alignItems: 'center',
justifyContent: 'center',
},
- wizard: {
- marginTop: '3.5%',
- flex: 1,
- justifyContent: 'center',
- },
- form: {
- alignItems: 'center',
- justifyContent: 'flex-start',
- flex: 3,
- },
formPasswordVerification: {
alignItems: 'center',
justifyContent: 'flex-start',
@@ -261,9 +203,6 @@ const styles = StyleSheet.create({
button: {
marginVertical: '5%',
},
- loadingIndicator: {
- marginVertical: '5%',
- },
footer: {
width: '100%',
flexDirection: 'row',
diff --git a/src/screens/onboarding/index.ts b/src/screens/onboarding/index.ts
index bce03bf8..7eb0587f 100644
--- a/src/screens/onboarding/index.ts
+++ b/src/screens/onboarding/index.ts
@@ -6,5 +6,5 @@ export {default as OnboardingStepTwo} from './OnboardingStepTwo';
export {default as PasswordReset} from './PasswordReset';
export {default as PasswordResetRequest} from './PasswordResetRequest';
export {default as PhoneVerification} from './PhoneVerification';
-export {default as Verification} from './Verification';
+export {default as PasswordVerification} from './PasswordVerification';
export {default as WelcomeScreen} from './WelcomeScreen';
diff --git a/src/types/types.ts b/src/types/types.ts
index 72fd7d04..c674866f 100644
--- a/src/types/types.ts
+++ b/src/types/types.ts
@@ -165,14 +165,6 @@ export interface UserXType {
}
/**
- * We have two verification screen types, this enum is used to display proper content based on the type
- */
-export enum VerificationScreenType {
- Phone,
- Password,
-}
-
-/**
* Gradient type to accomodate new g background gradients for Tagg
*/
export enum BackgroundGradientType {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-07 09:25:36 +0000