Fix default region for +1 region codes (marmelroy#352)

aircall · Mar 20, 2020 · 7251a67 · 7251a67
1 parent 3761437
commit 7251a67
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/PhoneNumberKit/PartialFormatter.swift b/PhoneNumberKit/PartialFormatter.swift
@@ -58,7 +58,13 @@ public final class PartialFormatter {
     // MARK: Status
 
     public var currentRegion: String {
-        return self.currentMetadata?.codeID ?? self.defaultRegion
+        if self.phoneNumberKit.countryCode(for: self.defaultRegion) != 1 {
+            return currentMetadata?.codeID ?? "US"
+        } else {
+            return self.currentMetadata?.countryCode == 1
+                ? self.defaultRegion
+                : self.currentMetadata?.codeID ?? self.defaultRegion
+        }
     }
 
     public func nationalNumber(from rawNumber: String) -> String {