Merge branch 'trunk' into woomob-860-shipping-labels-allow-proceeding-if-address-is-not-verified

Author: itsmeichigo

.github/workflows/screenshots.yml

@@ -5,16 +5,13 @@ on:
     types: [opened, synchronize, reopened, labeled, unlabeled]
 
 env:
-  S3_BUCKET: ${{ secrets.S3_BUCKET }}
-  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   CONFIGURE_ENCRYPTION_KEY: ${{ secrets.CONFIGURE_ENCRYPTION_KEY }}
 
 jobs:
   build:
     name: Build Application
     if: contains(github.event.pull_request.labels.*.name, 'generate screenshots')
-    runs-on: macos-latest
+    runs-on: macos-15
 
     steps:
     - name: "Check out Project"
@@ -30,26 +27,21 @@ jobs:
     - name: Compile the App
       run: bundle exec fastlane build_screenshots
 
-    - name: Archive App
+    - name: Archive Build Products
       uses: actions/upload-artifact@v4
       with:
-        name: screenshot-app
-        path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerce.app
-
-    - name: Archive Runner
-      uses: actions/upload-artifact@v4
-      with:
-        name: screenshot-runner
-        path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerceScreenshots-Runner.app
+        name: screenshot-build-products
+        path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/
+        retention-days: 1
 
   capture:
     name: Capture
     needs: build
-    runs-on: macos-latest
+    runs-on: macos-15
 
     strategy:
       matrix:
-        language: [ar, de-DE, en-US, es-ES, fr-FR, he, id, it, ja, ko, nl-NL, pt-BR, ru, sv, tr, zh-Hans, zh-Hant]
+        language: [ar-SA, de-DE, en-US, es-ES, fr-FR, he, id, it, ja, ko, nl-NL, pt-BR, ru, sv, tr, zh-Hans, zh-Hant]
         mode: [dark, light]
     steps:
     - uses: actions/checkout@v4
@@ -61,17 +53,11 @@ jobs:
     - name: Install Fastlane Dependencies
       run: bundle exec fastlane run configure_apply
 
-    - name: Download Screenshot App
-      uses: actions/download-artifact@v4
-      with:
-        name: screenshot-app
-        path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerce.app
-
-    - name: Download Screenshot Runner
+    - name: Download Build Products
       uses: actions/download-artifact@v4
       with:
-        name: screenshot-runner
-        path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/WooCommerceScreenshots-Runner.app
+        name: screenshot-build-products
+        path: fastlane/DerivedData/Build/Products/Debug-iphonesimulator/
 
     - name: Generate Screenshots
       run: |
@@ -85,14 +71,18 @@ jobs:
         path: fastlane/logs
 
     - name: Archive Generated Screenshots
-      run: |
-        cd fastlane && mkdir $GITHUB_RUN_ID && mv screenshots $GITHUB_RUN_ID
-        aws s3 cp $GITHUB_RUN_ID s3://$S3_BUCKET/$GITHUB_RUN_ID --recursive --exclude "*.html"
+      uses: actions/upload-artifact@v4
+      with:
+        name: "screenshots-${{ matrix.language }}-${{ matrix.mode }}"
+        path: fastlane/screenshots/
 
   process:
     name: "Process Screenshots"
     needs: capture
-    runs-on: macos-latest
+    runs-on: macos-15
+
+    env:
+      BUNDLE_WITH: screenshots
 
     steps:
       - uses: actions/checkout@v4
@@ -101,55 +91,50 @@ jobs:
         run: |
           brew install imagemagick@7
           brew link imagemagick@7 --force
+          brew install automattic/build-tools/drawText
 
       - name: "Set up Ruby"
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
 
-      - name: Install Screenshot Gems
-        run: bundle install --with screenshots
-
       - name: Install Fastlane Dependencies
         run: bundle exec fastlane run configure_apply
 
       - name: Download Generated Screenshots
-        run: |
-          cd fastlane
-          aws s3 cp s3://$S3_BUCKET/$GITHUB_RUN_ID/screenshots screenshots/  --recursive --exclude "*.html"
+        uses: actions/download-artifact@v4
+        with:
+          pattern: "screenshots-*"
+          path: fastlane/screenshots/
+          merge-multiple: true
 
