Skip to content

[Universal Links] Link does not open the order if the link store is already selected in the app #8425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 16, 2022
Merged

[Universal Links] Link does not open the order if the link store is already selected in the app #8425

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
119776f
Return true if the store is already selected, and rename functions fo…
toupper Dec 15, 2022
83bb383
Add comment
toupper Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions WooCommerce/Classes/ViewRelated/MainTabBarController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ extension MainTabBarController {
}
let siteID = Int64(note.meta.identifier(forKey: .site) ?? Int.min)

switchToStore(with: siteID, onCompletion: { _ in
showStore(with: siteID, onCompletion: { _ in
presentNotificationDetails(for: note)
})
}
Expand Down Expand Up @@ -367,8 +367,16 @@ extension MainTabBarController {
"already_read": note.read ])
}

private static func switchToStore(with siteID: Int64, onCompletion: @escaping (Bool) -> Void) {
SwitchStoreUseCase(stores: ServiceLocator.stores).switchToStoreIfSiteIsStored(with: siteID) { siteChanged in
private static func showStore(with siteID: Int64, onCompletion: @escaping (Bool) -> Void) {
let stores = ServiceLocator.stores

// Already showing that store, do nothing
guard siteID != stores.sessionManager.defaultStoreID else {
onCompletion(true)
return
}

SwitchStoreUseCase(stores: stores).switchToStoreIfSiteIsStored(with: siteID) { siteChanged in
guard siteChanged else {
return onCompletion(false)
}
Expand All @@ -393,9 +401,10 @@ extension MainTabBarController {
}

static func navigateToOrderDetails(with orderID: Int64, siteID: Int64) {
switchToStore(with: siteID, onCompletion: { siteChanged in
showStore(with: siteID, onCompletion: { storeIsShown in
switchToOrdersTab {
guard siteChanged else {
// It failed to show the order's store. We navigate to the orders tab and stop, as we cannot show the order details screen
guard storeIsShown else {
return
}
// We give some time to the orders tab transition to finish, otherwise it might prevent the second navigation from happening
Expand Down