status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-01-11 11:34:45 +00:00
Code Issues Projects Releases Wiki Activity

fix #1893 cannot scroll to last 2 transactions in history

Browse Source 
update react-native-swipper to latest working version
remove bottom margin hack in other screens with similar bug
fixes Cannot scroll transaction history when app is syncing #1902 as well
This commit is contained in:
Eric Dvorsak 2017-09-22 18:45:15 +02:00 committed by Roman Volosovskyi
parent c846574155
commit 7d9190bb85
8 changed files with 369 additions and 481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

823
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -75,7 +75,7 @@
"react-native-sortable-listview": "^0.1.1", "react-native-sortable-listview": "^0.1.1",
"react-native-splash-screen": "1.0.9", "react-native-splash-screen": "1.0.9",
"react-native-svg": "^4.6.1", "react-native-svg": "^4.6.1",
"react-native-swiper": "1.5.3", "react-native-swiper": "1.5.10",
"react-native-tcp": "^3.2.1", "react-native-tcp": "^3.2.1",
"react-native-udp": "^2.0.0", "react-native-udp": "^2.0.0",
"react-native-vector-icons": "^4.0.1", "react-native-vector-icons": "^4.0.1",

8
src/status_im/ui/screens/chats_list/styles.cljs
View File

@ -140,12 +140,10 @@
(def chats-container (def chats-container
{:flex 1}) {:flex 1})
(defnstyle list-container [tabs-hidden?] (defstyle list-container
{:android {:background-color color-light-gray {:android {:background-color color-light-gray}
:margin-bottom 20}
:ios {:background-color color-white :ios {:background-color color-white}})
:margin-bottom (if tabs-hidden? 20 (+ 16 tabs-st/tabs-height))}})
(def toolbar-actions (def toolbar-actions
{:flex-direction :row {:flex-direction :row

2
src/status_im/ui/screens/chats_list/views.cljs
View File

@ -92,7 +92,7 @@
[common/list-footer] [common/list-footer]
[common/bottom-shadow]])) [common/bottom-shadow]]))
:renderSeparator renderers/list-separator-renderer :renderSeparator renderers/list-separator-renderer
:style (st/list-container tabs-hidden?)}] :style st/list-container}]
(when (and (not edit?) (when (and (not edit?)
(not search?) (not search?)
(get-in platform-specific [:chats :action-button?])) (get-in platform-specific [:chats :action-button?]))

6
src/status_im/ui/screens/contacts/styles.cljs
View File

@ -10,10 +10,8 @@
{:flex 1 {:flex 1
:background-color common/color-light-gray}) :background-color common/color-light-gray})
(defnstyle contacts-list-container [tabs-hidden?] (def contacts-list-container
{:flex 1 {:flex 1})
:android {:margin-bottom 20}
:ios {:margin-bottom (if tabs-hidden? 20 (+ 16 tabs-st/tabs-height))}})
(def contacts-list (def contacts-list
{:background-color common/color-white}) {:background-color common/color-white})

2
src/status_im/ui/screens/contacts/views.cljs
View File

@ -122,7 +122,7 @@
groups [:all-added-groups] groups [:all-added-groups]
tabs-hidden? [:tabs-hidden?]] tabs-hidden? [:tabs-hidden?]]
[view {:flex 1} [view {:flex 1}
[view (st/contacts-list-container tabs-hidden?) [view st/contacts-list-container
(if edit? (if edit?
[toolbar-edit] [toolbar-edit]
[toolbar-view]) [toolbar-view])

5
src/status_im/ui/screens/discover/styles.cljs
View File

@ -141,9 +141,8 @@
{:flex 1 {:flex 1
:backgroundColor color-white}) :backgroundColor color-white})
(defnstyle list-container [tabs-hidden?] (def list-container
{:android {:margin-bottom 20} {:flex 1})
:ios {:margin-bottom (if tabs-hidden? 20 (+ 16 tabs-st/tabs-height))}})
(def search-icon (def search-icon
{:width 17 {:width 17

2
src/status_im/ui/screens/discover/views.cljs
View File

@ -84,7 +84,7 @@
[toolbar-view (and current-view? [toolbar-view (and current-view?
(= show-search :discover)) search-text] (= show-search :discover)) search-text]
(if discoveries (if discoveries
[scroll-view (st/list-container tabs-hidden?) [scroll-view st/list-container
[discover-popular {:contacts contacts [discover-popular {:contacts contacts
:current-account current-account}] :current-account current-account}]
[discover-recent {:current-account current-account}]] [discover-recent {:current-account current-account}]]