Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Network fee error changed from tooltip to red text #9009

Closed
wants to merge 1 commit into from
Closed

Network fee error changed from tooltip to red text #9009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 71 additions & 0 deletions src/status_im/ui/components/list_item/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,3 +405,74 @@
[accessories-column accessories width])]]
(when error
[tooltip/tooltip error styles/error])])))})))


(defn list-item-with-red-text

[_]
(let [width (reagent/atom 0)
r-key (name (gensym "list-item"))]
(reagent/create-class
{:reagent-render
(fn
[{:keys
[react-key type theme container-margin-top container-margin-bottom
icon title-prefix title-prefix-width title-prefix-height
title title-color-override title-row-accessory
title-accessibility-label subtitle subtitle-max-lines
subtitle-row-accessory content accessories on-press
on-long-press error accessibility-label disabled? selected?]
:or {react-key r-key
type :default
theme :default
disabled? false
container-margin-top 0
container-margin-bottom 0
subtitle-max-lines 1}}]
(let [title-row-elements
{:title title
:title-color-override title-color-override
:title-accessibility-label title-accessibility-label
:title-prefix title-prefix
:title-prefix-width title-prefix-width
:title-prefix-height title-prefix-height
:title-row-accessory title-row-accessory}
subtitle-row-elements
{:subtitle subtitle
:subtitle-max-lines subtitle-max-lines
:subtitle-row-accessory subtitle-row-accessory}
radio-selected? (and (= theme :selectable) selected?)]
^{:key react-key}
(if (= type :divider)
divider
[react/view {:style {:margin-top container-margin-top
:margin-bottom container-margin-bottom}
:on-layout #(reset! width (-> % .-nativeEvent .-layout .-width))}
[react/touchable-highlight
(cond-> {:on-press (when (not= theme :selectable) on-press)
:on-press-in (when (= theme :selectable) on-press)
:on-long-press on-long-press
:underlay-color colors/gray-transparent-40
:active-opacity (if (= theme :selectable) 1 0.85)
:disabled (or (not on-press) selected? disabled?)}
accessibility-label
(assoc :accessibility-label accessibility-label))
[react/view {:style (styles/container type radio-selected?)}
(when icon
[icon-column icon theme disabled?])

(when (or title subtitle content)
[title-column
title-row-elements subtitle-row-elements
type icon disabled? theme content accessories])

(when accessories
[accessories-column accessories width])]]
(when error

[react/view {:align-items :center}
[react/text {:style {:color colors/red}}
error]]


)])))})))
4 changes: 2 additions & 2 deletions src/status_im/ui/screens/signing/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,14 @@
[token-item token display-symbol]
(when-not approve?
[react/view
[list-item/list-item
[list-item/list-item-with-red-text
{:type :small
:title :t/send-request-amount
:error amount-error
:accessories [[acc-text (if amount (str amount) "0")
(or display-symbol fee-display-symbol)]]}]
[separator]])
[list-item/list-item
[list-item/list-item-with-red-text
{:type :small
:title :t/network-fee
:error gas-error
Expand Down