diff --git a/src/_components/family/familyFilter/FamilyFilter.tsx b/src/_components/family/familyFilter/FamilyFilter.tsx index 7833d531..5c569135 100644 --- a/src/_components/family/familyFilter/FamilyFilter.tsx +++ b/src/_components/family/familyFilter/FamilyFilter.tsx @@ -3,7 +3,6 @@ import { FlatList } from 'react-native'; import { useGetFamilyMembers } from '../../../onboarding/family/_queries'; import { TFamilyMember, TPassHolder } from '../../../profile/_models'; -import Typography from '../../typography/Typography'; import * as Styled from './style'; type TProps = { @@ -49,13 +48,13 @@ export const FamilyFilter = ({ selectedPassHolder, setSelectedPassHolder }: TPro isSelected={familyMember.passholder.id === selectedPassHolder.id} onPress={() => handleSelectPassHolder(familyMember.passholder, index)} > - {familyMember.passholder.firstName} - + )} showsHorizontalScrollIndicator={false} diff --git a/src/_components/family/familyFilter/style.ts b/src/_components/family/familyFilter/style.ts index 8481f8b7..741d99a4 100644 --- a/src/_components/family/familyFilter/style.ts +++ b/src/_components/family/familyFilter/style.ts @@ -2,12 +2,13 @@ import styled from 'styled-components/native'; import Icon from '../../icon/Icon'; import TouchableRipple from '../../touchableRipple/TouchableRipple'; +import { Typography } from '../../typography/style'; export const Container = styled.View` flex-direction: row; align-items: center; background-color: ${({ theme }) => theme.palette.primary[700]}; - padding-vertical: 8px; + padding-vertical: 9px; `; export const FilterPrevButton = styled(Icon)` @@ -27,6 +28,10 @@ export const FilterItem = styled(TouchableRipple)<{ isSelected: boolean }>` border-radius: 20px; `; +export const FilterLabel = styled(Typography)` + line-height: 21px; +`; + export const Separator = styled.View` width: 8px; `; diff --git a/src/history/History.tsx b/src/history/History.tsx index e3eaca9f..9d8375c7 100644 --- a/src/history/History.tsx +++ b/src/history/History.tsx @@ -45,7 +45,7 @@ const History: FC = () => { {t('PROFILE.HISTORY.EMPTY')}} - contentContainerStyle={{ paddingBottom: 105, paddingTop: 20 }} + contentContainerStyle={{ paddingBottom: 105, paddingTop: 24 }} data={members} estimatedItemSize={Styled.HISTORY_ITEM_HEIGHT} onEndReached={fetchNextPage} diff --git a/src/redeemedRewards/RedeemedRewards.tsx b/src/redeemedRewards/RedeemedRewards.tsx index 2bfba57d..61bf6000 100644 --- a/src/redeemedRewards/RedeemedRewards.tsx +++ b/src/redeemedRewards/RedeemedRewards.tsx @@ -61,7 +61,7 @@ export const RedeemedRewards = ({ navigation }: TProps) => { ) } - contentContainerStyle={{ paddingBottom: 105 }} + contentContainerStyle={{ paddingBottom: 105, paddingTop: 24 }} data={members} estimatedItemSize={MIMIMAL_REWARD_HEIGHT} keyExtractor={item => item.id}