fix home searchbar

components/Form/ChangePasswordForm.js

@@ -29,6 +29,7 @@ class ChangePassword extends React.Component {
 				<View style={styles.container}>
 				<View style={styles.container}>
 					<Text style={theme.description}>Current Password</Text>
 					<Text style={theme.description}>Current Password</Text>
 					<Field
 					<Field
+						hideCheckmark
 						forwardRef
 						forwardRef
 						ref={c => (this.currentPass = c)}
 						ref={c => (this.currentPass = c)}
 						refField="currentPass"
 						refField="currentPass"

components/Form/LoginForm.js

 import React, { Component } from 'react';
 import React, { Component } from 'react';
 import { Field, reduxForm } from 'redux-form';
 import { Field, reduxForm } from 'redux-form';
-import { View, KeyboardAvoidingView } from 'react-native';
+import { KeyboardAvoidingView } from 'react-native';
 import Input from './Input';
 import Input from './Input';
 import { theme } from '../../constants/Styles';
 import { theme } from '../../constants/Styles';
 import GradientBtn from '../GradientBtn';
 import GradientBtn from '../GradientBtn';
@@ -28,7 +28,7 @@ class Login extends Component {
 						keyboardType="default"
 						keyboardType="default"
 						component={Input}
 						component={Input}
 						validate={[required]}
 						validate={[required]}
-						placeholder={'Username'}
+						placeholder={'E-mail'}
 					/>
 					/>
 					<Field
 					<Field
 						hideCheckmark
 						hideCheckmark

screens/Private/SmartMeterScreen/SmartMeterScreen.js

@@ -84,7 +84,19 @@ class SmartMeterScreen extends PureComponent {
 		const { data } = this.state;
 		const { data } = this.state;
 
 
 		return !error ? (
 		return !error ? (
-			<>
+			<View style={[theme.container, theme.containerWithPadding]}>
+				<Text style={[theme.smallTitle, theme.textDark, { marginBottom: 10 }]}>Smart Device</Text>
+
+				<SearchBar
+					containerStyle={styles.searchBarContainer}
+					inputContainerStyle={styles.searchBarInputContainer}
+					inputStyle={theme.normalText}
+					lightTheme
+					placeholder="Search..."
+					onChangeText={text => this.updateSearch(text)}
+					value={this.state.search}
+				/>
+
 				<FlatList
 				<FlatList
 					refreshControl={
 					refreshControl={
 						<RefreshControl
 						<RefreshControl
@@ -96,8 +108,7 @@ class SmartMeterScreen extends PureComponent {
 							colors={[color.primary]}
 							colors={[color.primary]}
 						/>
 						/>
 					}
 					}
-					style={[theme.container]}
-					contentContainerStyle={[theme.containerWithPadding, { paddingBottom: isIphoneX() ? 90 : 55 }]} //iPhoneX BottomSpace = 34
+					contentContainerStyle={{ paddingBottom: isIphoneX() ? 90 : 55 }} //iPhoneX BottomSpace = 34
 					data={data}
 					data={data}
 					extraData={this.props || this.state}
 					extraData={this.props || this.state}
 					keyExtractor={(item, index) => item.deviceId}
 					keyExtractor={(item, index) => item.deviceId}
@@ -109,24 +120,9 @@ class SmartMeterScreen extends PureComponent {
 							</Text>
 							</Text>
 						</View>
 						</View>
 					)}
 					)}
-					ListHeaderComponent={() => (
-						<>
-							<Text style={[theme.smallTitle, theme.textDark, { marginBottom: 10 }]}>Smart Device</Text>
-
-							<SearchBar
-								containerStyle={styles.searchBarContainer}
-								inputContainerStyle={styles.searchBarInputContainer}
-								inputStyle={theme.normalText}
-								lightTheme
-								placeholder="Search..."
-								onChangeText={text => this.updateSearch(text)}
-								value={this.state.search}
-							/>
-						</>
-					)}
 					renderItem={(item, index) => this.renderItem(item)}
 					renderItem={(item, index) => this.renderItem(item)}
 				/>
 				/>
-			</>
+			</View>
 		) : (
 		) : (
 			<View>
 			<View>
 				<Text>{'Something went wrong ' + error}</Text>
 				<Text>{'Something went wrong ' + error}</Text>
@@ -137,8 +133,6 @@ class SmartMeterScreen extends PureComponent {
 
 
 const styles = StyleSheet.create({
 const styles = StyleSheet.create({
 	searchBarContainer: {
 	searchBarContainer: {
-		flex: 1,
-		display: 'flex',
 		backgroundColor: 'transparent',
 		backgroundColor: 'transparent',
 		height: 35,
 		height: 35,
 		padding: 0,
 		padding: 0,