Refactor POS tab: separate visibility and eligibility logic while removing POS as a tab i2 feature flag #16173

jaclync · 2025-09-25T09:21:52Z

Just one review is required.

Description

This PR refactors the POS tab logic to separate visibility and eligibility concerns, following the architecture discussion in PR #16153. It also removes the pointOfSaleAsATabi2 feature flag, which contributes to ~1000 deletion diffs.

Changes Made

Refactored POSTabEligibilityChecker to focus purely on eligibility check based on plugin version and feature switch eligibility, and POSTabVisibilityChecker now handles the visibility logic including CIAB checks
Removed pointOfSaleAsATabi2 feature flag, and LegacyPOSTabEligibilityChecker + LegacyPOSTabEligibilityCheckerTests that were used when the feature flag was disabled

Architecture Improvements

Clear separation of concerns: Visibility checker handles country/currency/CIAB, eligibility checker handles plugin/versions
Reduced coupling: Eligibility checker no longer depends on full Site model and can be set immediately after switching stores when the site ID becomes available before the full Site
Maintainability: Each checker has a single, well-defined responsibility

Steps to reproduce

Build and run the app on an iPad
Log in to a WPCOM account connected to more than one store eligible for POS (US/GB with proper currency)
Tap on the POS tab --> the products should be loaded for the connected store
Switch to another store and tap on the POS tab immediately --> the products should be loaded for the connected store

Testing information

I tested the above on iPad, and on iPhone to ensure that POS tab wasn't shown.

I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

…lity and eligibility.

dangermattic · 2025-09-25T09:22:26Z

	2 Warnings
⚠️	View files have been modified, but no screenshot or video is included in the pull request. Consider adding some for clarity.
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

Generated by 🚫 Danger

wpmobilebot · 2025-09-25T09:31:27Z

📲 You can test the changes from this Pull Request in WooCommerce iOS Prototype by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce iOS Prototype
	Build Number	`pr16173-d610283`
	Version	`23.3`
	Bundle ID	`com.automattic.alpha.woocommerce`
	Commit	`d610283`
	Installation URL	3rog3c4kvr91g

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

… in preview.

…CI uses phone simulator.

…ice` mocks to be reusable.

iamgabrielma

Tests well, switching between an US and UK store loads the site products correctly. I just saw the POS tab glitching for a moment when I first switched stores (POS tab becoming invisible) but was restored immediately, which I guess happened while checking the requirements and waiting for network response. All good!

Tested in iPad Pro 12.9 inch - iOS 26.0

iamgabrielma · 2025-09-29T07:53:43Z

WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/POSTabEligibilityChecker.swift

-            return .ineligible(reason: .unsupportedInCIABSites)
-        }
-
        guard #available(iOS 17.0, *) else {


Nit: We can remove this availability check as well and the unsupportedIOSVersion case as ineligible reason

iamgabrielma · 2025-09-29T07:54:11Z

WooCommerce/WooCommerceTests/POS/Models/PointOfSaleAggregateModelTests.swift

    )
 }

 @available(iOS 17.0, *)


Nit: We can remove this availability check as well

iamgabrielma · 2025-09-29T07:54:20Z

WooCommerce/WooCommerceTests/POS/Presentation/POSItemActionHandlerTests.swift

                                stockStatusKey: ""))
 }

 @available(iOS 17.0, *)


Nit: We can remove this availability check as well

…e-flag-with-refactoring # Conflicts: # Modules/Sources/Experiments/FeatureFlag.swift

…ed `POSIneligibleReason` cases.

jaclync · 2025-09-30T05:40:55Z

Tests well, switching between an US and UK store loads the site products correctly. I just saw the POS tab glitching for a moment when I first switched stores (POS tab becoming invisible) but was restored immediately, which I guess happened while checking the requirements and waiting for network response. All good!

I believe this is due to the recent CIAB change 8b32ea3 that delays the tab visibility check until the full site becomes available, which takes place a bit after the site ID becomes available, when we used to check the tab visibility. This delay causes the tab visibility "glitching" (changing back and forth). I'll see if I can fix this separately for Kiwi's review.

…e-flag-with-refactoring # Conflicts: # WooCommerce/WooCommerce.xcodeproj/project.pbxproj

jaclync · 2025-09-30T06:07:44Z

Update from #16173 (comment):

I'll see if I can fix this separately for Kiwi's review.

As the latest visibility check requires the CIAB check from the full site

woocommerce-ios/WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/POSTabEligibilityChecker.swift

Lines 115 to 117 in 2c9fd8a

    
           guard siteCIABEligibilityChecker.isFeatureSupported(.pointOfSale, for: site) else { 
        
               return false 
        
           }

I'm not sure if there's a good way to perform this check before the full site becomes available. A workaround is to skip the CIAB check when the site ID first becomes available, then include the CIAB check when the full site becomes available later. However, this could also result in a glitch if the visibility changes in the second check. It feels like a tradeoff from the CIAB change that we are accepting. Once the visibility check is performed from the full site, it should be cached and used for initial visibility next time when the full site is available. Please feel free to share any ideas for making the POS visibility available earlier like before the CIAB change @itsmeichigo @RafaelKayumov.

Remove pointOfSaleAsATabi2 feature flag and separate POS tab visibi…

9def52d

…lity and eligibility.

jaclync added type: technical debt Represents or solves tech debt of the project. feature: POS labels Sep 25, 2025

jaclync added this to the 23.4 milestone Sep 25, 2025

jaclync added 6 commits September 25, 2025 18:03

Add PointOfSalePreviewTabEligibilityChecker for eligibility checker…

61974f6

… in preview.

Remove unused code.

6e9333d

Remove unused import.

aaf1b96

Fix unit test failures from not DI'ing userInterfaceIdiom: .pad as …

df568e9

…CI uses phone simulator.

Move duplicate MockSelectedSiteSettings and `MockPOSSiteSettingServ…

