display real contacts on profile

display real contacts on profile

query contacts

add contact in form

fixes

fixes

display contacts

cleanup

cleanup

remove echo

refactor to use profile instead of contact model

src/app/chat/core.nim

@@ -61,7 +61,6 @@ proc handleMailserverEvents(self: ChatController) =
 proc init*(self: ChatController) =
   self.handleMailserverEvents()
   self.handleChatEvents()
-  
   self.status.mailservers.init()
   self.status.chat.init()
 

src/app/chat/view.nim

@@ -135,3 +135,6 @@ QtObject:
 
   proc blockContact*(self: ChatsView, id: string): string {.slot.} =
     return self.status.contacts.blockContact(id)
+
+  proc addContact*(self: ChatsView, id: string): string {.slot.} =
+    return self.status.contacts.addContact(id)

src/app/profile/core.nim

@@ -1,4 +1,5 @@
 import NimQml
+import json
 import ../../status/libstatus/mailservers as status_mailservers
 import ../../signals/types
 import "../../status/libstatus/types" as status_types
@@ -41,6 +42,6 @@ proc init*(self: ProfileController, account: Account) =
     let mailserver = MailServer(name: mailserver_config[0], endpoint: mailserver_config[1])
     self.view.addMailServerToList(mailserver)
 
-  self.view.addContactToList(Contact(name: "username1", address: "0x12345"))
+  let contactList = self.status.contacts.getContacts().elems
-  self.view.addContactToList(Contact(name: "username2", address: "0x23456"))
+  for contact in contactList:
-  self.view.addContactToList(Contact(name: "username3", address: "0x34567"))
+    self.view.addContactToList(contact.toProfileModel())

src/app/profile/view.nim

@@ -4,7 +4,6 @@ import views/contact_list
 import views/profile_info
 import ../../status/profile
 import ../../status/accounts as status_accounts
-import ../../status/contacts as status_contacts
 import ../../status/status
 
 QtObject:
@@ -38,7 +37,7 @@ QtObject:
   QtProperty[QVariant] mailserversList:
     read = getMailserversList
 
-  proc addContactToList*(self: ProfileView, contact: Contact) =
+  proc addContactToList*(self: ProfileView, contact: Profile) =
     self.contactList.addContactToList(contact)
 
   proc getContactList(self: ProfileView): QVariant {.slot.} =

src/app/profile/views/contact_list.nim

@@ -2,16 +2,16 @@ import NimQml
 import Tables
 import strformat
 import ../../../status/profile
-import ../../../status/contacts
 
 type
   ContactRoles {.pure.} = enum
     Name = UserRole + 1,
     Address = UserRole + 2
+    Identicon = UserRole + 3
 
 QtObject:
   type ContactList* = ref object of QAbstractListModel
-    contacts*: seq[Contact]
+    contacts*: seq[Profile]
 
   proc setup(self: ContactList) = self.QAbstractListModel.setup
 
@@ -32,16 +32,18 @@ QtObject:
       return
     let contact = self.contacts[index.row]
     case role.ContactRoles:
-      of ContactRoles.Name: result = newQVariant(contact.name)
+      of ContactRoles.Name: result = newQVariant(contact.username)
       of ContactRoles.Address: result = newQVariant(contact.address)
+      of ContactRoles.Identicon: result = newQVariant(contact.identicon)
 
   method roleNames(self: ContactList): Table[int, string] =
     {
       ContactRoles.Name.int:"name",
       ContactRoles.Address.int:"address",
+      ContactRoles.Identicon.int:"identicon",
     }.toTable
 
-  proc addContactToList*(self: ContactList, contact: Contact) =
+  proc addContactToList*(self: ContactList, contact: Profile) =
     self.beginInsertRows(newQModelIndex(), self.contacts.len, self.contacts.len)
     self.contacts.add(contact)
     self.endInsertRows()

src/status/chat.nim

@@ -121,7 +121,6 @@ proc leave*(self: ChatModel, chatId: string) =
   self.events.emit("channelLeft", ChatIdArg(chatId: chatId))
   self.events.emit("activeChannelChanged", ChatIdArg(chatId: ""))
 
-
 proc setActiveChannel*(self: ChatModel, chatId: string) =
   self.events.emit("activeChannelChanged", ChatIdArg(chatId: chatId))
 
@@ -162,7 +161,6 @@ proc confirmJoiningGroup*(self: ChatModel, chatId: string) =
   var response = parseJson(status_chat.confirmJoiningGroup(chatId))
   var (chats, messages) = formatChatUpdate(response)
   self.events.emit("chatUpdate", ChatUpdateArgs(messages: messages, chats: chats))
