Merge branch 'develop' into slideshow

status-im · Jan 16, 2024 · 52793d9 · 52793d9
2 parents eb7253a + a2bf23c
commit 52793d9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/quo/components/tags/summary_tag/style.cljs b/src/quo/components/tags/summary_tag/style.cljs
@@ -21,7 +21,12 @@
 (def collectible-image
   {:width         24
    :height        24
-   :border-radius 10})
+   :border-radius 8})
+
+(def network
+  {:width         24
+   :height        24
+   :border-radius 12})
 
 (def token-image
   {:border-radius 12})
diff --git a/src/quo/components/tags/summary_tag/view.cljs b/src/quo/components/tags/summary_tag/view.cljs
@@ -22,7 +22,7 @@
     :network
     [rn/image
      {:source image-source
-      :style  style/token-image}]
+      :style  style/network}]
     :saved-address
     [wallet-user-avatar/wallet-user-avatar
      {:full-name           label

diff --git a/src/status_im/contexts/preview/quo/tags/summary_tag.cljs b/src/status_im/contexts/preview/quo/tags/summary_tag.cljs
@@ -55,9 +55,7 @@
 
 (defn view
   []
-  (let [state (reagent/atom
-               (merge {:type :token}
-                      (data :token)))]
+  (let [state (reagent/atom (assoc (data :token) :type :token))]
     (fn []
       [preview/preview-container
        {:state      state

diff --git a/src/status_im/contexts/profile/login/events.cljs b/src/status_im/contexts/profile/login/events.cljs
@@ -143,7 +143,7 @@
   {:events [:messenger-started]}
   [{:keys [db] :as cofx} {:keys [mailservers] :as response}]
   (log/info "Messenger started")
-  (let [new-account? (get db :onboarding-2/new-account?)]
+  (let [new-account? (get db :onboarding/new-account?)]
     (rf/merge cofx
               {:db            (-> db
                                   (assoc :messenger/started? true)