Merge release/21.4 into release/21.5 (#14985)

toupper · web-flow · commit 08fc504b77c4 · 2025-01-27T14:36:03.000+01:00
diff --git a/WooCommerce/Classes/ViewRelated/JetpackSetup/JetpackSetupCoordinator.swift b/WooCommerce/Classes/ViewRelated/JetpackSetup/JetpackSetupCoordinator.swift
@@ -271,6 +271,7 @@ private extension JetpackSetupCoordinator {
                         if site.isJetpackCPConnected {
                             self?.presentJCPJetpackInstallFlow()
                         }
+                        progressView.dismiss(animated: true)
                     })
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -271,6 +271,7 @@ private extension JetpackSetupCoordinator {`
`271`	`271`	`if site.isJetpackCPConnected {`
`272`	`272`	`self?.presentJCPJetpackInstallFlow()`
`273`	`273`	`}`
	`274`	`+ progressView.dismiss(animated: true)`
`274`	`275`	`})`
`275`	`276`	`}`
`276`	`277`