Bookings: Show bookings tab when site is eligible #16153

itsmeichigo · 2025-09-19T06:18:39Z

Description

This PR adds a new tab for Bookings for CIAB sites with existing bookable products. Due to potential changes in the base branch, there will be updates to where the eligibility check is called, but the rest of the code should be ready for testing.

Testing steps

Create a new CIAB site using the Garden API tool if you haven't got one already.
Add a bookable product to the site if it has none.
Log in to the site on the app. Confirm that Bookings tab is available. Please ignore the placeholder content for now.
Switch to a non-CIAB site. Confirm that Bookings tab is not available.

Testing information

Tested the app with simulator iPhone 17 and iPad Mini iOS 26.

Screenshots

Simulator Screenshot - iPhone 17 - 2025-09-19 at 15 25 47

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

wpmobilebot · 2025-09-19T06:28:11Z

📲 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	`pr16153-7198db0`
	Version	`23.3`
	Bundle ID	`com.automattic.alpha.woocommerce`
	Commit	`7198db0`
	Installation URL	1k2uab0ph6v40

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

…-ios-bookings-tab

We need to wait for the full site model and update the tabs in observeConditionalTabsAvailabilityWith(_:Site)

RafaelKayumov

Thx for the fix

RafaelKayumov · 2025-09-23T07:56:00Z

Hey @itsmeichigo. Sry I accidentally put an approval here while looking at the over PR. I'll make a proper review for this one tonight. Don't yet merge.

RafaelKayumov

LGTM. Works as described. I can see bookings tab on a CIAB site with bookable products. It disappears after switching to a regular site.

We should include a testing step to add bookable product to the CIAB testing store to have the "Bookings" tab presented. I forgot about that requirement myself and couldn't get the tab displayed for a while 😅

Also I noticed that after adding a bookable product on site and refreshing a dashboard + refreshing products - the bookings tab didn't appear. I had to switch sites to get it visible or restart the app. I wonder if such scenario can also happen for users and cause confusion about the feature being broken. WDYT - should we address it or leave as good enough for the MVP?

itsmeichigo · 2025-09-24T03:03:11Z

Hey @RafaelKayumov, thanks for the review!

We should include a testing step to add bookable product to the CIAB testing store to have the "Bookings" tab presented. I forgot about that requirement myself and couldn't get the tab displayed for a while

Sorry for missing this step 🤦 I updated the PR description in case someone else comes across this PR in the future.

Also I noticed that after adding a bookable product on site and refreshing a dashboard + refreshing products - the bookings tab didn't appear. I had to switch sites to get it visible or restart the app. I wonder if such scenario can also happen for users and cause confusion about the feature being broken. WDYT - should we address it or leave as good enough for the MVP?

I discussed with Jorge about this in this thread: p1758087429642489-slack-C03L1NF1EA3. Currently, the tab bar is loaded only once and requires a relaunch or switching stores to update the tab bar for simplicity. Let's discuss there and update the behavior later if needed.

I'll wait for @jaclync's review to confirm that the POS works fine with this update before merging.

itsmeichigo · 2025-09-24T05:40:06Z

