@ledvance/ui-biz-bundle 1.1.165 → 1.1.167

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.1.165",
+  "version": "1.1.167",
   "scripts": {},
   "dependencies": {
     "@ledvance/base": "^1.x",

package/src/modules/flags/FlagInfo.tsx

@@ -88,6 +88,7 @@ export const defFlagList: FlagUiInfo[] = [
   {
     id: 249,
     name: I18n.getLang('country_TR'),
+    groupKey: 'latam_2026_d',
     ...defFlagConfig,
     colors: [{ h: 360, s: 100, v: 100 }, { h: 360, s: 100, v: 100 }, { h: 0, s: 0, v: 100 }]
   },
@@ -164,6 +165,7 @@ export const defFlagList: FlagUiInfo[] = [
   {
     id: 237,
     name: I18n.getLang('country_CZ'),
+    groupKey: 'latam_2026_a',
     ...defFlagConfig,
     colors: [{ h: 360, s: 100, v: 100 }, { h: 0, s: 0, v: 100 }, { h: 211, s: 100, v: 100 }]
   },
@@ -183,6 +185,7 @@ export const defFlagList: FlagUiInfo[] = [
   {
     id: 234,
     name: I18n.getLang('country_SE'),
+    groupKey: 'latam_2026_f',
     ...defFlagConfig,
     colors: [{ h: 201, s: 100, v: 100 }, { h: 48, s: 99, v: 100 }, { h: 201, s: 100, v: 100 }]
   },
@@ -630,6 +633,7 @@ export const defFlagList: FlagUiInfo[] = [
   {
     id: 163,
     name: I18n.getLang('country_BA'),
+    groupKey: 'latam_2026_b',
     ...defFlagConfig,
     colors: [{"h":0,"s":0,"v":100}, {"h":214,"s":100,"v":42}, {"h":48,"s":100,"v":100}],
   },
@@ -687,4 +691,18 @@ export const defFlagList: FlagUiInfo[] = [
     ...defFlagConfig,
     colors: [{"h":207,"s":100,"v":81}, {"h":0,"s":0,"v":100}, {"h":109,"s":76,"v":69}],
   },
+  {
+    id: 154,
+    name: I18n.getLang('country_IQ'),
+    groupKey: 'latam_2026_i',
+    ...defFlagConfig,
+    colors: [{"h":353,"s":92,"v":81}, {"h":0,"s":0,"v":100}, {"h":0,"s":0,"v":0}, {"h":150,"s":100,"v":48}],
+  },
+    {
+    id: 153,
+    name: I18n.getLang('country_CD'),
+    groupKey: 'latam_2026_k',
+    ...defFlagConfig,
+    colors: [{ h: 200, s: 100, v: 79 }, { h: 49, s: 100, v: 100 }, { h: 356, s: 79, v: 94 },],
+  },
 ]

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -3,7 +3,6 @@ import I18n from '@ledvance/base/src/i18n'
 import { useDp } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import {
   DpReportSataData,
-  DpResultByMonthResData,
   getDataWithSpecified,
   getDpResultByHour,
   getDpResultByMonth,
@@ -148,7 +147,8 @@ export interface PowerDataItem {
   key: string
   chartTitle: string
   time: number,
-  value: number
+  value: number,
+  interval: number,
 }
 
 // 常量抽离（便于维护）
@@ -161,21 +161,6 @@ const RETRY_CONFIG = {
   backoffFactor: 2,
 } as const;
 
-/**
- * 创建一个0值填充的数据点
- * @param timePoint Dayjs对象
- * @returns PowerDataItem
- */
-function createZeroPaddingPoint(timePoint: dayjs.Dayjs): PowerDataItem {
-  const timeMs = timePoint.valueOf();
-  return {
-    key: timePoint.format('HH:mm:ss'),
-    chartTitle: timePoint.format('MM/DD/YYYY HH:mm:ss'),
-    time: timeMs,
-    value: 0,
-  };
-}
-
 /**
  * 获取设备功率数据
  * @param devId 设备ID
@@ -205,7 +190,8 @@ export async function getPowerData(devId: string, powerDpCode: string, interval:
       key: dp.timeStr,
       chartTitle: dayjs.unix(dp.timeStamp).format('MM/DD/YYYY HH:mm:ss'),
       time: dp.timeStamp * 1000,
-      value: parseFloat(dp.value) / 10
+      value: parseFloat(dp.value) / 10,
+      interval: interval
     }
   })
 }

package/src/newModules/energyConsumption/EnergyConsumptionChart/PowerChartSection.tsx

@@ -3,12 +3,13 @@ import React from 'react'
 import { Text, TouchableOpacity, View } from 'react-native'
 import PowerLineChart from '../component/PowerLineChart'
 import { EmptyDataView } from './EmptyDataView'
+import { PowerRangeInterval } from '../co2Data'
 
 const INTERVAL_OPTIONS = [
-  { label: 'charttime_type1', value: 24 * 60 },
-  { label: 'charttime_type2', value: 6 * 60 },
-  { label: 'charttime_type3', value: 60 },
-  { label: 'charttime_type4', value: 5 },
+  { label: 'charttime_type1', value: PowerRangeInterval.DAY_1 },
+  { label: 'charttime_type2', value: PowerRangeInterval.HOUR_6 },
+  { label: 'charttime_type3', value: PowerRangeInterval.HOUR_1 },
+  { label: 'charttime_type4', value: PowerRangeInterval.MINUTE_5 },
 ]
 
 export const PowerChartSection = ({ isLandscape, state, actions, styles, theme, chartHeight }) => {

package/src/newModules/energyConsumption/co2Data.ts

@@ -23664,3 +23664,10 @@ export enum ChartType {
   kWh = 'kWh',
   Watt = 'Watt',
 }
+
+export enum PowerRangeInterval {
+  MINUTE_5 = 5,
+  HOUR_1 = 1 * 60,
+  HOUR_6 = 6 * 60,
+  DAY_1 = 24 * 60,
+}

package/src/newModules/energyConsumption/component/PowerLineChart.tsx

@@ -5,6 +5,7 @@ import React, { useRef } from 'react'
 import { View } from 'react-native'
 import { Utils } from 'tuya-panel-kit'
 import { PowerDataItem } from '../EnergyConsumptionActions'
+import { PowerRangeInterval } from '../co2Data'
 import dayjs from 'dayjs'
 
 const { withTheme } = Utils.ThemeUtils
@@ -24,6 +25,8 @@ const GAP_THRESHOLD_MS = 5 * 1000 // 5 秒
  */
 function fillGaps(items: PowerDataItem[]): PowerDataItem[] {
   if (!items || items.length < 2) return items
+  // MINUTE_5 模式下数据点本身间隔约 30s，不做间隙补充
+  if (items[0].interval === PowerRangeInterval.MINUTE_5) return items
   const result: PowerDataItem[] = []
   for (let i = 0; i < items.length; i++) {
     result.push(items[i])
@@ -45,10 +48,11 @@ function fillGaps(items: PowerDataItem[]): PowerDataItem[] {
         }
         const gapDayjs = dayjs(gapTime)
         result.push({
-          key: gapDayjs.format('YYYY-MM-DD HH:mm:ss'),
+          key: gapDayjs.format('MM/DD/YYYY HH:mm:ss'),
           chartTitle: gapDayjs.format('MM/DD/YYYY HH:mm:ss'),
           time: gapTime,
           value: gapValue,
+          interval: cur.interval,
         })
       }
     }
@@ -73,7 +77,18 @@ const PowerLineChart = (props: PowerLineChartProps) => {
       show: true,
       triggerOn: 'mousemove|click',
       trigger: 'axis',
-      position: ['30%', '50%']
+      position: ['30%', '50%'],
+      formatter: function (params) {
+        if (!params || !params.length) return ''
+        var item = params[0]
+        var date = new Date(item.value[0])
+        function pad(num) {
+          return num < 10 ? '0' + num : num
+        }
+        var time = pad(date.getMonth() + 1) + '/' + pad(date.getDate()) + '/' + date.getFullYear() + ' ' +
+          pad(date.getHours()) + ':' + pad(date.getMinutes()) + ':' + pad(date.getSeconds())
+        return (time + '<br/>' + item.marker + item.seriesName + ': ' + item.value[1])
+      }
     },
     grid: {
       right: '5%'

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -346,7 +346,7 @@ const newFixedTime = (isPlug: boolean) => {
     enable: true,
     weeks: [0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,
-    endTime: startTime + 60,
+    endTime: startTime + 30, //Fix https://ledvance.atlassian.net/browse/SUH-12973
     closeTime: 1,
     openTime: 1,
     channel: isPlug ? 0 : 1,

package/src/newModules/randomTime/RandomTimePage.tsx

@@ -347,7 +347,7 @@ const newRandomTime = (isPlug: boolean) => {
     enable: true,
     weeks: [0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,
-    endTime: startTime + 60,
+    endTime: startTime + 30, //Fix https://ledvance.atlassian.net/browse/SUH-12973
     channel: isPlug ? 0 : 1,
     color: {
       h: 0,

package/src/newModules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -454,59 +454,61 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
         <Spacer height={cx(30)} />
 
         {/* Apply for */}
-        <View style={styles.cardContainer}>
-          <Text style={styles.itemTitle}>
-            {I18n.getLang('timeschedule_add_schedule_subheadline_text')}
-          </Text>
-          <Spacer height={cx(10)} />
-          <View style={[styles.applyContent, { paddingTop: state.selectedSkill.length ? cx(10) : 0 }]}>
-            {state.selectedSkill.length === 0 ? (
-              <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('timer_ceiling_fan_selectionfield_no_components_text')}</Text>
-            ) : (
-              state.selectedSkill.map(skill => (
-                <View
-                  style={[styles.applyItem, { marginBottom: cx(10), borderRadius: 4 }]}
-                  key={skill.dp}
+        {(!params.applyForDisabled && params.applyForList.length > 1) && (
+          <View style={styles.cardContainer}>
+            <Text style={styles.itemTitle}>
+              {I18n.getLang('timeschedule_add_schedule_subheadline_text')}
+            </Text>
+            <Spacer height={cx(10)} />
+            <View style={[styles.applyContent, { paddingTop: state.selectedSkill.length ? cx(10) : 0 }]}>
+              {state.selectedSkill.length === 0 ? (
+                <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('timer_ceiling_fan_selectionfield_no_components_text')}</Text>
+              ) : (
+                state.selectedSkill.map(skill => (
+                  <View
+                    style={[styles.applyItem, { marginBottom: cx(10), borderRadius: 4 }]}
+                    key={skill.dp}
+                  >
+                    <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>{skill.key}</Text>
+                    {showSelectedIcon && (
+                      <TouchableOpacity
+                        onPress={() => {
+                          state.selectedSkill = state.selectedSkill.filter(s => skill.dp !== s.dp);
+                          state.unSelectedSkill = [...state.unSelectedSkill, skill];
+                        }}
+                        style={{ paddingHorizontal: cx(5) }}
+                      >
+                        <Image
+                          style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }}
+                          source={{ uri: res.ic_arrows_nav_clear}}
+                        />
+                      </TouchableOpacity>
+                    )}
+                  </View>
+                ))
+              )}
+            </View>
+            {state.unSelectedSkill.map((item: ApplyForItem) => {
+              return (
+                <TouchableOpacity
+                  style={styles.applyItem}
+                  key={item.dp}
+                  onPress={() => {
+                    state.selectedSkill = [...state.selectedSkill, item];
+                    state.unSelectedSkill = state.unSelectedSkill.filter(s => item.dp !== s.dp);
+                  }}
                 >
-                  <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>{skill.key}</Text>
-                  {showSelectedIcon && (
-                    <TouchableOpacity
-                      onPress={() => {
-                        state.selectedSkill = state.selectedSkill.filter(s => skill.dp !== s.dp);
-                        state.unSelectedSkill = [...state.unSelectedSkill, skill];
-                      }}
-                      style={{ paddingHorizontal: cx(5) }}
-                    >
-                      <Image
-                        style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }}
-                        source={{ uri: res.ic_arrows_nav_clear}}
-                      />
-                    </TouchableOpacity>
-                  )}
-                </View>
-              ))
-            )}
+                  <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>{item.key}</Text>
+                  <Image
+                    style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }}
+                    source={{ uri: res.device_panel_timer_add}}
+                  />
+                </TouchableOpacity>
+              );
+            })}
+            <Spacer />
           </View>
-          {state.unSelectedSkill.map((item: ApplyForItem) => {
-            return (
-              <TouchableOpacity
-                style={styles.applyItem}
-                key={item.dp}
-                onPress={() => {
-                  state.selectedSkill = [...state.selectedSkill, item];
-                  state.unSelectedSkill = state.unSelectedSkill.filter(s => item.dp !== s.dp);
-                }}
-              >
-                <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>{item.key}</Text>
-                <Image
-                  style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }}
-                  source={{ uri: res.device_panel_timer_add}}
-                />
-              </TouchableOpacity>
-            );
-          })}
-          <Spacer />
-        </View>
+        )}
 
         {/* device state */}
         <Text style={[styles.itemTitle, styles.cardContainer]}>

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

@@ -1,3 +1,4 @@
+import { xLog } from '@ledvance/base/src/utils'
 import React, { useCallback, useEffect, useMemo } from 'react';
 import { ScrollView, Text, StyleSheet, FlatList, View, Image } from 'react-native';
 import { useNavigation } from '@react-navigation/core';
@@ -14,7 +15,7 @@ import Spacer from '@ledvance/base/src/components/Spacer';
 import InfoText from '@ledvance/base/src/components/InfoText';
 import DeleteButton from '@ledvance/base/src/components/DeleteButton';
 import { useReactive, useUpdateEffect } from 'ahooks';
-import {DeviceStateType, SuggestItem, Timer, TimerActions} from './Interface';
+import {DeviceStateType, SuggestItem, Timer, TimerActions, DeviceType, SirenData} from './Interface';
 import { getTimeSchedule, manageTimeSchedule } from './TimeScheduleActions';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import ScheduleCard from './components/ScheduleCard';
@@ -23,7 +24,7 @@ import Tag from '@ledvance/base/src/components/Tag';
 import { cloneDeep } from 'lodash';
 import ThemeType from '@ledvance/base/src/config/themeType'
 import { showDialog } from '@ledvance/base/src/utils/common';
-import { ApplyForItem } from '@ledvance/base/src/utils/interface';
+import { AlarmState, ApplyForItem } from '@ledvance/base/src/utils/interface'
 import FeatureInfo from "@ledvance/base/src/components/FeatureInfo"
 
 const { convertX: cx } = Utils.RatioUtils;
@@ -74,6 +75,14 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
     state.originList,
   ]);
 
