Skip to content

Commit

Permalink
Merge branch 'develop' into milad/19657-remove-watch-only-balance-in-…
Browse files Browse the repository at this point in the history
…overal
  • Loading branch information
mmilad75 committed Apr 19, 2024
2 parents 7fb296a + ca53bf7 commit 9234420
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .env
Expand Up @@ -35,4 +35,4 @@ LOCAL_PAIRING_ENABLED=1
TEST_STATEOFUS=1
FAST_CREATE_COMMUNITY_ENABLED=1
TEST_NETWORKS_ENABLED=1
SHOW_NOT_IMPLEMENTED_FEATURES=1
SHOW_NOT_IMPLEMENTED_FEATURES=0
14 changes: 8 additions & 6 deletions src/quo/components/tabs/tabs/view.cljs
Expand Up @@ -116,6 +116,8 @@
set-active-tab-id] (rn/use-state default-active)
[fading set-fading] (rn/use-state fade-end-percentage)
flat-list-ref (rn/use-ref-atom nil)
tabs-data (rn/use-memo (fn [] (filterv some? data))
[data])
clean-props (dissoc props
:default-active
:fade-end-percentage
Expand All @@ -142,8 +144,8 @@
:index
(utils.collection/first-index
#(= active-tab-id (:id %))
data)}))))
[active-tab-id data])
tabs-data)}))))
[active-tab-id tabs-data])
on-tab-press (rn/use-callback (fn [id index]
(set-active-tab-id id)
(when (and scroll-on-press? @flat-list-ref)
Expand Down Expand Up @@ -175,7 +177,7 @@
:horizontal true
:scroll-event-throttle 64
:shows-horizontal-scroll-indicator false
:data data
:data tabs-data
:key-fn (comp str :id)
:on-scroll-to-index-failed identity
:on-scroll on-scroll
Expand All @@ -184,7 +186,7 @@
:render-data {:active-tab-id active-tab-id
:blur? blur?
:customization-color customization-color
:number-of-items (count data)
:number-of-items (count tabs-data)
:size size
:on-press on-tab-press
:style style}})]]]
Expand All @@ -195,8 +197,8 @@
{:active-tab-id active-tab-id
:blur? blur?
:customization-color customization-color
:number-of-items (count data)
:number-of-items (count tabs-data)
:size size
:on-press on-tab-press
:style style}])
data)])))
tabs-data)])))
14 changes: 8 additions & 6 deletions src/status_im/contexts/shell/activity_center/tabs/view.cljs
Expand Up @@ -2,6 +2,7 @@
(:require
[clojure.set :as set]
[quo.core :as quo]
[status-im.config :as config]
[status-im.contexts.shell.activity-center.notification-types :as types]
[status-im.contexts.shell.activity-center.style :as style]
[utils.i18n :as i18n]
Expand Down Expand Up @@ -48,12 +49,13 @@
:accessibility-label :tab-contact-request
:notification-dot? (when-not is-mark-all-as-read-undoable?
(contains? types-with-unread types/contact-request))}
{:id types/contact-verification
:label (i18n/label :t/identity-verification)
:accessibility-label :tab-contact-verification
:notification-dot? (when-not is-mark-all-as-read-undoable?
(contains? types-with-unread
types/contact-verification))}
(when config/show-not-implemented-features?
{:id types/contact-verification
:label (i18n/label :t/identity-verification)
:accessibility-label :tab-contact-verification
:notification-dot? (when-not is-mark-all-as-read-undoable?
(contains? types-with-unread
types/contact-verification))})
{:id types/tx
:label (i18n/label :t/transactions)
:accessibility-label :tab-tx
Expand Down

0 comments on commit 9234420

Please sign in to comment.