fix: missing display name when requesting to join a community (#2725)

status-im · Jun 22, 2022 · 31feea9 · 31feea9
1 parent dca550e
commit 31feea9
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 79 deletions.
diff --git a/protocol/messenger_communities.go b/protocol/messenger_communities.go
@@ -354,6 +354,11 @@ func (m *Messenger) RequestToJoinCommunity(request *requests.RequestToJoinCommun
 		return nil, err
 	}
 
+	displayName, err := m.settings.DisplayName()
+	if err != nil {
+		return nil, err
+	}
+
 	community, requestToJoin, err := m.communitiesManager.RequestToJoin(&m.identity.PublicKey, request)
 	if err != nil {
 		return nil, err
@@ -366,6 +371,7 @@ func (m *Messenger) RequestToJoinCommunity(request *requests.RequestToJoinCommun
 	requestToJoinProto := &protobuf.CommunityRequestToJoin{
 		Clock:       requestToJoin.Clock,
 		EnsName:     requestToJoin.ENSName,
+		DisplayName: displayName,
 		CommunityId: community.ID(),
 	}
 

diff --git a/protocol/messenger_handler.go b/protocol/messenger_handler.go
@@ -961,6 +961,13 @@ func (m *Messenger) HandleCommunityRequestToJoin(state *ReceivedMessageState, si
 
 	contact, _ := state.AllContacts.Load(contactID)
 
+	if len(requestToJoinProto.DisplayName) != 0 {
+		contact.DisplayName = requestToJoinProto.DisplayName
+		state.ModifiedContacts.Store(contact.ID, true)
+		state.AllContacts.Store(contact.ID, contact)
+		state.ModifiedContacts.Store(contact.ID, true)
+	}
+
 	state.Response.AddNotification(NewCommunityRequestToJoinNotification(requestToJoin.ID.String(), community, contact))
 
 	return nil

diff --git a/protocol/protobuf/communities.pb.go b/protocol/protobuf/communities.pb.go
diff --git a/protocol/protobuf/communities.proto b/protocol/protobuf/communities.proto
@@ -80,6 +80,7 @@ message CommunityRequestToJoin {
   string ens_name = 2;
   string chat_id = 3;
   bytes community_id = 4;
+  string display_name = 5;
 }
 
 message CommunityRequestToJoinResponse {