-  # self.events.emit("pushMessage", PushMessageArgs(messages: messages, chats: chats))
 
 proc blockContact*(self: ChatModel, id: string): string =
   var contact = status_profile.getContactByID(id)

src/status/contacts.nim

@@ -3,10 +3,6 @@ import json
 import libstatus/contacts as status_contacts
 import profile
 
-type
-  Contact* = ref object
-    name*, address*: string
-
 type
   ContactModel* = ref object
     events*: EventEmitter
@@ -23,3 +19,10 @@ proc blockContact*(self: ContactModel, id: string): string =
   var contact = self.getContactByID(id)
   contact.systemTags.add(":contact/blocked")
   status_contacts.blockContact(contact)
+
+proc getContacts*(self: ContactModel): JsonNode =
+  status_contacts.getContacts()
+
+proc addContact*(self: ContactModel, id: string): string =
+  let contact = self.getContactByID(id)
+  status_contacts.saveContact(contact.id, contact.ensVerified, contact.ensVerifiedAt, contact.ensVerificationRetries, contact.alias, contact.identicon, contact.systemTags)

src/status/libstatus/contacts.nim

@@ -19,3 +19,22 @@ proc blockContact*(contact: Profile): string =
 
 proc getContactByID*(id: string): string =
   callPrivateRPC("getContactByID".prefix, %* [id])
+
+proc getContacts*(): JsonNode =
+  let payload = %* []
+  let response = callPrivateRPC("wakuext_contacts", payload).parseJson
+  if response["result"].kind == JNull:
+    return %* []
+  return response["result"]
+
+proc saveContact*(id: string, ensVerified: bool, ensVerifiedAt: int, ensVerificationRetries: int, alias: string, identicon: string, systemTags: seq[string]): string =
+  let payload = %* [{
+      "id": id,
+      "ensVerified": ensVerified,
+      "ensVerifiedAt": ensVerifiedAt,
+      "ensVerificationRetries": ensVerificationRetries,
+      "alias": alias,
+      "identicon": identicon,
+      "systemTags": systemTags
+    }]
+  callPrivateRPC("shhext_saveContact", payload)

src/status/profile.nim

@@ -9,7 +9,7 @@ type
     name*, endpoint*: string
 
 type Profile* = ref object
-  id*, alias*, username*, identicon*: string
+  id*, alias*, username*, identicon*, address*: string
   ensVerified*: bool
   ensVerifiedAt*: int
   ensVerificationRetries*: int
@@ -36,6 +36,7 @@ proc toProfileModel*(profile: JsonNode): Profile =
       id: profile["id"].str,
       username: profile["alias"].str,
       identicon: profile["identicon"].str,
+      address: profile["id"].str,
       alias: profile["alias"].str,
       ensVerified: profile["ensVerified"].getBool,
       ensVerifiedAt: profile["ensVerifiedAt"].getInt,

ui/app/AppLayouts/Chat/components/ProfilePopup.qml

@@ -222,6 +222,9 @@ ModalPopup {
           label: "Add to contacts"
           anchors.bottom: parent.bottom
           onClicked: {
+            chatsModel.addContact(fromAuthor)
+            // TODO(iuri): Change add contact button state based
+            // on contact already added or not
             profilePopup.close()
           }
       }

ui/app/AppLayouts/Profile/Sections/Contacts/Contact.qml

@@ -0,0 +1,49 @@
+import QtQuick 2.3
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
+import Qt.labs.platform 1.1
+import "../../../../../imports"
+import "../../../../../shared"
+
+Rectangle {
+    property string name: "Jotaro Kujo"
+    property string address: "0x04d8c07dd137bd1b73a6f51df148b4f77ddaa11209d36e43d8344c0a7d6db1cad6085f27cfb75dd3ae21d86ceffebe4cf8a35b9ce8d26baa19dc264efe6d8f221b"
+    property string identicon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII="
+
+    height: 64
+    anchors.right: parent.right
+    anchors.left: parent.left
+    border.width: 0
+    radius: Theme.radius
+
+    RoundImage {
+        id: accountImage
+        anchors.left: parent.left
+        anchors.leftMargin: Theme.padding
+        anchors.verticalCenter: parent.verticalCenter
+        source: identicon
+    }
+    Text {
+        id: usernameText
+        text: name
+        elide: Text.ElideRight
+        anchors.right: parent.right
+        anchors.rightMargin: Theme.padding
+        font.pixelSize: 17
+        anchors.top: accountImage.top
+        anchors.left: accountImage.right
+        anchors.leftMargin: Theme.padding
+    }
+    Text {
+        id: addressText
+        width: 108
+        text: address
+        elide: Text.ElideMiddle
+        anchors.bottom: accountImage.bottom
+        anchors.bottomMargin: 0
+        anchors.left: usernameText.left
+        anchors.leftMargin: 0
+        font.pixelSize: 15
+        color: Theme.darkGrey
+    }
+}

