Skip to content

Commit

Permalink
styles fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
vkjr committed Dec 14, 2023
1 parent 95d9f09 commit 6d52a65
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
14 changes: 13 additions & 1 deletion src/status_im2/contexts/wallet/home/style.cljs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
(ns status-im2.contexts.wallet.home.style)
(ns status-im2.contexts.wallet.home.style
(:require
[react-native.safe-area :as safe-area]))

(def tabs
{:padding-horizontal 20
Expand All @@ -23,3 +25,13 @@
{:justify-content :center
:flex 1
:margin-bottom 44})

(def separator
{:width 12})

(def selected-tab-container
{:padding-horizontal 8})

(def home-container
{:margin-top (safe-area/get-top)
:flex 1})
11 changes: 5 additions & 6 deletions src/status_im2/contexts/wallet/home/view.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
(:require
[quo.core :as quo]
[react-native.core :as rn]
[react-native.safe-area :as safe-area]
[reagent.core :as reagent]
[status-im.ui.screens.wallet.components.styles :as styles]
[status-im2.common.home.top-nav.view :as common.top-nav]
[status-im2.contexts.wallet.common.activity-tab.view :as activity]
[status-im2.contexts.wallet.common.collectibles-tab.view :as collectibles]
Expand Down Expand Up @@ -49,14 +49,13 @@
(let [networks (rf/sub [:wallet/network-details])
account-cards-data (rf/sub [:wallet/account-cards-data])
accounts (rf/sub [:wallet/accounts])
cards (conj account-cards-data (new-account-card-data))
top (safe-area/get-top)]
cards (conj account-cards-data (new-account-card-data))]
(rn/use-effect (fn []
(rf/dispatch [:wallet/request-collectibles
{:start-at-index 0
:new-request? true}]))
[(count accounts)])
[rn/view {:style {:margin-top top :flex 1}}
[rn/view {:style style/home-container}
[common.top-nav/view]
[rn/view {:style style/overview-container}
[quo/wallet-overview (temp/wallet-overview-state networks)]]
Expand All @@ -66,7 +65,7 @@
:content-container-style style/accounts-list-container
:data cards
:horizontal true
:separator [rn/view {:style {:width 12}}]
:separator [rn/view {:style styles/separator}]
:render-fn quo/account-card
:shows-horizontal-scroll-indicator false}]
[quo/tabs
Expand All @@ -80,7 +79,7 @@
{:render-fn quo/token-value
:data temp/tokens
:key :assets-list
:content-container-style {:padding-horizontal 8}}]
:content-container-style style/selected-tab-container}]
:collectibles [collectibles/view]
[activity/view])]))

Expand Down

0 comments on commit 6d52a65

Please sign in to comment.