fix: fix the attempts login

newerton · Jan 24, 2022 · 102e0fc · 102e0fc
1 parent 2c3ce63
commit 102e0fc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/config/version.yaml b/config/version.yaml
@@ -1,5 +1,5 @@
   version:
-    app: "1.5.18"
-    config_file: "1.5.18"
+    app: "1.5.19"
+    config_file: "1.5.19"
     emergency: "false"
 
diff --git a/src/actions.py b/src/actions.py
@@ -122,6 +122,7 @@ def clickNewMap(self):
         self.bcoins.getBcoins()
 
     def refreshPage(self):
+        self.importLibs()
         self.log.console('Refreshing page', services=True,
                          emoji='🔃', color='green')
         pyautogui.hotkey('ctrl', 'shift', 'r')

diff --git a/src/auth.py b/src/auth.py
@@ -30,7 +30,6 @@ def login(self):
         metamaskData = self.config['metamask']
 
         connect_wallet_button = self.images.image('connect_wallet_button')
-        metamask_cancel_button = self.images.image('metamask_cancel_button')
         metamask_sign_button = self.images.image('metamask_sign_button')
         metamask_unlock_button = self.images.image('metamask_unlock_button')
         treasure_hunt_banner = self.images.image('treasure_hunt_banner')
@@ -83,7 +82,11 @@ def login(self):
                 self.log.console('+3 login attempts, retrying',
                                  services=True, emoji='🔃', color='red')
                 login_attempts = 0
+                self.errors.verify()
                 self.actions.refreshPage()
+                self.actions.sleep(1, 1, forceTime=True, randomMouseMovement=False)
+            self.login()
+
         self.errors.verify()
 
     def checkLogout(self):
@@ -100,13 +103,13 @@ def checkLogout(self):
                 self.log.console('Logout detected',
                                  services=True, emoji='😿', color='red')
                 self.actions.refreshPage()
+                self.login()
             elif self.recognition.positions(metamask_sign_button):
                 self.log.console('Sing button detected',
                                  services=True, emoji='✔️', color='green')
                 if self.actions.clickButton(metamask_cancel_button):
                     self.log.console('Metamask is glitched, fixing',
                                      services=True, emoji='🙀', color='yellow')
-                    self.actions.refreshPage()
             else:
                 return False
 

diff --git a/src/log.py b/src/log.py
@@ -68,7 +68,7 @@ def console(self, message, services=False, emoji=False, color='default'):
     def mapClicked(self):
         self.importLibs()
         if self.actions.clickButton(new_map_btn_img):
-            self.console('🗺️ New Map button clicked!')
+            self.console('New Map button clicked!', emoji='🗺️')
             file = open("./logs/new-map.log", "a", encoding='utf-8')
             file.write(self.date.dateFormatted() + '\n')
             file.close()