[PAY-2040] Payment Sheet Displayed On Unrelated Context (#1752)

* allow tracking incorrect page display for payment sheet create function calls for calling vm from vc, ensure nil value still sends the property name. No need to send user information. * found a way to prevent analytics altogether and prevent display of the payment sheet on unintended context. * naming variable correction.
kickstarter · Oct 27, 2022 · e61111e · e61111e
1 parent d954d24
commit e61111e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/Kickstarter-iOS/Features/PaymentMethods/Controller/PaymentMethodsViewController.swift b/Kickstarter-iOS/Features/PaymentMethods/Controller/PaymentMethodsViewController.swift
@@ -187,11 +187,16 @@ internal final class PaymentMethodsViewController: UIViewController, MessageBann
           strongSelf.messageBannerViewController?
             .showBanner(with: .error, message: error.localizedDescription)
         case let .success(paymentSheetFlowController):
-          strongSelf.paymentSheetFlowController = paymentSheetFlowController
-          strongSelf.paymentSheetFlowController?.presentPaymentOptions(from: strongSelf) { [weak self] in
-            guard let strongSelf = self else { return }
+          let topViewController = strongSelf.navigationController?.topViewController
+          let paymentSheetShownWithinPaymentMethodsContext = topViewController is PaymentMethodsViewController
 
-            strongSelf.confirmPaymentResult(with: data.clientSecret)
+          if paymentSheetShownWithinPaymentMethodsContext {
+            strongSelf.paymentSheetFlowController = paymentSheetFlowController
+            strongSelf.paymentSheetFlowController?.presentPaymentOptions(from: strongSelf) { [weak self] in
+              guard let strongSelf = self else { return }
+
+              strongSelf.confirmPaymentResult(with: data.clientSecret)
+            }
           }
         }
       }

diff --git a/...ter-iOS/Features/PledgePaymentMethods/Controller/PledgePaymentMethodsViewController.swift b/...ter-iOS/Features/PledgePaymentMethods/Controller/PledgePaymentMethodsViewController.swift
@@ -172,11 +172,16 @@ final class PledgePaymentMethodsViewController: UIViewController {
           strongSelf.messageDisplayingDelegate?
             .pledgeViewController(strongSelf, didErrorWith: error.localizedDescription)
         case let .success(paymentSheetFlowController):
-          strongSelf.paymentSheetFlowController = paymentSheetFlowController
-          strongSelf.paymentSheetFlowController?.presentPaymentOptions(from: strongSelf) { [weak self] in
-            guard let strongSelf = self else { return }
+          let topViewController = strongSelf.navigationController?.topViewController
+          let paymentSheetShownWithinPledgeContext = topViewController is PledgeViewController
 
-            strongSelf.confirmPaymentResult(with: data.clientSecret)
+          if paymentSheetShownWithinPledgeContext {
+            strongSelf.paymentSheetFlowController = paymentSheetFlowController
+            strongSelf.paymentSheetFlowController?.presentPaymentOptions(from: strongSelf) { [weak self] in
+              guard let strongSelf = self else { return }
+
+              strongSelf.confirmPaymentResult(with: data.clientSecret)
+            }
           }
         }
       }