Skip to content

Commit

Permalink
Fix tabbar bad rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Ferossgp committed Mar 10, 2020
1 parent a9083c0 commit 9119989
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/status_im/ui/components/tabbar/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@
[vector-icons/icon icon (tabs.styles/icon active?)]
(when count
(cond
(or (pos? @count) (pos? (:other @count)))
(or (pos? count) (pos? (:other count)))
[react/view {:style (if (= nav-stack :chat-stack)
tabs.styles/message-counter
tabs.styles/counter)}
[badge/message-counter (or (:other @count) @count) true]]
(pos? (:public @count))
[badge/message-counter (or (:other count) count) true]]
(pos? (:public count))
[react/view {:style tabs.styles/counter-public-container}
[react/view {:style tabs.styles/counter-public
:accessibility-label :public-unread-badge}]]))]
Expand Down

0 comments on commit 9119989

Please sign in to comment.