-      - name: Generate and Upload Screenshot Summary
+      - name: Generate Screenshot Summary
         run: |
           bundle exec fastlane create_screenshot_summary
-          aws s3 cp fastlane/screenshots/screenshots.html s3://$S3_BUCKET/$GITHUB_RUN_ID/screenshots/screenshots.html
+      
+      - name: Upload Screenshot Summary
+        uses: actions/upload-artifact@v4
+        with:
+          name: screenshot-summary
+          path: fastlane/screenshots/screenshots.html
 
       - name: Archive Raw Screenshots
         uses: actions/upload-artifact@v4
         with:
           name: raw-screenshots
           path: fastlane/screenshots
 
-      - name: Install Promo Screenshot Fonts
+      - name: Setup Git LFS
         run: |
-          aws s3 cp s3://$S3_BUCKET/fonts.zip fonts.zip
-          unzip fonts.zip
-
-          mkdir -p ~/Library/Fonts
-          cp -v fonts/*.otf ~/Library/Fonts
-          ls ~/Library/Fonts
-
-          mkdir -p /Library/Fonts
-          cp -v fonts/*.otf /Library/Fonts
-          ls /Library/Fonts
-
-          # Reset the font server in order to use these fonts
-          atsutil databases -removeUser
-          atsutil server -shutdown
-          atsutil server -ping
+          # Install Git LFS if not available
+          if ! command -v git-lfs &> /dev/null; then
+            echo "Installing Git LFS..."
+            brew install git-lfs
+          fi
+          git lfs install && git lfs fetch && git lfs pull
 
       - name: Generate Promo Screenshots
         run: |
-          git lfs install && git lfs fetch && git lfs pull
           bundle exec fastlane create_promo_screenshots force:true
 
       - name: Archive Promo Screenshots

RELEASE-NOTES.txt

@@ -11,6 +11,8 @@
 - [*] Shipping Labels: Display base rate on selected shipping service cards [https://github.com/woocommerce/woocommerce-ios/pull/15916]
 - [*] Shipping Labels: Update mark order completed toggle on purchase form [https://github.com/woocommerce/woocommerce-ios/pull/15917]
 - [*] Shipping Labels: Allow confirming destination addresses when validation fails. [https://github.com/woocommerce/woocommerce-ios/pull/15928]
+- [*] Shipping Labels: Validate custom package dimensions [https://github.com/woocommerce/woocommerce-ios/pull/15925]
+- [*] Shipping Labels: Show UPS TOS modal in full length for better accessibility. [https://github.com/woocommerce/woocommerce-ios/pull/15926]
 - [*] Shipping Labels: Optimize data loading on purchase form [https://github.com/woocommerce/woocommerce-ios/pull/15919]
 - [internal] Optimized assets for app size reduction [https://github.com/woocommerce/woocommerce-ios/pull/15881]
 

WooCommerce/Classes/POS/Presentation/Barcode Scanner Setup/PointOfSaleBarcodeScannerSetupFlow.swift

@@ -7,16 +7,19 @@ import WooFoundation
 class PointOfSaleBarcodeScannerSetupFlow {
     private let scannerType: PointOfSaleBarcodeScannerType
     private let onBackToSelection: () -> Void
+    fileprivate let onDismiss: () -> Void
     private var flowSteps: [PointOfSaleBarcodeScannerStepID: PointOfSaleBarcodeScannerSetupStep] = [:]
     private var currentStepKey: PointOfSaleBarcodeScannerStepID = .setupBarcodeHID
     private let analytics: Analytics
 
     init(scannerType: PointOfSaleBarcodeScannerType,
          analytics: Analytics = ServiceLocator.analytics,
-         onBackToSelection: @escaping () -> Void) {
+         onBackToSelection: @escaping () -> Void,
+         onDismiss: @escaping () -> Void) {
         self.scannerType = scannerType
         self.analytics = analytics
         self.onBackToSelection = onBackToSelection
+        self.onDismiss = onDismiss
         self.flowSteps = createFlowSteps(for: scannerType)
         self.currentStepKey = initialStep(for: scannerType)
     }
@@ -132,7 +135,7 @@ class PointOfSaleBarcodeScannerSetupFlow {
                 .testScanTimedOut: testScanTimeOutStep(barcode: .ean13),
                 .testScanFailed: testScanFailedStep(),
                 .complete: setupCompleteStep(),
-                .setupInformation: setupInformationStep()
+                .setupProducts: setupProductsStep()
             ]
         case .tera12002D:
             return [
@@ -172,19 +175,19 @@ class PointOfSaleBarcodeScannerSetupFlow {
                 .testScanTimedOut: testScanTimeOutStep(barcode: .ean13),
                 .testScanFailed: testScanFailedStep(),
                 .complete: setupCompleteStep(),
-                .setupInformation: setupInformationStep()
+                .setupProducts: setupProductsStep()
             ]
         case .other:
             return [
                 .setupInformation: PointOfSaleBarcodeScannerSetupStep(
                     content: { BarcodeScannerInformation() },
-                    transitions: [.next: .setupProducts]
+                    transitions: [.next: .test]
                 ),
-                .setupProducts: PointOfSaleBarcodeScannerSetupStep(
-                    content: { ProductBarcodeSetupInformation() },
-                    buttonCustomization: PointOfSaleBarcodeScannerBackOnlyButtonCustomization(),
-                    transitions: [.back: .setupInformation]
-                )
+                .test: testScanStep(barcode: .ean13, transitions: [.back: .setupInformation]),
+                .testScanTimedOut: testScanTimeOutStep(barcode: .ean13, transitions: [.back: .setupInformation]),
+                .testScanFailed: testScanFailedStep(),
+                .complete: setupCompleteStep(),
+                .setupProducts: setupProductsStep()
             ]
         }
     }
@@ -212,7 +215,11 @@ class PointOfSaleBarcodeScannerSetupFlow {
 
     // MARK: - Steps
 
-    private func testScanStep(barcode: PointOfSaleBarcodeScannerTestBarcode, timerCompleted: Bool = false) -> PointOfSaleBarcodeScannerSetupStep {
+    private func testScanStep(
+        barcode: PointOfSaleBarcodeScannerTestBarcode,
+        transitions: [PointOfSaleBarcodeScannerTransitionType: PointOfSaleBarcodeScannerStepID] = [.back: .pairing],
+        timerCompleted: Bool = false
+    ) -> PointOfSaleBarcodeScannerSetupStep {
         PointOfSaleBarcodeScannerSetupStep(
             content: {
                 PointOfSaleBarcodeScannerTestBarcodeView(
@@ -234,14 +241,15 @@ class PointOfSaleBarcodeScannerSetupFlow {
                 )
             },
             buttonCustomization: PointOfSaleBarcodeScannerBackOnlyButtonCustomization(),
-            transitions: [
-                .back: .pairing
-            ]
+            transitions: transitions
         )
     }
 
-    private func testScanTimeOutStep(barcode: PointOfSaleBarcodeScannerTestBarcode) -> PointOfSaleBarcodeScannerSetupStep {
-        testScanStep(barcode: barcode, timerCompleted: true)
+    private func testScanTimeOutStep(
+        barcode: PointOfSaleBarcodeScannerTestBarcode,
+        transitions: [PointOfSaleBarcodeScannerTransitionType: PointOfSaleBarcodeScannerStepID] = [.back: .pairing]
+    ) -> PointOfSaleBarcodeScannerSetupStep {
+        testScanStep(barcode: barcode, transitions: transitions, timerCompleted: true)
     }
 
     private func testScanFailedStep() -> PointOfSaleBarcodeScannerSetupStep {
@@ -264,14 +272,17 @@ class PointOfSaleBarcodeScannerSetupFlow {
             },
             buttonCustomization: PointOfSaleBarcodeScannerOptionalScannerInformationButtonCustomization(),
             transitions: [
-                .next: .setupInformation,
+                .next: .setupProducts
             ])
     }
 
-    private func setupInformationStep() -> PointOfSaleBarcodeScannerSetupStep {
+    private func setupProductsStep() -> PointOfSaleBarcodeScannerSetupStep {
         PointOfSaleBarcodeScannerSetupStep(
             content: { ProductBarcodeSetupInformation() },
-            buttonCustomization: PointOfSaleBarcodeScannerNoButtonsButtonCustomization()
+            buttonCustomization: PointOfSaleBarcodeScannerProductBarcodeSetupInformationButtonCustomization(),
+            transitions: [
+                .back: .complete
+            ]
         )
     }
 }
@@ -344,9 +355,18 @@ struct PointOfSaleBarcodeScannerOptionalScannerInformationButtonCustomization: P
 }
 
 @available(iOS 17.0, *)
-struct PointOfSaleBarcodeScannerNoButtonsButtonCustomization: PointOfSaleBarcodeScannerButtonCustomization {
+struct PointOfSaleBarcodeScannerProductBarcodeSetupInformationButtonCustomization: PointOfSaleBarcodeScannerButtonCustomization {
     func customizeButtons(for flow: PointOfSaleBarcodeScannerSetupFlow) -> PointOfSaleFlowButtonConfiguration {
-        return PointOfSaleFlowButtonConfiguration.noButtons()
+        return PointOfSaleFlowButtonConfiguration(
+            primaryButton: PointOfSaleFlowButtonConfiguration.ButtonConfig(
+                title: PointOfSaleBarcodeScannerSetupFlow.Localization.doneButtonTitle,
+                action: { flow.onDismiss() }
+            ),
+            secondaryButton: PointOfSaleFlowButtonConfiguration.ButtonConfig(
+                title: PointOfSaleBarcodeScannerSetupFlow.Localization.backButtonTitle,
+                action: { flow.transition(to: .back) }
+            )
+        )
     }
 }
 
@@ -397,6 +417,13 @@ private extension PointOfSaleBarcodeScannerSetupFlow {
             value: "Back",
             comment: "Title for the back button in barcode scanner setup navigation"
         )
+
+        static let doneButtonTitle = NSLocalizedString(
+            "pos.barcodeScannerSetup.done.button.title",
+            value: "Done",
+            comment: "Title for the done button in barcode scanner setup navigation"
+        )
+
         //TODO: WOOMOB-792
         static let scannerSetUpBarcodeStepTitleFormat = "Scanner Setup"
         static let setUpBarcodeHIDStepInstruction = "Scan the Bluetooth HID symbol."

WooCommerce/Classes/POS/Presentation/Barcode Scanner Setup/PointOfSaleBarcodeScannerSetupFlowManager.swift

@@ -30,6 +30,9 @@ class PointOfSaleBarcodeScannerSetupFlowManager {
             analytics: analytics,
             onBackToSelection: { [weak self] in
                 self?.goBackToSelection()
+            },
+            onDismiss: { [weak self] in
+                self?.isPresented = false
             }
         )
         currentState = .setupFlow(scannerType)

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

@@ -16,7 +16,7 @@ struct PointOfSaleCardPresentPaymentActivityIndicatingMessageView: View {
                 .renderedIf(!dynamicTypeSize.isAccessibilitySize)
             VStack(alignment: .center, spacing: PointOfSaleCardPresentPaymentLayout.textSpacing) {
                 Text(title)
-                    .foregroundStyle(Color.posOnSurface)
+                    .foregroundStyle(Color.posOnSurfaceVariantHighest)
                     .font(.posBodyLargeRegular())
                     .matchedGeometryEffect(id: animation.titleTransitionId, in: animation.namespace, properties: .position)
 

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

@@ -16,7 +16,7 @@ struct PointOfSaleCardPresentPaymentTapSwipeInsertCardMessageView: View {
                 .renderedIf(!dynamicTypeSize.isAccessibilitySize)
             VStack(alignment: .center, spacing: PointOfSaleCardPresentPaymentLayout.textSpacing) {
                 Text(viewModel.title)
-                    .foregroundStyle(Color.posOnSurface)
+                    .foregroundStyle(Color.posOnSurfaceVariantHighest)
                     .font(.posBodyLargeRegular())
                     .matchedGeometryEffect(id: animation.titleTransitionId, in: animation.namespace, properties: .position)