diff --git a/src/status_im/transport/message/core.cljs b/src/status_im/transport/message/core.cljs index 66a9ee53fd..7542afacc7 100644 --- a/src/status_im/transport/message/core.cljs +++ b/src/status_im/transport/message/core.cljs @@ -49,7 +49,7 @@ ^js visibility-status-updates (.-statusUpdates response-js) ^js current-visibility-status (.-currentStatus response-js) ^js bookmarks (.-bookmarks response-js) - ^js settings (.-settings response-js) + ^js settings (remove nil? (.-settings response-js)) ^js cleared-histories (.-clearedHistories response-js) ^js identity-images (.-identityImages response-js) ^js accounts (.-accounts response-js) diff --git a/src/status_im/ui/screens/profile/contact/views.cljs b/src/status_im/ui/screens/profile/contact/views.cljs index 9f3c6e6fb0..1ee5977cb0 100644 --- a/src/status_im/ui/screens/profile/contact/views.cljs +++ b/src/status_im/ui/screens/profile/contact/views.cljs @@ -21,8 +21,8 @@ :icon :main-icons/message :disabled (not mutual?) :action #(re-frame/dispatch [:chat.ui/start-chat - {:public-key public-key - :ens-name ens-name}]) + public-key + ens-name]) :accessibility-label :start-conversation-button}] (if added? [{:label (i18n/label :t/remove-from-contacts) diff --git a/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs b/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs index fe0fc0103f..b89ae1f7c7 100644 --- a/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs +++ b/src/status_im2/contexts/activity_center/notification/contact_request/view.cljs @@ -20,8 +20,7 @@ [rn/touchable-opacity {:on-press (fn [] (rf/dispatch [:hide-popover]) - (rf/dispatch [:chat.ui/start-chat - {:public-key author}]))}] + (rf/dispatch [:chat.ui/start-chat author]))}] [:<>])] (conj pressable diff --git a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs index 7feb5a81d4..faf32a0d4c 100644 --- a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs +++ b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs @@ -15,7 +15,8 @@ :on-press #(rf/dispatch [:chat.ui/show-profile contact-id]) :before :i/communities} (cond - (or (= contact-request-state + (or (not contact-request-state) + (= contact-request-state constants/contact-request-state-none) (= contact-request-state constants/contact-request-state-received)) diff --git a/src/status_im2/contexts/chat/messages/view.cljs b/src/status_im2/contexts/chat/messages/view.cljs index dece44e06b..796a896aee 100644 --- a/src/status_im2/contexts/chat/messages/view.cljs +++ b/src/status_im2/contexts/chat/messages/view.cljs @@ -73,12 +73,9 @@ [page-nav] [pin.banner/banner chat-id] [messages.list/messages-list {:chat chat :show-input? show-input?}] - (cond (and (not show-input?) - contact-request-state) - [contact-requests.bottom-drawer/view chat-id contact-request-state] - - show-input? - [composer/composer chat-id insets])])])) + (if-not show-input? + [contact-requests.bottom-drawer/view chat-id contact-request-state] + [composer/composer chat-id insets])])])) (defn chat [] diff --git a/status-go-version.json b/status-go-version.json index 413a2661df..92db50c18c 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.125.4", - "commit-sha1": "7e1a894ab824904f0c90acbc307955940ef17800", - "src-sha256": "0sf33afgvmn4rj6ka7rxx3jnvpyjxcayv25jyiv1s9dkh581zy1i" + "version": "v0.126.0", + "commit-sha1": "cefa0089dcf24e2f91ebc133ec4994c1f2e128ce", + "src-sha256": "00zy4k1200da67dg23r0hvl3dfd9b4pfzsv238islp8pqa869sfi" }