Watch-only test and additional waiting when signing transaction

Signed-off-by: Churikova Tetiana <churikova.tm@gmail.com>

test/appium/tests/atomic/account_management/test_profile.py

@@ -140,7 +140,7 @@ class TestProfileSingleDevice(SingleDeviceTestCase):
             self.errors.append("Can't share public key")
         for _ in range(2):
             profile_view.click_system_back_button()
-        profile_view.close_share_chat_key_popup()
+        profile_view.close_share_popup()
         wallet = profile_view.wallet_button.click()
         wallet.set_up_wallet()
         wallet.accounts_status_account.click()
@@ -162,7 +162,7 @@ class TestProfileSingleDevice(SingleDeviceTestCase):
         public_key = profile_view.public_key_text.text
         profile_view.public_key_text.long_press_element()
         profile_view.copy_text()
-        profile_view.close_share_chat_key_popup()
+        profile_view.close_share_popup()
         home = profile_view.home_button.click()
         chat = home.add_contact(transaction_senders['M']['public_key'])
         chat.chat_message_input.click()

test/appium/tests/atomic/account_management/test_wallet_management.py

@@ -1,4 +1,3 @@
-import pytest
 import random
 import string
 
@@ -306,6 +305,59 @@ class TestWalletManagement(SingleDeviceTestCase):
         if not account_button.color_matches('multi_account_color.png'):
             self.driver.fail('Account color does not match expected')
 
+    @marks.testrail_id(6244)
+    @marks.high
+    def test_add_and_delete_watch_only_account_to_multiaccount_instance(self):
+        sign_in_view = SignInView(self.driver)
+        sign_in_view.create_user()
+        wallet_view = sign_in_view.wallet_button.click()
+        wallet_view.set_up_wallet()
+
+        wallet_view.just_fyi('Add watch-only account')
+        wallet_view.add_account_button.click()
+        wallet_view.add_watch_only_address_button.click()
+        wallet_view.enter_address_input.send_keys(basic_user['address'])
+        wallet_view.next_button.click()
+        account_name = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(10))
+        wallet_view.account_name_input.send_keys(account_name)
+        wallet_view.finish_button.click()
+        account_button = wallet_view.get_account_by_name(account_name)
+        if not account_button.is_element_displayed():
+            self.driver.fail('Account was not added')
+
+        wallet_view.just_fyi('Check that overall balance is changed after adding watch-only account')
+        for asset in ('ETHro', 'ADI', 'STT'):
+            wallet_view.wait_balance_is_changed(asset)
+
+        wallet_view.just_fyi('Check individual watch-only account view, settings and receive option')
+        wallet_view.get_account_by_name(account_name).click()
+        if wallet_view.send_transaction_button.is_element_displayed():
+            self.errors.append('Send button is shown on watch-only wallet')
+        if not wallet_view.element_by_text('Watch-only').is_element_displayed():
+            self.errors.append('No "Watch-only" label is shown on watch-only wallet')
+        wallet_view.receive_transaction_button.click()
+        if wallet_view.address_text.text[2:] != basic_user['address']:
+            self.errors.append('Wrong address %s is shown in "Receive" popup for watch-only account ' % wallet_view.address_text.text)
+        wallet_view.close_share_popup()
+        wallet_view.get_account_options_by_name(account_name).click()
+        wallet_view.account_settings_button.click()
+        if not wallet_view.element_by_text('Watch-only').is_element_displayed():
+            self.errors.append('"Watch-only" type is not shown in account settings')
+
+        wallet_view.just_fyi('Delete watch-only account')
+        wallet_view.delete_account_button.click()
+        wallet_view.yes_button.click()
+        if account_button.is_element_displayed():
+            self.driver.fail('Account was not deleted')
+        # TODO: uncomment check of assets after fix of 9717
+        # for asset in ('ETHro', 'ADI', 'STT'):
+        #     balance = wallet_view.get_asset_amount_by_name(asset)
+        #     if balance != 0:
+        #         self.errors.append("Balance for %s is not updated after deleting watch-only account" % asset)
+
+        self.errors.verify_no_errors()
+
+
     @marks.testrail_id(5406)
     @marks.critical
     def test_ens_username_recipient(self):

test/appium/tests/atomic/transactions/test_daaps_transactions.py

