Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek

view/NewPassword.js

 import React from 'react';
-import { View, Text, TextInput, StyleSheet, Button, Alert, TouchableOpacity, Image } from 'react-native';
+import { View, Text, TextInput, StyleSheet, Button, Alert, TouchableOpacity, Image, ImageBackground, ScrollView } from 'react-native';
 import { connect } from 'react-redux';
 import Axios from 'axios';
 import ActionType from '../redux/globalActionType';
@@ -82,7 +82,7 @@ class NewPassword extends React.Component {
                     textStyle={styles.spinnerTextStyle}
                 />
                 <View style={{ flex: 3 }}>
-                    <View style={{ flex: 1, marginRight: 30, marginLeft: 30, top: 50 }}>
+                    <View style={{ flex: 1, marginRight: 30, marginLeft: 30, top: 20 }}>
                         <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Email</Text>
                         <Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 18, textAlign: 'center', margin: 3, marginBottom: 15 }}>{this.props.email}</Text>
 
@@ -112,7 +112,7 @@ class NewPassword extends React.Component {
                 <View style={{ flex: 1, flexDirection: 'row' }}>
                     <View style={styles.v_logo}>
                         <View style={{ flex: 1, alignSelf: 'flex-start' }}>
-                            <Image resizeMode="contain" source={require('../assets/images/daun.png')} style={styles.logo}></Image>
+                            <Image resizeMode="contain" source={require('../assets/images/daun.png')} style={styles.logo} />
                         </View>
                         <View style={{ flex: 1 }}>
                         </View>