From 65d76ba9c809079a8a68501833b0e10ff19cfdd2 Mon Sep 17 00:00:00 2001 From: Michele Balistreri Date: Tue, 25 May 2021 09:55:54 +0300 Subject: [PATCH] remove puk/pairing step from onboarding Signed-off-by: Michele Balistreri --- src/status_im/keycard/onboarding.cljs | 4 +- .../ui/screens/keycard/onboarding/views.cljs | 55 ++++++------------- .../atomic/account_management/test_keycard.py | 35 +----------- test/appium/views/keycard_view.py | 6 +- translations/en.json | 4 +- 5 files changed, 26 insertions(+), 78 deletions(-) diff --git a/src/status_im/keycard/onboarding.cljs b/src/status_im/keycard/onboarding.cljs index a8c69ca4d3..0831656baa 100644 --- a/src/status_im/keycard/onboarding.cljs +++ b/src/status_im/keycard/onboarding.cljs @@ -237,9 +237,7 @@ (assoc-in [:keycard :card-state] :init) (assoc-in [:keycard :setup-step] :secret-keys) (update-in [:keycard :secrets] merge secrets'))} - (common/hide-connection-sheet) - (common/listen-to-hardware-back-button) - (navigation/navigate-replace :keycard-onboarding-puk-code nil)))) + (load-pairing-screen)))) (fx/defn on-install-applet-and-init-card-error {:events [:keycard.callback/on-install-applet-and-init-card-error diff --git a/src/status_im/ui/screens/keycard/onboarding/views.cljs b/src/status_im/ui/screens/keycard/onboarding/views.cljs index 7aa3456fe4..d672532ba0 100644 --- a/src/status_im/ui/screens/keycard/onboarding/views.cljs +++ b/src/status_im/ui/screens/keycard/onboarding/views.cljs @@ -23,13 +23,13 @@ (when-not from-key-storage-and-migration? [topbar/topbar]) [react/view {:flex 1 - :justify-content :space-between :align-items :center :margin-top (when from-key-storage-and-migration? 80)} [react/view {:align-items :center} [react/view [react/view {:align-items :center - :justify-content :center} + :justify-content :center + :margin-top 16} [react/image {:source (resources/get-image :keycard) :style {:width 120 :height 95}}]]] @@ -54,45 +54,26 @@ (i18n/label :t/learn-more-about-keycard)] [icons/tiny-icon :tiny-icons/tiny-external {:color colors/blue :container-style {:margin-left 5}}]]]]] - [react/view {:width "80%"} - (for [[number header text] [["1" - (i18n/label :t/keycard-onboarding-start-step1) - (i18n/label :t/keycard-onboarding-start-step1-text)] - ["2" - (i18n/label :t/keycard-onboarding-start-step2) - (i18n/label :t/keycard-onboarding-start-step2-text)] - (when (not= flow :recovery) - ["3" - (i18n/label :t/keycard-onboarding-start-step3) - (i18n/label :t/keycard-onboarding-start-step3-text)])]] - (when number - ^{:key number} [react/view {:flex-direction :row - :margin-top 15} - [react/view {:border-width 1 - :border-radius 20 - :border-color colors/black-transparent - :align-items :center - :justify-content :center - :width 40 - :height 40} - [react/text {:style {:typography :title}} - number]] - [react/view {:align-items :flex-start - :justify-content :flex-start - :margin-left 11} - [react/view - [react/text {:style {:typography :main-medium}} - header]] - [react/view - [react/text {:style {:color colors/gray - :padding-right 35}} - text]]]]))] - [react/view {:style {:flex-direction :row}} + [react/view {:margin-top 16 + :margin-left 24 + :margin-right 24} + [react/text {:style {:typography :main-medium + :line-height 22 + :text-align :left}} + (i18n/label :t/keycard-onboarding-pin-text)] + (when (not= flow :recovery) + [react/text {:style {:typography :main-medium + :margin-top 16 + :line-height 22 + :text-align :left}} + (i18n/label :t/keycard-onboarding-mnemonic-text)])] + [react/view {:style {:flex-direction :row + :margin-top 24}} [checkbox/checkbox {:checked? factory-reset-card? :style {:margin-right 10} :on-value-change #(re-frame/dispatch [:keycard.onboarding.intro.ui/factory-reset-card-toggle %])}] [react/text (i18n/label :t/keycard-factory-reset)]] - [react/view {:margin-bottom 40} + [react/view {:margin-top 40} [quo/button {:on-press #(re-frame/dispatch [:keycard.onboarding.intro.ui/begin-setup-pressed])} (i18n/label :t/begin-set-up)]]]])) diff --git a/test/appium/tests/atomic/account_management/test_keycard.py b/test/appium/tests/atomic/account_management/test_keycard.py index 1368f834dd..fbea21176f 100644 --- a/test/appium/tests/atomic/account_management/test_keycard.py +++ b/test/appium/tests/atomic/account_management/test_keycard.py @@ -56,10 +56,6 @@ class TestCreateAccount(SingleDeviceTestCase): keycard.connect_card_button.click() keycard.enter_default_pin() keycard.enter_default_pin() - keycard.next_button.scroll_to_element() - keycard.next_button.wait_for_visibility_of_element(20) - keycard.next_button.click() - keycard.yes_button.click() sign_in.maybe_later_button.wait_and_click(30) sign_in.lets_go_button.wait_and_click(30) @@ -157,21 +153,10 @@ class TestCreateAccount(SingleDeviceTestCase): self.driver.fail('No Dangerous operation popup is shown on canceling operation from PIN code stage') keycard_flow.yes_button.click() - sign_in.just_fyi('Cancel on Pair code stage: initialized') - keycard_flow.begin_setup_button.click() - keycard_flow.enter_default_pin() - keycard_flow.enter_default_pin() - keycard_flow.wait_for_element_starts_with_text('Write codes down') - pair_code = keycard_flow.pair_code_text.text - keycard_flow.cancel_button.click() - if not keycard_flow.element_by_translation_id("keycard-cancel-setup-title").is_element_displayed(): - self.driver.fail('No Dangerous operation popup is shown on canceling operation from Pair code stage') - keycard_flow.yes_button.click() - sign_in.just_fyi('Cancel from Confirm seed phrase: initialized + 1 pairing slot is used') keycard_flow.begin_setup_button.click() - keycard_flow.pair_code_input.set_value(pair_code) - keycard_flow.pair_to_this_device_button.click() + keycard_flow.enter_default_pin() + keycard_flow.enter_default_pin() seed_phrase = keycard_flow.get_seed_phrase() keycard_flow.confirm_button.click() keycard_flow.yes_button.click() @@ -233,23 +218,9 @@ class TestCreateAccount(SingleDeviceTestCase): self.driver.fail('No Dangerous operation popup is shown on canceling operation from PIN code stage') keycard_flow.yes_button.click() - sign_in.just_fyi('Cancel on Pair code stage: initialized') - keycard_flow.begin_setup_button.click() - keycard_flow.enter_default_pin() - keycard_flow.enter_default_pin() - keycard_flow.wait_for_element_starts_with_text('Write codes down') - pair_code = keycard_flow.pair_code_text.text - keycard_flow.cancel_button.click() - if not keycard_flow.element_by_translation_id("keycard-cancel-setup-title").is_element_displayed(): - self.driver.fail('No Dangerous operation popup is shown on canceling operation from Pair code stage') - keycard_flow.yes_button.click() - sign_in.just_fyi('Finish setup and relogin') keycard_flow.begin_setup_button.click() - if not keycard_flow.element_by_text_part('5 free pairing slots').is_element_displayed(): - self.errors.append('Number of free pairing slots is not shown or wrong') - keycard_flow.pair_code_input.set_value(pair_code) - keycard_flow.pair_to_this_device_button.click() + keycard_flow.enter_default_pin() keycard_flow.enter_default_pin() for element in sign_in.maybe_later_button, sign_in.lets_go_button: element.wait_for_visibility_of_element(30) diff --git a/test/appium/views/keycard_view.py b/test/appium/views/keycard_view.py index d544d8e056..02f1d0ab83 100644 --- a/test/appium/views/keycard_view.py +++ b/test/appium/views/keycard_view.py @@ -66,8 +66,4 @@ class KeycardView(BaseView): self.begin_setup_button.click() self.connect_card_button.click() self.enter_default_pin() - self.enter_default_pin() - self.next_button.scroll_to_element() - self.next_button.wait_for_visibility_of_element(20) - self.next_button.click() - self.yes_button.click() \ No newline at end of file + self.enter_default_pin() \ No newline at end of file diff --git a/translations/en.json b/translations/en.json index 89f5ac35b8..c4f5713611 100644 --- a/translations/en.json +++ b/translations/en.json @@ -513,7 +513,7 @@ "enter-contact-code": "ENS (vitalik94) or chat key (0x04…)", "enter-pair-code": "Enter your pairing code", "pair-code-placeholder": "Pair code...", - "enter-pair-code-description": "Pairing code was displayed to you during the Keycard setup", + "enter-pair-code-description": "Pairing code can be set from an already paired Status client", "enter-password": "Enter password", "password-placeholder":"Password...", "confirm-password-placeholder": "Confirm your password...", @@ -730,6 +730,8 @@ "keycard-onboarding-recovery-phrase-header": "Back up seed phrase", "keycard-onboarding-recovery-phrase-text": "For your eyes only. This is the magical seed used to generate your key.", "keycard-onboarding-start-header": "Hold card to the back\n of your phone to start", + "keycard-onboarding-pin-text": "You will need to create a 6-digit passcode which will be used to protect access to your Keycard.", + "keycard-onboarding-mnemonic-text": "You will also need a piece of paper and a pencil to write down your seed phrase.", "keycard-onboarding-start-step1": "Create a passcode", "keycard-onboarding-start-step1-text": "Around 1 minute. Create a 6-digit passcode to encrypt your keys", "keycard-onboarding-start-step2": "Write down PUK and the pairing code",