Skip to content

Commit fedd6f9

Browse files
committed
review
1 parent d622f0c commit fedd6f9

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/quo2/components/wallet/keypair/view.cljs

+5-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
:accessibility-label :options-button}]])]))
6060

6161
(defn details-view
62+
<<<<<<< HEAD
6263
<<<<<<< HEAD
6364
[address stored blur? theme]
6465
[rn/view
@@ -84,6 +85,9 @@
8485
>>>>>>> be98d71dc (quo2: keypair blur)
8586
=======
8687
[details stored blur? theme]
88+
=======
89+
[{:keys [details stored blur? theme]}]
90+
>>>>>>> 099b4ac61 (review)
8791
(let [{:keys [address]} details]
8892
[rn/view
8993
{:style {:flex-direction :row
@@ -116,7 +120,7 @@
116120
[rn/view
117121
{:style {:margin-left 8
118122
:flex 1}}
119-
[title-view (merge props {:selected? @selected?})]
123+
[title-view (assoc props :selected? @selected?)]
120124
[details-view props]]]
121125
[rn/flat-list
122126
{:data accounts

0 commit comments

Comments
 (0)