Resolve comments

stripe · Oct 27, 2023 · 6e9642e · 6e9642e
1 parent 0c6357d
commit 6e9642e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/...com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormScreenState.kt b/...com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormScreenState.kt
@@ -14,37 +14,37 @@ internal sealed class USBankAccountFormScreenState(
     abstract val isProcessing: Boolean
 
     fun copy(
-        error: Int? = null,
-        primaryButtonText: String? = null,
-        mandateText: String? = null,
-        isProcessing: Boolean? = null,
+        error: Int? = this.error,
+        primaryButtonText: String = this.primaryButtonText,
+        mandateText: String? = this.mandateText,
+        isProcessing: Boolean = this.isProcessing,
     ): USBankAccountFormScreenState {
         return when (this) {
             is BillingDetailsCollection -> {
                 BillingDetailsCollection(
-                    error = error ?: this.error,
-                    primaryButtonText = primaryButtonText ?: this.primaryButtonText,
-                    isProcessing = isProcessing ?: this.isProcessing,
+                    error = error,
+                    primaryButtonText = primaryButtonText,
+                    isProcessing = isProcessing,
                 )
             }
             is MandateCollection -> {
                 MandateCollection(
                     paymentAccount = paymentAccount,
                     financialConnectionsSessionId = financialConnectionsSessionId,
                     intentId = intentId,
-                    isProcessing = isProcessing ?: this.isProcessing,
-                    primaryButtonText = primaryButtonText ?: this.primaryButtonText,
-                    mandateText = mandateText ?: this.mandateText,
+                    isProcessing = isProcessing,
+                    primaryButtonText = primaryButtonText,
+                    mandateText = mandateText,
                 )
             }
             is VerifyWithMicrodeposits -> {
                 VerifyWithMicrodeposits(
                     paymentAccount = paymentAccount,
                     financialConnectionsSessionId = financialConnectionsSessionId,
                     intentId = intentId,
-                    isProcessing = isProcessing ?: this.isProcessing,
-                    primaryButtonText = primaryButtonText ?: this.primaryButtonText,
-                    mandateText = mandateText ?: this.mandateText,
+                    isProcessing = isProcessing,
+                    primaryButtonText = primaryButtonText,
+                    mandateText = mandateText,
                 )
             }
             is SavedAccount -> {
@@ -53,9 +53,9 @@ internal sealed class USBankAccountFormScreenState(
                     intentId = intentId,
                     bankName = bankName,
                     last4 = last4,
-                    isProcessing = isProcessing ?: this.isProcessing,
-                    primaryButtonText = primaryButtonText ?: this.primaryButtonText,
-                    mandateText = mandateText ?: this.mandateText,
+                    isProcessing = isProcessing,
+                    primaryButtonText = primaryButtonText,
+                    mandateText = mandateText,
                 )
             }
         }

diff --git a/...a/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormViewModel.kt b/...a/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormViewModel.kt
@@ -309,9 +309,9 @@ internal class USBankAccountFormViewModel @Inject internal constructor(
     }
 
     fun handlePrimaryButtonClick(screenState: USBankAccountFormScreenState) {
-        handlePrimaryButtonStateChanged(PrimaryButton.State.StartProcessing)
         when (screenState) {
             is USBankAccountFormScreenState.BillingDetailsCollection -> {
+                setProcessingState(PrimaryButton.State.StartProcessing)
                 collectBankAccount(args.clientSecret)
             }
             is USBankAccountFormScreenState.MandateCollection ->
@@ -338,7 +338,7 @@ internal class USBankAccountFormViewModel @Inject internal constructor(
         }
     }
 
-    private fun handlePrimaryButtonStateChanged(primaryButtonState: PrimaryButton.State) {
+    private fun setProcessingState(primaryButtonState: PrimaryButton.State) {
         _currentScreenState.update {
             it.copy(isProcessing = primaryButtonState.isProcessing)
         }

diff --git a/...m/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormViewModelTest.kt b/...m/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountFormViewModelTest.kt
@@ -149,7 +149,7 @@ class USBankAccountFormViewModelTest {
             val currentScreenState = viewModel.currentScreenState.stateIn(viewModel.viewModelScope).value
             viewModel.handlePrimaryButtonClick(currentScreenState as USBankAccountFormScreenState.VerifyWithMicrodeposits)
 
-            assertThat(awaitItem().screenState).isEqualTo(currentScreenState.copy(isProcessing = true))
+            assertThat(awaitItem().screenState).isEqualTo(currentScreenState)
         }
     }
 
@@ -163,7 +163,7 @@ class USBankAccountFormViewModelTest {
             val currentScreenState = viewModel.currentScreenState.stateIn(viewModel.viewModelScope).value
             viewModel.handlePrimaryButtonClick(currentScreenState as USBankAccountFormScreenState.MandateCollection)
 
-            assertThat(awaitItem().screenState).isEqualTo(currentScreenState.copy(isProcessing = true))
+            assertThat(awaitItem().screenState).isEqualTo(currentScreenState)
         }
     }
 
@@ -178,7 +178,7 @@ class USBankAccountFormViewModelTest {
             val currentScreenState = viewModel.currentScreenState.stateIn(viewModel.viewModelScope).value
             viewModel.handlePrimaryButtonClick(currentScreenState as USBankAccountFormScreenState.VerifyWithMicrodeposits)
 
-            assertThat(awaitItem().screenState).isEqualTo(currentScreenState.copy(isProcessing = true))
+            assertThat(awaitItem().screenState).isEqualTo(currentScreenState)
         }
     }
 
@@ -193,7 +193,7 @@ class USBankAccountFormViewModelTest {
             val currentScreenState = viewModel.currentScreenState.stateIn(viewModel.viewModelScope).value
             viewModel.handlePrimaryButtonClick(currentScreenState as USBankAccountFormScreenState.MandateCollection)
 
-            assertThat(awaitItem().screenState).isEqualTo(currentScreenState.copy(isProcessing = true))
+            assertThat(awaitItem().screenState).isEqualTo(currentScreenState)
         }
     }