Merge remote-tracking branch 'origin/development' into sa/post-video-render

This commit is contained in:
noumantahir 2022-01-23 00:26:14 +05:00
commit d348ba1a89
4 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,5 @@
import React from 'react';
import { View, Text } from 'react-native';
import { TouchableWithoutFeedback } from 'react-native-gesture-handler';
import { View, Text, TouchableOpacity } from 'react-native';
// Components
import { DropdownButton, PopoverWrapper, Icon, GrayWrapper } from '../../..';
@ -30,7 +29,7 @@ const WalletLineItem = ({
hintDescription,
onPress,
}) => (
<TouchableWithoutFeedback onPress={onPress} disabled={!onPress}>
<TouchableOpacity onPress={onPress} disabled={!onPress} activeOpacity={0.8}>
<GrayWrapper isGray={index && index % 2 !== 0}>
<View style={[styles.container, fitContent && styles.fitContent, style]}>
<View style={styles.iconTextWrapper}>
@ -104,7 +103,7 @@ const WalletLineItem = ({
)}
</View>
</GrayWrapper>
</TouchableWithoutFeedback>
</TouchableOpacity>
);
export default WalletLineItem;

View File

@ -50,6 +50,7 @@ const HorizontalIconList = ({ options, optionsKeys }) => {
keyExtractor={(item) => get(item, 'type', Math.random()).toString()}
horizontal
renderItem={_renderItem}
showsHorizontalScrollIndicator={false}
/>
</View>
);

View File

@ -34,7 +34,7 @@ export default EStyleSheet.create({
color: '$primaryDarkText',
},
mainButton: {
marginVertical: 8,
marginTop: 16,
alignSelf: 'center',
paddingHorizontal: 24,
},

View File

@ -6,7 +6,7 @@ import { SafeAreaView, View, RefreshControl, Text } from 'react-native';
// Containers
import { FlatList } from 'react-native-gesture-handler';
import { useIntl } from 'react-intl';
import { LoggedInContainer, ThemeContainer } from '../../../containers';
import { LoggedInContainer } from '../../../containers';
// Components
import {
@ -28,7 +28,7 @@ import styles from './walletScreenStyles';
import POINTS, { POINTS_KEYS } from '../../../constants/options/points';
import { useAppSelector } from '../../../hooks';
const HEADER_EXPANDED_HEIGHT = 260;
const HEADER_EXPANDED_HEIGHT = 312;
const WalletScreen = () => {
const intl = useIntl();