From fe49ec8dd7bddf56e52018b671f8a7a7a5602387 Mon Sep 17 00:00:00 2001
From: Issam Mani <issamouu69@gmail.com>
Date: Wed, 20 Nov 2024 14:25:22 +0100
Subject: [PATCH] chore: enable address edit by default on US and CA

---
 .../Frontend/Autofill/Address/AddressListViewModel.swift     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/firefox-ios/Client/Frontend/Autofill/Address/AddressListViewModel.swift b/firefox-ios/Client/Frontend/Autofill/Address/AddressListViewModel.swift
index c45d69eeae90..1f1e80a5e878 100644
--- a/firefox-ios/Client/Frontend/Autofill/Address/AddressListViewModel.swift
+++ b/firefox-ios/Client/Frontend/Autofill/Address/AddressListViewModel.swift
@@ -35,7 +35,10 @@ final class AddressListViewModel: ObservableObject, FeatureFlaggable {
 
     private let logger: Logger
 
-    var isEditingFeatureEnabled: Bool { featureFlags.isFeatureEnabled(.addressAutofillEdit, checking: .buildOnly) }
+    var isEditingFeatureEnabled: Bool {
+        AddressLocaleFeatureValidator.isValidRegion() ||
+        featureFlags.isFeatureEnabled(.addressAutofillEdit, checking: .buildOnly)
+    }
 
     var addressSelectionCallback: ((UnencryptedAddressFields) -> Void)?
     var saveAction: ((@escaping (UpdatableAddressFields) -> Void) -> Void)?