@@ -1,4 +1,3 @@
-import pytest
 
 from tests import marks, unique_password, common_password
 from tests.base_test_case import SingleDeviceTestCase

test/appium/tests/atomic/transactions/test_wallet.py

@@ -548,7 +548,7 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
         wallet_view = sign_in_view.wallet_button.click()
         wallet_view.set_up_wallet()
         status_account_address = wallet_view.get_wallet_address()
-        wallet_view.account_options_button.click()
+        wallet_view.get_account_options_by_name().click()
 
         wallet_view.just_fyi('open Account Settings screen and check that all elements are shown')
         wallet_view.account_settings_button.click()

test/appium/views/base_view.py

@@ -584,7 +584,7 @@ class BaseView(object):
         sign_in_view = self.get_sign_in_view()
         sign_in_view.sign_in(password)
 
-    def close_share_chat_key_popup(self):
+    def close_share_popup(self):
         TouchAction(self.driver).tap(None, 255, 104, 1).perform()
 
     def get_public_key(self):
@@ -592,7 +592,7 @@ class BaseView(object):
         profile_view.share_my_profile_button.click()
         profile_view.public_key_text.wait_for_visibility_of_element()
         public_key = profile_view.public_key_text.text
-        self.close_share_chat_key_popup()
+        self.close_share_popup()
         return public_key
 
     def share_via_messenger(self):

test/appium/views/send_transaction_view.py

@@ -254,7 +254,8 @@ class SendTransactionView(BaseView):
     def sign_transaction(self, sender_password: str = common_password):
         self.sign_with_password.click_until_presence_of_element(self.enter_password_input)
         self.enter_password_input.send_keys(sender_password)
-        self.sign_button.click_until_presence_of_element(self.ok_button)
+        self.sign_button.click_until_absense_of_element(self.sign_button)
+        self.ok_button.wait_for_element(120)
         self.ok_button.click()
 
     def get_transaction_fee_total(self):

test/appium/views/wallet_view.py

@@ -273,6 +273,20 @@ class AddAnAccountButton(BaseButton):
         super(AddAnAccountButton, self).__init__(driver)
         self.locator = self.Locator.text_selector('Add an account')
 
+class AddAWatchOnlyAddressButton(BaseButton):
+    def __init__(self, driver):
+        super(AddAWatchOnlyAddressButton, self).__init__(driver)
+        self.locator = self.Locator.text_selector('Add a watch-only address')
+
+class EnterAddressInput(BaseEditBox):
+    def __init__(self, driver):
+        super(EnterAddressInput, self).__init__(driver)
+        self.locator = self.Locator.text_selector('Enter address')
+
+class DeleteAccountButton(BaseButton):
+    def __init__(self, driver):
+        super(DeleteAccountButton, self).__init__(driver)
+        self.locator = self.Locator.text_selector('Delete account')
 
 class GenerateNewAccountButton(BaseButton):
     def __init__(self, driver):
@@ -367,6 +381,9 @@ class WalletView(BaseView):
         self.set_currency_button = SetCurrencyButton(self.driver)
         self.add_account_button = AddAccountButton(self.driver)
         self.add_an_account_button = AddAnAccountButton(self.driver)
+        self.add_watch_only_address_button = AddAWatchOnlyAddressButton(self.driver)
+        self.enter_address_input = EnterAddressInput(self.driver)
+        self.delete_account_button = DeleteAccountButton(self.driver)
         self.generate_new_account_button = GenerateNewAccountButton(self.driver)
         self.enter_your_password_input = EnterYourPasswordInput(self.driver)
         self.generate_account_button = GenerateAccountButton(self.driver)
@@ -377,12 +394,13 @@ class WalletView(BaseView):
         # individual account settings
         self.account_settings_button = AccountSettingsButton(self.driver)
         self.apply_settings_button = ApplySettingsButton(self.driver)
-        self.account_options_button = AccountOptionsButton(self.driver, account_name='Status account')
 
     def get_usd_total_value(self):
         import re
         return float(re.sub('[~,]', '', self.usd_total_value.text))
 
+    def get_account_options_by_name(self, account_name='Status account'):
+        return AccountOptionsButton(self.driver, account_name)
 
 
     def get_asset_amount_by_name(self, asset: str):