From 5a2fbb0f8e5e7ca9d7f7453b559633d178be8720 Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Thu, 7 Mar 2019 10:28:37 +0100 Subject: [PATCH] default json value --- src/cljs/status_dapp/db.cljs | 1 + src/cljs/status_dapp/views.cljs | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cljs/status_dapp/db.cljs b/src/cljs/status_dapp/db.cljs index 9bd503c..198383b 100644 --- a/src/cljs/status_dapp/db.cljs +++ b/src/cljs/status_dapp/db.cljs @@ -22,4 +22,5 @@ :web3-async-data {} :view-id (if web3 :web3 :no-web3) :message "Test message" + :message-json "{\"types\":{\"EIP712Domain\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"version\",\"type\":\"string\"},{\"name\":\"chainId\",\"type\":\"uint256\"},{\"name\":\"verifyingContract\",\"type\":\"address\"}],\"Person\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"wallet\",\"type\":\"address\"}],\"Mail\":[{\"name\":\"from\",\"type\":\"Person\"},{\"name\":\"to\",\"type\":\"Person\"},{\"name\":\"contents\",\"type\":\"string\"}]},\"primaryType\":\"Mail\",\"domain\":{\"name\":\"Ether Mail\",\"version\":\"1\",\"chainId\":3,\"verifyingContract\":\"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC\"},\"message\":{\"from\":{\"name\":\"Cow\",\"wallet\":\"0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826\"},\"to\":{\"name\":\"Bob\",\"wallet\":\"0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB\"},\"contents\":\"Hello, Bob!\"}}" :tab-view :accounts}) \ No newline at end of file diff --git a/src/cljs/status_dapp/views.cljs b/src/cljs/status_dapp/views.cljs index b78d533..00c1bb4 100644 --- a/src/cljs/status_dapp/views.cljs +++ b/src/cljs/status_dapp/views.cljs @@ -14,8 +14,9 @@ (defview contract-panel [accounts] (letsubs [message [:get :message] + typed-message [:get :message-json] {:keys [result]} [:get :signed-message] - typed-message [:get :signed-typed-message] + signed-typed-message [:get :signed-typed-message] {:keys [tx-hash address value]} [:get :contract]] [react/view [react/view {:style {:margin-bottom 10 :flex-direction :row :align-items :center}} @@ -32,17 +33,17 @@ [react/text {:style {:flex 1}} (str result)]]) [react/view [react/text-input {:style {:font-size 15 :border-width 1 :border-color "#4360df33" :height 60} - :placeholder "JSON" + :default-value typed-message :multiline true :on-change (fn [e] (let [native-event (.-nativeEvent e) text (.-text native-event)] (re-frame/dispatch [:set :message-json text])))}]] [ui/button "Sign Typed Message" #(re-frame/dispatch [:sign-json-message])] - (when (:result typed-message) + (when (:result signed-typed-message) [react/view {:style {:margin-bottom 10}} [ui/label "Signed typed message: " ""] - [react/text {:style {:flex 1}} (str (:result typed-message))]]) + [react/text {:style {:flex 1}} (str (:result signed-typed-message))]]) [react/view {:style {:height 20}}] (cond