@eohjsc/react-native-smart-city 0.7.46 → 0.7.48

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.7.46",
+  "version": "0.7.48",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -131,7 +131,7 @@
     "pluralize": "^8.0.0",
     "postinstall": "^0.7.0",
     "precompiled-mqtt": "^4.3.14-beta",
-    "pusher-js": "^8.4.0-rc2",
+    "pusher-js": "~8.4.3",
     "pusher-js-auth": "^4.0.1",
     "python-struct": "^1.1.3",
     "querystring": "^0.2.0",

package/src/commons/ViewButtonBottom/index.js

@@ -116,9 +116,10 @@ const styles = StyleSheet.create({
     paddingHorizontal: 16,
     position: 'absolute',
     bottom: 0,
+    backgroundColor: Colors.White,
   },
   button: {
-    paddingBottom: 10,
+    height: 48,
     width: '100%',
     flex: 1,
     justifyContent: 'center',

package/src/screens/AddNewGateway/SelectDeviceType.js

@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { ScrollView, TouchableOpacity, View } from 'react-native';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useNavigation } from '@react-navigation/native';
 
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -81,6 +82,7 @@ const SelectDeviceType = ({ route }) => {
   const [addType, setAddType] = useState();
   const [selectedAddType, setSelectedAddType] = useState();
   const permissions = useBackendPermission();
+  const insets = useSafeAreaInsets();
 
   const listDeviceType = useMemo(() => {
     const list = [
@@ -221,7 +223,9 @@ const SelectDeviceType = ({ route }) => {
   return (
     <View style={styles.container}>
       <HeaderCustom title={t('choose_type_of_device')} isShowSeparator />
-      <ScrollView style={styles.contentContainer}>
+      <ScrollView
+        style={{ ...styles.contentContainer, marginBottom: insets.bottom + 48 }}
+      >
         <SelectDeviceGrid options={listDeviceType} onSelect={handleOnSelect} />
       </ScrollView>
       <ViewButtonBottom

package/src/screens/AddNewGateway/SelectDeviceTypeStyles.js

@@ -10,7 +10,6 @@ export default StyleSheet.create({
   },
   contentContainer: {
     paddingTop: 16,
-    marginBottom: 48,
   },
   gridContainer: {
     flexDirection: 'row',

package/src/screens/Sharing/Components/Styles/ShareDeviceSelectorStyles.js

@@ -48,6 +48,6 @@ export default StyleSheet.create({
     fontSize: 14,
   },
   wrapViewButtonStyle: {
-    paddingTop: 48,
+    paddingTop: 42,
   },
 });