From 311fde9409666565fc122fa9c837dd9f28a890e3 Mon Sep 17 00:00:00 2001 From: John Ngei Date: Thu, 11 Jul 2024 02:09:03 +0200 Subject: [PATCH] chore: remove identifiers screens (#20503) * chore: remove identifiers screens so users are navigated straight to enable notifications during onboarding * removed navigated back button from enable notification screen * fix top margin * e2e: updated sign in flow * make lint-fix --------- Co-authored-by: Yevheniia Berdnyk --- .../onboarding/enable_notifications/view.cljs | 5 +---- src/status_im/contexts/onboarding/events.cljs | 2 +- src/status_im/navigation/screens.cljs | 11 +++++------ test/appium/views/sign_in_view.py | 12 ++++++------ 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/status_im/contexts/onboarding/enable_notifications/view.cljs b/src/status_im/contexts/onboarding/enable_notifications/view.cljs index 1706597eff..0c043b8081 100644 --- a/src/status_im/contexts/onboarding/enable_notifications/view.cljs +++ b/src/status_im/contexts/onboarding/enable_notifications/view.cljs @@ -72,10 +72,7 @@ (let [insets (safe-area/get-insets)] [rn/view {:style (style/page-container insets)} [rn/view {:style style/page-heading} - [quo/page-nav - {:background :blur - :icon-name :i/arrow-left - :on-press #(rf/dispatch [:navigate-back])}] + [quo/page-nav {:type :no-title :background :blur}] [page-title]] [enable-notifications-simple] [enable-notification-buttons {:insets insets}]])) diff --git a/src/status_im/contexts/onboarding/events.cljs b/src/status_im/contexts/onboarding/events.cljs index 865d0ba09c..b5a5a75a7f 100644 --- a/src/status_im/contexts/onboarding/events.cljs +++ b/src/status_im/contexts/onboarding/events.cljs @@ -73,7 +73,7 @@ :onboarding/navigated-to-enter-seed-phrase-from-screen :screen/onboarding.new-to-status)]] :dispatch-later [{:ms constants/onboarding-generating-keys-animation-duration-ms - :dispatch [:onboarding/navigate-to-identifiers]}] + :dispatch [:init-root :screen/onboarding.enable-notifications]}] :db (-> db (dissoc :profile/login) (dissoc :auth-method) diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs index d7b72a78f5..f8e8345452 100644 --- a/src/status_im/navigation/screens.cljs +++ b/src/status_im/navigation/screens.cljs @@ -346,12 +346,11 @@ :component enter-seed-phrase/view} {:name :screen/onboarding.enable-notifications - :options {:theme :dark - :layout options/onboarding-transparent-layout - :animations (merge - transitions/new-to-status-modal-animations - transitions/push-animations-for-transparent-background) - :modalPresentationStyle :overCurrentContext} + :options {:theme :dark + :layout options/onboarding-transparent-layout + :animations (merge + transitions/new-to-status-modal-animations + transitions/push-animations-for-transparent-background)} :component enable-notifications/view} {:name :screen/onboarding.identifiers diff --git a/test/appium/views/sign_in_view.py b/test/appium/views/sign_in_view.py index a88f169048..6de36d7027 100644 --- a/test/appium/views/sign_in_view.py +++ b/test/appium/views/sign_in_view.py @@ -244,8 +244,8 @@ class SignInView(BaseView): self.generate_keys_button.click_until_presence_of_element(self.profile_title_input) self.set_profile(username) self.set_password(password) - if self.enable_biometric_maybe_later_button.is_element_displayed(10): - self.enable_biometric_maybe_later_button.click() + # if self.enable_biometric_maybe_later_button.is_element_displayed(10): + # self.enable_biometric_maybe_later_button.click() # self.next_button.click_until_absense_of_element(self.element_by_translation_id("intro-wizard-title2")) # if keycard: # keycard_flow = self.keycard_storage_button.click() @@ -256,7 +256,7 @@ class SignInView(BaseView): # self.create_password_input.send_keys(password) # self.confirm_your_password_input.send_keys(password) # self.next_button.click() - self.identifiers_button.wait_and_click(30) + # self.identifiers_button.wait_and_click(30) if enable_notifications: self.enable_notifications_button.click_until_presence_of_element(self.start_button) if self.allow_button.is_element_displayed(): @@ -283,9 +283,9 @@ class SignInView(BaseView): self.continue_button.click_until_presence_of_element(self.profile_title_input) self.set_profile(username, set_image) self.set_password(password) - if self.enable_biometric_maybe_later_button.is_element_displayed(10): - self.enable_biometric_maybe_later_button.click() - self.identifiers_button.wait_and_click(30) + # if self.enable_biometric_maybe_later_button.is_element_displayed(10): + # self.enable_biometric_maybe_later_button.click() + # self.identifiers_button.wait_and_click(30) if enable_notifications: self.enable_notifications_button.click_until_presence_of_element(self.start_button) else: