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

Fix topbar in new contact 

Fixes #11091

Fix more nav handlers keys

Signed-off-by: Gheorghe Pinzaru <feross95@gmail.com>
This commit is contained in:
Gheorghe Pinzaru 2020-08-18 10:02:40 +03:00
parent cc0076048d
commit 1e7061acc2
No known key found for this signature in database
GPG Key ID: C9A094959935A952
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/status_im/ui/screens/add_new/new_chat/views.cljs
View File

@ -64,13 +64,13 @@
{:keys [state ens-name public-key error]} [:contacts/new-identity]] {:keys [state ens-name public-key error]} [:contacts/new-identity]]
[react/view {:style {:flex 1}} [react/view {:style {:flex 1}}
[topbar/topbar [topbar/topbar
{:title (i18n/label :t/new-chat) {:title (i18n/label :t/new-chat)
:modal? true :modal? true
:right-accessories :right-accessories
[{:icon :qr [{:icon :qr
:accessibility-label :scan-contact-code-button :accessibility-label :scan-contact-code-button
:handler #(re-frame/dispatch [::qr-scanner/scan-code :on-press #(re-frame/dispatch [::qr-scanner/scan-code
{:title (i18n/label :t/new-contact) {:title (i18n/label :t/new-chat)
:handler :contact/qr-code-scanned}])}]}] :handler :contact/qr-code-scanned}])}]}]
[react/view {:flex-direction :row [react/view {:flex-direction :row
:padding 16} :padding 16}
@ -113,14 +113,15 @@
(views/letsubs [{:keys [state ens-name public-key error]} [:contacts/new-identity]] (views/letsubs [{:keys [state ens-name public-key error]} [:contacts/new-identity]]
[react/view {:style {:flex 1}} [react/view {:style {:flex 1}}
[topbar/topbar [topbar/topbar
{:title :t/new-contact {:title (i18n/label :t/new-contact)
:modal? true :modal? true
:accessories [{:icon :qr :right-accessories
:accessibility-label :scan-contact-code-button [{:icon :qr
:handler #(re-frame/dispatch [::qr-scanner/scan-code :accessibility-label :scan-contact-code-button
{:title (i18n/label :t/new-contact) :on-press #(re-frame/dispatch [::qr-scanner/scan-code
:handler :contact/qr-code-scanned {:title (i18n/label :t/new-contact)
:new-contact? true}])}]}] :handler :contact/qr-code-scanned
:new-contact? true}])}]}]
[react/view {:flex-direction :row [react/view {:flex-direction :row
:padding 16} :padding 16}
[react/view {:flex 1 [react/view {:flex 1

2
src/status_im/ui/screens/intro/password.cljs
View File

@ -37,7 +37,7 @@
:navigation :navigation
{:icon :main-icons/back {:icon :main-icons/back
:accessibility-label :back-button :accessibility-label :back-button
:handler #(re-frame/dispatch [:intro-wizard/navigate-back])}}] :on-press #(re-frame/dispatch [:intro-wizard/navigate-back])}}]
[rn/view {:style {:flex 1 [rn/view {:style {:flex 1
:justify-content :space-between :justify-content :space-between
:padding-vertical 16 :padding-vertical 16

4
src/status_im/ui/screens/wallet/add_new/views.cljs
View File

@ -30,8 +30,8 @@
(when (= type :watch) (when (= type :watch)
{:right-accessories {:right-accessories
[{:icon :qr [{:icon :qr
:handler #(re-frame/dispatch [:wallet.add-new/qr-scanner :on-press #(re-frame/dispatch [:wallet.add-new/qr-scanner
{:handler :wallet.add-new/qr-scanner-result}])}]}))])) {:handler :wallet.add-new/qr-scanner-result}])}]}))]))
(defn common-settings [account] (defn common-settings [account]
[react/view {:margin-horizontal 16} [react/view {:margin-horizontal 16}