ordering-ui-react-native 0.23.64 → 0.23.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.23.64",
+  "version": "0.23.66",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/business/src/components/OrdersOption/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useRef } from 'react';
-import { View, Pressable, StyleSheet, ScrollView, RefreshControl, Platform, TouchableOpacity } from 'react-native';
+import { View, Pressable, StyleSheet, ScrollView, RefreshControl, Platform, TouchableOpacity, Animated, Easing } from 'react-native';
 import { useLanguage, useUtils, OrderListGroups, useConfig } from 'ordering-components/native';
 import SelectDropdown from 'react-native-select-dropdown'
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
@@ -139,6 +139,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
   const HEIGHT_SCREEN = orientationState?.dimensions?.height
   const IS_PORTRAIT = orientationState.orientation === PORTRAIT
   const showTagsList = !props.isAlsea && !props.isDriverApp && currentTabSelected !== 'logisticOrders'
+  const AnimatedFeatherIcon = Animated.createAnimatedComponent(FeatherIcon);
+  const spinValue = new Animated.Value(0);
 
   const preorderTypeList = [
     { key: null, name: t('SLA', 'SLA\'s') },
@@ -468,6 +470,25 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     }
   }, [isNetConnected, JSON.stringify(offlineActionsState.orders)]);
 
+
+  const handleInitAnimation = () => {
+    Animated.timing(
+      spinValue,
+      {
+        toValue: 1,
+        duration: 2000,
+        easing: Easing.linear,
+        useNativeDriver: true
+      }
+    ).start()
+  }
+
+  useEffect(() => {
+    if (currentOrdersGroup?.loading || logisticOrders?.loading){
+      handleInitAnimation()
+    }
+  }, [currentOrdersGroup?.loading, logisticOrders?.loading])
+
   return (
     <>
       <View style={styles.header}>
@@ -477,12 +498,20 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             <WebsocketStatus />
           </View>
           {isNetConnected && (
-            <FeatherIcon
+            <AnimatedFeatherIcon
               name='refresh-cw'
               color={theme.colors.backgroundDark}
               size={24}
-              onPress={() => { currentTabSelected === 'logisticOrders' ? loadLogisticOrders && loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true }) }}
-              style={{ marginRight: 20 }}
+              onPress={() => currentTabSelected === 'logisticOrders' ? loadLogisticOrders && loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true })}
+              style={{
+                marginRight: 20,
+                transform: [{
+                  rotate: spinValue.interpolate({
+                    inputRange: [0, 0.3],
+                    outputRange: ['0deg', '360deg'],
+                  })
+                }]
+              }}
             />
           )}
           <FontistoIcon

package/themes/original/src/components/UserFormDetails/index.tsx

@@ -85,7 +85,7 @@ export const UserFormDetailsUI = (props: any) => {
 	const [, { showToast }] = useToast();
 	const { handleSubmit, control, errors, setValue } = useForm();
 
-	const [{ user }, { login }] = useSession();
+	const [{ user }, { login, logout }] = useSession();
 	const [userPhoneNumber, setUserPhoneNumber] = useState<any>(null);
 	const [isValid, setIsValid] = useState(false)
 	const [isChanged, setIsChanged] = useState(false)
@@ -247,9 +247,12 @@ export const UserFormDetailsUI = (props: any) => {
 			open: true,
 			content: [t('QUESTION_REMOVE_ACCOUNT', 'Are you sure that you want to remove your account?')],
 			title: t('ACCOUNT_ALERT', 'Account alert'),
-			handleOnAccept: () => {
+			handleOnAccept: async () => {
 				setConfirm({ ...confirm, open: false })
-				handleRemoveAccount && handleRemoveAccount(user?.id)
+				const response = await handleRemoveAccount?.(user?.id)
+				if (response === 'OK'){
+					logout()
+				}
 			}
 		})
 	}
@@ -355,7 +358,7 @@ export const UserFormDetailsUI = (props: any) => {
 																isDisabled={false}
 																value={
 																	formState?.changes[field.code] ??
-																	(user && user?.guest_id && field.code === 'email' ? user?.guest_email : user[field.code]) ??
+																	(user && user?.guest_id && field.code === 'email' ? user?.guest_email : user?.[field.code]) ??
 																	''
 																}
 																onChange={(val: any) => {
@@ -399,7 +402,7 @@ export const UserFormDetailsUI = (props: any) => {
 													)}
 													name={field.code}
 													rules={getInputRules(field)}
-													defaultValue={user && (field.code === 'email' && user?.guest_id ? user?.guest_email : user[field.code])}
+													defaultValue={user && (field.code === 'email' && user?.guest_id ? user?.guest_email : user?.[field.code])}
 												/>
 											</React.Fragment>
 										))