@eohjsc/react-native-smart-city 0.2.91 → 0.2.94

package/src/screens/Unit/components/__test__/MyUnitDevice.test.js

@@ -43,7 +43,7 @@ describe('Test MyUnitDevice', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(10);
+    expect(Views).toHaveLength(11);
 
     const touches = instance.findAllByType(TouchableOpacity);
     expect(touches).toHaveLength(1);
@@ -60,6 +60,6 @@ describe('Test MyUnitDevice', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(10);
+    expect(Views).toHaveLength(11);
   });
 });

package/src/screens/Unit/hook/useFavorites.js

@@ -0,0 +1,28 @@
+import { useMemo } from 'react';
+import { useSCContextSelector } from '../../../context';
+
+export const useFavorites = (stations, automatesData) => {
+  const favoriteDeviceIds = useSCContextSelector(
+    (state) => state.unit.favoriteDeviceIds
+  );
+  const starredScriptIds = useSCContextSelector(
+    (state) => state.automate.starredScriptIds
+  );
+
+  const favoriteDevices = useMemo(() => {
+    return []
+      .concat(...stations.map((station) => station.sensors || []))
+      .filter((device) => favoriteDeviceIds.includes(device.id));
+  }, [stations, favoriteDeviceIds]);
+
+  const favoriteAutomates = useMemo(() => {
+    return []
+      .concat(...automatesData.map((automateData) => automateData.data || []))
+      .filter((automate) => starredScriptIds.includes(automate?.script?.id));
+  }, [automatesData, starredScriptIds]);
+
+  return {
+    favoriteDevices,
+    favoriteAutomates,
+  };
+};

package/src/utils/Apis/axios.js

@@ -50,10 +50,11 @@ const parseErrorResponse = async (error) => {
     error,
     message,
     data,
+    resp_status: error?.response?.status,
   };
 };
 
-export async function axiosCache(URL) {
+export async function axiosCache(URL, resp_status) {
   const cacheKey = `@CACHE_REQUEST_${URL}`;
   const cachedData = await getData(cacheKey);
   if (!cachedData) {
@@ -64,6 +65,7 @@ export async function axiosCache(URL) {
     success: true,
     data: JSON.parse(cachedData),
     cache: true,
+    resp_status,
   };
 }
 
@@ -89,7 +91,10 @@ export async function axiosGet(URL, config = {}, cache = false) {
     if (cache) {
       // only network error or server error
       if (!error.response || error.response.status >= 500) {
-        return (await axiosCache(URL)) || (await parseErrorResponse(error));
+        return (
+          (await axiosCache(URL, error.response.status)) ||
+          (await parseErrorResponse(error))
+        );
       } else {
         await deleteData(cacheKey);
       }

package/src/utils/I18n/translations/en.json

@@ -646,7 +646,7 @@
   "last_updated": "Last updated",
   "emergency_contacts": "Emergency contacts",
   "emergency_contacts_hint": "Set up Emergency contacts for this unit in order to call urgently when you’re in an emergency situation.",
-  "emergency_max_contacts": "Maximum %{number} contacts",
+  "emergency_max_contacts": "Maximum {number} contacts",
   "parking_completed": "Parking Completed",
   "please_move_your_car_and_drive_back_safely": "Please move your car and drive back safely. Thank you for using our service.",
   "text_add_new_credit_card": "+ Add new credit card",
@@ -692,7 +692,7 @@
   "text_notification_content_replace_water_filter": "Filter **%{number_coil}** of **%{device_name}** in **%{unit_name}**: **%{sub_unit_name}** has less than 10h remaining. Check and replace now.",
   "text_notification_content_remove_unit_to_owner": "Unit **%{unit_name}** has been removed successfully.",
   "text_notification_content_remove_unit_to_member": "Unit **%{unit_name}** has been removed by **%{unit_owner_name}**. You cannot access to this unit anymore.",
-  "text_notification_content_remove_member": "You were remove from **%{unit_name}** by **%{unit_owner_name}**. You cannot access to this unit anymore.",
+  "text_notification_content_remove_member": "You were removed from **%{unit_name}** by **%{unit_owner_name}**. You cannot access to this unit anymore.",
   "text_notification_content_member_leave_unit": "**%{member_name}**  has left **%{unit_name}**.",
   "text_notification_content_rename_unit": "Unit **%{old_unit_name}** has been renamed to **%{new_unit_name}** by **%{owner_name}**.",
   "text_notification_content_divice_disconnect": "**%{device_name}** at **%{unit_name}**: **%{sub_unit_name}** has been disconnected. Please check and reconnect.",
@@ -932,12 +932,10 @@
   "deny": "DENY",
   "allow": "ALLOW",
   "avatar" : "Avatar",
-  "error_share_permission": "{text} {data} does not exist!",
-  "text_phone_share_permission": "The phone",
-  "text_email_share_permission": "Email",
   "mask_off": "Mask off",
   "mask_on": "Mask on",
   "stranger": "Stranger",
+  "image_from_camera": "Image from camera",
   "icon_unit": "Icon unit",
   "lock": "LOCK",
   "unlock": "UNLOCK",

package/src/utils/I18n/translations/vi.json

@@ -664,7 +664,7 @@
   "last_updated": "Đã cập nhật ",
   "emergency_contacts": "Danh sách liên hệ khẩn cấp",
   "emergency_contacts_hint": "Thiết lập danh bạ khẩn cấp cho địa điểm này để có thể liên lạc nhanh khi có tình huống khẩn cấp xảy ra.",
-  "emergency_max_contacts": "Tối đa %{number} liên hệ",
+  "emergency_max_contacts": "Tối đa {number} liên hệ",
   "parking_completed": "Đỗ xe hoàn tất!",
   "please_move_your_car_and_drive_back_safely": "Vui lòng dời xe của bạn khỏi vị trí đỗ.\nCảm ơn đã sử dụng dịch vụ đỗ xe SmartParking.",
   "text_add_new_credit_card": "+ Thêm thẻ tín dụng",
@@ -934,12 +934,10 @@
   "deny": "Từ chối",
   "allow": "Cho phép",
   "avatar" : "Ảnh đại diện",
-  "error_share_permission": "{text} {data} không tồn tại!",
-  "text_phone_share_permission": "Số điện thoại",
-  "text_email_share_permission": "Email",
   "mask_off": "Không có khẩu trang",
   "mask_on": "Có khẩu trang",
   "stranger": "Người lạ",
+  "image_from_camera": "Ảnh chụp",
   "icon_unit": "Ảnh đại diện địa điểm",
   "lock": "KHÓA",
   "unlock": "MỞ KHÓA",