Add request to response when canceling request

VERSION

@@ -1 +1 @@
-0.138.0
+0.138.1

images/qr-assets.go

@@ -276,8 +276,8 @@ var _bintree = &bintree{nil, map[string]*bintree{
 		"tests": {nil, map[string]*bintree{
 			"qr": {nil, map[string]*bintree{
 				"QRWithLogo.png": {_assetsTestsQrQrwithlogoPng, map[string]*bintree{}},
-				"defaultQR.png": {_assetsTestsQrDefaultqrPng, map[string]*bintree{}},
-				"status.png": {_assetsTestsQrStatusPng, map[string]*bintree{}},
+				"defaultQR.png":  {_assetsTestsQrDefaultqrPng, map[string]*bintree{}},
+				"status.png":     {_assetsTestsQrStatusPng, map[string]*bintree{}},
 			}},
 		}},
 	}},

protocol/communities/manager.go

@@ -1042,6 +1042,7 @@ func (m *Manager) CancelRequestToJoin(request *requests.CancelRequestToJoinCommu
 		return nil, nil, err
 	}
 
+	dbRequest.State = RequestToJoinStateCanceled
 	if err := m.markRequestToJoinAsCanceled(pk, community); err != nil {
 		return nil, nil, err
 	}

protocol/communities_messenger_test.go

@@ -1183,6 +1183,8 @@ func (s *MessengerCommunitiesSuite) TestCancelRequestAccess() {
 	response, err = s.alice.CancelRequestToJoinCommunity(requestToCancel)
 	s.Require().NoError(err)
 	s.Require().NotNil(response)
+	s.Require().Len(response.RequestsToJoinCommunity, 1)
+	s.Require().Equal(communities.RequestToJoinStateCanceled, response.RequestsToJoinCommunity[0].State)
 
 	// pull to make sure it has been saved
 	cancelRequestsToJoin, err := s.alice.MyCanceledRequestsToJoin()

protocol/messenger_communities.go

@@ -685,6 +685,8 @@ func (m *Messenger) CancelRequestToJoinCommunity(request *requests.CancelRequest
 
 	response := &MessengerResponse{}
 	response.AddCommunity(community)
+	response.RequestsToJoinCommunity = append(response.RequestsToJoinCommunity, requestToJoin)
+
 	return response, nil
 }