From a5c95569e6175e621dcf5a71964be21c4fe193ef Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Mon, 1 Dec 2025 16:31:30 -0500 Subject: [PATCH 1/2] fix(cr): update CR API and up status-go to get contact request fix Fixes #15930 --- src/app_service/service/contacts/service.nim | 4 ++-- src/backend/contacts.nim | 10 ++++++---- vendor/status-go | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/app_service/service/contacts/service.nim b/src/app_service/service/contacts/service.nim index 71a4e1fa22a..1d6eb630bd5 100644 --- a/src/app_service/service/contacts/service.nim +++ b/src/app_service/service/contacts/service.nim @@ -446,7 +446,7 @@ QtObject: # NOTE: publicKey used for accepting last request let response = if contactRequestId.len > 0: - status_contacts.acceptContactRequest(contactRequestId) + status_contacts.acceptContactRequest(contactRequestId, publicKey) else: status_contacts.acceptLatestContactRequestForContact(publicKey) @@ -469,7 +469,7 @@ QtObject: # NOTE: publicKey used for dismissing last request let response = if contactRequestId.len > 0: - status_contacts.declineContactRequest(contactRequestId) + status_contacts.declineContactRequest(contactRequestId, publicKey) else: status_contacts.dismissLatestContactRequestForContact(publicKey) diff --git a/src/backend/contacts.nim b/src/backend/contacts.nim index bb93a2f000f..abad3477b14 100644 --- a/src/backend/contacts.nim +++ b/src/backend/contacts.nim @@ -37,9 +37,10 @@ proc acceptLatestContactRequestForContact*(id: string): RpcResponse[JsonNode] = }] result = callPrivateRPC("acceptLatestContactRequestForContact".prefix, payload) -proc acceptContactRequest*(id: string): RpcResponse[JsonNode] = +proc acceptContactRequest*(id, contactId: string): RpcResponse[JsonNode] = let payload = %* [{ - "id": id + "id": id, + "contactId": contactId }] result = callPrivateRPC("acceptContactRequest".prefix, payload) @@ -49,9 +50,10 @@ proc dismissLatestContactRequestForContact*(id: string): RpcResponse[JsonNode] = }] result = callPrivateRPC("dismissLatestContactRequestForContact".prefix, payload) -proc declineContactRequest*(id: string): RpcResponse[JsonNode] = +proc declineContactRequest*(id, contactId: string): RpcResponse[JsonNode] = let payload = %*[{ - "id": id + "id": id, + "contactId": contactId }] result = callPrivateRPC("declineContactRequest".prefix, payload) diff --git a/vendor/status-go b/vendor/status-go index 0fc843266f7..ff8c5c4d4e5 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 0fc843266f74c4ce90c7230d89bdd8ef75b0a2f1 +Subproject commit ff8c5c4d4e554ef3f29ec0a1582d712f5db2c967 From b9f9325f9adf6cf4626dc22a1c84dc59b77db2c6 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Thu, 18 Dec 2025 15:08:52 -0500 Subject: [PATCH 2/2] fix(contact): fix dismissed CR is not synced by upping status-go Fixes https://github.com/status-im/status-app/issues/19587 and https://github.com/status-im/status-app/issues/18674 --- vendor/status-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/status-go b/vendor/status-go index ff8c5c4d4e5..ea2dcf4d6b5 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit ff8c5c4d4e554ef3f29ec0a1582d712f5db2c967 +Subproject commit ea2dcf4d6b5d18d74d430aba604cd70f76ecb515