moved wallet under options

Signed-off-by: yenda <eric@status.im>
This commit is contained in:
Andrey Shovkoplyas 2018-09-24 21:41:42 +02:00 committed by yenda
parent a87f79ab4d
commit 764bbf1e2c
No known key found for this signature in database
GPG Key ID: 0095623C0069DCE6
3 changed files with 13 additions and 9 deletions

View File

@ -2,6 +2,10 @@
(:require [re-frame.core :as re-frame]
[status-im.i18n :as i18n]))
(def view-my-wallet
{:label (i18n/label :t/view-my-wallet)
:action #(re-frame/dispatch [:navigate-to :wallet-modal])})
(defn view-profile [chat-id]
{:label (i18n/label :t/view-profile)
:action #(re-frame/dispatch [:show-profile chat-id])})
@ -19,17 +23,20 @@
:action #(re-frame/dispatch [:remove-chat-and-navigate-home? chat-id group?])})
(defn- chat-actions [chat-id]
[(view-profile chat-id)
[view-my-wallet
(view-profile chat-id)
(clear-history)
(delete-chat chat-id false)])
(defn- group-chat-actions [chat-id]
[(group-info chat-id)
[view-my-wallet
(group-info chat-id)
(clear-history)
(delete-chat chat-id true)])
(defn- public-chat-actions [chat-id]
[(clear-history)
[view-my-wallet
(clear-history)
(delete-chat chat-id true)])
(defn actions [group-chat? chat-id public?]

View File

@ -59,11 +59,7 @@
(toolbar/nav-back-count {:home? true}))
[toolbar-content/toolbar-content-view]
(when-not modal?
[toolbar/actions [{:icon :icons/wallet
:icon-opts {:color :black
:accessibility-label :wallet-modal-button}
:handler #(re-frame/dispatch [:navigate-to :wallet-modal])}
{:icon :icons/options
[toolbar/actions [{:icon :icons/options
:icon-opts {:color :black
:accessibility-label :chat-menu-button}
:handler #(on-options chat-id name group-chat public?)}]])]

View File

@ -731,5 +731,6 @@
"create-pin": "Create a PIN",
"create-pin-description": "You'll need your card + this PIN to log in and to confirm transactions",
"repeat-pin": "Repeate your PIN",
"pin-mismatch": "PIN does not match"
"pin-mismatch": "PIN does not match",
"view-my-wallet": "View my wallet"
}