Merge pull request #675 from glouvigny/glouvigny/fix-add-contact-shar…

…e-key fix(web): pubkey displayed in add contact for sharing
berty · Nov 29, 2018 · c624fcd · c624fcd
2 parents 0cea71e + 1875771
commit c624fcd
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/client/react-native/common/components/Library/PublicKeyWithActions.js b/client/react-native/common/components/Library/PublicKeyWithActions.js
@@ -65,8 +65,7 @@ export default class PublicKeyWithActions extends PureComponent {
         props.navigation.getParam('initialName'),
       ]
       : [props.initialKey, props.initialName]
-    const initialData =
-      props.initialKey === undefined && props.initialName === undefined
+    const missingInitialData = props.initialKey === undefined
     this.state = {
       contact: {
         id: initialKey || '',
@@ -77,10 +76,12 @@ export default class PublicKeyWithActions extends PureComponent {
       },
     }
 
-    if (initialData && props.data !== undefined) {
+    if (missingInitialData && props.data !== undefined) {
       try {
-        this.state.contact = props.data
-        this.state.contact.id = extractPublicKeyFromId(props.data.id)
+        this.state.contact = {
+          ...props.data,
+          id: extractPublicKeyFromId(props.data.id),
+        }
       } catch (e) {
         console.error(e)
       }