Merge pull request #258 from afterpay/feature/EIT-3043-remove-eu-assets

EIT-3043 - Remove assets for EU
afterpay · Aug 7, 2023 · f4b4ef0 · f4b4ef0
2 parents f196fbb + 9f5ebe9
commit f4b4ef0
Show file tree

Hide file tree

Showing 34 changed files with 45 additions and 228 deletions.
diff --git a/AfterpayTests/CurrencyFormatterTests.swift b/AfterpayTests/CurrencyFormatterTests.swift
@@ -10,6 +10,9 @@
 import XCTest
 
 class CurrencyFormatterTests: XCTestCase {
+  private let itIT = Locale(identifier: "it_IT")
+  private let frFR = Locale(identifier: "fr_FR")
+  private let esES = Locale(identifier: "es_ES")
 
   func testEnAuLocale() {
     let currencyFormatter = createCurrencyFormatters(clientLocale: Locales.enAU)
@@ -19,7 +22,6 @@ class CurrencyFormatterTests: XCTestCase {
     XCTAssertEqual(currencyFormatter.gbp.string(from: 120), "£120.00")
     XCTAssertEqual(currencyFormatter.nzd.string(from: 120), "$120.00 NZD")
     XCTAssertEqual(currencyFormatter.usd.string(from: 120), "$120.00 USD")
-    XCTAssertEqual(currencyFormatter.eur.string(from: 120), "120.00€")
   }
 
   func testEnCaLocale() {
@@ -30,7 +32,6 @@ class CurrencyFormatterTests: XCTestCase {
     XCTAssertEqual(currencyFormatter.gbp.string(from: 120), "£120.00")
     XCTAssertEqual(currencyFormatter.nzd.string(from: 120), "$120.00 NZD")
     XCTAssertEqual(currencyFormatter.usd.string(from: 120), "$120.00 USD")
-    XCTAssertEqual(currencyFormatter.eur.string(from: 120), "120.00€")
   }
 
   func testFrCaLocale() {
@@ -41,7 +42,6 @@ class CurrencyFormatterTests: XCTestCase {
     XCTAssertEqual(currencyFormatter.gbp.string(from: 120), "£120,00")
     XCTAssertEqual(currencyFormatter.nzd.string(from: 120), "$120,00 NZD")
     XCTAssertEqual(currencyFormatter.usd.string(from: 120), "$120,00 USD")
-    XCTAssertEqual(currencyFormatter.eur.string(from: 120), "120,00€")
   }
 
   func testEnGbLocale() {
@@ -52,7 +52,6 @@ class CurrencyFormatterTests: XCTestCase {
     XCTAssertEqual(currencyFormatter.gbp.string(from: 120), "£120.00")
     XCTAssertEqual(currencyFormatter.nzd.string(from: 120), "$120.00 NZD")
     XCTAssertEqual(currencyFormatter.usd.string(from: 120), "$120.00 USD")
-    XCTAssertEqual(currencyFormatter.eur.string(from: 120), "120.00€")
   }
 
   func testEnNzLocale() {
@@ -63,7 +62,6 @@ class CurrencyFormatterTests: XCTestCase {
     XCTAssertEqual(currencyFormatter.gbp.string(from: 120), "£120.00")
     XCTAssertEqual(currencyFormatter.nzd.string(from: 120), "$120.00")
     XCTAssertEqual(currencyFormatter.usd.string(from: 120), "$120.00 USD")
-    XCTAssertEqual(currencyFormatter.eur.string(from: 120), "120.00€")
   }
 
   func testEnUSLocale() {
@@ -74,29 +72,26 @@ class CurrencyFormatterTests: XCTestCase {
     XCTAssertEqual(currencyFormatter.gbp.string(from: 120), "£120.00")
     XCTAssertEqual(currencyFormatter.nzd.string(from: 120), "NZ$120.00")
     XCTAssertEqual(currencyFormatter.usd.string(from: 120), "$120.00")
-    XCTAssertEqual(currencyFormatter.eur.string(from: 120), "120.00€")
   }
 
   func testItItLocale() {
-    let currencyFormatter = createCurrencyFormatters(clientLocale: Locales.itIT)
+    let currencyFormatter = createCurrencyFormatters(clientLocale: itIT)
 
     XCTAssertEqual(currencyFormatter.aud.string(from: 120), "$120,00 AUD")
     XCTAssertEqual(currencyFormatter.cad.string(from: 120), "$120,00 CAD")
     XCTAssertEqual(currencyFormatter.gbp.string(from: 120), "£120,00")
     XCTAssertEqual(currencyFormatter.nzd.string(from: 120), "$120,00 NZD")
     XCTAssertEqual(currencyFormatter.usd.string(from: 120), "$120,00 USD")
-    XCTAssertEqual(currencyFormatter.eur.string(from: 120), "120,00 €")
   }
 
   func testEsEsLocale() {
-    let currencyFormatter = createCurrencyFormatters(clientLocale: Locales.esES)
+    let currencyFormatter = createCurrencyFormatters(clientLocale: esES)
 
     XCTAssertEqual(currencyFormatter.aud.string(from: 120), "$120,00 AUD")
     XCTAssertEqual(currencyFormatter.cad.string(from: 120), "$120,00 CAD")
     XCTAssertEqual(currencyFormatter.gbp.string(from: 120), "£120,00")
     XCTAssertEqual(currencyFormatter.nzd.string(from: 120), "$120,00 NZD")
     XCTAssertEqual(currencyFormatter.usd.string(from: 120), "$120,00 USD")
-    XCTAssertEqual(currencyFormatter.eur.string(from: 120), "120,00 €")
   }
 
   func createCurrencyFormatters(clientLocale: Locale) -> AllFormatters {
@@ -109,8 +104,7 @@ class CurrencyFormatterTests: XCTestCase {
       cad: formatter(Locales.enCA),
       gbp: formatter(Locales.enGB),
       nzd: formatter(Locales.enNZ),
-      usd: formatter(Locales.enUS),
-      eur: formatter(Locales.esES)
+      usd: formatter(Locales.enUS)
     )
   }
 
@@ -120,7 +114,6 @@ class CurrencyFormatterTests: XCTestCase {
     let gbp: CurrencyFormatter
     let nzd: CurrencyFormatter
     let usd: CurrencyFormatter
-    let eur: CurrencyFormatter
   }
 
 }
diff --git a/AfterpayTests/LocaleTests.swift b/AfterpayTests/LocaleTests.swift
@@ -12,7 +12,7 @@ import XCTest
 private struct LocaleCombination {
   let merchantLocale: Locale
   let consumerLocale: Locale
-  let valid: Bool
+  var valid: Bool?
 }
 
 class LocaleTests: XCTestCase {
@@ -24,9 +24,10 @@ class LocaleTests: XCTestCase {
   let enAuLocale = Locale(identifier: "en_AU")
   let enCaLocale = Locale(identifier: "en_CA")
   let frCaLocale = Locale(identifier: "fr_CA")
+
   let frFrLocale = Locale(identifier: "fr_FR")
   let esEsLocale = Locale(identifier: "es_ES")
-
+  let itITLocale = Locale(identifier: "it_IT")
   let esUsLocale = Locale(identifier: "es_US")
   let jpJPLocale = Locale(identifier: "jp_JP")
 
@@ -57,14 +58,6 @@ class LocaleTests: XCTestCase {
       LocaleCombination(merchantLocale: frCaLocale, consumerLocale: frCaLocale, valid: true),
       LocaleCombination(merchantLocale: frCaLocale, consumerLocale: frFrLocale, valid: true),
       LocaleCombination(merchantLocale: frCaLocale, consumerLocale: jpJPLocale, valid: false),
-
-      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: frFrLocale, valid: true),
-      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: enAuLocale, valid: true),
-      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: esUsLocale, valid: false),
-      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: esEsLocale, valid: false),
-      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: frCaLocale, valid: true),
-      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: enUsLocale, valid: true),
-      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: jpJPLocale, valid: false),
     ]
 
     for combination in localeCombinations {
@@ -87,4 +80,34 @@ class LocaleTests: XCTestCase {
       )
     }
   }
