fix(rn): add public key

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Nov 26, 2018 · a7c4d65 · a7c4d65
1 parent 2eeb2ec
commit a7c4d65
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 17 deletions.
diff --git a/client/react-native/common/components/Library/PublicKeyWithActions.js b/client/react-native/common/components/Library/PublicKeyWithActions.js
@@ -57,14 +57,14 @@ export default class PublicKeyWithActions extends PureComponent {
 
   constructor (props) {
     super(props)
-
+    console.log(props)
     const [initialKey, initialName] = [
       this.props.navigation.getParam('initialKey'),
-      this.props.navigation.getParam('nickname'),
+      this.props.navigation.getParam('initialName'),
     ]
     const initialData =
       props.initialKey !== undefined && props.initialName !== undefined
-
+    console.log(initialData)
     this.state = {
       contact: {
         id: initialKey || '',
@@ -77,7 +77,8 @@ export default class PublicKeyWithActions extends PureComponent {
 
     if (!initialData && props.data !== undefined) {
       try {
-        this.state.id = extractPublicKeyFromId(props.data.id)
+        this.state.contact = props.data
+        this.state.contact.id = extractPublicKeyFromId(props.data.id)
       } catch (e) {
         console.error(e)
       }

diff --git a/client/react-native/common/components/Screens/Contacts/Add/ByPublicKey.js b/client/react-native/common/components/Screens/Contacts/Add/ByPublicKey.js
@@ -12,7 +12,8 @@ import {
 } from '../../../Library'
 import { borderBottom, paddingVertical } from '../../../../styles'
 import { colors } from '../../../../constants'
-import { fragments, queries } from '../../../../graphql'
+import { fragments } from '../../../../graphql'
+import { merge } from '../../../../helpers'
 
 const ByPublicKey = fragments.Contact(PublicKeyWithActions)
 
@@ -24,21 +25,20 @@ const AddByPublicKeyScreen = props => (
 
 class SharePublicKeyScreen extends PureComponent {
   render () {
-    const { navigation } = this.props
+    const {
+      navigation,
+      screenProps: {
+        context: { queries },
+      },
+    } = this.props
     return (
       <Screen style={[{ backgroundColor: colors.white }, paddingVertical]}>
         <QueryReducer
           query={queries.Contact.graphql}
-          variables={{
-            filter: {
-              id: '',
-              status: 42,
-              displayName: '',
-              displayStatus: '',
-              overrideDisplayName: '',
-              overrideDisplayStatus: '',
-            },
-          }}
+          variables={merge([
+            queries.Contact.defaultVariables,
+            { filter: { status: 42 } },
+          ])}
         >
           {(state, retry) => {
             switch (state.type) {

diff --git a/client/react-native/common/graphql/queries/Contact.js b/client/react-native/common/graphql/queries/Contact.js
@@ -21,8 +21,21 @@ const query = graphql`
   }
 `
 
+const defaultVariables = {
+  filter: contact.default,
+  orderBy: '',
+  orderDesc: false,
+  count: 1,
+  cursor: '',
+}
+
 export default context => ({
   graphql: query,
+  defaultVariables,
   fetch: variables =>
-    fetchQuery(context.environment, query, merge([contact, variables])),
+    fetchQuery(
+      context.environment,
+      query,
+      merge([defaultVariables, variables])
+    ),
 })