Rich PR feedback

KunJeongPark · KunJeongPark · commit 9363cc4f35f1 · 2023-12-12T09:25:17.000-08:00
diff --git a/Demo/Demo/SwiftUIComponents/CardVaultViews/CardVaultView.swift b/Demo/Demo/SwiftUIComponents/CardVaultViews/CardVaultView.swift
@@ -20,7 +20,7 @@ struct CardVaultView: View {
                         UpdateSetupTokenView(cardVaultViewModel: cardVaultViewModel, setupToken: setupToken.id)
                     }
                     UpdateSetupTokenResultView(cardVaultViewModel: cardVaultViewModel)
-                    if let updateSetupToken = cardVaultViewModel.updateSetupToken {
+                    if let updateSetupToken = cardVaultViewModel.state.updateSetupToken {
                         CreatePaymentTokenView(
                             vaultViewModel: cardVaultViewModel,
                             selectedMerchantIntegration: DemoSettings.merchantIntegration,
@@ -53,11 +53,6 @@ struct CardVaultView: View {
                                 scrollView.scrollTo("bottomView")
                             }
                         }
-                        .onChange(of: cardVaultViewModel.updateSetupToken) { _ in
-                            withAnimation {
-                                scrollView.scrollTo("bottomView")
-                            }
-                        }
                 }
             }
         }
