status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Fixes: #14834] Fix backup of contacts 

7e1a894a...cefa0089
This commit is contained in:
Andrea Maria Piana 2023-01-27 09:44:52 +00:00
parent cbd920f070
commit 41124acf4d
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
6 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/transport/message/core.cljs
View File

@ -49,7 +49,7 @@
^js visibility-status-updates (.-statusUpdates response-js) ^js visibility-status-updates (.-statusUpdates response-js)
^js current-visibility-status (.-currentStatus response-js) ^js current-visibility-status (.-currentStatus response-js)
^js bookmarks (.-bookmarks 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 cleared-histories (.-clearedHistories response-js)
^js identity-images (.-identityImages response-js) ^js identity-images (.-identityImages response-js)
^js accounts (.-accounts response-js) ^js accounts (.-accounts response-js)

4
src/status_im/ui/screens/profile/contact/views.cljs
View File

@ -21,8 +21,8 @@
:icon :main-icons/message :icon :main-icons/message
:disabled (not mutual?) :disabled (not mutual?)
:action #(re-frame/dispatch [:chat.ui/start-chat :action #(re-frame/dispatch [:chat.ui/start-chat
{:public-key public-key public-key
:ens-name ens-name}]) ens-name])
:accessibility-label :start-conversation-button}] :accessibility-label :start-conversation-button}]
(if added? (if added?
[{:label (i18n/label :t/remove-from-contacts) [{:label (i18n/label :t/remove-from-contacts)

3
src/status_im2/contexts/activity_center/notification/contact_request/view.cljs
View File

@ -20,8 +20,7 @@
[rn/touchable-opacity [rn/touchable-opacity
{:on-press (fn [] {:on-press (fn []
(rf/dispatch [:hide-popover]) (rf/dispatch [:hide-popover])
(rf/dispatch [:chat.ui/start-chat (rf/dispatch [:chat.ui/start-chat author]))}]
{:public-key author}]))}]
[:<>])] [:<>])]
(conj (conj
pressable pressable

3
src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs
View File

@ -15,7 +15,8 @@
:on-press #(rf/dispatch [:chat.ui/show-profile contact-id]) :on-press #(rf/dispatch [:chat.ui/show-profile contact-id])
:before :i/communities} :before :i/communities}
(cond (cond
(or (= contact-request-state (or (not contact-request-state)
(= contact-request-state
constants/contact-request-state-none) constants/contact-request-state-none)
(= contact-request-state (= contact-request-state
constants/contact-request-state-received)) constants/contact-request-state-received))

5
src/status_im2/contexts/chat/messages/view.cljs
View File

@ -73,11 +73,8 @@
[page-nav] [page-nav]
[pin.banner/banner chat-id] [pin.banner/banner chat-id]
[messages.list/messages-list {:chat chat :show-input? show-input?}] [messages.list/messages-list {:chat chat :show-input? show-input?}]
(cond (and (not show-input?) (if-not show-input?
contact-request-state)
[contact-requests.bottom-drawer/view chat-id contact-request-state] [contact-requests.bottom-drawer/view chat-id contact-request-state]
show-input?
[composer/composer chat-id insets])])])) [composer/composer chat-id insets])])]))
(defn chat (defn chat

6
status-go-version.json
View File

@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>", "_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.125.4", "version": "v0.126.0",
"commit-sha1": "7e1a894ab824904f0c90acbc307955940ef17800", "commit-sha1": "cefa0089dcf24e2f91ebc133ec4994c1f2e128ce",
"src-sha256": "0sf33afgvmn4rj6ka7rxx3jnvpyjxcayv25jyiv1s9dkh581zy1i" "src-sha256": "00zy4k1200da67dg23r0hvl3dfd9b4pfzsv238islp8pqa869sfi"
} }