From 9078c3b61bd34af3c6be6a5edf861bed6df9d8ca Mon Sep 17 00:00:00 2001 From: Icaro Motta Date: Fri, 13 Oct 2023 17:10:38 +0000 Subject: [PATCH] Composer - Link previews - Adjust for upcoming API breaking changes in status-go (#17573) Adapt the JSON RPC response to the new shape returned by `wakuext_unfurlURLs` on v0.170.0. The changes were introduced PR https://github.com/status-im/status-go/pull/4033. There are no behavioral changes in the API as far as mobile is concerned at the moment. --- .../chat/composer/link_preview/events.cljs | 2 +- .../composer/link_preview/events_test.cljs | 18 ++++++++++-------- status-go-version.json | 6 +++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/status_im2/contexts/chat/composer/link_preview/events.cljs b/src/status_im2/contexts/chat/composer/link_preview/events.cljs index 5e1ce194588..806ee9dff0c 100644 --- a/src/status_im2/contexts/chat/composer/link_preview/events.cljs +++ b/src/status_im2/contexts/chat/composer/link_preview/events.cljs @@ -82,7 +82,7 @@ (rf/defn unfurl-parsed-urls-success {:events [:link-preview/unfurl-parsed-urls-success]} - [{:keys [db]} request-id new-previews] + [{:keys [db]} request-id {new-previews :linkPreviews}] (when (= request-id (get-in db [:chat/link-previews :request-id])) (let [new-previews (map data-store.messages/<-link-preview-rpc new-previews) curr-previews (get-in db [:chat/link-previews :unfurled]) diff --git a/src/status_im2/contexts/chat/composer/link_preview/events_test.cljs b/src/status_im2/contexts/chat/composer/link_preview/events_test.cljs index ddff60844e7..6ea012fbb65 100644 --- a/src/status_im2/contexts/chat/composer/link_preview/events_test.cljs +++ b/src/status_im2/contexts/chat/composer/link_preview/events_test.cljs @@ -139,7 +139,7 @@ {:request-id request-id :unfurled [] :cache {}}}}] - (is (nil? (events/unfurl-parsed-urls-success cofx "banana" [preview-github]))))) + (is (nil? (events/unfurl-parsed-urls-success cofx "banana" {:linkPreviews [preview-github]}))))) (testing "reconciles new previews with existing ones" (let [cofx {:db {:chat/link-previews @@ -147,9 +147,10 @@ :unfurled [preview-github {:url url-gitlab :loading? true}] :cache {url-github preview-github}}}} - {db :db} (events/unfurl-parsed-urls-success cofx - request-id - [preview-gitlab])] + {db :db} (events/unfurl-parsed-urls-success + cofx + request-id + {:linkPreviews [preview-gitlab]})] (is (= {:chat/link-previews {:request-id request-id :unfurled [preview-github preview-gitlab] @@ -165,10 +166,11 @@ preview-youtube {:url url-gitlab :loading? true}] :cache {(:url preview-youtube) preview-youtube}}}} - {db :db} (events/unfurl-parsed-urls-success cofx - request-id - [preview-github - preview-youtube])] + {db :db} (events/unfurl-parsed-urls-success + cofx + request-id + {:linkPreviews [preview-github + preview-youtube]})] (is (= {:chat/link-previews {:request-id request-id :unfurled [preview-github preview-youtube] diff --git a/status-go-version.json b/status-go-version.json index b7abc6385d7..0ba75ca5d6a 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -3,7 +3,7 @@ "_comment": "Instead use: scripts/update-status-go.sh ", "owner": "status-im", "repo": "status-go", - "version": "v0.168.1", - "commit-sha1": "9034f0a984601d71e40d0aa846fbc5e4d01017cd", - "src-sha256": "1niics10a0p3dnlfr011sqf5prrjilv6kjplnc2c51q2pw6fv35h" + "version": "v0.170.0", + "commit-sha1": "aded258ccb68f88dc995e22f8b4e06157bb642db", + "src-sha256": "1wdc814yx6qam2ngrh119hm63bgjigqi4cpiawy2i0ywk47qwdbg" }