some UI fixes and resources to properly support Base

status-im/status-go@df1c878...e60b776

Author: briansztamfater

resources/images/networks/[email protected]

@@ -30,13 +30,16 @@
 
 (defn networks
   [values theme]
-  (let [{:keys [ethereum optimism arbitrum]} values
-        show-optimism?                       (and optimism
-                                                  (or (pos? (:amount optimism))
-                                                      (= (:amount optimism) "<0.01")))
-        show-arbitrum?                       (and arbitrum
-                                                  (or (pos? (:amount arbitrum))
-                                                      (= (:amount arbitrum) "<0.01")))]
+  (let [{:keys [ethereum optimism arbitrum base]} values
+        show-optimism?                            (and optimism
+                                                       (or (pos? (:amount optimism))
+                                                           (= (:amount optimism) "<0.01")))
+        show-arbitrum?                            (and arbitrum
+                                                       (or (pos? (:amount arbitrum))
+                                                           (= (:amount arbitrum) "<0.01")))
+        show-base?                                (and base
+                                                       (or (pos? (:amount base))
+                                                           (= (:amount base) "<0.01")))]
     [rn/view
      {:style               style/networks-container
       :accessibility-label :networks}
@@ -56,6 +59,11 @@
        [network-amount
         {:network :arbitrum
          :amount  (str (:amount arbitrum) " " (or (:token-symbol arbitrum) "ARB"))
+         :theme   theme}])
+     (when show-base?
+       [network-amount
+        {:network :base
+         :amount  (str (:amount base) " " (or (:token-symbol base) "ETH"))
          :theme   theme}])]))
 
 (defn- view-internal

resources/images/networks/[email protected]

@@ -44,6 +44,7 @@
    :hermez   (js/require "../resources/images/networks/Hermez.png")
    :optimism (js/require "../resources/images/networks/Optimism.png")
    :paraswap (js/require "../resources/images/networks/Paraswap.png")
+   :base     (js/require "../resources/images/networks/Base.png")
    :polygon  (js/require "../resources/images/networks/Polygon.png")
    :scroll   (js/require "../resources/images/networks/Scroll.png")
    :taiko    (js/require "../resources/images/networks/Taiko.png")

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

@@ -279,9 +279,7 @@
  (fn [{:keys [db]} [{:keys [sent-transactions swap-data approval-transaction?]}]]
    (let [wallet-transactions  (get-in db [:wallet :transactions] {})
          transactions         (utils/transactions->hash-to-transaction-map sent-transactions)
-         transaction-ids      (->> transactions
-                                   vals
-                                   (map :hash))
+         transaction-ids      (keys transactions)
          transaction-id       (first transaction-ids)
          transaction-details  (cond-> transactions
                                 :always   (assoc-in [transaction-id :tx-type] :swap)

src/quo/foundations/resources.cljs

@@ -4,6 +4,6 @@
     "owner": "status-im",
     "repo": "status-go",
     "version": "feat/integrate-base-chain",
-    "commit-sha1": "85a35c3e6c3bc9ac844a5a87df8d52617ed8eeff",
-    "src-sha256": "1575p1ib4ziymmpmqagbr1dizvq9kzvxgk7vn30xcyc25fybbgnk"
+    "commit-sha1": "e60b77602d8f325ad4de3d8b4f3589cbf5279ad7",
+    "src-sha256": "1l3sb9a8vf1mbx748r5y2r428l6qyz6k04hkwsw6d0qswca0dabr"
 }