diff --git a/app/containers/UIKit/MultiSelect/Items.tsx b/app/containers/UIKit/MultiSelect/Items.tsx index 2bcdb2fdf..8c8b07c1e 100644 --- a/app/containers/UIKit/MultiSelect/Items.tsx +++ b/app/containers/UIKit/MultiSelect/Items.tsx @@ -1,15 +1,15 @@ import React from 'react'; -import { Text } from 'react-native'; +import { Text, View } from 'react-native'; import Touchable from 'react-native-platform-touchable'; import FastImage from 'react-native-fast-image'; import { FlatList } from 'react-native-gesture-handler'; -import Check from '../../Check'; import * as List from '../../List'; import { textParser } from '../utils'; import styles from './styles'; import { IItemData } from '.'; import { useTheme } from '../../../theme'; +import { CustomIcon } from '../../CustomIcon'; interface IItem { item: IItemData; @@ -30,12 +30,18 @@ const Item = ({ item, selected, onSelect }: IItem) => { const itemName = item.value?.name || item.text.text.toLowerCase(); const { colors } = useTheme(); return ( - onSelect(item)} style={[styles.item]}> - <> - {item.imageUrl ? : null} - {textParser([item.text])} - {selected ? : null} - + onSelect(item)}> + + + {item.imageUrl ? : null} + + + + {textParser([item.text])} + + + {selected ? : null} + ); }; @@ -43,8 +49,8 @@ const Item = ({ item, selected, onSelect }: IItem) => { const Items = ({ items, selected, onSelect }: IItems) => ( - { - setTimeout(() => { - hideActionSheet(); - }, 150); - }} - /> + + + { + setTimeout(() => { + hideActionSheet(); + }, 150); + }} + /> + ); diff --git a/app/containers/UIKit/MultiSelect/styles.ts b/app/containers/UIKit/MultiSelect/styles.ts index 8e3753c87..b515d3425 100644 --- a/app/containers/UIKit/MultiSelect/styles.ts +++ b/app/containers/UIKit/MultiSelect/styles.ts @@ -9,7 +9,6 @@ export default StyleSheet.create({ justifyContent: 'flex-end' }, actionSheetContainer: { - padding: 16, flex: 1 }, content: { @@ -28,9 +27,9 @@ export default StyleSheet.create({ }, item: { height: 48, - maxWidth: '85%', alignItems: 'center', - flexDirection: 'row' + flexDirection: 'row', + flex: 1 }, input: { minHeight: 48, @@ -46,8 +45,12 @@ export default StyleSheet.create({ right: 16 }, itemContent: { + paddingHorizontal: 16, paddingBottom: 36 }, + inputStyle: { + paddingHorizontal: 16 + }, items: { height: 226 }, @@ -83,5 +86,11 @@ export default StyleSheet.create({ borderRadius: 2, width: 24, height: 24 + }, + flex: { + flex: 1 + }, + flexZ: { + flex: 0 } });