MBL-1123: Rename setupIntent to clientSecret in PledgePaymentSheetPay…

…mentMethodCellViewModel
kickstarter · Mar 22, 2024 · a494263 · a494263
1 parent 0939141
commit a494263
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/Library/ViewModels/PaymentMethodsViewModel.swift b/Library/ViewModels/PaymentMethodsViewModel.swift
@@ -86,13 +86,13 @@ public final class PaymentMethodsViewModel: PaymentMethodsViewModelType,
         return (
           image: displayData.image,
           redactedCardNumber: displayData.label,
-          setupIntent: setupIntent,
+          clientSecret: setupIntent,
           isSelected: false,
           isEnabled: true
         )
       }
       .map { paymentMethodData -> String? in
-        guard let selectedPaymentSheetPaymentMethodCardId = paymentMethodData?.setupIntent else {
+        guard let selectedPaymentSheetPaymentMethodCardId = paymentMethodData?.clientSecret else {
           return nil
         }
 

diff --git a/Library/ViewModels/PledgePaymentMethodsViewModel.swift b/Library/ViewModels/PledgePaymentMethodsViewModel.swift
@@ -110,7 +110,7 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
         return [(
           image: displayData.image,
           redactedCardNumber: displayData.label,
-          setupIntent: setupIntent,
+          clientSecret: setupIntent,
           isSelected: false,
           isEnabled: true
         )]
@@ -203,14 +203,14 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
 
         if indexPath.row < paymentSheetPaymentMethodCount {
           // we are selecting a new payment sheet card
-          let setupIntent = data.paymentSheetPaymentMethodsCellData[indexPath.row].setupIntent
+          let clientSecret = data.paymentSheetPaymentMethodsCellData[indexPath.row].clientSecret
 
           let selectedAllSheetPaymentMethods = data.paymentSheetPaymentMethodsCellData.map { data in
             (
               image: data.image,
               redactedCardNumber: data.redactedCardNumber,
-              setupIntent: data.setupIntent,
-              isSelected: setupIntent == data.setupIntent,
+              clientSecret: data.clientSecret,
+              isSelected: clientSecret == data.clientSecret,
               isEnabled: true
             )
           }
@@ -221,8 +221,8 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
             |> \.paymentMethodsCellData .~ cellData(data.paymentMethodsCellData, selecting: nil)
             |> \.paymentSheetPaymentMethodsCellData .~ selectedAllSheetPaymentMethods
             |> \.selectedPaymentMethod .~
-            (usePaymentIntent ? .paymentIntentClientSecret(setupIntent) :
-              .setupIntentClientSecret(setupIntent))
+            (usePaymentIntent ? .paymentIntentClientSecret(clientSecret) :
+              .setupIntentClientSecret(clientSecret))
 
           return selectionUpdatedData
         } else if indexPath.row < paymentSheetPaymentMethodCount + paymentMethodCount {
@@ -233,7 +233,7 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
             (
               image: data.image,
               redactedCardNumber: data.redactedCardNumber,
-              setupIntent: data.setupIntent,
+              clientSecret: data.clientSecret,
               isSelected: false,
               isEnabled: data.isEnabled
             )
@@ -502,7 +502,7 @@ private func pledgePaymentSheetMethodCellDataAndSelectedCardSetupIntent(
       (
         image: data.image,
         redactedCardNumber: data.redactedCardNumber,
-        setupIntent: data.setupIntent,
+        clientSecret: data.clientSecret,
         isSelected: false,
         isEnabled: true
       )
@@ -531,8 +531,8 @@ private func pledgePaymentSheetMethodCellDataAndSelectedCardSetupIntent(
       |> \.paymentMethodsCellData .~ preexistingCardDataUnselected
       |> \.paymentSheetPaymentMethodsCellData .~ data
       |> \.selectedPaymentMethod .~
-      (usePaymentIntent ? .paymentIntentClientSecret(newestPaymentSheetPaymentMethod.setupIntent) :
-        .setupIntentClientSecret(newestPaymentSheetPaymentMethod.setupIntent))
+      (usePaymentIntent ? .paymentIntentClientSecret(newestPaymentSheetPaymentMethod.clientSecret) :
+        .setupIntentClientSecret(newestPaymentSheetPaymentMethod.clientSecret))
 
     return updatePaymentMethodData
   }()

diff --git a/Library/ViewModels/PledgePaymentSheetPaymentMethodCellViewModel.swift b/Library/ViewModels/PledgePaymentSheetPaymentMethodCellViewModel.swift
@@ -7,7 +7,7 @@ import UIKit
 public typealias PaymentSheetPaymentMethodCellData = (
   image: UIImage,
   redactedCardNumber: String,
-  setupIntent: String,
+  clientSecret: String,
   isSelected: Bool,
   isEnabled: Bool // FIXME: These cards are always enabled, so this flag isn't used in the cvm, but if there is a scenario where they are disabled in the future, use `PledgePaymentMethodCellViewModel` as a reference of how to update the signals.
 )
@@ -67,11 +67,11 @@ public final class PledgePaymentSheetPaymentMethodCellViewModel: PledgePaymentSh
       .map(\.image)
     let paymentSheetCreditCardRedactedNumber = self.configureValueProperty.signal.skipNil()
       .map(\.redactedCardNumber)
-    let paymentSheetCreditCardSetupIntent = self.configureValueProperty.signal.skipNil()
-      .map(\.setupIntent)
+    let paymentSheetCreditCardClientSecret = self.configureValueProperty.signal.skipNil()
+      .map(\.clientSecret)
     let paymentSheetCreditCardAsSelected = self.configureValueProperty.signal.skipNil()
       .map(\.isSelected)
-    let selectedCardSetupIntent = self.selectedCardProperty.signal.skipNil()
+    let selectedCardClientSecret = self.selectedCardProperty.signal.skipNil()
 
     self.cardImage = paymentSheetCreditCardImage
 
@@ -87,8 +87,8 @@ public final class PledgePaymentSheetPaymentMethodCellViewModel: PledgePaymentSh
     self.expirationDateText = paymentSheetCreditCardExpiryDate
 
     let cardAndSelectedCard = Signal.combineLatest(
-      paymentSheetCreditCardSetupIntent,
-      selectedCardSetupIntent
+      paymentSheetCreditCardClientSecret,
+      selectedCardClientSecret
     )
 
     let setAsSelected = cardAndSelectedCard.map(==)