+
+  func testInvalidMerchantLocaleCombinations() {
+    let invalidMerchantLocales: [LocaleCombination] = [
+      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: frFrLocale),
+      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: enAuLocale),
+      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: esUsLocale),
+      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: esEsLocale),
+      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: frCaLocale),
+      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: enUsLocale),
+      LocaleCombination(merchantLocale: frFrLocale, consumerLocale: jpJPLocale),
+
+      LocaleCombination(merchantLocale: esEsLocale, consumerLocale: esEsLocale),
+      LocaleCombination(merchantLocale: itITLocale, consumerLocale: itITLocale),
+    ]
+
+    for combination in invalidMerchantLocales {
+      XCTAssertThrowsError(
+        try Configuration(
+          minimumAmount: one,
+          maximumAmount: oneThousand,
+          currencyCode: usdCode,
+          locale: combination.merchantLocale,
+          environment: .sandbox,
+          consumerLocale: combination.consumerLocale
+        )
+      ) { error in
+        XCTAssertEqual(error as? ConfigurationError, .invalidLocale(combination.merchantLocale))
+      }
+    }
+  }
 }
diff --git a/AfterpayTests/PriceBreakdownTests.swift b/AfterpayTests/PriceBreakdownTests.swift
@@ -79,15 +79,15 @@ class PriceBreakdownTests: XCTestCase {
 
     let fiftyDollarBreakdown = PriceBreakdown(totalAmount: 50)
     XCTAssertEqual(fiftyDollarBreakdown.badgePlacement, .end)
-    XCTAssertEqual(fiftyDollarBreakdown.string, "or 3 interest-free payments of 16.67€ with")
+    XCTAssertEqual(fiftyDollarBreakdown.string, "or pay with")
 
     let oneHundredDollarBreakdown = PriceBreakdown(totalAmount: 100)
     XCTAssertEqual(oneHundredDollarBreakdown.badgePlacement, .end)
-    XCTAssertEqual(oneHundredDollarBreakdown.string, "or 3 interest-free payments of 33.33€ with")
+    XCTAssertEqual(oneHundredDollarBreakdown.string, "or pay with")
 
     let twoHundredDollarBreakdown = PriceBreakdown(totalAmount: 200)
     XCTAssertEqual(twoHundredDollarBreakdown.badgePlacement, .end)
-    XCTAssertEqual(twoHundredDollarBreakdown.string, "or 3 interest-free payments of 66.67€ with")
+    XCTAssertEqual(twoHundredDollarBreakdown.string, "or pay with")
   }
 
   func testOutOfRangeWithMinimum() {

diff --git a/Sources/Afterpay/Afterpay.swift b/Sources/Afterpay/Afterpay.swift
@@ -416,7 +416,7 @@ internal var brand: Brand {
 }
 
 public var enabled: Bool {
-  language != nil
+  return language != nil && getConfiguration()?.locale != nil
 }
 
 public var cashAppClientId: String? {

diff --git a/Sources/Afterpay/Model/Brand.swift b/Sources/Afterpay/Model/Brand.swift
@@ -10,9 +10,6 @@ import Foundation
 
 private let clearpayLocales: Set<Locale> = [
   Locales.enGB,
-  Locales.esES,
-  Locales.frFR,
-  Locales.itIT,
 ]
 private let afterpayLocales: Set<Locale> = [
   Locales.enAU,

diff --git a/Sources/Afterpay/Model/CurrencyFormatter.swift b/Sources/Afterpay/Model/CurrencyFormatter.swift
@@ -40,13 +40,8 @@ struct CurrencyFormatter {
 
     let usCurrencySymbol = Locales.enUS.currencySymbol
     let gbCurrencySymbol = Locales.enGB.currencySymbol
-    let euCurrencySymbol = Locales.frFR.currencySymbol
 
-    if clientLocale == Locales.enUS {
-      if currencySymbol == euCurrencySymbol {
-        formatter.positiveFormat = "#,##0.00¤"
-      }
-    } else if clientLocale.currencyCode != locale.currencyCode {
+    if clientLocale != Locales.enUS && clientLocale.currencyCode != locale.currencyCode {
       formatter.currencySymbol = currencySymbol
 
       switch currencySymbol {
@@ -55,8 +50,6 @@ struct CurrencyFormatter {
         formatter.positiveFormat = "¤#,##0.00 ¤¤"
       case gbCurrencySymbol:
         formatter.positiveFormat = "¤#,##0.00"
-      case euCurrencySymbol:
-        formatter.positiveFormat = "#,##0.00¤"
       default:
         formatter.positiveFormat = formatter.positiveFormat
       }

diff --git a/Sources/Afterpay/Model/Locales.swift b/Sources/Afterpay/Model/Locales.swift
@@ -16,9 +16,6 @@ enum Locales: Hashable {
   static let enGB = Locale(identifier: "en_GB")
   static let enNZ = Locale(identifier: "en_NZ")
   static let enUS = Locale(identifier: "en_US")
-  static let frFR = Locale(identifier: "fr_FR")
-  static let itIT = Locale(identifier: "it_IT")
-  static let esES = Locale(identifier: "es_ES")
   static let enUSposix = Locale(identifier: "en_US_POSIX")
 
   static let validArray: [Locale] = [
@@ -28,9 +25,6 @@ enum Locales: Hashable {
     enGB,
     enNZ,
     enUS,
-    frFR,
-    itIT,
-    esES,
   ]
 }
 
@@ -40,9 +34,6 @@ private let validRegionLanguages = [
   Locales.enGB.regionCode!: [Locales.enGB],
   Locales.enNZ.regionCode!: [Locales.enNZ],
   Locales.enUS.regionCode!: [Locales.enUS],
-  Locales.frFR.regionCode!: [Locales.frFR, Locales.enGB],
-  Locales.itIT.regionCode!: [Locales.itIT, Locales.enGB],
-  Locales.esES.regionCode!: [Locales.esES, Locales.enGB],
 ]
 
 internal func getRegionLanguage(merchantLocale: Locale, clientLocale: Locale) -> Locale? {

diff --git a/Sources/Afterpay/Model/PriceBreakdown.swift b/Sources/Afterpay/Model/PriceBreakdown.swift
@@ -81,5 +81,5 @@ struct PriceBreakdown {
 }
 
 internal func getNumberOfInstalments(currencyCode: String?) -> Decimal {
-  return currencyCode == "EUR" && currencyCode != nil ? 3 : 4
+  return 4
 }
diff --git a/...ssets.xcassets/images/button/button-foreground-buy-now-clearpay-es.imageset/Contents.json b/...ssets.xcassets/images/button/button-foreground-buy-now-clearpay-es.imageset/Contents.json
diff --git a/...ets/images/button/button-foreground-buy-now-clearpay-es.imageset/buy now with_spanish.pdf b/...ets/images/button/button-foreground-buy-now-clearpay-es.imageset/buy now with_spanish.pdf
diff --git a/...ssets.xcassets/images/button/button-foreground-buy-now-clearpay-fr.imageset/Contents.json b/...ssets.xcassets/images/button/button-foreground-buy-now-clearpay-fr.imageset/Contents.json
diff --git a/.../button/button-foreground-buy-now-clearpay-fr.imageset/buy now with_french canadian-1.pdf b/.../button/button-foreground-buy-now-clearpay-fr.imageset/buy now with_french canadian-1.pdf
diff --git a/...ssets.xcassets/images/button/button-foreground-buy-now-clearpay-it.imageset/Contents.json b/...ssets.xcassets/images/button/button-foreground-buy-now-clearpay-it.imageset/Contents.json
diff --git a/...ets/images/button/button-foreground-buy-now-clearpay-it.imageset/buy now with_italian.pdf b/...ets/images/button/button-foreground-buy-now-clearpay-it.imageset/buy now with_italian.pdf
diff --git a/...sets.xcassets/images/button/button-foreground-checkout-clearpay-es.imageset/Contents.json b/...sets.xcassets/images/button/button-foreground-checkout-clearpay-es.imageset/Contents.json
diff --git a/...s/images/button/button-foreground-checkout-clearpay-es.imageset/checkout with_spanish.pdf b/...s/images/button/button-foreground-checkout-clearpay-es.imageset/checkout with_spanish.pdf
diff --git a/...sets.xcassets/images/button/button-foreground-checkout-clearpay-fr.imageset/Contents.json b/...sets.xcassets/images/button/button-foreground-checkout-clearpay-fr.imageset/Contents.json
diff --git a/...ts/images/button/button-foreground-checkout-clearpay-fr.imageset/checkout with_french.pdf b/...ts/images/button/button-foreground-checkout-clearpay-fr.imageset/checkout with_french.pdf
diff --git a/...sets.xcassets/images/button/button-foreground-checkout-clearpay-it.imageset/Contents.json b/...sets.xcassets/images/button/button-foreground-checkout-clearpay-it.imageset/Contents.json
diff --git a/...s/images/button/button-foreground-checkout-clearpay-it.imageset/checkout with_italian.pdf b/...s/images/button/button-foreground-checkout-clearpay-it.imageset/checkout with_italian.pdf
diff --git a/...ssets.xcassets/images/button/button-foreground-pay-now-clearpay-es.imageset/Contents.json b/...ssets.xcassets/images/button/button-foreground-pay-now-clearpay-es.imageset/Contents.json
diff --git a/...ets/images/button/button-foreground-pay-now-clearpay-es.imageset/pay now with_spanish.pdf b/...ets/images/button/button-foreground-pay-now-clearpay-es.imageset/pay now with_spanish.pdf
diff --git a/...ssets.xcassets/images/button/button-foreground-pay-now-clearpay-fr.imageset/Contents.json b/...ssets.xcassets/images/button/button-foreground-pay-now-clearpay-fr.imageset/Contents.json
diff --git a/.../button/button-foreground-pay-now-clearpay-fr.imageset/pay now with_french canadian-1.pdf b/.../button/button-foreground-pay-now-clearpay-fr.imageset/pay now with_french canadian-1.pdf