Fix for transaction confirmation and asset button

Signed-off-by: yevh-berdnyk <ie.berdnyk@gmail.com>

test/appium/support/api/network_api.py

@@ -73,7 +73,7 @@ class NetworkApi:
             if int(transaction['confirmations']) >= 12:
                 return
             time.sleep(10)
-            pytest.fail('Transaction with amount %s was not confirmed, address is %s' % (amount, address))
+        pytest.fail('Transaction with amount %s was not confirmed, address is %s' % (amount, address))
 
     def verify_balance_is_updated(self, initial_balance, recipient_address, wait_time=360):
         counter = 0

test/appium/views/base_view.py

@@ -239,6 +239,21 @@ class CrossIcon(BaseButton):
         self.locator = self.Locator.xpath_selector('(//android.view.ViewGroup[@content-desc="icon"])[1]')
 
 
+class AssetButton(BaseButton):
+    def __init__(self, driver, asset_name):
+        super(AssetButton, self).__init__(driver)
+        self.asset_name = asset_name
+        self.locator = self.Locator.text_part_selector(self.asset_name)
+
+    @property
+    def name(self):
+        return self.asset_name + self.__class__.__name__
+
+    def click(self):
+        self.wait_for_element().click()
+        self.driver.info('Tap on %s' % self.name)
+
+
 class BaseView(object):
     def __init__(self, driver):
         self.driver = driver
@@ -500,3 +515,6 @@ class BaseView(object):
         for key, value in kwargs.items():
             if re.findall('\W%s$|\W%s\W' % (value, value), logcat):
                 pytest.fail('%s in logcat!!!' % key.capitalize(), pytrace=False)
+
+    def asset_by_name(self, asset_name):
+        return AssetButton(self.driver, asset_name)

test/appium/views/chat_view.py

@@ -388,8 +388,3 @@ class ChatView(BaseView):
         today_height = today_text_element.size['height']
         if message_location < today_location + today_height:
             errors.append("Message '%s' is not under 'Today' text" % text)
-
-    def asset_by_name(self, asset_name):
-        element = BaseButton(self.driver)
-        element.locator = element.Locator.text_selector(asset_name)
-        return element

test/appium/views/send_transaction_view.py

@@ -89,12 +89,6 @@ class SelectAssetButton(BaseButton):
         self.locator = self.Locator.accessibility_id('choose-asset-button')
 
 
-class AssetButton(BaseButton):
-    def __init__(self, driver, asset_name):
-        super(AssetButton, self).__init__(driver)
-        self.locator = self.Locator.text_part_selector(asset_name)
-
-
 class ErrorDialog(BaseView):
     def __init__(self, driver):
         super(ErrorDialog, self).__init__(driver)
@@ -180,6 +174,3 @@ class SendTransactionView(BaseView):
         self.sign_transaction_button.click_until_presence_of_element(self.progress_bar)
         self.progress_bar.wait_for_invisibility_of_element(60)
         self.got_it_button.click()
-
-    def asset_by_name(self, asset_name):
-        return AssetButton(self.driver, asset_name)