Skip to content

Commit

Permalink
Remove extra null from survey button
Browse files Browse the repository at this point in the history
  • Loading branch information
soniasophia committed Sep 21, 2017
1 parent e7f3ae0 commit 0bf5ee0
Showing 1 changed file with 19 additions and 4 deletions.
23 changes: 19 additions & 4 deletions js/scenes/AccountSettings/AccountSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,23 @@ import pencil from '../../assets/icons/pencil.png';
import { styles } from './styles';
import SettingsPopUp from '../../components/SettingsPopUp/';

const AccountSettings = ({ updateSettings, currentEmail, currentPassword, getCurrentEmail, getCurrentPassword, isVisible, user, showPopUp, handleImageUpload, imageUrl, handleEmail, emailField, handlePassword, passwordField, handleFullname, fullnameField }) => {
const AccountSettings = ({
updateSettings,
currentEmail,
currentPassword,
getCurrentEmail,
getCurrentPassword,
isVisible,
user,
showPopUp,
handleImageUpload,
imageUrl,
handleEmail,
emailField,
handlePassword,
passwordField,
handleFullname,
fullnameField }) => {
const getImage = imageUrl || user.imageUrl
return (
<ScrollView style={styles.container}>
Expand Down Expand Up @@ -67,12 +83,11 @@ const AccountSettings = ({ updateSettings, currentEmail, currentPassword, getCur
placeholder={user.password}
/>
</View>
{(fullnameField || emailField || passwordField) ?
{(fullnameField || emailField || passwordField) &&
<SurveyButton
text="save settings"
onPress={() => showPopUp()}
/>
: null}
/>}
</View>
<SettingsPopUp
isVisible={isVisible}
Expand Down

0 comments on commit 0bf5ee0

Please sign in to comment.