mirror of
https://github.com/status-im/status-react.git
synced 2025-02-18 22:08:10 +00:00
fix icon missing regression (#13907)
This was a tricky one :P removing un-necessary check of new-ui? this is a better solution The core issue was that when new-ui? was passed instead of the actual value just the key was passed
This commit is contained in:
parent
0495a9a0ba
commit
7f50b56c26
@ -12,6 +12,7 @@
|
|||||||
[status-im.ui.components.icons.icons :as icons]
|
[status-im.ui.components.icons.icons :as icons]
|
||||||
[quo2.foundations.colors :as quo2.colors]
|
[quo2.foundations.colors :as quo2.colors]
|
||||||
[quo2.components.icon :as quo.icons]
|
[quo2.components.icon :as quo.icons]
|
||||||
|
[status-im.utils.config :as config]
|
||||||
[quo.components.animated.pressable :as animated]))
|
[quo.components.animated.pressable :as animated]))
|
||||||
|
|
||||||
(defn themes [theme]
|
(defn themes [theme]
|
||||||
@ -77,14 +78,14 @@
|
|||||||
children))
|
children))
|
||||||
|
|
||||||
(defn icon-column
|
(defn icon-column
|
||||||
[{:keys [icon icon-bg-color icon-color size icon-container-style new-ui?]}]
|
[{:keys [icon icon-bg-color icon-color size icon-container-style]}]
|
||||||
(when icon
|
(when icon
|
||||||
(let [icon-size (size->icon-size size)]
|
(let [icon-size (size->icon-size size)
|
||||||
|
new-ui? @config/new-ui-enabled?]
|
||||||
[rn/view {:style (or icon-container-style (:tiny spacing/padding-horizontal))}
|
[rn/view {:style (or icon-container-style (:tiny spacing/padding-horizontal))}
|
||||||
(cond
|
(cond
|
||||||
(vector? icon)
|
(vector? icon)
|
||||||
icon
|
icon
|
||||||
|
|
||||||
(keyword? icon)
|
(keyword? icon)
|
||||||
(if new-ui?
|
(if new-ui?
|
||||||
[quo.icons/icon icon {:container-style {:align-items :center
|
[quo.icons/icon icon {:container-style {:align-items :center
|
||||||
@ -270,8 +271,7 @@
|
|||||||
:subtitle subtitle
|
:subtitle subtitle
|
||||||
:subtitle-max-lines subtitle-max-lines
|
:subtitle-max-lines subtitle-max-lines
|
||||||
:subtitle-secondary subtitle-secondary
|
:subtitle-secondary subtitle-secondary
|
||||||
:right-side-present? (or accessory chevron)
|
:right-side-present? (or accessory chevron)}]
|
||||||
:new-ui? :new-ui?}]
|
|
||||||
[right-side {:chevron chevron
|
[right-side {:chevron chevron
|
||||||
:active active
|
:active active
|
||||||
:disabled disabled
|
:disabled disabled
|
||||||
|
Loading…
x
Reference in New Issue
Block a user