Merge branch 'task/14646-add-ipp-support-for-puerto-rico' of https://github.com/woocommerce/woocommerce-ios into task/14646-add-ipp-support-for-puerto-rico

Author: iamgabrielma

Podfile.lock

@@ -46,7 +46,7 @@ PODS:
   - WordPressShared (2.1.0)
   - WordPressUI (1.15.1)
   - Wormholy (1.6.6)
-  - WPMediaPicker (1.8.11)
+  - WPMediaPicker (1.8.12)
   - wpxmlrpc (0.10.0)
   - ZendeskCommonUISDK (9.0.3)
   - ZendeskCoreSDK (5.0.5)
@@ -148,7 +148,7 @@ SPEC CHECKSUMS:
   WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
   WordPressUI: 700e3ec5a9f77b6920c8104c338c85788036ab3c
   Wormholy: 09da0b876f9276031fd47383627cb75e194fc068
-  WPMediaPicker: 79548964e9c7e131ccfa72270bdda3aec8fa56b5
+  WPMediaPicker: e9eaa804e1b0288d7969776608053ae0ea2941f2
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
   ZendeskCommonUISDK: f3ce3e7a1bd7762550a78dbaff57509f3112c22b
   ZendeskCoreSDK: c542b3f82abc3ee52e1291c6fb3436515e098806

RELEASE-NOTES.txt

