diff --git a/src/components/UI/ALibrary/AStack.tsx b/src/components/UI/ALibrary/AStack.tsx index e804403..e110d4c 100644 --- a/src/components/UI/ALibrary/AStack.tsx +++ b/src/components/UI/ALibrary/AStack.tsx @@ -35,6 +35,7 @@ type AStackType = { justifyContent?: 'center' | 'flex-start' | 'flex-end' | 'space-between' | 'space-around' | 'space-evenly' alignItems?: FlexAlignType backgroundColor?: string + flexWrap?: 'wrap' | 'nowrap' style?: AStyle children: React.ReactNode } @@ -49,6 +50,7 @@ export default function AStack({ justifyContent = 'center', alignItems = 'center', backgroundColor = 'transparent', + flexWrap = 'nowrap', style = {}, children, }: AStackType) { @@ -61,6 +63,7 @@ export default function AStack({ justifyContent, alignItems, backgroundColor, + flexWrap, paddingHorizontal: px, paddingVertical: py, marginHorizontal: mx, diff --git a/src/components/UI/Filters.tsx b/src/components/UI/Filters.tsx index 7058aa7..4352591 100644 --- a/src/components/UI/Filters.tsx +++ b/src/components/UI/Filters.tsx @@ -1,10 +1,15 @@ import React, { useMemo } from 'react'; import { useDispatch, useSelector } from 'react-redux'; -import { HStack, VStack } from 'native-base'; -import { Text, TouchableOpacity, View } from 'react-native'; +import { + Text, + TouchableOpacity, + View, + ScrollView, +} from 'react-native'; import { useNavigation } from '@react-navigation/native'; - import { AntDesign, Ionicons } from '@expo/vector-icons'; + +import { AStack } from './ALibrary'; import { RootDispatch, RootState } from '../../store'; import translate from '../../i18n/locale'; import { useThemeColors } from '../../lib/common'; @@ -33,13 +38,13 @@ export default function Filters() { } = useDispatch(); return useMemo(() => ( - - - + {currencies.map((currency) => ( ))} - + - + {[1, 3, 6, 12].map((period) => ( ))} - + {translate('home_accounts')} - + {accounts.map((account) => ( - - + + + ), [ range, currencies,