Merge branch 'feature/profile-edit' of https://github.com/esteemapp/esteem-mobile into feature/profile-edit

This commit is contained in:
ue 2019-09-12 23:08:53 +03:00
commit f10ffd421c
3 changed files with 7 additions and 5 deletions

View File

@ -28,7 +28,7 @@ const AvatarHeader = ({
iconStyle={styles.backIcon} iconStyle={styles.backIcon}
iconType="MaterialIcons" iconType="MaterialIcons"
name="arrow-back" name="arrow-back"
onPress={() => navigation.goBack()} onPress={navigation.goBack}
size={25} size={25}
/> />
<View style={styles.wrapper}> <View style={styles.wrapper}>
@ -44,7 +44,7 @@ const AvatarHeader = ({
style={styles.addButton} style={styles.addButton}
iconType="MaterialCommunityIcons" iconType="MaterialCommunityIcons"
name="plus" name="plus"
onPress={() => showImageUploadActions()} onPress={showImageUploadActions}
size={15} size={15}
/> />
<View style={styles.textWrapper}> <View style={styles.textWrapper}>

View File

@ -102,7 +102,7 @@ class FormInputView extends Component {
placeholder={placeholder} placeholder={placeholder}
editable={isEditable || true} editable={isEditable || true}
textContentType={type} textContentType={type}
onChangeText={val => this._handleOnChange(val)} onChangeText={this._handleOnChange}
value={value} value={value}
/> />
</View> </View>

View File

@ -128,7 +128,7 @@ export const loginWithSC2 = async (code, isPinCodeOpen) => {
postingKey: '', postingKey: '',
activeKey: '', activeKey: '',
memoKey: '', memoKey: '',
accessToken: scTokens.access_token, accessToken: '',
}; };
if (isPinCodeOpen) { if (isPinCodeOpen) {
@ -177,7 +177,9 @@ export const setUserDataWithPinCode = async data => {
get(userData, 'memoKey') || get(userData, 'memoKey') ||
get(userData, 'postingKey'); get(userData, 'postingKey');
data.password = decryptKey(publicKey, data.pinCode); if (publicKey) {
data.password = decryptKey(publicKey, data.pinCode);
}
} }
const updatedUserData = getUpdatedUserData(userData, data); const updatedUserData = getUpdatedUserData(userData, data);