fix(rn): conversation pagination update

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Dec 11, 2018 · 2de1b3f · 2de1b3f
1 parent 78756c5
commit 2de1b3f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/client/react-native/common/relay/genericUpdater.js b/client/react-native/common/relay/genericUpdater.js
@@ -49,11 +49,9 @@ export default (fragment, alias, args) => {
     }
 
     const edges = connection.getLinkedRecords('edges')
+    const field = Case.camel(args.orderBy || args.sortBy || 'id')
     const cursor =
-      (args.orderBy && args.orderBy !== 'id') ||
-      (args.sortBy && args.sortBy !== 'id')
-        ? data[Case.camel(args.orderBy || args.sortBy)]
-        : atob(data.id).split(':')[1]
+      field === 'id' ? atob(data.id).split(/:(.+)/)[1] : data[field]
     if (edges.length > 0 && edges.some(e => e.getValue('cursor') === cursor)) {
       // update
       return

diff --git a/client/react-native/common/utils/conversation.js b/client/react-native/common/utils/conversation.js
@@ -6,16 +6,18 @@ export default {
 
 export const getTitle = ({ title, members } = this.props) =>
   (title && title !== '' && title) ||
-  members
-    .map((m, index) => {
-      const displayName =
-        m.contact && m.contact.status === 42
-          ? 'Myself'
-          : (m.contact &&
-              (m.contact.overrideDisplayName || m.contact.displayName)) ||
-            '?????'
-      const before =
-        index === 0 ? '' : index === members.length - 1 ? ' and ' : ', '
-      return `${before}${displayName}`
-    })
-    .join('')
+  (members &&
+    members
+      .map((m, index) => {
+        const displayName =
+          m.contact && m.contact.status === 42
+            ? 'Myself'
+            : (m.contact &&
+                (m.contact.overrideDisplayName || m.contact.displayName)) ||
+              '?????'
+        const before =
+          index === 0 ? '' : index === members.length - 1 ? ' and ' : ', '
+        return `${before}${displayName}`
+      })
+      .join('')) ||
+  'No name'