@eohjsc/react-native-smart-city 0.3.48 → 0.3.50

package/src/commons/MediaPlayerDetail/__test__/MediaPlayerFull.test.js

@@ -9,7 +9,6 @@ const mockSetState = jest.fn();
 jest.mock('react', () => {
   return {
     ...jest.requireActual('react'),
-    memo: (x) => x,
     useState: jest.fn((init) => [init, mockSetState]),
   };
 });

package/src/commons/MenuActionMore/index.js

@@ -70,7 +70,10 @@ const MenuActionMore = memo(
                 }`}
                 disabled={isDisable}
               >
-                <Text style={[styles.modalHeaderText, item?.textStyle]}>
+                <Text
+                  accessibilityLabel={AccessibilityLabel.TEXT_SUB_UNIT}
+                  style={[styles.modalHeaderText, item?.textStyle]}
+                >
                   {item?.text}
                 </Text>
               </TouchableOpacity>

package/src/commons/NavBar/index.js

@@ -51,7 +51,7 @@ const NavBar = memo(
           childRef={childRef}
           onItemClick={onSnapToItem}
           isTextCenter={false}
-          accessibilityLabel={AccessibilityLabel.NAVBAR_MENU_ACTION_MORE}
+          idLabelPopover={AccessibilityLabel.NAVBAR_MENU_ACTION_MORE}
           wrapStyle={styles.wrapStyle}
           idLabelScrollView={idLabelScrollView}
           idLabelItem={idLabelItem}

package/src/commons/OneTapTemplate/OptionsDropdownActionTemplate.js

@@ -120,7 +120,7 @@ const OptionsDropdownActionTemplate = ({ device, data, onSelectAction }) => {
                 <Text
                   type="H4"
                   bold
-                  color={activeAction >= 0 ? Colors.Primary : Colors.Disabled}
+                  color={activeAction >= 0 ? Colors.Primary : Colors.TextGray}
                   style={styles.textButton}
                 >
                   {t('done')}

package/src/commons/OneTapTemplate/__test__/NumberUpDownActionTemplate.test.js

@@ -8,13 +8,6 @@ import { TouchableOpacity } from 'react-native';
 import Text from '../../Text';
 import { AccessibilityLabel } from '../../../configs/Constants';
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 const mockOnSelectAction = jest.fn();
 
 const wrapComponent = (data) => (

package/src/commons/OneTapTemplate/__test__/OptionsDropdownActionTemplate.test.js

@@ -8,13 +8,6 @@ import { RadioCircle } from '../..';
 import { TouchableOpacity } from 'react-native';
 import { AccessibilityLabel } from '../../../configs/Constants';
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 const mockOnSelectAction = jest.fn();
 
 const wrapComponent = (data) => (

package/src/commons/OneTapTemplate/__test__/StatesGridActionTemplate.test.js

@@ -7,13 +7,6 @@ import StatesGridActionTemplate from '../StatesGridActionTemplate';
 import { TouchableOpacity } from 'react-native';
 import { AccessibilityLabel } from '../../../configs/Constants';
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 const mockOnSelectAction = jest.fn();
 
 const wrapComponent = (data) => (

package/src/commons/Processing/styles.js

@@ -1,10 +1,8 @@
 import { StyleSheet } from 'react-native';
 import { Colors, Constants } from '../../configs';
-import { getStatusBarHeight } from 'react-native-iphone-x-helper';
 
 export default StyleSheet.create({
   wrap: {
-    paddingTop: getStatusBarHeight(true),
     backgroundColor: Colors.White,
     width: '100%',
     height: '100%',

package/src/commons/RowItem/index.js

@@ -5,6 +5,7 @@ import { Colors } from '../../configs';
 import Text from '../Text';
 import styles from './styles';
 import { CircleView } from '../CircleView';
+import AccessibilityLabel from '../../configs/AccessibilityLabel';
 
 const arrColor = [
   Colors.GeekBlue3,
@@ -49,7 +50,11 @@ export const RowItem = memo(
                 </View>
               )}
               <View style={styles.columeFlex}>
-                <Text numberOfLines={1} style={styles.titleName}>
+                <Text
+                  numberOfLines={1}
+                  style={styles.titleName}
+                  accessibilityLabel={AccessibilityLabel.TEXT_SUB_UNIT}
+                >
                   {text}
                 </Text>
                 {!!isShowSubText && (

package/src/commons/SelectUnit/index.js

@@ -67,7 +67,10 @@ const SelectUnit = ({ title, subTitle, onPressNext }) => {
     })();
   }, []);
   return (
-    <View style={styles.container}>
+    <View
+      style={styles.container}
+      accessibilityLabel={AccessibilityLabel.SELECT_UNIT}
+    >
       <HeaderCustom title={title} isShowSeparator />
       <Text style={styles.subtitle}>{subTitle}</Text>
       <View style={styles.contentContainer}>

package/src/commons/Sharing/WrapHeaderScrollable.js

@@ -5,9 +5,10 @@ import {
   Animated,
   View,
   Platform,
+  SafeAreaView,
 } from 'react-native';
 import { ActivityIndicator } from '@ant-design/react-native';
-import { getStatusBarHeight, isIphoneX } from 'react-native-iphone-x-helper';
+import { isIphoneX } from 'react-native-iphone-x-helper';
 
 import { Colors, Theme } from '../../configs';
 import HeaderAni, { heightHeader } from '../../commons/HeaderAni';
@@ -49,7 +50,8 @@ const WrapHeaderScrollable = ({
   );
 
   return (
-    <View style={[styles.container, headerAniStyle]}>
+    // NOTE: We have problem if don't use SafeAreaView in here. Hinh will remove it later
+    <SafeAreaView style={[styles.container, headerAniStyle]}>
       <HeaderAni
         scrollY={animatedScrollYValue}
         contentHeight={contentHeight}
@@ -103,7 +105,7 @@ const WrapHeaderScrollable = ({
           </View>
         )}
       </Animated.ScrollView>
-    </View>
+    </SafeAreaView>
   );
 };
 
@@ -112,7 +114,6 @@ export default memo(WrapHeaderScrollable);
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    paddingTop: getStatusBarHeight() + 10,
   },
   scrollView: {
     flex: 1,

package/src/commons/StatusBox/styles.js

@@ -3,7 +3,7 @@ import { Colors } from '../../configs';
 
 export default StyleSheet.create({
   viewStatus: {
-    width: 65,
+    width: 70,
     paddingHorizontal: 8,
     paddingVertical: 4,
     borderRadius: 54,
@@ -13,7 +13,7 @@ export default StyleSheet.create({
   },
   textStatus: {
     fontStyle: 'normal',
-    fontWeight: 600,
+    fontWeight: 'bold',
     letterSpacing: 0.04,
     fontSize: 12,
     lineHeight: 16,
@@ -21,7 +21,12 @@ export default StyleSheet.create({
     textAlign: 'center',
   },
   textOnline: {
-    fontStyle: 'bold',
+    letterSpacing: 0.04,
+    fontSize: 12,
+    lineHeight: 16,
+    fontStyle: 'normal',
+    fontWeight: 'bold',
+    color: Colors.Green11,
   },
   viewOnline: {
     backgroundColor: Colors.LightGreen,

package/src/commons/SubUnit/__test__/Favorites.test.js

@@ -13,13 +13,6 @@ const wrapComponent = (props) => (
   </SCProvider>
 );
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 const mockNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
   return {

package/src/commons/SubUnit/__test__/ShortDetail.test.js

@@ -16,13 +16,6 @@ const wrapComponent = (props) => (
   </SCProvider>
 );
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 jest.mock('react-native-permissions', () => {
   return mock;
 });

package/src/commons/Tabbar/__test__/index.test.js

@@ -23,13 +23,6 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 describe('Test HanetCameraDetail', () => {
   Date.now = jest.fn(() => new Date('2021-09-09T10:00:00.000Z'));
   let tree, props;

package/src/commons/Unit/__test__/HeaderUnit.test.js

@@ -14,11 +14,6 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('react', () => ({
-  ...jest.requireActual('react'),
-  memo: (x) => x,
-}));
-
 describe('Test HeaderUnit', () => {
   afterEach(() => {
     mockedGoBack.mockClear();

package/src/commons/UnitSummary/ConfigHistoryChart/__test__/ConfigHistoryChart.test.js

@@ -10,13 +10,6 @@ import { SCProvider } from '../../../../context';
 import API from '../../../../configs/API';
 import { getPusher } from '../../../../utils/Pusher';
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
 const mock = new MockAdapter(api.axiosInstance);
 
 const wrapComponent = (configs = []) => (
@@ -73,6 +66,7 @@ describe('Test HistoryChart', () => {
     const configs = [{ id: 1 }];
     await act(async () => {
       tree = await create(wrapComponent(configs));
+      jest.runAllTimers();
     });
     await assertChartData([]);
   });
@@ -98,6 +92,7 @@ describe('Test HistoryChart', () => {
     const configs = [{ id: 1 }];
     await act(async () => {
       tree = await create(wrapComponent(configs));
+      jest.runAllTimers();
     });
     await assertChartData([{ x: 1, y: 2 }]);
   });
@@ -123,6 +118,7 @@ describe('Test HistoryChart', () => {
     const configs = [{ id: 1 }];
     await act(async () => {
       tree = await create(wrapComponent(configs));
+      jest.runAllTimers();
     });
     await assertChartData([{ x: 1, y: 2 }]);
   });
@@ -148,6 +144,7 @@ describe('Test HistoryChart', () => {
     const configs = [{ id: 1 }];
     await act(async () => {
       tree = await create(wrapComponent(configs));
+      jest.runAllTimers();
     });
     await assertChartData([
       { x: 1, y: 2 },
@@ -178,6 +175,7 @@ describe('Test HistoryChart', () => {
     const configs = [{ id: 1 }];
     await act(async () => {
       tree = await create(wrapComponent(configs));
+      jest.runAllTimers();
     });
     await assertChartData([
       { x: 1, y: 2 },
@@ -190,7 +188,6 @@ describe('Test HistoryChart', () => {
     const cacheUrl = 'https://s3.eoh.io/xxx.json';
     const response = {
       data: {
-        channel: 'cache-xxx',
         configs: [
           {
             id: 1,
@@ -199,6 +196,7 @@ describe('Test HistoryChart', () => {
             middle: {
               ready: [],
               not_ready: [{ date: '2022-03-03', url: cacheUrl }],
+              channel: 'cache-xxx',
             },
           },
         ],
@@ -209,6 +207,7 @@ describe('Test HistoryChart', () => {
     const configs = [{ id: 1 }];
     await act(async () => {
       tree = await create(wrapComponent(configs));
+      jest.runAllTimers();
     });
     await assertChartData([
       { x: 1, y: 2 },
@@ -235,7 +234,6 @@ describe('Test HistoryChart', () => {
     const cacheUrl4 = 'https://s3.eoh.io/xxx4.json';
     const response = {
       data: {
-        channel: 'cache-xxx',
         configs: [
           {
             id: 1,
@@ -250,6 +248,7 @@ describe('Test HistoryChart', () => {
                 { date: '2022-03-03', url: cacheUrl2 },
                 { date: '2022-03-05', url: cacheUrl4 },
               ],
+              channel: 'cache-xxx',
             },
           },
         ],
@@ -263,6 +262,7 @@ describe('Test HistoryChart', () => {
     const configs = [{ id: 1 }];
     await act(async () => {
       tree = await create(wrapComponent(configs));
+      jest.runAllTimers();
     });
     await assertChartData([
       { x: 1, y: 2 },

package/src/commons/UnitSummary/ConfigHistoryChart/index.js

@@ -61,46 +61,44 @@ export const updateConfigChart = async (
     })
   );
 
-  if (data.channel) {
-    const channel = getPusher().subscribe(data.channel);
-    // eslint-disable-next-line no-shadow
-    channel.bind('caching-value-log-process', async ({ success }) => {
-      await Promise.all(
-        data.configs.map(async (config) => {
-          if (config.middle.not_ready.length) {
-            await Promise.all(
-              config.middle.not_ready.map(async (item) => {
-                item.data = await fetchDataS3(item.url);
-              })
-            );
-          }
-          const middleDataByDay = [
-            ...config.middle.not_ready,
-            ...config.middle.ready,
-          ];
-
-          // sort
-          middleDataByDay.sort((a, b) => (a.date > b.date ? 1 : -1)); // small to large
-          const middleData = middleDataByDay.map((x) => x.data).flat();
-
-          data_by_id[config.id] = [
-            ...config.head,
-            ...middleData,
-            ...config.tail,
-          ];
-        })
-      );
+  data.configs.map((config) => {
+    if (config.middle.not_ready.length > 0) {
+      const channel = getPusher().subscribe(config.middle.channel);
+      channel.bind('caching-value-log-process', async ({ success }) => {
+        await Promise.all(
+          config.middle.not_ready.map((item) =>
+            (async () => {
+              item.data = await fetchDataS3(item.url);
+            })()
+          )
+        );
+        const middleDataByDay = [
+          ...config.middle.not_ready,
+          ...config.middle.ready,
+        ];
 
-      setChartData(
-        configuration.map((config) => {
-          config.data = data_by_id[config.id];
-          return config;
-        })
-      );
-    });
-  }
+        middleDataByDay.sort((a, b) => (a.date > b.date ? 1 : -1)); // small to large
+        const middleData = middleDataByDay.map((x) => x.data).flat();
+        data_by_id[config.id] = [...config.head, ...middleData, ...config.tail];
+        setChartData((chartData) => {
+          const index = chartData.map((c) => c.id).indexOf(config.id);
+          chartData[index].data = data_by_id[config.id];
+          return [...chartData];
+        });
+      });
+    }
+  });
 };
 
+const areEqual = ({ configs: oldConfigs }, { configs: newConfigs }) => {
+  return (
+    JSON.stringify(oldConfigs.map((config) => config.id).sort()) ===
+    JSON.stringify(newConfigs.map((config) => config.id).sort())
+  );
+};
+
+let timeoutId;
+
 const ConfigHistoryChart = memo(({ configs }) => {
   const [chartData, setChartData] = useState(configs);
   const [startDate, setStartDate] = useState(
@@ -128,7 +126,11 @@ const ConfigHistoryChart = memo(({ configs }) => {
       });
       updateConfigChart(success, data, configuration, setChartData);
     };
-    fetchData();
+
+    timeoutId = setTimeout(fetchData, 200);
+    return () => {
+      clearTimeout(timeoutId);
+    };
   }, [startDate, endDate, configs]);
 
   if (!chartData.length) {
@@ -143,6 +145,6 @@ const ConfigHistoryChart = memo(({ configs }) => {
       setEndDate={setEndDate}
     />
   );
-});
+}, areEqual);
 
 export default ConfigHistoryChart;

package/src/configs/API.js

@@ -215,6 +215,34 @@ const API = {
       LIST: () => '/chip_manager/developer_mode_chips/',
       DETAIL: (id) => `/chip_manager/developer_mode_chips/${id}/`,
     },
+    ZIGBEE: {
+      SEARCH_DEVICE: (id) => `/iot/modules/zigbee/chips/${id}/search_device/`,
+      DEVICE_CONFIGURATION: (id, deviceId) =>
+        `/iot/modules/zigbee/chips/${id}/sensors/${deviceId}/configuration/`,
+      CONFIGURATION: (id) => `/iot/modules/zigbee/chips/${id}/configuration/`,
+      DEVICE: (gatewayId) =>
+        `/iot/modules/zigbee/gateways/${gatewayId}/devices/`,
+      DEVICE_DETAIL: (gatewayId, deviceId) =>
+        `/iot/modules/zigbee/gateways/${gatewayId}/devices/${deviceId}/`,
+      CONFIG_MAP: (gatewayId, deviceId) =>
+        `/iot/modules/zigbee/gateways/${gatewayId}/devices/${deviceId}/config_maps/`,
+      ACTION: (gatewayId, deviceId) =>
+        `/iot/modules/zigbee/gateways/${gatewayId}/devices/${deviceId}/zigbee_actions/`,
+    },
+    MODBUS: {
+      DEVICE: (gatewayId) =>
+        `/iot/modules/modbus/gateways/${gatewayId}/devices/`,
+      DEVICE_DETAIL: (gatewayId, deviceId) =>
+        `/iot/modules/modbus/gateways/${gatewayId}/devices/${deviceId}/`,
+      REGISTER: (gatewayId, deviceId) =>
+        `/iot/modules/modbus/gateways/${gatewayId}/devices/${deviceId}/registers/`,
+      ACTION: (gatewayId, deviceId) =>
+        `/iot/modules/modbus/gateways/${gatewayId}/devices/${deviceId}/actions/`,
+      ACTION_DETAIL: (gatewayId, deviceId, actionId) =>
+        `/iot/modules/modbus/gateways/${gatewayId}/devices/${deviceId}/actions/${actionId}/`,
+      ACTION_ITEM_DETAIL: (actionId, actionItemId) =>
+        `/iot/modules/modbus/actions/${actionId}/items/${actionItemId}/`,
+    },
   },
 };
 

package/src/configs/AccessibilityLabel.js

@@ -262,6 +262,7 @@ export default {
   ADD_SUB_UNIT_NAME_FIELD: 'ADD_SUB_UNIT_NAME_FIELD',
   ADD_SUB_UNIT_BUTTON_CHOOSE_PHOTO: 'ADD_SUB_UNIT_BUTTON_CHOOSE_PHOTO',
   ADD_SUB_UNIT_BUTTON_CHOOSE_LOCATION: 'ADD_SUB_UNIT_BUTTON_CHOOSE_LOCATION',
+  TITLE_SUB_UNIT: 'TITLE_SUB_UNIT',
 
   SCANNING_RESPONSE_TITLE: 'SCANNING_RESPONSE_TITLE',
   SCANNING_RESPONSE_DESCRIPTION: 'SCANNING_RESPONSE_DESCRIPTION',
@@ -342,6 +343,7 @@ export default {
   MANAGE_SUB_UNIT_NAME: 'MANAGE_SUB_UNIT_NAME',
   MANAGE_SUB_UNIT_REMOVE_BUTTON: 'MANAGE_SUB_UNIT_REMOVE_BUTTON',
   MANAGE_SUB_UNIT_SELECT_FILE_BUTTON: 'MANAGE_SUB_UNIT_SELECT_FILE_BUTTON',
+  MANAGE_SUB_UNIT: 'MANAGE_SUB_UNIT',
 
   BUTTON_POPUP_RESOLVED: 'BUTTON_POPUP_RESOLVED',
   BUTTON_POPUP_RESOLVED_TITLE: 'BUTTON_POPUP_RESOLVED_TITLE',
@@ -415,11 +417,13 @@ export default {
   SELECT_SUBUNIT_NAME: 'SELECT_SUBUNIT_NAME',
   SELECT_SUBUNIT_RADIO_BUTTON: 'SELECT_SUBUNIT_RADIO_BUTTON',
   SELECT_SUBUNIT_SELECT: 'SELECT_SUBUNIT_SELECT',
+  TEXT_SUB_UNIT: 'TEXT_SUB_UNIT',
 
   // Select unit
   SELECT_UNIT_NAME: 'SELECT_UNIT_NAME',
   SELECT_UNIT_RADIO_BUTTON: 'SELECT_UNIT_RADIO_BUTTON',
   SELECT_UNIT_SELECT: 'SELECT_UNIT_SELECT',
+  SELECT_UNIT: 'SELECT_UNIT',
   SELECT_MEMBER_UNIT: 'SELECT_MEMBER_UNIT',
 
   // select wifi
@@ -649,8 +653,17 @@ export default {
   BUTTON_REMOVE_EDIT_ACTION_LIST: 'BUTTON_REMOVE_EDIT_ACTION_LIST',
   // GATEWAY
   LIST_GATEWAY: 'LIST_GATEWAY',
+  GATEWAY_INFO_ALERT: 'GATEWAY_INFO_ALERT',
+  GATEWAY_INFO_BUTTON_GOTO_CONNECTION_METHODS:
+    'GATEWAY_INFO_BUTTON_GOTO_CONNECTION_METHODS',
+  GATEWAY_INFO_BUTTON_DELETE_GATEWAY: 'GATEWAY_INFO_BUTTON_DELETE_GATEWAY',
+  MENU_POPPER_MORE: 'MENU_POPPER_MORE',
+  GATEWAY_CONNECTION_METHODS_TEXT: 'GATEWAY_CONNECTION_METHODS_TEXT',
   //Notification
   CUSTOM_TEXT: 'CUSTOM_TEXT',
   //ButtonWrapper
   BUTTON_WRAPPER: 'BUTTON_WRAPPER',
+  //devmod
+  TAB_PANE_CT_FLATLIST: 'TAB_PANE_CT_FLATLIST',
+  ROW_ITEM_DEVMOD: 'ROW_ITEM_DEVMOD',
 };

package/src/configs/Colors.js

@@ -61,6 +61,7 @@ export const Colors = {
   Gray18: '#9B9A9B',
   Gray19: '#E5E5E5',
   Gray20: '#808080',
+  Gray21: '#F2F2F2',
 
   // Range Green
   Green1: '#F6FFED',
@@ -70,6 +71,7 @@ export const Colors = {
   Green8: '#D9F7BE',
   Green9: '#389E0D',
   Green10: '#237804',
+  Green11: '#008040',
 
   //Yellow
   Yellow6: '#FADB14',
@@ -112,6 +114,8 @@ export const Colors = {
   Blue11: '#096DD9',
   Blue12: '#0050B3',
   Blue13: '#E2F0F8',
+  Blue14: '#D9ECFF',
+  Blue15: '#99CCFF',
 
   //Range Volcano:
   Volcano3: '#FFBB96',

package/src/configs/Constants.js

@@ -84,6 +84,12 @@ export const DEVICE_TYPE = {
   WIFI_DEVICE: 'WIFI_DEVICE',
   MODBUS: 'MODBUS',
 };
+export const PERMISSION_TYPE = {
+  ACTION: 'ACTION',
+  CONFIG: 'CONFIG',
+  CONFIG_WRITE: 'CONFIG_WRITE',
+  CONFIG_READ: 'CONFIG_READ',
+};
 
 const marginItem = 12;
 const marginHorizontal = 16;
@@ -248,6 +254,7 @@ export const NOTIFICATION_TYPES = {
   FIRE: 'FIRE',
   SOS: 'SOS',
   FILTER_WATER: 'FILTER_WATER',
+  LOW_BATTERY: 'LOW_BATTERY',
 };
 
 export const ACTIVITY_LOG_TYPES = {
@@ -270,6 +277,7 @@ export const PROBLEM_CODE = {
   UNKNOWN_ERROR: 'UNKNOWN_ERROR',
   CANCEL_ERROR: 'CANCEL_ERROR',
   ADDRESS_CHANGING: 'Please wait 30s for changing address.',
+  READ_CONFIG_PERMISSION: 'read_config_permission_error',
 };
 
 export const DATE_TIME_FORMAT = {

package/src/configs/Images.js

@@ -24,4 +24,5 @@ export default {
   removeCircle: require('../Images/DevMode/remove_circle.png'),
   dienquang: require('../Images/SmartAccount/DienQuang.png'),
   lg: require('../Images/SmartAccount/LG.png'),
+  inforCode: require('../Images/DevMode/inforCode.png'),
 };

package/src/configs/SCConfig.js

@@ -86,6 +86,7 @@ LocaleConfig.locales.en = {
 };
 
 const SCDefaultConfig = {
+  ENV: 'PRODUCTION',
   apiRoot: 'https://backend.eoh.io/api',
   GOOGLE_MAP_API_KEY: 'AIzaSyCF1Q-WFXCnfAHhOeXRF9WK7eT-TtxO9ss',
   LG_CLIENT_ID: '2b85aee334f046848341547894bb7c4e',
@@ -100,6 +101,7 @@ const SCDefaultConfig = {
 
 export class SCConfig {
   static apiRoot = SCDefaultConfig.apiRoot;
+  static ENV = SCDefaultConfig.ENV;
   static GOOGLE_MAP_API_KEY = SCDefaultConfig.GOOGLE_MAP_API_KEY;
   static LG_CLIENT_ID = SCDefaultConfig.LG_CLIENT_ID;
   static LG_REDIRECT_URI_APP = SCDefaultConfig.LG_REDIRECT_URI_APP;
@@ -115,6 +117,7 @@ export class SCConfig {
 export const initSCConfig = (config) => {
   api.setBaseURL(config.apiRoot ?? SCDefaultConfig.apiRoot);
   LocaleConfig.defaultLocale = config.language ?? SCConfig.language;
+  SCConfig.ENV = config.ENV ?? SCConfig.ENV;
   SCConfig.language = config.language ?? SCConfig.language;
   SCConfig.apiRoot = config.apiRoot ?? SCDefaultConfig.apiRoot;
   SCConfig.GOOGLE_MAP_API_KEY =

package/src/context/actionType.ts

@@ -18,6 +18,8 @@ export const Action = {
   STAR_SCRIPTS: 'STAR_SCRIPTS',
   UNSTAR_SCRIPTS: 'UNSTAR_SCRIPTS',
   SET_BLUETOOTH_CONNECTED_DEVICE: 'SET_BLUETOOTH_CONNECTED_DEVICE',
+  SET_BLUETOOTH_PERM_REQUESTED: 'SET_BLUETOOTH_PERM_REQUESTED',
+  SET_BLUETOOTH_PERM_GRANTED: 'SET_BLUETOOTH_PERM_GRANTED',
   SET_HOME_ASSISTANT_CONNECTIONS: 'SET_HOME_ASSISTANT_CONNECTIONS',
   CHANGE_HOME_ASSISTANT_CONN_STATE: 'CHANGE_HOME_ASSISTANT_CONN_STATE',
   SET_LG_THINQ_CONNECTED: 'SET_LG_THINQ_CONNECTED',
@@ -87,7 +89,6 @@ export type AppType = {
   isFirstOpenCamera: boolean;
   isLavidaSource: boolean;
   isConnectWifiGateway: boolean;
-  isBluetoothEnabled: boolean;
   isNetworkConnected: boolean;
   camera_opened: any[];
   notificationData: any;
@@ -115,3 +116,9 @@ export type DevModeType = {
   isEditingTemplate: boolean;
   isInEditTemplateScreen: boolean;
 };
+
+export type BluetoothType = {
+  isEnabled: boolean;
+  permissionsGranted: boolean;
+  permissionsRequested: boolean;
+};