ui/app/AppLayouts/Profile/Sections/Contacts/ContactList.qml

@@ -0,0 +1,27 @@
+import QtQuick 2.14
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
+import Qt.labs.platform 1.1
+import "./samples/"
+import "../../../../../imports"
+import "../../../../../shared"
+
+ListView {
+    property var contacts: ContactsData {}
+
+    anchors.topMargin: 48
+    anchors.top: element2.bottom
+    anchors.fill: parent
+
+    model: contacts
+    delegate: Contact {
+        name: model.name
+        address: model.address
+        identicon: model.identicon
+    }
+}
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/

ui/app/AppLayouts/Profile/Sections/Contacts/qmldir

@@ -0,0 +1,2 @@
+Contact 1.0 Contact.qml
+ContactList 1.0 ContactList.qml

ui/app/AppLayouts/Profile/Sections/Contacts/samples/ContactsData.qml

@@ -0,0 +1,23 @@
+import QtQuick 2.3
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
+import Qt.labs.platform 1.1
+
+ListModel {
+    ListElement {
+        name: "Ferocious Herringbone Sinewave2"
+        identicon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAg0lEQVR4nOzXwQmAMBAFURV7sQybsgybsgyr0QYUlE1g+Mw7ioQMe9lMQwhDaAyhMYTGEJqYkPnrj/t5XE/ft2UdW1yken7MRAyhMYTGEBpDaAyhKe9JbzvSX9WdLWYihtAYQuMLkcYQGkPUScxEDKExhMYQGkNoDKExhMYQmjsAAP//ZfIUZgXTZXQAAAAASUVORK5CYII="
+        address: "0x123456789009876543211234567890"
+    }
+    ListElement {
+        name: "Another Account"
+        identicon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAg0lEQVR4nOzXwQmAMBAFURV7sQybsgybsgyr0QYUlE1g+Mw7ioQMe9lMQwhDaAyhMYTGEJqYkPnrj/t5XE/ft2UdW1yken7MRAyhMYTGEBpDaAyhKe9JbzvSX9WdLWYihtAYQuMLkcYQGkPUScxEDKExhMYQGkNoDKExhMYQmjsAAP//ZfIUZgXTZXQAAAAASUVORK5CYII="
+        address: "0x123456789009876543211234567890"
+    }
+}
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/

ui/app/AppLayouts/Profile/Sections/Contacts/samples/qmldir

@@ -0,0 +1 @@
+ContactsData 1.0 ContactsData.qml

ui/app/AppLayouts/Profile/Sections/ContactsContainer.qml

@@ -2,6 +2,7 @@ import QtQuick 2.3
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.3
 import "../../../../imports"
+import "./Contacts"
 
 Item {
     id: contactsContainer
@@ -21,40 +22,8 @@ Item {
         font.pixelSize: 20
     }
 
-    Component {
+    ContactList {
-        id: contactsList
-
-        Item {
-            height: 56
-            anchors.right: parent.right
-            anchors.rightMargin: 0
-            anchors.left: parent.left
-            anchors.leftMargin: 0
-            Column {
-                Row {
-                    Text {
-                        text: name
-                        font.weight: Font.Bold
-                        font.pixelSize: 14
-                    }
-                }
-                Row {
-                    Text {
-                        text: address
-                        font.weight: Font.Bold
-                        font.pixelSize: 12
-                    }
-                }
-            }
-        }
-    }
-
-    ListView {
         id: contactListView
-        anchors.topMargin: 48
+        contacts: profileModel.contactList
-        anchors.top: element2.bottom
-        anchors.fill: parent
-        model: profileModel.contactList
-        delegate: contactsList
     }
-}
+}

ui/nim-status-client.pro

@@ -77,6 +77,11 @@ DISTFILES += \
     app/AppLayouts/Profile/LeftTab/Profile.qml \
     app/AppLayouts/Profile/LeftTab/qmldir \
     app/AppLayouts/Profile/ProfileLayout.qml \
+    app/AppLayouts/Profile/Sections/Contacts/Contact.qml \
+    app/AppLayouts/Profile/Sections/Contacts/ContactList.qml \
+    app/AppLayouts/Profile/Sections/Contacts/qmldir \
+    app/AppLayouts/Profile/Sections/Contacts/samples/ContactsData.qml \
+    app/AppLayouts/Profile/Sections/Contacts/samples/qmldir \
     app/AppLayouts/Wallet/AccountSettingsModal.qml \
     app/AppLayouts/Wallet/AddCustomTokenModal.qml \
     app/AppLayouts/Wallet/AssetsTab.qml \