status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

load more ui fix 

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Andrey Shovkoplyas 2020-02-03 15:04:08 +01:00
parent 6e9292c1e1
commit e0bafb842e
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/status_im/ui/screens/wallet/transactions/views.cljs
View File

@ -7,9 +7,10 @@
[status-im.ui.components.icons.vector-icons :as vector-icons] [status-im.ui.components.icons.vector-icons :as vector-icons]
[status-im.ui.components.styles :as components.styles] [status-im.ui.components.styles :as components.styles]
[status-im.ui.components.toolbar.actions :as actions] [status-im.ui.components.toolbar.actions :as actions]
[status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.toolbar.view :as toolbar-old]
[status-im.ui.screens.wallet.transactions.styles :as styles] [status-im.ui.screens.wallet.transactions.styles :as styles]
[status-im.ui.components.topbar :as topbar]) [status-im.ui.components.topbar :as topbar]
[status-im.ui.components.toolbar :as toolbar])
(:require-macros [status-im.utils.views :refer [defview letsubs]])) (:require-macros [status-im.utils.views :refer [defview letsubs]]))
(defn- transaction-icon (defn- transaction-icon
@ -124,19 +125,12 @@
:margin-vertical 8}} :margin-vertical 8}}
[react/activity-indicator {:size :large [react/activity-indicator {:size :large
:animating true}]] :animating true}]]
[react/view [toolbar/toolbar
{:style {:flex 1 {:center {:label (i18n/label :t/transactions-load-more)
:padding-horizontal 14 :type :secondary
:height 52
:align-items :center
:justify-content :center
:background-color colors/blue-light}}
[react/text
{:style {:color colors/blue}
:on-press (when-not fetching-more-history? :on-press (when-not fetching-more-history?
#(re-frame/dispatch #(re-frame/dispatch
[:transactions/fetch-more address]))} [:transactions/fetch-more address]))}}]))]))
(i18n/label :t/transactions-load-more)]]))]))
(defn- render-item-filter [{:keys [id label checked? on-touch]}] (defn- render-item-filter [{:keys [id label checked? on-touch]}]
[react/view {:accessibility-label :filter-item} [react/view {:accessibility-label :filter-item}
@ -256,10 +250,10 @@
[:wallet.transactions.details/screen hash address]] [:wallet.transactions.details/screen hash address]]
[react/view {:style components.styles/flex} [react/view {:style components.styles/flex}
;;TODO options should be replaced by bottom sheet ,and topbar should be used here ;;TODO options should be replaced by bottom sheet ,and topbar should be used here
[toolbar/toolbar {} [toolbar-old/toolbar {}
toolbar/default-nav-back toolbar-old/default-nav-back
[toolbar/content-title (i18n/label :t/transaction-details)] [toolbar-old/content-title (i18n/label :t/transaction-details)]
(when transaction [toolbar/actions (details-action hash url)])] (when transaction [toolbar-old/actions (details-action hash url)])]
[react/scroll-view {:style components.styles/main-container} [react/scroll-view {:style components.styles/main-container}
[details-header date type amount-text currency-text] [details-header date type amount-text currency-text]
[details-confirmations confirmations confirmations-progress (= :failed type)] [details-confirmations confirmations confirmations-progress (= :failed type)]