e2e: updated recovery phrase elements and flow

Author: yevh-berdnyk

test/appium/tests/profile/test_fallback.py

@@ -261,10 +261,12 @@ def test_fallback_add_key_pair(self):
             self.errors.append(
                 self.profile_2,
                 "Newly added regular account is not shown in profile as on device before importing key pair")
-        self.profile_2.options_button.click()
-        if not self.profile_2.import_by_entering_recovery_phrase_button.is_element_displayed():
+        self.profile_2.get_missing_key_pair_by_name(key_pair_name=generated_key_pair_name).options_button.click()
+        if self.profile_2.import_by_entering_recovery_phrase_button.is_element_displayed():
+            self.profile_2.click_system_back_button(times=4)
+        else:
             self.errors.append(self.profile_2, "Can not import key pair account from profile")
-        self.profile_2.click_system_back_button(times=4)
+            self.profile_2.click_system_back_button(times=3)
 
         wallet_2.just_fyi("Device 2: import key pair")
         wallet_2.get_account_element(account_name=regular_account_name).swipe_left_on_element()

test/appium/tests/profile/test_profile.py

@@ -26,28 +26,36 @@ def prepare_devices(self):
     @marks.testrail_id(741966)
     def test_profile_back_up_seed_phrase_validation(self):
         self.profile.backup_recovery_phrase_button.click()
-        self.profile.ok_continue_button.click()
+        for checkbox in self.profile.checkbox_button.find_elements():
+            checkbox.click()
+        self.profile.button_one.click()
         recovery_phrase = self.profile.get_recovery_phrase()
-        self.profile.recovery_phrase_next_button.click()
+        self.profile.button_one.click()
         word_number = self.profile.recovery_phrase_word_number.number
-        incorrect_word_number = 11 if word_number == 12 else word_number + 1
-        self.profile.recovery_phrase_word_input.send_keys(recovery_phrase[incorrect_word_number])
-        self.profile.recovery_phrase_next_button.click()
-        if not self.profile.element_by_translation_id('wrong-word').is_element_displayed():
+        self.profile.get_incorrect_word_button(recovery_phrase[word_number]).click()
+        if not self.profile.element_by_translation_id('oops-wrong-word').is_element_displayed():
             self.errors.append(self.profile,
-                               "Error message 'Wrong word' is not shown on the first seed phrase validation step")
-        self.profile.recovery_phrase_word_input.send_keys(recovery_phrase[word_number])
-        self.profile.recovery_phrase_next_button.click()
-        word_number_1 = self.profile.recovery_phrase_word_number.number
-        incorrect_word_number_1 = 11 if word_number_1 == 12 else word_number_1 + 1
-        self.profile.recovery_phrase_word_input.send_keys(recovery_phrase[incorrect_word_number_1])
-        self.profile.done_button.click()
-        if not self.profile.element_by_translation_id('wrong-word').is_element_displayed():
-            self.errors.append(self.profile,
-                               "Error message 'Wrong word' is not shown on the second seed phrase validation step")
-        # self.profile.click_system_back_button() # ToDo: issue with LT emulators, needs investigation
-        # if not self.profile.backup_recovery_phrase_button.is_element_displayed():
-        #     self.errors.append(self.profile, "Backup recovery phrase button is not shown after failed validation")
+                               "Error message 'Oops! Wrong word' is not shown on the first seed phrase validation step")
+        self.profile.get_incorrect_word_button(recovery_phrase[word_number]).click()
+        if not self.profile.element_by_translation_id(
+                'do-not-cheat').is_element_displayed() or not self.profile.element_by_translation_id(
+            'do-not-cheat-description').is_element_displayed():
+            self.errors.append(
+                self.profile,
+                "Expected messages are not shown for the second attempt with incorrect recovery phrase word")
+        self.profile.button_one.find_elements()[1].click()
+        if not self.profile.recovery_phrase_table.is_element_displayed():
+            self.errors.append(self.profile, "Recovery phrase is not shown after failed attempts to check it")
+            self.errors.verify_no_errors()  # the test fails if the recovery phrase is not shown on this step
+
+        self.profile.button_one.click()
+        self.profile.fill_recovery_phrase_checking_words(recovery_phrase)
+        if not self.profile.element_by_translation_id('written-seed-ready').is_element_displayed():
+            self.errors.append(self.profile, "Can't complete backup")
+
+        self.profile.click_system_back_button(3)
+        if not self.profile.backup_recovery_phrase_button.is_element_displayed():
+            self.errors.append(self.profile, "Backup recovery phrase button is not shown after failed validation")
         self.profile.reopen_app(sign_in=True, user_name=self.username)
         self.home.profile_button.click()
         if not self.profile.backup_recovery_phrase_button.is_element_displayed():

