Skip to content

Commit

Permalink
fix: bring the CR flow in accordance with the requirements
Browse files Browse the repository at this point in the history
Close #11121
  • Loading branch information
MishkaRogachev committed Jul 10, 2023
1 parent 9629a14 commit e830be2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
7 changes: 2 additions & 5 deletions src/app_service/service/message/service.nim
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,8 @@ QtObject:
error "error: received `chats` array for handling messages update is empty"
return

# Temporary commented until we provide appropriate flags on the `status-go` side to cover all sections.
# blocking contact deletes the chat on the `status-go` side, after unblocking it, `active` prop is still false
# that's the reason why the following check is commented out here.
# if (not chats[0].active):
# return
if (not chats[0].active):
return

self.bulkReplacePubKeysWithDisplayNames(messages)

Expand Down
2 changes: 1 addition & 1 deletion vendor/status-go
Submodule status-go updated 59 files
+1 −1 VERSION
+4 −0 api/defaults.go
+45 −9 api/geth_backend.go
+8 −8 appdatabase/database.go
+2 −2 go.mod
+4 −4 go.sum
+2 −1 node/status_node_services.go
+1 −1 protocol/anonmetrics/client.go
+9 −11 protocol/common/message_sender.go
+3 −3 protocol/common/message_sender_test.go
+1 −1 protocol/common/raw_message.go
+2 −2 protocol/common/raw_messages_persistence.go
+13 −0 protocol/communities_messenger_test.go
+0 −124 protocol/encryption/encryption_test.go
+3 −3 protocol/messenger.go
+1 −1 protocol/messenger_backup.go
+43 −26 protocol/messenger_communities.go
+90 −77 protocol/messenger_contact_requests_test.go
+30 −79 protocol/messenger_contacts.go
+42 −39 protocol/messenger_handler.go
+5 −5 protocol/pushnotificationclient/client.go
+3 −3 protocol/pushnotificationserver/server.go
+2 −1 protocol/requests/create_account.go
+16 −10 services/wallet/activity/activity.go
+1 −1 services/wallet/api.go
+28 −0 services/wallet/decoder.go
+3 −4 services/wallet/service.go
+103 −0 services/wallet/thirdparty/fourbytegithub/client.go
+34 −0 services/wallet/thirdparty/fourbytegithub/client_test.go
+52 −3 services/wallet/transfer/transaction.go
+2 −1 services/wallet/transfer/transaction_test.go
+10 −3 signal/events_node.go
+3 −1 signal/events_wakuv2.go
+21 −13 sqlite/sqlite.go
+0 −36 vendor/github.com/waku-org/go-waku/waku/try/try.go
+48 −8 vendor/github.com/waku-org/go-waku/waku/v2/discovery_connector.go
+26 −14 vendor/github.com/waku-org/go-waku/waku/v2/discv5/discover.go
+0 −1 vendor/github.com/waku-org/go-waku/waku/v2/node/keepalive.go
+61 −0 vendor/github.com/waku-org/go-waku/waku/v2/node/localnode.go
+0 −6 vendor/github.com/waku-org/go-waku/waku/v2/node/service.go
+6 −70 vendor/github.com/waku-org/go-waku/waku/v2/node/wakunode2.go
+2 −15 vendor/github.com/waku-org/go-waku/waku/v2/node/wakuoptions.go
+0 −1 vendor/github.com/waku-org/go-waku/waku/v2/protocol/enr/localnode.go
+13 −3 vendor/github.com/waku-org/go-waku/waku/v2/protocol/enr/shards.go
+9 −10 vendor/github.com/waku-org/go-waku/waku/v2/protocol/filter/client.go
+5 −1 vendor/github.com/waku-org/go-waku/waku/v2/protocol/peer_exchange/client.go
+5 −4 vendor/github.com/waku-org/go-waku/waku/v2/protocol/peer_exchange/protocol.go
+48 −2 vendor/github.com/waku-org/go-waku/waku/v2/protocol/relay/waku_relay.go
+2 −2 vendor/github.com/waku-org/go-waku/waku/v2/protocol/shard.go
+0 −1 vendor/github.com/waku-org/go-waku/waku/v2/protocol/topic.go
+8 −8 vendor/github.com/waku-org/go-waku/waku/v2/rendezvous/rendezvous.go
+8 −0 vendor/golang.org/x/crypto/cryptobyte/asn1.go
+6 −93 vendor/golang.org/x/crypto/curve25519/curve25519.go
+105 −0 vendor/golang.org/x/crypto/curve25519/curve25519_compat.go
+46 −0 vendor/golang.org/x/crypto/curve25519/curve25519_go120.go
+2 −3 vendor/modules.txt
+1 −1 wakuv2/api_test.go
+74 −40 wakuv2/waku.go
+4 −4 wakuv2/waku_test.go

0 comments on commit e830be2

Please sign in to comment.