@eohjsc/react-native-smart-city 0.2.63 → 0.2.64

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.2.63",
+  "version": "0.2.64",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/navigations/SharedStack.js

@@ -12,7 +12,7 @@ import Routes from '../utils/Route';
 const Stack = createStackNavigator();
 const SharedStack = memo(() => {
   const t = useTranslations();
-  const navigation = useNavigation();
+  const { toggleDrawer, goBack } = useNavigation();
   const { params } = useRoute();
   return (
     <Stack.Navigator>
@@ -21,15 +21,17 @@ const SharedStack = memo(() => {
         component={Shared}
         options={{
           title: t('text_shared_with_me'),
-          headerLeft: () =>
-            params?.isMainSource && (
-              <TouchableOpacity
-                style={styles.btnMenu}
-                onPress={() => navigation.toggleDrawer()}
-              >
-                <Icon name={'menu'} color={Colors.Black} />
-              </TouchableOpacity>
-            ),
+          headerLeft: () => (
+            <TouchableOpacity
+              style={styles.btnMenu}
+              onPress={() => (params?.isMainSource ? toggleDrawer() : goBack())}
+            >
+              <Icon
+                name={params?.isMainSource ? 'menu' : 'arrow-left'}
+                color={Colors.Black}
+              />
+            </TouchableOpacity>
+          ),
           headerTitleAlign: 'left',
           headerStyle: {
             backgroundColor: Colors.Gray2,

package/src/screens/AddNewGateway/AddNewGatewayStyles.js

@@ -1,10 +1,15 @@
-import { StyleSheet } from 'react-native';
+import { StyleSheet, StatusBar, Platform } from 'react-native';
 import { Colors } from '../../configs';
 
 export default StyleSheet.create({
   wrap: {
     flex: 1,
     backgroundColor: Colors.Gray2,
+    ...Platform.select({
+      android: {
+        paddingTop: StatusBar.currentHeight,
+      },
+    }),
   },
   textHeader: {
     marginTop: 16,

package/src/screens/ScriptDetail/Styles/indexStyles.js

@@ -159,4 +159,7 @@ export default StyleSheet.create({
   paddingRight4: {
     paddingRight: 4,
   },
+  flex1: {
+    flex: 1,
+  },
 });

package/src/screens/ScriptDetail/index.js

@@ -269,7 +269,12 @@ const ScriptDetail = ({ route }) => {
               >
                 {item?.unit_name}
               </Text>
-              <Text numberOfLines={1} type="Label" color={Colors.Gray7}>
+              <Text
+                numberOfLines={1}
+                type="Label"
+                color={Colors.Gray7}
+                style={styles.flex1}
+              >
                 {item?.station_name}
               </Text>
             </View>

package/src/screens/Unit/Detail.js

@@ -260,6 +260,7 @@ const UnitDetail = ({ route }) => {
           isOwner={isOwner}
           favorites={favorites}
           wrapItemStyle={styles.wrapItemStyle}
+          isGGHomeConnected={isGGHomeConnected}
         />
       );
     }