@@ -4,13 +4,14 @@
 22.0
 -----
 - [*] Payments: Puerto Rico is now available in the list of countries that are supported by In-Person Payments, when using WooPayments [https://github.com/woocommerce/woocommerce-ios/pull/14972]
+- [*] Payments: Puerto Rico is now available in the list of countries that are supported by in-person payments [https://github.com/woocommerce/woocommerce-ios/pull/14972]
+- [*] Product Form: Fix crash related to picking photos [https://github.com/woocommerce/woocommerce-ios/pull/15275]
 
 21.9
 -----
 - [*] Product Form: Reset uploaded images upon discarding changes [https://github.com/woocommerce/woocommerce-ios/pull/15265]
 - [*] Improved accessibility on login flow [https://github.com/woocommerce/woocommerce-ios/pull/15281]
 
-
 21.8
 -----
 - [**] Shipping Labels: resolved issue preventing shipping labels from displaying in some orders when an error occurred during label creation. [https://github.com/woocommerce/woocommerce-ios/pull/15101]

WooCommerce/Classes/Extensions/Date+Woo.swift

@@ -25,45 +25,6 @@ extension Date {
         toString(dateStyle: dateStyle, timeStyle: timeStyle, timeZone: .siteTimezone, locale: locale)
     }
 
-    /// Returns a localized update string relative to the receiver if it's within one day of now *or*
-    /// a medium datestyle + short timestyle string otherwise.
-    ///
-    /// *Note:* if the receiver is a future date, "Updated moments ago" will be returned
-    ///
-    /// - Example: Updated moments ago
-    /// - Example: Updated 55 minutes ago
-    /// - Example: Updated 1 hour ago
-    /// - Example: Updated 14 hours ago
-    /// - Example: Updated on Jan 28, 2019 at 5:17 PM
-    ///
-    var relativelyFormattedUpdateString: String {
-        let now = Date()
-        let components = Calendar.current.dateComponents(
-            [.year, .month, .weekOfYear, .day, .hour, .minute, .second],
-            from: self,
-            to: now
-        )
-
-        guard let years = components.year, years < 1,
-            let months = components.month, months < 1,
-            let weeks = components.weekOfYear, weeks < 1,
-            let days = components.day, days < 1 else {
-                let longFormDate = self.toString(dateStyle: .medium, timeStyle: .short)
-                return String.localizedStringWithFormat(Strings.longFormUpdateStatement, longFormDate)
-        }
-
-        if let hours = components.hour, hours > 0 {
-            return String.pluralize(hours, singular: Strings.singularHourUpdateStatment, plural: Strings.pluralHourUpdateStatment)
-        }
-
-        // We only display the minutes update string when we have a time interval greater than 2 minutes...otherwise default to the present deictic expression
-        if let minutes = components.minute, minutes > 1 {
-            return String.pluralize(minutes, singular: Strings.singularMinuteUpdateStatment, plural: Strings.pluralMinuteUpdateStatment)
-        }
-
-        return Strings.presentDeicticExpression
-    }
-
     /// Returns a localized string used for describe a date range string based on two dates. E.g.
     ///
     /// receiver: 2021-01-01
@@ -165,40 +126,3 @@ extension Date {
         calendar.isDate(self, inSameDayAs: other)
     }
 }
-
-
-// MARK: - Constants!
-//
-private extension Date {
-
-    enum Strings {
-        static let presentDeicticExpression = NSLocalizedString(
-            "Updated moments ago",
-            comment: "Deictic expression for a data update that occurred in the very recent past - similar to 'Updated just now'"
-        )
-        static let singularMinuteUpdateStatment = NSLocalizedString(
-            "Updated %ld minute ago",
-            comment: "Singular of 'minute' — date and time string that represents the time interval since last data update when exactly 1 minute ago. " +
-            "Usage example: Updated 1 minute ago"
-        )
-        static let pluralMinuteUpdateStatment = NSLocalizedString(
-            "Updated %ld minutes ago",
-            comment: "Plural of 'minute' — date and time string that represents the time interval since last data update when greater than 1 minute ago. " +
-            "Usage example: Updated 55 minutes ago"
-        )
-        static let singularHourUpdateStatment = NSLocalizedString(
-            "Updated %ld hour ago",
-            comment: "Singular of 'hour' — date and time string that represents the time interval since last data update when exactly 1 hour ago. " +
-            "Usage example: Updated 1 hour ago"
-        )
-        static let pluralHourUpdateStatment = NSLocalizedString(
-            "Updated %ld hours ago",
-            comment: "Plural of 'hour' — date and time string that represents the time interval since last data update when greater than 1 hour ago. " +
-            "Usage example: Updated 14 hours ago"
-        )
-        static let longFormUpdateStatement = NSLocalizedString(
-            "Updated on %@",
-            comment: "A specific date and time string which represents when the data was last updated. Usage example: Updated on Jan 22, 2019 3:31PM"
-        )
-    }
-}

WooCommerce/Classes/Extensions/UIImage+Woo.swift

@@ -420,6 +420,10 @@ extension UIImage {
         return UIImage(named: "delivery-icon")!
     }
 
+    static var giftIcon: UIImage {
+        return UIImage(named: "gift-icon")!
+    }
+
     /// Blaze success image
     ///
     static var blazeSuccessImage: UIImage {

WooCommerce/Classes/POS/Presentation/Card Present Payments/Reader Messages/PointOfSaleCardPresentPaymentCaptureErrorMessageViewModel.swift

@@ -5,7 +5,6 @@ final class PointOfSaleCardPresentPaymentCaptureErrorMessageViewModel: Observabl
     let id = UUID()
     let title = Localization.title
     let message = Localization.message
-    let nextStep = Localization.nextStep
     let tryAgainButtonViewModel: CardPresentPaymentsModalButtonViewModel
     let newOrderButtonViewModel: CardPresentPaymentsModalButtonViewModel
 
@@ -29,7 +28,6 @@ final class PointOfSaleCardPresentPaymentCaptureErrorMessageViewModel: Observabl
         lhs.id == rhs.id &&
         lhs.title == rhs.title &&
         lhs.message == rhs.message  &&
-        lhs.nextStep == rhs.nextStep &&
         lhs.tryAgainButtonViewModel == rhs.tryAgainButtonViewModel &&
         lhs.newOrderButtonViewModel == rhs.newOrderButtonViewModel &&
         lhs.showsInfoSheet == rhs.showsInfoSheet
@@ -46,19 +44,14 @@ private extension PointOfSaleCardPresentPaymentCaptureErrorMessageViewModel {
         )
 
         static let message = NSLocalizedString(
-            "pointOfSale.cardPresent.paymentCaptureError.unable.to.confirm.message",
-            value: "Due to a network error, we’re unable to confirm that the payment succeeded.",
+            "pointOfSale.cardPresent.paymentCaptureError.unable.to.confirm.message.1",
+            value: "Due to a network error, we’re unable to confirm that the payment succeeded. " +
+            "Verify payment on a device with a working network connection. If unsuccessful, retry the payment. " +
+            "If successful, start a new order.",
             comment: "Error message. Presented to users after collecting a payment fails from payment capture error " +
             "on the Point of Sale Checkout"
         )
 
-        static let nextStep = NSLocalizedString(
-            "pointOfSale.cardPresent.paymentCaptureError.nextSteps",
-            value: "Verify payment on a device with a working network connection. If unsuccessful, retry the payment. " +
-            "If successful, start a new order.",
-            comment: "Next steps hint for what to do after seeing a payment capture error message. Presented to users " +
-            "after collecting a payment fails from payment capture error on the Point of Sale Checkout")
-
         static let tryPaymentAgain = NSLocalizedString(
             "pointOfSale.cardPresent.paymentCaptureError.tryPaymentAgain.button.title",
             value: "Try payment again",

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSaleCardPresentPaymentCaptureErrorMessageView.swift

@@ -26,14 +26,12 @@ struct PointOfSaleCardPresentPaymentCaptureErrorMessageView: View {
                     .font(.posHeadingBold)
                     .matchedGeometryEffect(id: animation.titleTransitionId, in: animation.namespace, properties: .position)
 
-                VStack(alignment: .center, spacing: PointOfSaleCardPresentPaymentLayout.textSpacing) {
-                    Text(viewModel.message)
-                    Text(viewModel.nextStep)
-                }
-                .font(.posBodyLargeRegular())
-                .foregroundStyle(Color.posOnSurface)
-                .matchedGeometryEffect(id: animation.messageTransitionId, in: animation.namespace, properties: .position)
+                Text(viewModel.message)
+                    .font(.posBodyLargeRegular())
+                    .foregroundStyle(Color.posOnSurface)
+                    .matchedGeometryEffect(id: animation.messageTransitionId, in: animation.namespace, properties: .position)
             }
+            .dynamicWidthScaling(containerWidth: width)
 
             Spacer()
                 .frame(height: PointOfSaleCardPresentPaymentLayout.textAndButtonSpacing)
@@ -48,9 +46,10 @@ struct PointOfSaleCardPresentPaymentCaptureErrorMessageView: View {
                 }
                 .buttonStyle(POSOutlinedButtonStyle(size: .normal))
             }
+            .dynamicWidthScaling(containerWidth: width)
         }
         .multilineTextAlignment(.center)
-        .frame(maxWidth: PointOfSaleCardPresentPaymentLayout.errorContentMaxWidth)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
         .posModal(isPresented: $viewModel.showsInfoSheet) {
             PointOfSaleCardPresentPaymentCaptureFailedView(isPresented: $viewModel.showsInfoSheet)
         }

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSaleCardPresentPaymentErrorMessageView.swift

@@ -8,6 +8,8 @@ struct PointOfSaleCardPresentPaymentErrorMessageView: View {
 
     var body: some View {
         VStack(alignment: .center, spacing: POSSpacing.none) {
+            Spacer()
+
             POSErrorXMark()
                 .matchedGeometryEffect(id: animation.iconTransitionId, in: animation.namespace, properties: .position)
 
@@ -26,6 +28,7 @@ struct PointOfSaleCardPresentPaymentErrorMessageView: View {
                     .foregroundStyle(Color.posOnSurface)
                     .matchedGeometryEffect(id: animation.messageTransitionId, in: animation.namespace, properties: .position)
             }
+            .dynamicWidthScaling(containerWidth: width)
 
             Spacer()
                 .frame(height: PointOfSaleCardPresentPaymentLayout.textAndButtonSpacing)
@@ -41,9 +44,12 @@ struct PointOfSaleCardPresentPaymentErrorMessageView: View {
                     .buttonStyle(POSOutlinedButtonStyle(size: .normal))
                 }
             }
+            .dynamicWidthScaling(containerWidth: width)
+
+            Spacer()
         }
         .multilineTextAlignment(.center)
-        .frame(maxWidth: PointOfSaleCardPresentPaymentLayout.errorContentMaxWidth)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
         .measureWidth({ containerWidth in
             width = containerWidth
         })

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSaleCardPresentPaymentIntentCreationErrorMessageView.swift

@@ -41,9 +41,10 @@ struct PointOfSaleCardPresentPaymentIntentCreationErrorMessageView: View {
                     .buttonStyle(POSOutlinedButtonStyle(size: .normal))
                 }
             }
+            .dynamicWidthScaling(containerWidth: width)
         }
         .multilineTextAlignment(.center)
-        .frame(maxWidth: PointOfSaleCardPresentPaymentLayout.errorContentMaxWidth)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
         .measureWidth({ containerWidth in
             width = containerWidth
         })

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSaleCardPresentPaymentLayout.swift

@@ -7,5 +7,4 @@ enum PointOfSaleCardPresentPaymentLayout {
     static let textSpacing: CGFloat = POSSpacing.small
     static let buttonSpacing: CGFloat = POSSpacing.large
     static let horizontalPadding: CGFloat = POSPadding.xxLarge
-    static let errorContentMaxWidth: CGFloat = 604
 }

WooCommerce/Classes/POS/Presentation/CardReaderConnection/UI States/Reader Messages/PointOfSaleCardPresentPaymentNonRetryableErrorMessageView.swift

@@ -8,6 +8,8 @@ struct PointOfSaleCardPresentPaymentNonRetryableErrorMessageView: View {
 
     var body: some View {
         VStack(alignment: .center, spacing: POSSpacing.none) {
+            Spacer()
+
             POSErrorXMark()
                 .matchedGeometryEffect(id: animation.iconTransitionId, in: animation.namespace, properties: .position)
 
@@ -29,16 +31,20 @@ struct PointOfSaleCardPresentPaymentNonRetryableErrorMessageView: View {
                 .foregroundStyle(Color.posOnSurface)
                 .matchedGeometryEffect(id: animation.messageTransitionId, in: animation.namespace, properties: .position)
             }
+            .dynamicWidthScaling(containerWidth: width)
 
             Spacer()
                 .frame(height: PointOfSaleCardPresentPaymentLayout.textAndButtonSpacing)
 
             Button(viewModel.tryAnotherPaymentMethodButtonViewModel.title,
                    action: viewModel.tryAnotherPaymentMethodButtonViewModel.actionHandler)
             .buttonStyle(POSFilledButtonStyle(size: .normal))
+            .dynamicWidthScaling(containerWidth: width)
+
+            Spacer()
         }
         .multilineTextAlignment(.center)
-        .frame(maxWidth: PointOfSaleCardPresentPaymentLayout.errorContentMaxWidth)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
         .measureWidth({ containerWidth in
             width = containerWidth
         })