+  const alarmStateValueMap = useMemo(() => {
+    return {
+      [AlarmState.AlarmSound]: I18n.getLang('siren_alarm_type_sound'),
+      [AlarmState.AlarmLight]: I18n.getLang('siren_alarm_type_light'),
+      [AlarmState.AlarmSoundAndLight]: I18n.getLang('siren_alarm_type_sound_light'),
+    }
+  }, [])
+
   useUpdateEffect(() => {
     const status = state.originList.some(item => item.enable);
     if (status !== timeScheduleStatus) {
@@ -148,6 +157,51 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
     });
   }, []);
 
+  const calculateTagStatus: (item: Timer) => ApplyForItem[] = useCallback((item: Timer) => {
+    return params.applyForList.map(tag => {
+      const deviceData = params.manualDataDp2Obj(item.dps).deviceData
+      if (params.isMixLight && deviceData.type === DeviceType.MixLight) {
+        return {
+          ...tag,
+          enable:
+            tag.type === 'mainLight'
+              ? deviceData.deviceData.whiteLightSwitch
+              : deviceData.deviceData.colorLightSwitch,
+        };
+      }
+      if (item.dps.hasOwnProperty(tag.dp)) {
+        return {
+          ...tag,
+          enable: item.dps[tag.dp],
+        };
+      }
+      return tag;
+    }).filter(tag => params.applyForDisabled || item.dps.hasOwnProperty(tag.dp))
+      .map(tag => {
+        const {isManual, deviceData} = params.manualDataDp2Obj(item.dps)
+        let tagName: string;
+        if (params.isSiren) {
+          tagName = `${tag.key} : ${alarmStateValueMap[(deviceData.deviceData as SirenData).alarmState]}`
+          tagName = alarmStateValueMap[(deviceData.deviceData as SirenData).alarmState]
+        } else {
+          if (isManual) {
+            if (tag.enable) {
+              tagName = `${tag.key} : ${I18n.getLang(params.isShutter ? 'curtain_summary_action_txt_1' : 'routine_push_msg_on')}`
+            } else {
+              tagName = `${tag.key} : ${I18n.getLang(params.isShutter ? 'curtain_summary_action_txt_2' : 'watchapp_entitystate_off')}`
+            }
+          } else {
+            tagName = `${tag.key} : ${I18n.getLang('mood_overview_headline_text')}`
+          }
+
+        }
+        return {
+          ...tag,
+          key: tagName,
+        };
+      });
+  }, [])
+
   const styles = StyleSheet.create({
     overviewDescription: {
       color: props.theme?.global.fontColor,
@@ -226,8 +280,7 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
             renderItem={({ item }) => (
               <ScheduleCard
                 item={item}
-                tags={params.applyForList}
-                showTag={params.applyForList.length > 1}
+                calculateTagStatus={() => calculateTagStatus(item)}
                 onEnableChange={async enable => {
                   state.loading = true;
                   await modDeleteTimeSchedule('update', {

package/src/newModules/timeSchedule/components/ManuaSettings.tsx

@@ -101,6 +101,8 @@ function ManualSettings(props: ManualSettingProps) {
                 title={item.name || item.key}
                 color={getBlockColor(item as any)}
                 colorAlpha={1}
+                onText={I18n.getLang('routine_push_msg_on')}
+                offText={I18n.getLang('watchapp_entitystate_off')}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {
                   state.applyForList = state.applyForList.map((apply, index) => {
@@ -259,6 +261,8 @@ function ManualSettings(props: ManualSettingProps) {
                 title={item.key}
                 color={getBlockColor(item.type)}
                 colorAlpha={1}
+                onText={I18n.getLang('routine_push_msg_on')}
+                offText={I18n.getLang('watchapp_entitystate_off')}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {
                   state.applyForList[idx].enable = enable;
@@ -329,6 +333,8 @@ function ManualSettings(props: ManualSettingProps) {
             title={state.applyForList[0]?.name || state.applyForList[0]?.key}
             color={getBlockColor()}
             colorAlpha={1}
+            onText={I18n.getLang('routine_push_msg_on')}
+            offText={I18n.getLang('watchapp_entitystate_off')}
             enable={state.applyForList[0]?.enable}
             setEnable={(enable: boolean) => {
               state.applyForList[0].enable = enable;
@@ -408,6 +414,8 @@ function ManualSettings(props: ManualSettingProps) {
                 title={item.key}
                 color={getBlockColor(item.type)}
                 colorAlpha={1}
+                onText={I18n.getLang('routine_push_msg_on')}
+                offText={I18n.getLang('watchapp_entitystate_off')}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {
                   state.applyForList[idx].enable = enable;
@@ -499,6 +507,8 @@ function ManualSettings(props: ManualSettingProps) {
               icon={{ uri: PowerStripIcon[item.index ?? 0] }}
               disabledEdit={true}
               onNameChange={() => { }}
+              onText={I18n.getLang('routine_push_msg_on')}
+              offText={I18n.getLang('watchapp_entitystate_off')}
               enabled={item.enable}
               onSwitchChange={async enable => {
                 state.applyForList = state.applyForList.map((apply, index) => {

package/src/newModules/timeSchedule/components/ScheduleCard.tsx

@@ -1,32 +1,30 @@
-import React, { useMemo } from "react";
-import { ViewStyle, View, Text, StyleSheet } from "react-native";
-import Card from "@ledvance/base/src/components/Card";
-import { SwitchButton, Utils } from 'tuya-panel-kit';
-import { convertTo12HourFormat, loopText } from '@ledvance/base/src/utils/common';
-import { ApplyForItem, Timer } from "../Interface";
-import { useSystemTimeFormate } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import React, { useMemo } from 'react'
+import { ViewStyle, View, Text, StyleSheet } from 'react-native'
+import Card from '@ledvance/base/src/components/Card'
+import { SwitchButton, Utils } from 'tuya-panel-kit'
+import { convertTo12HourFormat, loopText } from '@ledvance/base/src/utils/common'
+import { ApplyForItem } from '@ledvance/base/src/utils/interface'
+import { useSystemTimeFormate } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import ThemeType from '@ledvance/base/src/config/themeType'
-import Spacer from "@ledvance/base/src/components/Spacer";
-const { convertX: cx } = Utils.RatioUtils;
+import { Timer } from '../Interface'
+
+const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
 interface ScheduleCardProps {
   theme?: ThemeType
   item: Timer
   style?: ViewStyle
-  showTag?: boolean
-  tags: ApplyForItem[]
+  calculateTagStatus: () => ApplyForItem[]
   onEnableChange: (enable: boolean) => void
   onPress: (item: any) => void
   onLongPress?: (item: any) => void
 }
 
 const ScheduleCard = (props: ScheduleCardProps) => {
-  const { item, style, showTag, tags, onEnableChange, onPress, onLongPress } = props;
+  const { item, style, calculateTagStatus, onEnableChange, onPress, onLongPress } = props
   const is24HourClock = useSystemTimeFormate()
-  const showTags = useMemo(() => {
-    return tags.filter(tag => item.dps.hasOwnProperty(tag.dp))
-  }, [tags, item.dps])
+  const tags = useMemo(() => calculateTagStatus(), [item.dps])
 
   const styles = StyleSheet.create({
     card: {
@@ -87,15 +85,15 @@ const ScheduleCard = (props: ScheduleCardProps) => {
       // fontFamily: 'PingFangSC-Medium',
       color: '#000'
     },
-  });
+  })
   return (
     <Card
       style={styles.card}
       containerStyle={[style]}
       onPress={() => {
-        onPress(item);
+        onPress(item)
       }}
-      onLongPress={() =>{
+      onLongPress={() => {
         onLongPress && onLongPress(item)
       }}
     >
@@ -112,20 +110,20 @@ const ScheduleCard = (props: ScheduleCardProps) => {
             value={item.enable}
             thumbStyle={{ elevation: 0 }}
             onValueChange={() => {
-              onEnableChange(!item.enable);
+              onEnableChange(!item.enable)
             }}
           />
         </View>
       </View>
-      {showTag ? <View style={styles.typeContainer}>
-        {showTags.map(tag => (
+      <View style={styles.typeContainer}>
+        {tags.map(tag => (
           <View style={styles.tag} key={tag.dp}>
             <Text style={styles.tagTitle}>
               {tag.key}
             </Text>
           </View>
         ))}
-      </View> : <Spacer height={cx(16)} />}
+      </View>
     </Card>
   )