diff --git a/Demo/Demo/SwiftUIComponents/CardVaultViews/UpdateSetupTokenResultView.swift b/Demo/Demo/SwiftUIComponents/CardVaultViews/UpdateSetupTokenResultView.swift
@@ -5,7 +5,7 @@ struct UpdateSetupTokenResultView: View {
     @ObservedObject var cardVaultViewModel: CardVaultViewModel
 
     var body: some View {
-        switch cardVaultViewModel.updateSetupTokenResponse {
+        switch cardVaultViewModel.state.updateSetupTokenResponse {
         case .idle, .loading:
             EmptyView()
         case .loaded(let updateSetupTokenResponse):
@@ -15,7 +15,7 @@ struct UpdateSetupTokenResultView: View {
         }
     }
 
-    func getSuccessView(updateSetupTokenResponse: CardVaultViewModel.UpdateSetupTokenResult) -> some View {
+    func getSuccessView(updateSetupTokenResponse: UpdateSetupTokenResult) -> some View {
         VStack(spacing: 16) {
             HStack {
                 Text("Vault Success")
diff --git a/Demo/Demo/SwiftUIComponents/CardVaultViews/UpdateSetupTokenView.swift b/Demo/Demo/SwiftUIComponents/CardVaultViews/UpdateSetupTokenView.swift
@@ -50,7 +50,7 @@ struct UpdateSetupTokenView: View {
                     }
                 }
                 .buttonStyle(RoundedBlueButtonStyle())
-                if case .loading = cardVaultViewModel.updateSetupTokenResponse {
+                if case .loading = cardVaultViewModel.state.updateSetupTokenResponse {
                     CircularProgressView()
                 }
             }
diff --git a/Demo/Demo/SwiftUIComponents/PayPalVaultViews/PayPalVaultResultView.swift b/Demo/Demo/SwiftUIComponents/PayPalVaultViews/PayPalVaultResultView.swift
@@ -6,7 +6,7 @@ struct PayPalVaultResultView: View {
     @ObservedObject var paypalVaultViewModel: PayPalVaultViewModel
 
     var body: some View {
-        switch paypalVaultViewModel.paypalVaultTokenResponse {
+        switch paypalVaultViewModel.state.paypalVaultTokenResponse {
         case .idle, .loading:
             EmptyView()
         case .loaded(let vaultResult):
diff --git a/Demo/Demo/SwiftUIComponents/PayPalVaultViews/PayPalVaultView.swift b/Demo/Demo/SwiftUIComponents/PayPalVaultViews/PayPalVaultView.swift
@@ -24,7 +24,7 @@ struct PayPalVaultView: View {
                         .padding()
                     }
                     PayPalVaultResultView(paypalVaultViewModel: paypalVaultViewModel)
-                    if let paypalVaultResult = paypalVaultViewModel.paypalVaultToken {
+                    if let paypalVaultResult = paypalVaultViewModel.state.paypalVaultToken {
                         CreatePaymentTokenView(
                             vaultViewModel: paypalVaultViewModel,
                             selectedMerchantIntegration: DemoSettings.merchantIntegration,
@@ -57,11 +57,6 @@ struct PayPalVaultView: View {
                                 scrollView.scrollTo("bottomView")
                             }
                         }
-                        .onChange(of: paypalVaultViewModel.paypalVaultToken) { _ in
-                            withAnimation {
-                                scrollView.scrollTo("bottomView")
-                            }
-                        }
                 }
             }
         }
diff --git a/Demo/Demo/SwiftUIComponents/VaultViews/SetupTokenResultView.swift b/Demo/Demo/SwiftUIComponents/VaultViews/SetupTokenResultView.swift
@@ -30,7 +30,7 @@ struct SetupTokenResultView: View {
             LeadingText("\(setupTokenResponse.status)")
             if let url = setupTokenResponse.paypalURL {
                 LeadingText("PayPalURL", weight: .bold)
-                LeadingText("\(setupTokenResponse.paypalURL ?? "No url")")
+                LeadingText("\(url)")
             }
         }
         .frame(maxWidth: .infinity)
diff --git a/Demo/Demo/ViewModels/CardVaultViewModel.swift b/Demo/Demo/ViewModels/CardVaultViewModel.swift
@@ -4,27 +4,11 @@ import CorePayments
 
 class CardVaultViewModel: VaultViewModel, CardVaultDelegate {
 
-    struct UpdateSetupTokenResult: Decodable, Equatable {
-
-        var id: String
-        var status: String
-    }
-
-    @Published var updateSetupToken: UpdateSetupTokenResult?
-
-    @Published var updateSetupTokenResponse: LoadingState<UpdateSetupTokenResult> = .idle {
-        didSet {
-            if case .loaded(let value) = updateSetupTokenResponse {
-                updateSetupToken = value
-            }
-        }
-    }
-
     let configManager = CoreConfigManager(domain: "Card Vault")
 
     func vault(card: Card, setupToken: String) async {
         DispatchQueue.main.async {
-            self.updateSetupTokenResponse = .loading
+            self.state.updateSetupTokenResponse = .loading
         }
         do {
             let config = try await configManager.getCoreConfig()
@@ -33,7 +17,7 @@ class CardVaultViewModel: VaultViewModel, CardVaultDelegate {
             let cardVaultRequest = CardVaultRequest(card: card, setupTokenID: setupToken)
             cardClient.vault(cardVaultRequest)
         } catch {
-            updateSetupTokenResponse = .error(message: error.localizedDescription)
+            self.state.updateSetupTokenResponse = .error(message: error.localizedDescription)
             print("failed in updating setup token. \(error.localizedDescription)")
         }
     }
@@ -49,24 +33,18 @@ class CardVaultViewModel: VaultViewModel, CardVaultDelegate {
 
     func setUpTokenSuccessResult(vaultResult: CardPayments.CardVaultResult) {
         DispatchQueue.main.async {
-            self.updateSetupTokenResponse = .loaded(
+            self.state.updateSetupTokenResponse = .loaded(
                 UpdateSetupTokenResult(id: vaultResult.setupTokenID, status: vaultResult.status)
             )
         }
     }
 
     func setUpdateSetupTokenFailureResult(vaultError: CorePayments.CoreSDKError) {
         DispatchQueue.main.async {
-            self.updateSetupTokenResponse = .error(message: vaultError.localizedDescription)
+            self.state.updateSetupTokenResponse = .error(message: vaultError.localizedDescription)
         }
     }
 
-    override func resetState() {
-        super.resetState()
-        updateSetupToken = nil
-        updateSetupTokenResponse = .idle
-    }
-    
     // MARK: - CardVault Delegate
 
     func card(_ cardClient: CardPayments.CardClient, didFinishWithVaultResult vaultResult: CardPayments.CardVaultResult) {
diff --git a/Demo/Demo/ViewModels/PayPalVaultViewModel.swift b/Demo/Demo/ViewModels/PayPalVaultViewModel.swift
@@ -4,24 +4,14 @@ import CorePayments
 
 class PayPalVaultViewModel: VaultViewModel, PayPalVaultDelegate {
 
-    @Published var paypalVaultToken: PayPalVaultResult?
-
-    @Published var paypalVaultTokenResponse: LoadingState<PayPalVaultResult> = .idle {
-        didSet {
-            if case .loaded(let value) = paypalVaultTokenResponse {
-                paypalVaultToken = value
-            }
-        }
-    }
-
     let configManager = CoreConfigManager(domain: "PayPal Vault")
 
     func vault(url: String) async {
         guard let paypalUrl = URL(string: url) else {
             return
         }
         DispatchQueue.main.async {
-            self.paypalVaultTokenResponse = .loading
+            self.state.paypalVaultTokenResponse = .loading
         }
         do {
             let config = try await configManager.getCoreConfig()
@@ -33,20 +23,14 @@ class PayPalVaultViewModel: VaultViewModel, PayPalVaultDelegate {
         }
     }
 
-    override func resetState() {
-        super.resetState()
-        paypalVaultToken = nil
-        paypalVaultTokenResponse = .idle
-    }
-
     // MARK: - PayPalVault Delegate
 
     func paypal(
         _ paypalWebClient: PayPalWebPayments.PayPalWebCheckoutClient,
         didFinishWithVaultResult paypalVaultResult: PayPalVaultResult
     ) {
         DispatchQueue.main.async {
-            self.paypalVaultTokenResponse = .loaded(paypalVaultResult)
+            self.state.paypalVaultTokenResponse = .loaded(paypalVaultResult)
         }
     }
 
@@ -56,7 +40,7 @@ class PayPalVaultViewModel: VaultViewModel, PayPalVaultDelegate {
     ) {
 
         DispatchQueue.main.async {
-            self.paypalVaultTokenResponse = .error(message: vaultError.localizedDescription)
+            self.state.paypalVaultTokenResponse = .error(message: vaultError.localizedDescription)
         }
     }
 
diff --git a/Demo/Demo/ViewModels/VaultState.swift b/Demo/Demo/ViewModels/VaultState.swift
@@ -2,16 +2,20 @@ import Foundation
 import CardPayments
 import PayPalWebPayments
 
-struct VaultState: Equatable {
+struct UpdateSetupTokenResult: Decodable, Equatable {
 
-    struct UpdateSetupTokenResult: Decodable, Equatable {
+    var id: String
+    var status: String
+}
 
-        var id: String
-        var status: String
-    }
+struct VaultState: Equatable {
 
     var setupToken: SetUpTokenResponse?
     var paymentToken: PaymentTokenResponse?
+    // result for card vault
+    var updateSetupToken: UpdateSetupTokenResult?
+    // result for paypal vault
+    var paypalVaultToken: PayPalVaultResult?
 
     var setupTokenResponse: LoadingState<SetUpTokenResponse> = .idle {
         didSet {
@@ -28,6 +32,24 @@ struct VaultState: Equatable {
             }
         }
     }
+
+    // response from Card Vault
+    var updateSetupTokenResponse: LoadingState<UpdateSetupTokenResult> = .idle {
+        didSet {
+            if case .loaded(let value) = updateSetupTokenResponse {
+                updateSetupToken = value
+            }
+        }
+    }
+    
+    // response from PayPal Vault
+    var paypalVaultTokenResponse: LoadingState<PayPalVaultResult> = .idle {
+        didSet {
+            if case .loaded(let value) = paypalVaultTokenResponse {
+                paypalVaultToken = value
+            }
+        }
+    }
 }
 
 enum LoadingState<T: Decodable & Equatable>: Equatable {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ struct CardVaultView: View {`
`20`	`20`	`UpdateSetupTokenView(cardVaultViewModel: cardVaultViewModel, setupToken: setupToken.id)`
`21`	`21`	`}`
`22`	`22`	`UpdateSetupTokenResultView(cardVaultViewModel: cardVaultViewModel)`
`23`		`- if let updateSetupToken = cardVaultViewModel.updateSetupToken {`
	`23`	`+ if let updateSetupToken = cardVaultViewModel.state.updateSetupToken {`
`24`	`24`	`CreatePaymentTokenView(`
`25`	`25`	`vaultViewModel: cardVaultViewModel,`
`26`	`26`	`selectedMerchantIntegration: DemoSettings.merchantIntegration,`
`@@ -53,11 +53,6 @@ struct CardVaultView: View {`
`53`	`53`	`scrollView.scrollTo("bottomView")`
`54`	`54`	`}`
`55`	`55`	`}`
`56`		`- .onChange(of: cardVaultViewModel.updateSetupToken) { _ in`
`57`		`- withAnimation {`
`58`		`- scrollView.scrollTo("bottomView")`
`59`		`- }`
`60`		`- }`
`61`	`56`	`}`
`62`	`57`	`}`
`63`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ struct UpdateSetupTokenView: View {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`.buttonStyle(RoundedBlueButtonStyle())`
`53`		`- if case .loading = cardVaultViewModel.updateSetupTokenResponse {`
	`53`	`+ if case .loading = cardVaultViewModel.state.updateSetupTokenResponse {`
`54`	`54`	`CircularProgressView()`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ struct PayPalVaultView: View {`
`24`	`24`	`.padding()`
`25`	`25`	`}`
`26`	`26`	`PayPalVaultResultView(paypalVaultViewModel: paypalVaultViewModel)`
`27`		`- if let paypalVaultResult = paypalVaultViewModel.paypalVaultToken {`
	`27`	`+ if let paypalVaultResult = paypalVaultViewModel.state.paypalVaultToken {`
`28`	`28`	`CreatePaymentTokenView(`
`29`	`29`	`vaultViewModel: paypalVaultViewModel,`
`30`	`30`	`selectedMerchantIntegration: DemoSettings.merchantIntegration,`
`@@ -57,11 +57,6 @@ struct PayPalVaultView: View {`
`57`	`57`	`scrollView.scrollTo("bottomView")`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`- .onChange(of: paypalVaultViewModel.paypalVaultToken) { _ in`
`61`		`- withAnimation {`
`62`		`- scrollView.scrollTo("bottomView")`
`63`		`- }`
`64`		`- }`
`65`	`60`	`}`
`66`	`61`	`}`
`67`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ struct SetupTokenResultView: View {`
`30`	`30`	`LeadingText("\(setupTokenResponse.status)")`
`31`	`31`	`if let url = setupTokenResponse.paypalURL {`
`32`	`32`	`LeadingText("PayPalURL", weight: .bold)`
`33`		`- LeadingText("\(setupTokenResponse.paypalURL ?? "No url")")`
	`33`	`+ LeadingText("\(url)")`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`.frame(maxWidth: .infinity)`