Add the requested changes

Author: soncuteanca

modules/page_object_autofill.py

@@ -511,24 +511,6 @@ def verify_autofill_data_on_hover(
                     [value in val for val in autofill_data.__dict__.values()]
                 )
 
-                # Special handling for Austrian phone numbers with duplicated country code
-                if not is_present and field == "tel" and region == "AT":
-                    # Check if this is the Austrian phone duplication issue
-                    # Browser provides duplicated country code (e.g., '43439839147007'), test data has correct format (e.g., '439839147007')
-                    if value.startswith("4343") and len(value) > 12:
-                        # Try to find a match by removing the duplicated '43'
-                        corrected_value = "43" + value[4:]
-                        is_present = any(
-                            [
-                                corrected_value in val
-                                for val in autofill_data.__dict__.values()
-                            ]
-                        )
-                        if is_present:
-                            logging.info(
-                                f"Fixed Austrian phone duplication: {value} -> {corrected_value}"
-                            )
-
                 assert is_present, (
                     f"Mismatched data: {(field, value)} not in {autofill_data.__dict__.values()}."
                 )

modules/util.py

@@ -571,6 +571,16 @@ def normalize_regional_phone_numbers(self, phone: str, region: str) -> str:
             "AT": "43",
         }
 
+        # Handle leading zero in local numbers
+        if region not in ["US", "CA"] and phone.startswith("0"):
+            # Remove the leading zero
+            phone = phone[1:]
+
+        # Fix Austrian phone number duplication issue before processing
+        if region == "AT" and "4343" in phone:
+            # Remove the duplicated country code
+            phone = phone.replace("4343", "43")
+
         # If phone is already normalized, return as it is
         expected_country_code = country_codes.get(region)
         if (
@@ -581,11 +591,6 @@ def normalize_regional_phone_numbers(self, phone: str, region: str) -> str:
         ):
             return phone
 
-        # Fix Austrian phone number duplication issue before processing
-        if region == "AT" and "4343" in phone:
-            # Remove the duplicated country code
-            phone = phone.replace("4343", "43")
-
         # Sub out anything that matches this regex statement with an empty string to get rid of extensions in generated phone numbers
         phone = re.sub(r"\s*(?:x|ext)\s*\d*$", "", phone, flags=re.IGNORECASE)
         # Sub out anything that is not a digit with the empty string to ensure the phone number is formatted with no spaces or special characters
@@ -603,11 +608,6 @@ def normalize_regional_phone_numbers(self, phone: str, region: str) -> str:
             # Remove country code from the local number
             local_number = digits[len(country_code) :]
 
-        # Handle leading zero in local numbers
-        if region not in ["US", "CA"] and local_number.startswith("0"):
-            # Remove the leading zero
-            local_number = local_number[1:]
-
         # Validate local number length
         if len(local_number) < 6:  # Too short to be valid
             logging.warning(f"Invalid phone number format: {phone}")