pdate e2e and fleet in e2e env

Signed-off-by: Serhy <sergii@status.im>

.env.e2e

@@ -3,7 +3,7 @@ DEFAULT_NETWORK=testnet_rpc
 ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.staging
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug

test/appium/tests/atomic/chats/test_chats_management.py

@@ -234,12 +234,12 @@ class TestChatManagement(SingleDeviceTestCase):
         chat_view.just_fyi("Clear quotes from both chats")
         chat_view.cancel_reply_button.click()
 
-        if chat_view.tiny_reply_icon_in_message_input.is_element_displayed():
+        if chat_view.cancel_reply_button.is_element_displayed():
             self.errors.append("Message quote kept in public chat input after it's cancelation")
         chat_view.get_back_to_home_view(times_to_click_on_back_btn=1)
         home.get_chat_with_user(dummy_user["username"]).click()
         chat_view.cancel_reply_button.click()
-        if chat_view.tiny_reply_icon_in_message_input.is_element_displayed():
+        if chat_view.cancel_reply_button.is_element_displayed():
             self.errors.append("Message quote kept in 1-1 chat input after it's cancelation")
 
         self.errors.verify_no_errors()
@@ -482,7 +482,7 @@ class TestChatManagementMultipleDevice(MultipleDeviceTestCase):
         device_1_chat = home_1.add_contact(device_2_public_key)
         device_1_chat.send_message(message_from_sender)
         device_1_chat.quote_message(message_from_sender)
-        if device_1_chat.quote_username_in_message_input.text != "You":
+        if device_1_chat.quote_username_in_message_input.text != "↪ You":
             self.errors.append("'You' is not displayed in reply quote snippet replying to own message")
         reply_to_message_from_sender = message_from_sender + " reply"
         device_1_chat.send_message(reply_to_message_from_sender)
@@ -505,7 +505,7 @@ class TestChatManagementMultipleDevice(MultipleDeviceTestCase):
         chat_public_1, chat_public_2 = home_1.get_chat_view(), home_2.get_chat_view()
         chat_public_1.send_message(message_from_sender)
         chat_public_2.quote_message(message_from_sender)
-        if chat_public_2.quote_username_in_message_input.text != device_1_username:
+        if chat_public_2.quote_username_in_message_input.text != ("↪ " + device_1_username):
             self.errors.append(" %s is not displayed in reply quote snippet replying to own message " % device_1_username)
 
         device_1.just_fyi('Message receiver verifies reply is present in received message')

test/appium/tests/atomic/dapps_and_browsing/test_dapps.py

@@ -48,7 +48,7 @@ class TestDApps(SingleDeviceTestCase):
         wallet_view.just_fyi('create new account in multiaccount')
         wallet_view.set_up_wallet()
         status_account = 'Status account'
-        account_name = 'subaccount'
+        account_name = 'Subaccount'
         wallet_view.add_account(account_name)
         address = wallet_view.get_wallet_address(account_name)
 
@@ -78,7 +78,6 @@ class TestDApps(SingleDeviceTestCase):
         if not status_test_dapp.element_by_text(account_name).is_element_displayed():
             self.errors.append("No expected account %s is shown in authorize web3 popup for wallet" % account_name)
         status_test_dapp.allow_button.click()
-        status_test_dapp.allow_button.click()
         dapp_view.profile_button.click()
         profile_view.element_by_text(test_dapp_name).click()
         for text in 'Chat key', account_name:
@@ -93,6 +92,17 @@ class TestDApps(SingleDeviceTestCase):
         if not send_transaction_view.element_by_text(address).is_element_displayed():
             self.errors.append("Wallet address %s in not shown in 'From' on Send Transaction screen" % address)
 
+        sign_in_view.just_fyi('Relogin and check multiaccount loads fine')
+        send_transaction_view.cancel_button.click()
+        sign_in_view.profile_button.click()
+        sign_in_view.get_back_to_home_view()
+        sign_in_view.relogin()
+        sign_in_view.wallet_button.click()
+        if not wallet_view.element_by_text(account_name).is_element_displayed():
+            self.errors.append("Subaccount is gone after relogin in Wallet!")
+        sign_in_view.dapp_tab_button.click()
+        if not dapp_view.element_by_text(account_name).is_element_displayed():
+            self.errors.append("Subaccount is not selected after relogin in Dapps!")
         self.errors.verify_no_errors()
 
     @marks.testrail_id(5654)

test/appium/views/chat_view.py

@@ -25,8 +25,8 @@ class TinyReplyIconInMessageInput(BaseElement):
 class QuoteUsernameInMessageInput(BaseText):
     def __init__(self, driver):
         super().__init__(driver)
-        self.locator = self.Locator.xpath_selector("//android.view.ViewGroup[@content-desc='tiny-reply-icon']/"
-                                                   "../android.widget.TextView[1]")
+        self.locator = self.Locator.xpath_selector("//android.view.ViewGroup[@content-desc='cancel-message-reply']/"
+                                                   "..//android.widget.TextView[1]")
 
 
 class CancelReplyButton(BaseEditBox):

test/appium/views/sign_in_view.py

@@ -144,8 +144,8 @@ class PrivacyPolicyLink(BaseButton):
         element = self.find_element()
         location = element.location
         size = element.size
-        x = int(location['x'] + size['width'] * 0.8)
-        y = int(location['y'] + size['height'] / 2)
+        x = int(location['x'] + size['width'] * 0.9)
+        y = int(location['y'] + size['height'] * 0.8)
         TouchAction(self.driver).tap(None, x, y).perform()
         self.driver.info('Tap on %s' % self.name)
         return self.navigate()