Merge pull request #1608 from ever-co/bug/statues-arrow-down-icon-dar…

…k-theme Bug/statues arrow down icon dark theme
ever-co · Oct 20, 2023 · 6e51a50 · 6e51a50
2 parents 339e2ef + eaedbd9
commit 6e51a50
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/apps/mobile/app/components/TaskPriority.tsx b/apps/mobile/app/components/TaskPriority.tsx
@@ -52,7 +52,7 @@ const TaskPriority: FC<TaskPriorityProps> = observer(
 		return (
 			<>
 				<TaskPriorityPopup
-					priorityName={task?.priority}
+					priorityName={task ? task?.priority : priority}
 					visible={openModal}
 					setSelectedPriority={(e) => onChangePriority(e.value)}
 					onDismiss={() => setOpenModal(false)}
@@ -81,7 +81,11 @@ const TaskPriority: FC<TaskPriorityProps> = observer(
 								</Text>
 							</View>
 						)}
-						<AntDesign name="down" size={14} color={colors.primary} />
+						<AntDesign
+							name="down"
+							size={14}
+							color={task?.priority || priority ? "#000000" : colors.primary}
+						/>
 					</View>
 				</TouchableOpacity>
 			</>

diff --git a/apps/mobile/app/components/TaskSize.tsx b/apps/mobile/app/components/TaskSize.tsx
@@ -88,7 +88,11 @@ const TaskSize: FC<TaskSizeProps> = observer(({ task, containerStyle, setSize, s
 							</Text>
 						</View>
 					)}
-					<AntDesign name="down" size={14} color={colors.primary} />
+					<AntDesign
+						name="down"
+						size={14}
+						color={task?.size || size ? "#000000" : colors.primary}
+					/>
 				</View>
 			</TouchableOpacity>
 		</>

diff --git a/apps/mobile/app/components/TaskSizePopup.tsx b/apps/mobile/app/components/TaskSizePopup.tsx
@@ -103,6 +103,7 @@ interface ItemProps {
 const Item: FC<ItemProps> = ({ currentSizeName, size, onSizeSelected }) => {
 	const { colors } = useAppTheme()
 	const selected = size.value === currentSizeName
+
 	return (
 		<TouchableOpacity onPress={() => onSizeSelected(size)}>
 			<View style={{ ...styles.wrapperItem, borderColor: colors.border }}>

diff --git a/apps/mobile/app/components/TaskStatus.tsx b/apps/mobile/app/components/TaskStatus.tsx
@@ -54,7 +54,7 @@ const TaskStatus: FC<TaskStatusProps> = observer(
 		return (
 			<>
 				<TaskStatusPopup
-					statusName={task?.status}
+					statusName={task ? task?.status : status}
 					visible={openModal}
 					setSelectedStatus={(e) => onChangeStatus(e)}
 					onDismiss={() => setOpenModal(false)}
@@ -90,7 +90,11 @@ const TaskStatus: FC<TaskStatusProps> = observer(
 								)}
 							</Text>
 						)}
-						<AntDesign name="down" size={14} color={colors.primary} />
+						<AntDesign
+							name="down"
+							size={14}
+							color={task?.status || status ? "#000000" : colors.primary}
+						/>
 					</View>
 				</TouchableOpacity>
 			</>