Fixes; test updates

Author: alwx

src/quo/components/wallet/summary_info/component_spec.cljs

@@ -55,3 +55,11 @@
                                                        :arbitrum 25}
                                     :account-props    status-account-props}])
     (h/is-null (h/query-by-label-text :networks))))
+
+(h/describe "Wallet: network summary info"
+  (h/test "Type of `network` title renders"
+    (h/render-with-theme-provider [summary-info/view
+                                   {:type          :network
+                                    :network-props {:full-name    "Ethereum"
+                                                    :network-name :ethereum}}])
+    (h/is-truthy (h/get-by-text "Ethereum"))))

src/quo/components/wallet/summary_info/schema.cljs

@@ -7,7 +7,7 @@
      [:map
       [:type [:enum :status-account :saved-account :account :user :token]]
       [:account-props {:optional true} [:maybe :map]]
+      [:network-props {:optional true} [:maybe :map]]
       [:token-props {:optional true} [:maybe :map]]
-      [:networks? {:optional true} [:maybe :boolean]]
-      [:values {:optional true} [:maybe :map]]]]]
+      [:networks-to-show {:optional true} [:maybe :map]]]]]
    :any])

src/quo/components/wallet/summary_info/style.cljs

@@ -39,3 +39,7 @@
    :height             32
    :flex-direction     :row
    :align-items        :center})
+
+(def network-icon
+  {:width  32
+   :height 32})

src/quo/components/wallet/summary_info/view.cljs

@@ -34,11 +34,6 @@
    :arbitrum "ARB"
    :base     "ETH"})
 
-(defn prnt
-  [data]
-  (js/console.log "DATA: " (clj->js data))
-  data)
-
 (defn networks
   [networks-to-show theme]
   (->> networks-to-show
@@ -52,13 +47,12 @@
               :divider? (not= (dec i) (-> networks-to-show keys count))
               :theme    theme}])))
        (remove nil?)
-       (prnt)
        (into [rn/view
               {:style               style/networks-container
                :accessibility-label :networks}])))
 
 (defn- view-internal
-  [{:keys [type account-props token-props networks-to-show]}]
+  [{:keys [type account-props network-props token-props networks-to-show]}]
   (let [theme   (quo.theme/use-theme)
         address (or (:address account-props) (:address token-props))]
     [rn/view
@@ -73,16 +67,26 @@
                          (assoc account-props
                                 :size     :size-32
                                 :neutral? true)]
+        :network        [rn/image
+                         {:source (resources/get-network (:network-name network-props))
+                          :style  style/network-icon}]
         [user-avatar/user-avatar account-props])
       [rn/view {:style {:margin-left 8}}
-       (when (not= type :account)
-         [text/text {:weight :semi-bold} (or (:name account-props) (:label token-props))])
+       (when (not (some #{type} [:account :network]))
+         [text/text
+          {:weight :semi-bold}
+          (or (:name account-props) (:label token-props))])
+       (when (= type :network)
+         [text/text
+          {:weight :semi-bold}
+          (:full-name network-props)])
        [rn/view
         {:style {:flex-direction :row
                  :align-items    :center}}
         (when (= type :user)
           [:<>
-           [rn/view {:style {:margin-right 4}} [account-avatar/view (:status-account account-props)]]
+           [rn/view {:style {:margin-right 4}}
+            [account-avatar/view (:status-account account-props)]]
            [text/text
             {:size  :paragraph-2
              :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}

src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs

@@ -163,8 +163,8 @@
          :accessibility-label accessibility-label}
         label]
        [quo/summary-info
-        {:type    :network
-         :network :ethereum}]])))
+        {:type          :network
+         :network-props network}]])))
 
 (defn- data-item
   [{:keys [title subtitle]}]
@@ -348,5 +348,5 @@
          :account-to?         true
          :theme               theme}]
        [network-summary
-        {:label (i18n/label :t/on)
+        {:label (i18n/label :t/on-capitalized)
          :theme theme}]]]]))

src/status_im/contexts/wallet/sheets/buy_network_selection/view.cljs

@@ -24,7 +24,7 @@
     {:size   :paragraph-2
      :weight :medium
      :style  style/on}
-    (i18n/label :t/on-uppercase)]
+    (i18n/label :t/on-capitalized)]
    [quo/context-tag
     {:type            :network
      :network-logo    (:logo-url provider)

src/status_im/subs/wallet/networks.cljs

@@ -76,10 +76,7 @@
  :wallet/send-selected-network
  :<- [:wallet/wallet-send]
  (fn [{:keys [to-values-by-chain]}]
-   (let [network-name (-> to-values-by-chain
-                          keys
-                          first
-                          network-utils/id->network)]
-     (if (= network-name :mainnet)
-       :ethereum
-       network-name))))
+   (-> to-values-by-chain
+       keys
+       first
+       network-utils/get-network-details)))

translations/en.json

@@ -1892,7 +1892,6 @@
   "on-keycard": "On Keycard",
   "on-status-tree": "On Status tree",
   "on-the-web": "On the web",
-  "on-uppercase": "On",
   "once-enabled-share-metadata": "Once enabled, links posted in the chat may share your metadata with the site",
   "one-day": "One day",
   "one-month": "One month",