test/appium/tests/wallet/test_collectibles.py

@@ -106,7 +106,7 @@ def test_wallet_send_collectible(self):
         self.wallet_view.continue_button.click()
         self.wallet_view.collectibles_tab_on_select_token_view.click()
         self.wallet_view.get_collectible_element('BVL').wait_and_click(20)
-        self.wallet_view.confirm_button.click()
+        self.wallet_view.button_one.click()
         data_to_find_on_review = {
             self.account_name: ("From", self.wallet_view.from_data_container),
             self.sender_short_address: ("From", self.wallet_view.from_data_container),

test/appium/tests/wallet/test_wallet_mainnet_no_send.py

@@ -96,7 +96,7 @@ def test_wallet_send_flow_mainnet(self):
                         self.wallet_view,
                         "%s on %s: max fees is not shown before Review Send button is clicked" % (asset, network))
 
-                self.wallet_view.confirm_button.click_until_presence_of_element(self.wallet_view.slide_button_track)
+                self.wallet_view.button_one.click_until_presence_of_element(self.wallet_view.slide_button_track)
                 self.wallet_view.just_fyi("Checking Review Send page for %s on %s" % (asset, network))
 
                 sender_short_address = self.sender['wallet_address'].replace(self.sender['wallet_address'][6:-3],
@@ -299,7 +299,7 @@ def test_wallet_bridge_flow_mainnet(self):
             except TimeoutException:
                 self.errors.append(self.wallet_view, "%s to %s: 'To' route is not shown" % (network_from, network_to))
 
-            self.wallet_view.confirm_button.click()
+            self.wallet_view.button_one.click()
             self.wallet_view.just_fyi("Checking Bridge screen from %s to %s" % (network_from, network_to))
             containers = {'from': self.wallet_view.from_data_container, 'to': self.wallet_view.to_data_container}
             for name, container in containers.items():

test/appium/views/base_view.py

@@ -170,6 +170,8 @@ def __init__(self, driver):
             self.driver, xpath="//*[@content-desc='checkbox-off'][@resource-id='checkbox-component']")
         self.slide_button_track = SlideButton(self.driver)
 
+        self.button_one = Button(self.driver, accessibility_id='button-one')
+
         # external browser
         self.open_in_android_button = Button(self.driver, translation_id="browsing-open-in-android-web-browser")
 

test/appium/views/profile_view.py

@@ -48,18 +48,18 @@ def click(self):
 
 class RecoveryPhraseTable(Text):
     def __init__(self, driver):
-        super().__init__(driver, translation_id="your-recovery-phrase",
-                         suffix="/following-sibling::android.view.ViewGroup[1]/android.widget.TextView")
+        super().__init__(driver, translation_id="backup-recovery-phrase",
+                         suffix="/following-sibling::android.view.ViewGroup[2]//android.widget.TextView")
 
 
 class RecoveryPhraseWordNumberText(Text):
     def __init__(self, driver):
-        super().__init__(driver, xpath="//*[contains(@text,'#')]")
+        super().__init__(driver, xpath="//*[@content-desc='number-container']/android.widget.TextView")
 
     @property
     def number(self):
         time.sleep(1)
-        return int(self.find_element().text.split('#')[1])
+        return int(self.find_element().text)
 
 
 class HelpButton(Button):
@@ -117,8 +117,6 @@ def __init__(self, driver):
 
         self.recovery_phrase_table = RecoveryPhraseTable(self.driver)
         self.recovery_phrase_word_number = RecoveryPhraseWordNumberText(self.driver)