2b7c016

…ice` mocks to be reusable.

Remove unused code in unit tests.

a35cc78

jaclync changed the title ~~Refactor POS Tab: Separate Visibility and Eligibility Logic~~ Refactor POS tab: separate visibility and eligibility logic while removing POS as a tab i2 feature flag Sep 25, 2025

jaclync requested review from iamgabrielma and itsmeichigo September 25, 2025 14:16

jaclync mentioned this pull request Sep 26, 2025

[Woo POS] Modularization: refactor POS entry point initializer to minimize public dependencies #16175

Merged

2 tasks

iamgabrielma self-assigned this Sep 29, 2025

iamgabrielma approved these changes Sep 29, 2025

View reviewed changes

jaclync mentioned this pull request Sep 30, 2025

[Local Catalog] POS Settings: integrate with catalog data and full sync functionality #16144

Merged

1 task

jaclync added 2 commits September 30, 2025 10:54

Merge branch 'trunk' into backlog/WOOMOB-869-remove-pos-tab-i2-featur…

d876003

…e-flag-with-refactoring # Conflicts: # Modules/Sources/Experiments/FeatureFlag.swift

Remove unnecessary iOS 17 checks now that the app is iOS 17+ and unus…

c144a6b

…ed `POSIneligibleReason` cases.

jaclync added 2 commits September 30, 2025 13:41

Merge branch 'trunk' into backlog/WOOMOB-869-remove-pos-tab-i2-featur…

4933fd7

…e-flag-with-refactoring # Conflicts: # WooCommerce/WooCommerce.xcodeproj/project.pbxproj

Revert deletion of two mock files in WooCommerceTests.

d610283

jaclync enabled auto-merge September 30, 2025 06:14

jaclync merged commit 6a1c368 into trunk Sep 30, 2025
13 checks passed

jaclync deleted the backlog/WOOMOB-869-remove-pos-tab-i2-feature-flag-with-refactoring branch September 30, 2025 06:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Refactor POS tab: separate visibility and eligibility logic while removing POS as a tab i2 feature flag #16173

Refactor POS tab: separate visibility and eligibility logic while removing POS as a tab i2 feature flag #16173

Uh oh!

jaclync commented Sep 25, 2025 •

edited

Loading

Uh oh!

dangermattic commented Sep 25, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Sep 25, 2025 •

edited

Loading

Uh oh!

iamgabrielma left a comment

Uh oh!

iamgabrielma Sep 29, 2025

Uh oh!

iamgabrielma Sep 29, 2025

Uh oh!

iamgabrielma Sep 29, 2025

Uh oh!

jaclync commented Sep 30, 2025

Uh oh!

jaclync commented Sep 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Refactor POS tab: separate visibility and eligibility logic while removing POS as a tab i2 feature flag #16173

Refactor POS tab: separate visibility and eligibility logic while removing POS as a tab i2 feature flag #16173

Uh oh!

Conversation

jaclync commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Changes Made

Architecture Improvements

Steps to reproduce

Testing information

Uh oh!

dangermattic commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

iamgabrielma left a comment

Choose a reason for hiding this comment

Uh oh!

iamgabrielma Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

iamgabrielma Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

iamgabrielma Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

jaclync commented Sep 30, 2025

Uh oh!

jaclync commented Sep 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jaclync commented Sep 25, 2025 •

edited

Loading

dangermattic commented Sep 25, 2025 •

edited

Loading

wpmobilebot commented Sep 25, 2025 •

edited

Loading