Compare commits

...
2 Commits
Author SHA1 Message Date
alwx 3ff4b8d8b6 Fixes 2024-07-23 14:20:58 +02:00
alwx f775010691 WalletConnect request header UI is misaligned 2024-07-23 14:17:39 +02:00
5 changed files with 42 additions and 35 deletions
@@ -4,8 +4,7 @@
(defn main (defn main
[{:keys [type customization-color]} theme] [{:keys [type customization-color]} theme]
{:justify-content :center {:align-items :center
:align-items :center
:height 32 :height 32
:padding-left 4 :padding-left 4
:padding-right 10 :padding-right 10
@@ -67,7 +67,9 @@
:style (style/main (assoc props :customization-color customization-color) theme)} :style (style/main (assoc props :customization-color customization-color) theme)}
[left-view props] [left-view props]
[text/text [text/text
{:style (style/label type theme) {:style (style/label type theme)
:weight :semi-bold :weight :semi-bold
:size :heading-1} :ellipsize-mode :tail
:number-of-lines 1
:size :heading-1}
label]])) label]]))
@@ -1,16 +1,16 @@
(ns status-im.contexts.wallet.connected-dapps.view (ns status-im.contexts.wallet.connected-dapps.view
(:require (:require
[quo.core :as quo] [quo.core :as quo]
[quo.foundations.colors :as colors] [quo.foundations.colors :as colors]
[quo.theme] [quo.theme]
[react-native.core :as rn] [react-native.core :as rn]
[react-native.safe-area :as safe-area] [react-native.safe-area :as safe-area]
[status-im.common.plus-button.view :as plus-button] [status-im.common.plus-button.view :as plus-button]
[status-im.common.resources :as resources] [status-im.common.resources :as resources]
[status-im.contexts.wallet.connected-dapps.disconnect-dapp.view :as disconnect-dapp] [status-im.contexts.wallet.connected-dapps.disconnect-dapp.view :as disconnect-dapp]
[status-im.contexts.wallet.connected-dapps.style :as style] [status-im.contexts.wallet.connected-dapps.style :as style]
[utils.i18n :as i18n] [utils.i18n :as i18n]
[utils.re-frame :as rf])) [utils.re-frame :as rf]))
(defn- on-disconnect (defn- on-disconnect
[wallet-account {:keys [name topic]}] [wallet-account {:keys [name topic]}]
@@ -1,10 +1,15 @@
(ns status-im.contexts.wallet.wallet-connect.modals.common.header.style) (ns status-im.contexts.wallet.wallet-connect.modals.common.header.style)
(def header-container (def header-container
{:padding-vertical 12}) {:padding-vertical 12
:flex-direction :column
:align-items :stretch})
(def header-dapp-name (def header-dapp-name
{:margin-top -4}) {:flex-direction :row})
(def header-text
{:margin-vertical 4})
(def header-account-name (def header-account-name
{:padding-top 4}) {:align-items :flex-start})
@@ -5,22 +5,23 @@
(defn view (defn view
[{:keys [label dapp account]}] [{:keys [label dapp account]}]
[rn/view [rn/view {:style style/header-container}
{:style style/header-container} (let [{:keys [name iconUrl]} dapp]
[quo/text [rn/view {:style style/header-dapp-name}
{:size :heading-1 [rn/view {:flex 1}
:weight :semi-bold}
(let [{:keys [name iconUrl]} dapp]
[rn/view {:style style/header-dapp-name}
[quo/summary-tag [quo/summary-tag
{:type :dapp {:type :dapp
:label name :label name
:image-source iconUrl}]]) :image-source iconUrl}]]])
(str " " label " ") [quo/text
(let [{:keys [emoji customization-color name]} account] {:size :heading-1
[rn/view {:style style/header-account-name} :weight :semi-bold
[quo/summary-tag :style style/header-text}
{:type :account label]
:emoji emoji (let [{:keys [emoji customization-color name]} account]
:label name [rn/view {:style style/header-account-name}
:customization-color customization-color}]])]]) [quo/summary-tag
{:type :account
:emoji emoji
:label name
:customization-color customization-color}]])])