diff --git a/src/status_im/ui/components/list/styles.cljs b/src/status_im/ui/components/list/styles.cljs index 82dce41087..ac75ee5ada 100644 --- a/src/status_im/ui/components/list/styles.cljs +++ b/src/status_im/ui/components/list/styles.cljs @@ -83,7 +83,6 @@ :flex 1 :flex-direction :row :align-items :center - :background-color colors/white :height (if large? 82 52)}) (defn settings-item-icon @@ -173,8 +172,7 @@ :android {:margin-bottom 3} :ios {:margin-bottom 10}}) -(def section-header-container - {:background-color colors/white}) +(def section-header-container {}) (def action-list {:background-color colors/blue}) diff --git a/src/status_im/ui/screens/home/styles.cljs b/src/status_im/ui/screens/home/styles.cljs index 8cf83520ac..2526aa10f8 100644 --- a/src/status_im/ui/screens/home/styles.cljs +++ b/src/status_im/ui/screens/home/styles.cljs @@ -14,7 +14,6 @@ (defstyle chat-container {:flex-direction :row - :background-color colors/white :android {:height 76} :ios {:height 74} :overflow :hidden}) diff --git a/src/status_im/ui/screens/home/views.cljs b/src/status_im/ui/screens/home/views.cljs index 680c6b081b..a21501f80c 100644 --- a/src/status_im/ui/screens/home/views.cljs +++ b/src/status_im/ui/screens/home/views.cljs @@ -88,7 +88,6 @@ false)})) [list/flat-list {:data all-home-items :key-fn first - :end-fill-color colors/white :footer [react/view {:style {:height tabs.styles/tabs-diff :align-self :stretch}}] @@ -119,8 +118,7 @@ (when loading? (utils/set-timeout #(re-frame/dispatch [:init-rest-of-chats]) 100))))} [react/view {:flex 1} [status-bar/status-bar {:type :main}] - [react/keyboard-avoiding-view {:style {:flex 1 - :background-color :white}} + [react/keyboard-avoiding-view {:style {:flex 1}} [toolbar/toolbar nil nil [toolbar/content-title (i18n/label :t/chat)]] [les-debug-info] (cond loading? diff --git a/src/status_im/ui/screens/profile/components/styles.cljs b/src/status_im/ui/screens/profile/components/styles.cljs index 1eb519ff81..65ec724a9f 100644 --- a/src/status_im/ui/screens/profile/components/styles.cljs +++ b/src/status_im/ui/screens/profile/components/styles.cljs @@ -54,7 +54,6 @@ :flex 1 :flex-direction :row :align-items :center - :background-color colors/white :height 52}) (def settings-item-icon @@ -102,10 +101,8 @@ {:align-items :center}) (def profile - {:flex 1 - :background-color colors/white - :flex-direction :column}) + {:flex 1 + :flex-direction :column}) (def profile-form - {:background-color colors/white - :padding-vertical 16}) + {:padding-vertical 16}) diff --git a/src/status_im/ui/screens/profile/user/styles.cljs b/src/status_im/ui/screens/profile/user/styles.cljs index 01a78cca79..cd385f704c 100644 --- a/src/status_im/ui/screens/profile/user/styles.cljs +++ b/src/status_im/ui/screens/profile/user/styles.cljs @@ -23,8 +23,7 @@ {:margin-top 12 :margin-bottom 16}) -(defstyle my-profile-info-container - {:background-color colors/white}) +(defstyle my-profile-info-container {}) (defstyle my-profile-settings-logout-wrapper {:flex-direction :row diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs index da1f9cfb82..5c99abcf8a 100644 --- a/src/status_im/ui/screens/profile/user/views.cljs +++ b/src/status_im/ui/screens/profile/user/views.cljs @@ -323,7 +323,6 @@ [contacts-list-item active-contacts-count] (when config/tr-to-talk-enabled? [tribute-to-talk-item snt-amount tribute-to-talk-seen?]) - [react/view styles/my-profile-info-container - [my-profile-settings current-account shown-account currency (nil? login-data)]] + [my-profile-settings current-account shown-account currency (nil? login-data)] (when (nil? login-data) [advanced shown-account on-show-advanced])]]]))) diff --git a/src/status_im/ui/screens/wallet/main/styles.cljs b/src/status_im/ui/screens/wallet/main/styles.cljs index f9ab85f91a..e9f7f0f05f 100644 --- a/src/status_im/ui/screens/wallet/main/styles.cljs +++ b/src/status_im/ui/screens/wallet/main/styles.cljs @@ -5,8 +5,7 @@ ;; Main section (defstyle main-section - {:flex 1 - :background-color colors/blue}) + {:flex 1}) (defstyle scroll-bottom {:background-color colors/white @@ -85,10 +84,9 @@ ;; Assets section (def asset-section - {:flex 1 - :padding-top 5 - :padding-bottom 20 - :background-color colors/white}) + {:flex 1 + :padding-top 5 + :padding-bottom 20}) (def asset-section-header {:font-size 15 diff --git a/src/status_im/ui/screens/wallet/settings/views.cljs b/src/status_im/ui/screens/wallet/settings/views.cljs index 9bfff46f86..9237e19389 100644 --- a/src/status_im/ui/screens/wallet/settings/views.cljs +++ b/src/status_im/ui/screens/wallet/settings/views.cljs @@ -71,7 +71,8 @@ (defview toolbar-view [] (letsubs [settings [:wallet/settings] {address :address} [:account/account]] - [toolbar/toolbar {:transparent? true} + [toolbar/toolbar {:style {:background-color colors/blue + :border-bottom-width 0}} nil [toolbar/content-wrapper] [toolbar/actions diff --git a/test/appium/views/home_view.py b/test/appium/views/home_view.py index 4f338d2d9c..15a124c2d8 100644 --- a/test/appium/views/home_view.py +++ b/test/appium/views/home_view.py @@ -60,18 +60,18 @@ class ChatElement(BaseButton): class DeleteButton(BaseButton): def __init__(self, driver, parent_locator: str): super(DeleteButton, self).__init__(driver) - locator_str = "/../../android.view.ViewGroup/*[@content-desc='icon']" + locator_str = "/..//*[@content-desc='icon']" self.locator = self.Locator.xpath_selector(parent_locator + locator_str) return DeleteButton(self.driver, self.locator.value) def swipe_and_delete(self): counter = 0 - while counter < 10: + while counter < 3: self.swipe_element() if self.swipe_delete_button.is_element_present(): break - time.sleep(10) + time.sleep(3) counter += 1 self.swipe_delete_button.click()