@boneframework/native-components 1.0.34 → 1.0.36

package/components/ActivityIndicator.tsx

@@ -7,6 +7,10 @@ import useStyle from "../hooks/useStyle";
 function ActivityIndicator({ visible = false , type="default", animationSource}) {
     const defaultStyles = useStyle();
 
+    if (!animationSource) {
+        animationSource = '../../../../assets/animations/loader.json'
+    }
+
     const styles = StyleSheet.create({
         overlay: {
             flex:1,

package/components/Image.tsx

@@ -33,7 +33,7 @@ function Image({style, uri, onPress, handleError = error => console.error, sourc
         imageSource = source;
     }
 
-    if ((null !== user.authToken.accessToken && protectedUri == true) || protectedUri == false) {
+    if ((null !== user?.authToken?.accessToken && protectedUri == true) || protectedUri == false) {
         return (
             <ExpoImage
                 source={imageSource}

package/hooks/useLinking.ts

@@ -1,6 +1,6 @@
 import * as Linking from "expo-linking";
 import {useEffect} from "react";
-import router from 'ex';
+import {router} from 'expo-router';
 
 import routes from '../../../../config/routes';
 
@@ -13,7 +13,7 @@ export default useLinking = () => {
             if (parts.path !== null && parts.path !== '') {
                 switch (parts.path) {
                     case routes.USER_ACTIVATION:
-                        router.navigate(routes.USER_ACTIVATION, parts.queryParams);
+                        router.navigate({pathname: routes.USER_ACTIVATION, params: parts.queryParams});
                         break;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boneframework/native-components",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "Expo Components for Bone Framework",
   "main": "src/Bone.ts",
   "scripts": {

package/screens/ActivateUserScreen.tsx

@@ -1,41 +1,39 @@
-import {Image, ImageBackground, Keyboard, StyleSheet, View} from "react-native";
-import * as Linking from 'expo-linking';
+import {ImageBackground, Keyboard, StyleSheet, View} from "react-native";
+import {router, useGlobalSearchParams} from 'expo-router';
 import React, {useEffect, useState} from "react";
-import * as Yup from 'yup'
 
-import Button from '../components/Button';
-import CheckEmailScreen from '../screens/CheckEmailScreen';
-import Text from '../components/Text';
 import ActivityIndicator from "../components/ActivityIndicator";
-import Animation from "../components/Animation";
 import {ErrorMessage, Form, FormField, SubmitButton} from "../components/forms";
 import ResendActivationScreen from "../screens/ResendActivationlScreen";
 import SetPasswordScreen from "../screens/SetPasswordScreen";
 import useApi from "../hooks/useApi";
 import useAuth from "../hooks/useAuth";
-import useLinking from "../hooks/useLinking";
 import userApi from "../api/users";
 
 import settings from "../../../../config/settings";
 import routes from "../../../../config/routes";
-import colors from '../../../../config/colors';
 
-function ActivateUserScreen({navigation, route}) {
+function ActivateUserScreen() {
+    const STATUS_BEGIN = 'start_validating';
     const STATUS_VALIDATE = 'validate_email_token';
     const STATUS_RESEND = 'resend_email_token';
     const STATUS_SET_PASSWORD = 'set_password';
+
     const activationApi = useApi(userApi.activateAccount);
     const resendActivationApi = useApi(userApi.resendactivationEmail);
     const validateEmailTokenApi = useApi(userApi.validateEmailToken);
-    const [status, setStatus] = useState(STATUS_VALIDATE);
+
+    const [status, setStatus] = useState(STATUS_BEGIN);
     const [error, setError] = useState();
     const [tokenError, setTokenError] = useState();
+
     const {login} = useAuth();
-    const url = Linking.useURL();
-    const email = route.params.email;
-    const token = route.params.token;
+    const params = useGlobalSearchParams();
+    const email = params.email;
+    const token = params.token;
 
     const validateEmailToken = async () => {
+        setStatus(STATUS_VALIDATE);
         const result = await validateEmailTokenApi.request(email, token);
 
         if (result.data.ok) {
@@ -53,6 +51,15 @@ function ActivateUserScreen({navigation, route}) {
         }
     }
 
+    const convertResponse = (data) => {
+        return {
+            accessToken: data.access_token,
+            expiresIn: data.expires_in,
+            refreshToken: data.refresh_token,
+            tokenType: data.token_type,
+        }
+    }
+
     const handleSubmit = async userInfo => {
         Keyboard.dismiss();
         try {
@@ -76,7 +83,7 @@ function ActivateUserScreen({navigation, route}) {
                 return;
             }
 
-            login({accessToken: result.data.access_token, refreshToken: result.data.refresh_token});
+            login(convertResponse(result.data)).then(router.navigate(routes.HOME));
         } catch (error) {
             setError(error);
             console.error(error);
@@ -94,7 +101,7 @@ function ActivateUserScreen({navigation, route}) {
     }
 
     useEffect(() => {
-        if (status === STATUS_VALIDATE) {
+        if (status === STATUS_BEGIN) {
             validateEmailToken();
         }
     });

package/screens/WelcomeScreen.tsx

@@ -9,7 +9,7 @@ import colors from '../../../../config/colors'
 function WelcomeScreen({loginOnPress = () => {}, registerOnPress = () => {}, title = 'BONE FRAMEWORK', isLoading = false}) {
     return (
         <ImageBackground blurRadius={10} style={styles.background} source={require('../../../../assets/background.png')} >
-            <ActivityIndicator visible={isLoading} type={'overlay'}/>
+            <ActivityIndicator visible={isLoading} type={'overlay'} />
             <View style={styles.logoContainer}>
                 <Image style={styles.logo} source={require('../../../../assets/logo.png')} />
                 <Text style={styles.tagline}>{ title }</Text>