-        self.recovery_phrase_next_button = Button(self.driver, accessibility_id="Next, icon")
-        self.recovery_phrase_word_input = EditBox(self.driver, xpath="//android.widget.EditText")
 
         # Notifications
         self.profile_notifications_button = Button(self.driver,
@@ -219,20 +217,35 @@ def get_recovery_phrase(self):
         text = [i.text for i in self.recovery_phrase_table.find_elements()]
         return dict(zip(map(int, text[::2]), text[1::2]))
 
+    def get_correct_word_button(self, word: str):
+        return Button(self.driver, accessibility_id=word)
+
+    def get_incorrect_word_button(self, word: str):
+        try:
+            button = Button(self.driver,
+                            xpath="//*[@content-desc='%s']/following-sibling::android.view.ViewGroup" % word)
+            button.find_element()
+        except NoSuchElementException:
+            button = Button(self.driver,
+                            xpath="//*[@content-desc='%s']/preceding-sibling::*/*/android.widget.TextView" % word)
+        return button
+
+    def fill_recovery_phrase_checking_words(self, recovery_phrase: dict):
+        for _ in range(4):
+            word_number = self.recovery_phrase_word_number.number
+            self.get_correct_word_button(recovery_phrase[word_number]).click()
+
     def backup_recovery_phrase(self):
         self.just_fyi("Back up recovery phrase")
         self.backup_recovery_phrase_button.click()
-        self.ok_continue_button.click()
+        for checkbox in self.checkbox_button.find_elements():
+            checkbox.click()
+        self.button_one.click()
         recovery_phrase = self.get_recovery_phrase()
-        self.recovery_phrase_next_button.click()
-        word_number = self.recovery_phrase_word_number.number
-        self.recovery_phrase_word_input.send_keys(recovery_phrase[word_number])
-        self.recovery_phrase_next_button.click()
-        word_number_1 = self.recovery_phrase_word_number.number
-        self.recovery_phrase_word_input.send_keys(recovery_phrase[word_number_1])
-        self.done_button.click()
-        self.yes_button.click()
-        self.ok_got_it_button.click()
+        self.button_one.click()
+        self.fill_recovery_phrase_checking_words(recovery_phrase)
+        self.checkbox_button.click()
+        self.button_one.find_elements()[-1].click()
         return ' '.join(recovery_phrase.values())
 
     def edit_profile_picture(self, image_index: int, update_by="Gallery"):
@@ -342,8 +355,13 @@ def __init__(self, driver, account_name):
         return KeyPairAccountElement(self.driver, account_name)
 
     def get_missing_key_pair_by_name(self, key_pair_name: str):
-        return BaseElement(self.driver,
-                           xpath="//*[@content-desc='missing-keypair-item']//*[@text='%s']" % key_pair_name)
+        class MissingKeyPairElement(BaseElement):
+            def __init__(self, driver, key_pair_name):
+                locator = "//*[@content-desc='missing-keypair-item']//*[@text='%s']" % key_pair_name
+                super().__init__(driver, xpath=locator)
+                self.options_button = Button(driver, xpath=locator + "/../..//*[@content-desc='options-button']")
+
+        return MissingKeyPairElement(self.driver, key_pair_name)
 
     def turn_new_contact_requests_toggle(self, state: str = 'on'):
         self.profile_messages_button.click()

test/appium/views/wallet_view.py

@@ -179,7 +179,6 @@ def __init__(self, driver):
         self.amount_input = EditBox(self.driver, xpath="//android.widget.EditText")
         self.from_network_text = Text(
             self.driver, xpath="(//*[@content-desc='loading']/following-sibling::android.widget.TextView)[1]")
-        self.confirm_button = Button(self.driver, accessibility_id='button-one')
         self.done_button = Button(self.driver, accessibility_id='done')
         self.amount_input_increase_button = Button(self.driver, accessibility_id='amount-input-inc-button')
 
@@ -263,12 +262,12 @@ def slide_and_confirm_with_password(self):
         self.login_button.click()
 
     def confirm_transaction(self):
-        self.confirm_button.click()
+        self.button_one.click()
         for _ in range(3):
             if self.slide_button_track.is_element_displayed():
                 break
             time.sleep(5)
-            self.confirm_button.click()
+            self.button_one.click()
         self.slide_and_confirm_with_password()
 
     def set_amount(self, amount: str):
@@ -301,7 +300,7 @@ def swap_asset_from_drawer(self, asset_name: str, amount, network_name: str, dec
         self.select_network(network_name)
         self.set_amount(str(amount))
         self.max_fees_text.wait_for_visibility_of_element(30)
-        self.confirm_button.click_until_presence_of_element(self.swap_receive_amount_summary_text)
+        self.button_one.click_until_presence_of_element(self.swap_receive_amount_summary_text)
         expected_amount = self.get_receive_swap_amount(decimals_to)
         est_time, slippage, fees = self.est_time_text.text, self.max_slippage_text.text, self.max_fees_text.text
         self.slide_and_confirm_with_password()
@@ -335,7 +334,7 @@ def remove_account(self, account_name: str, watch_only: bool = False):
         self.remove_account_button.click()
         if not watch_only:
             self.derivation_path_note_checkbox.click()
-        self.confirm_button.click()
+        self.button_one.click()
 
     def get_activity_element(self, index=1):
         return ActivityElement(self.driver, index=index)