updated

Author: murphyc759

ios/cloudbeds.xcodeproj/project.pbxproj

@@ -586,7 +586,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = cloudbeds/cloudbeds.entitlements;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = 45V8A9SP6B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = cloudbeds/Info.plist;
@@ -616,7 +616,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = cloudbeds/cloudbeds.entitlements;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = 45V8A9SP6B;
 				INFOPLIST_FILE = cloudbeds/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

ios/cloudbeds/Info.plist

@@ -33,7 +33,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

src/Components/BottomTabNavigation/BottomTabNavigation.js

@@ -46,24 +46,27 @@ const BottomTabNavigation = ({ state, descriptors, navigation, insets }) => {
         })
 
         return (
-          <Box key={route.key} flex={1} alignItems={'center'}>
-            <Box
-              p="2"
-              rounded="lg"
-              borderColor={isFocused ? 'primary.500' : 'white'}
-              bg={isFocused ? 'primary.50' : null}
-              borderWidth="1">
-              <TouchableOpacity
-                accessibilityRole="button"
-                accessibilityState={isFocused ? { selected: true } : {}}
-                accessibilityLabel={options.tabBarAccessibilityLabel}
-                testID={options.tabBarTestID}
-                onPress={onPress}
-                onLongPress={onLongPress}>
+          <TouchableOpacity
+            key={route.key}
+            accessibilityRole="button"
+            accessibilityState={isFocused ? { selected: true } : {}}
+            accessibilityLabel={options.tabBarAccessibilityLabel}
+            testID={options.tabBarTestID}
+            // eslint-disable-next-line react-native/no-inline-styles
+            style={{ flex: 1 }}
+            onPress={onPress}
+            onLongPress={onLongPress}>
+            <Box alignItems={'center'}>
+              <Box
+                p="2"
+                rounded="lg"
+                borderColor={isFocused ? 'primary.500' : 'white'}
+                bg={isFocused ? 'primary.50' : null}
+                borderWidth="1">
                 <Square size="8">{icon}</Square>
-              </TouchableOpacity>
+              </Box>
             </Box>
-          </Box>
+          </TouchableOpacity>
         )
       })}
     </Box>

src/Hooks/api/useRefetchOnFocus.js

@@ -0,0 +1,19 @@
+import { useCallback, useRef } from 'react'
+import { InteractionManager } from 'react-native'
+import { useFocusEffect } from '@react-navigation/native'
+
+export function useRefreshOnFocus(refetch: () => void) {
+  const enabledRef = useRef(false)
+
+  useFocusEffect(
+    useCallback(() => {
+      InteractionManager.runAfterInteractions(() => {
+        if (enabledRef.current) {
+          refetch()
+        } else {
+          enabledRef.current = true
+        }
+      })
+    }, [refetch]),
+  )
+}

src/Hooks/api/useRefetchOnFocus.ts

@@ -105,13 +105,9 @@ export default function useUser(refresh = false) {
         hideProgress()
       }
     },
-    [
-      changeCurrentProperty,
-      changeProperties,
-      changeUserInfo,
-      hideProgress,
-      showProgress,
-    ],
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [changeCurrentProperty, changeProperties, changeUserInfo],
   )
 
   const clearTimers = useCallback(() => {

src/Hooks/useUser.ts

@@ -23,9 +23,9 @@ export const headerLeft = (
 
   return (
     <Pressable
-      width={8}
+      width={12}
       height={10}
-      alignItems={'flex-end'}
+      alignItems={'center'}
       justifyContent={'center'}
       onPress={backPress}>
       <FontAwesomeIcon icon={faChevronLeft as Icon} size={16} />

src/Navigation/header.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useState } from 'react'
+import React, { memo, useCallback, useMemo, useState } from 'react'
 import { Keyboard } from 'react-native'
 import {
   Actionsheet,
@@ -136,7 +136,9 @@ function AddNote() {
       placement: 'top',
       showClose: true,
     })
-  }, [hideProgress, showToast])
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [showToast])
 
   const successProcess = useCallback(
     (data: any, message: string) => {
@@ -155,7 +157,9 @@ function AddNote() {
         noteSussess(message)
       }
     },
-    [hideProgress, noteSussess, showToast],
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [noteSussess, showToast],
   )
 
   const updateNote = useCallback(() => {
@@ -236,14 +240,9 @@ function AddNote() {
     } else {
       sendReservationNote()
     }
-  }, [
-    isGuest,
-    selectedNote,
-    sendGuestNote,
-    sendReservationNote,
-    showProgress,
-    updateNote,
-  ])
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isGuest, selectedNote, sendGuestNote, sendReservationNote, updateNote])
 
   const reservationNoteDelete = useCallback(() => {
     deleteReservationNote(
@@ -302,13 +301,9 @@ function AddNote() {
     } else {
       reservationNoteDelete()
     }
-  }, [
-    guestNoteDelete,
-    isGuest,
-    onCloseDot,
-    reservationNoteDelete,
-    showProgress,
-  ])
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [guestNoteDelete, isGuest, onCloseDot, reservationNoteDelete])
 
   const openDot = useCallback(
     (item: ReservationNotesProps) => {
@@ -466,4 +461,4 @@ function AddNote() {
   )
 }
 
-export default AddNote
+export default memo(AddNote)

src/Screens/AddNote/index.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react'
-import { RefreshControl } from 'react-native'
+import { InteractionManager, RefreshControl } from 'react-native'
 import { useNavigation } from '@react-navigation/native'
 import { Box, Text, VStack, ScrollView, HStack } from 'native-base'
 import { AnimatedCircularProgress } from 'react-native-circular-progress'
@@ -37,7 +37,13 @@ function Dashboard() {
   const response = data ? data.data : {}
   const { arrivals, departures, inHouse, percentageOccupied } = response
 
-  useRefreshOnFocus(refetch)
+  const refetchs = useCallback(() => {
+    InteractionManager.runAfterInteractions(() => {
+      refetch()
+    })
+  }, [refetch])
+
+  useRefreshOnFocus(refetchs)
 
   const refetchAll = useCallback(() => {
     refetchAllReservations()

src/Screens/Dashboard/index.tsx

@@ -175,7 +175,9 @@ function Rooms() {
         noteSussess('')
       }
     },
-    [closeFilter, hideProgress, housekeepingFilters, noteSussess, showToast],
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [closeFilter, housekeepingFilters, noteSussess, showToast],
   )
 
   const errorProcess = useCallback(() => {
@@ -187,7 +189,9 @@ function Rooms() {
       placement: 'top',
       showClose: true,
     })
-  }, [hideProgress, showToast])
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [showToast])
 
   const setHousekeepingStatus = useCallback(
     (params: any) => {
@@ -202,7 +206,9 @@ function Rooms() {
         },
       })
     },
-    [errorProcess, postHousekeepingStatus, showProgress, successProcess],
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [errorProcess, postHousekeepingStatus, successProcess],
   )
 
   const changeDisturb = useCallback(
@@ -253,13 +259,14 @@ function Rooms() {
         )
       }
     },
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       errorProcess,
       housekeepingStatus?.roomID,
       postHousekeepingAssignment,
       sFilters,
       setHousekeepingStatus,
-      showProgress,
       showToast,
       successProcess,
     ],