WooCommerce/Classes/ViewRelated/NotificationsBadgeController.swift

    private func hideDotOn(with input: NotificationsBadgeInput) {
        let tag = dotTag(for: input.tab)
-        if let subviews = input.tabBar.orderedTabBarActionableViews[input.tabIndex].subviews.first?.subviews {
+        if let subviews = input.tabBar.orderedTabBarActionableViews[safe: input.tabIndex]?.subviews.first?.subviews {


While testing I encountered a crash due to index out of bound here, so I added this for safety.

jaclync · 2025-09-25T01:38:26Z

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

+                                                    isBookingsTabVisible: isBookingsTabVisible)
+
+        // Updates site ID for the POS coordinator to ensure correct data
+        posTabCoordinator?.didSwitchStore(id: siteID)


I'm hoping the siteID can remain constant in POSTabCoordinator. How about reinitializing the POSTabCoordinator here instead of updating the siteID? Would it cause any issues?

@jaclync POSTabCoordinator requires the eligibility checker, which now requires a full site model to check if the site is CIAB. Upon changes of site ID, we don't yet have the full site model so it's not possible to reinitialize the coordinator.

It would be great if the coordinator can be separated from the eligibility checker, but with the current design I don't have a better solution. Please feel free to suggest a solution if you have one in mind, thanks!

I'd consider separating the tab visibility logic in POSEntryPointEligibilityCheckerProtocol to a new protocol that stays in the app, so that POSEntryPointEligibilityCheckerProtocol just has checkEligibility and refreshEligibility that should not depend on the full Site (the CIAB check is performed on the tab visibility).

We're also in the middle of moving POS code into a separate module, and I'm refactoring the dependencies of PointOfSaleEntryPointView passed in POSTabCoordinator. Please go ahead with merging this PR and I'll look into the refactoring as part of the POS module refactoring work.

Show bookings tab when site is eligible

077d33f

itsmeichigo added this to the 23.4 milestone Sep 19, 2025

itsmeichigo added the type: task An internally driven task. label Sep 19, 2025

itsmeichigo added 5 commits September 19, 2025 15:35

Remove unnecessary caching

9e81f47

Add unit tests

6f6c479

Create bookingsEligibilityChecker upon observing

f460ecd

Ignore periphery

2115397

Merge branch 'WOOMOB-1363-hide-POS-tab-for-CIAB-sites' into woomob-1231…

349779f

…-ios-bookings-tab

itsmeichigo marked this pull request as ready for review September 22, 2025 02:56

itsmeichigo requested a review from RafaelKayumov September 22, 2025 02:56

Base automatically changed from WOOMOB-1363-hide-POS-tab-for-CIAB-sites to trunk September 22, 2025 07:58

Disable optional tabs when site ID change

ecfc2b3

We need to wait for the full site model and update the tabs in observeConditionalTabsAvailabilityWith(_:Site)

RafaelKayumov approved these changes Sep 23, 2025

View reviewed changes

RafaelKayumov self-requested a review September 23, 2025 07:54

RafaelKayumov approved these changes Sep 23, 2025

View reviewed changes

itsmeichigo requested a review from jaclync September 24, 2025 03:03

itsmeichigo added 2 commits September 24, 2025 12:13

Update site ID for POSTabCoordinator upon switching stores

76c5b0d

Ignore unused method to be updated later

35c4988

itsmeichigo commented Sep 24, 2025

View reviewed changes

jaclync reviewed Sep 25, 2025

View reviewed changes

Merge branch 'trunk' into woomob-1231-ios-bookings-tab

7198db0

itsmeichigo merged commit 94221d2 into trunk Sep 25, 2025
13 checks passed

itsmeichigo deleted the woomob-1231-ios-bookings-tab branch September 25, 2025 04:49

jaclync mentioned this pull request Sep 25, 2025

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

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Bookings: Show bookings tab when site is eligible #16153

Bookings: Show bookings tab when site is eligible #16153

Uh oh!

itsmeichigo commented Sep 19, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Sep 19, 2025 •

edited

Loading

Uh oh!

RafaelKayumov left a comment

Uh oh!

RafaelKayumov commented Sep 23, 2025

Uh oh!

RafaelKayumov left a comment

Uh oh!

itsmeichigo commented Sep 24, 2025

Uh oh!

itsmeichigo Sep 24, 2025

Uh oh!

jaclync Sep 25, 2025

Uh oh!

itsmeichigo Sep 25, 2025

Uh oh!

itsmeichigo Sep 25, 2025

Uh oh!

jaclync Sep 25, 2025

Uh oh!

itsmeichigo Sep 25, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Bookings: Show bookings tab when site is eligible #16153

Bookings: Show bookings tab when site is eligible #16153

Uh oh!

Conversation

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

Uh oh!

Description

Testing steps

Testing information

Screenshots

Uh oh!

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

Uh oh!

Uh oh!

RafaelKayumov left a comment

Choose a reason for hiding this comment

Uh oh!

RafaelKayumov commented Sep 23, 2025

Uh oh!

RafaelKayumov left a comment

Choose a reason for hiding this comment

Uh oh!

itsmeichigo commented Sep 24, 2025

Uh oh!

itsmeichigo Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

jaclync Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

itsmeichigo Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

itsmeichigo Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

jaclync Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

itsmeichigo Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

itsmeichigo commented Sep 19, 2025 •

edited

Loading

wpmobilebot commented Sep 19, 2025 •

edited

Loading