Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Link Verification Dialog UI #10047

Merged
merged 10 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ internal fun VerificationDialog(
linkAccount = linkAccount,
isDialog = true,
onVerificationSucceeded = onVerificationSucceeded,
onChangeEmailClicked = { },
onDismissClicked = onDismissClicked
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ internal fun VerificationBody(
BackHandler(onBack = onBack)

ScrollableTopLevelColumn {
TopSection(
Header(
isDialog = state.isDialog,
onBackClicked = onBack
)
Expand Down Expand Up @@ -154,7 +154,7 @@ internal fun VerificationBody(
}

@Composable
private fun TopSection(
private fun Header(
isDialog: Boolean,
onBackClicked: () -> Unit
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ internal class VerificationViewModel @Inject constructor(
linkAccount: LinkAccount,
isDialog: Boolean,
onVerificationSucceeded: () -> Unit,
onChangeEmailClicked: () -> Unit,
onChangeEmailClicked: () -> Unit = {},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this is the right fix here -- we probably don't want to default this to doing nothing. If we were to introduce a new use of VerificationViewModel that did show the change email button, this would be a foot gun for making that button unresponsive.

I was thinking that there might be a way to not require this parameter when we are not going to show the change email button

I'm ok merging this for now and we can figure out a better solution later

onDismissClicked: () -> Unit,
): ViewModelProvider.Factory {
return viewModelFactory {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.stripe.android.link

import com.stripe.android.cards.CardAccountRangeRepository
import com.stripe.android.core.Logger
import com.stripe.android.link.account.FakeLinkAccountManager
import com.stripe.android.link.account.FakeLinkAuth
import com.stripe.android.link.account.LinkAccountManager
import com.stripe.android.link.account.LinkAuth
import com.stripe.android.link.analytics.FakeLinkEventsReporter
import com.stripe.android.link.analytics.LinkEventsReporter
import com.stripe.android.link.confirmation.FakeLinkConfirmationHandler
import com.stripe.android.link.confirmation.LinkConfirmationHandler
import com.stripe.android.link.injection.NativeLinkComponent
import com.stripe.android.payments.core.analytics.ErrorReporter
import com.stripe.android.testing.FakeErrorReporter
import com.stripe.android.testing.FakeLogger
import com.stripe.android.utils.NullCardAccountRangeRepositoryFactory
import org.mockito.kotlin.mock

internal class FakeNativeLinkComponent(
override val linkAccountManager: LinkAccountManager = FakeLinkAccountManager(),
override val configuration: LinkConfiguration = TestFactory.LINK_CONFIGURATION,
override val linkEventsReporter: LinkEventsReporter = FakeLinkEventsReporter(),
override val logger: Logger = FakeLogger(),
override val linkConfirmationHandlerFactory: LinkConfirmationHandler.Factory = LinkConfirmationHandler.Factory {
FakeLinkConfirmationHandler()
},
override val webLinkActivityContract: WebLinkActivityContract = mock(),
override val cardAccountRangeRepositoryFactory: CardAccountRangeRepository.Factory =
NullCardAccountRangeRepositoryFactory,
override val viewModel: LinkActivityViewModel = mock(),
override val errorReporter: ErrorReporter = FakeErrorReporter(),
override val linkAuth: LinkAuth = FakeLinkAuth()
) : NativeLinkComponent
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,12 @@ import androidx.navigation.PopUpToBuilder
import androidx.savedstate.SavedStateRegistryOwner
import androidx.test.core.app.ApplicationProvider
import com.google.common.truth.Truth.assertThat
import com.stripe.android.cards.CardAccountRangeRepository
import com.stripe.android.core.Logger
import com.stripe.android.link.account.FakeLinkAccountManager
import com.stripe.android.link.account.FakeLinkAuth
import com.stripe.android.link.account.LinkAccountManager
import com.stripe.android.link.account.LinkAuth
import com.stripe.android.link.account.LinkAuthResult
import com.stripe.android.link.analytics.FakeLinkEventsReporter
import com.stripe.android.link.analytics.LinkEventsReporter
import com.stripe.android.link.confirmation.FakeLinkConfirmationHandler
import com.stripe.android.link.confirmation.LinkConfirmationHandler
import com.stripe.android.link.gate.FakeLinkGate
import com.stripe.android.link.gate.LinkGate
import com.stripe.android.link.injection.NativeLinkComponent
import com.stripe.android.link.model.AccountStatus
import com.stripe.android.link.model.LinkAccount
import com.stripe.android.paymentelement.confirmation.ConfirmationHandler
Expand All @@ -42,9 +34,7 @@ import com.stripe.android.paymentsheet.analytics.EventReporter
import com.stripe.android.paymentsheet.analytics.FakeEventReporter
import com.stripe.android.testing.CoroutineTestRule
import com.stripe.android.testing.FakeErrorReporter
import com.stripe.android.testing.FakeLogger
import com.stripe.android.utils.DummyActivityResultCaller
import com.stripe.android.utils.NullCardAccountRangeRepositoryFactory
import com.stripe.attestation.IntegrityRequestManager
import kotlinx.coroutines.test.UnconfinedTestDispatcher
import kotlinx.coroutines.test.advanceUntilIdle
Expand Down Expand Up @@ -735,19 +725,3 @@ internal class LinkActivityViewModelTest {
private const val FAKE_GRAPH_ID = 123
}
}

internal class FakeNativeLinkComponent(
override val linkAccountManager: LinkAccountManager = FakeLinkAccountManager(),
override val configuration: LinkConfiguration = TestFactory.LINK_CONFIGURATION,
override val linkEventsReporter: LinkEventsReporter = FakeLinkEventsReporter(),
override val logger: Logger = FakeLogger(),
override val linkConfirmationHandlerFactory: LinkConfirmationHandler.Factory = LinkConfirmationHandler.Factory {
FakeLinkConfirmationHandler()
},
override val webLinkActivityContract: WebLinkActivityContract = mock(),
override val cardAccountRangeRepositoryFactory: CardAccountRangeRepository.Factory =
NullCardAccountRangeRepositoryFactory,
override val viewModel: LinkActivityViewModel = mock(),
override val errorReporter: ErrorReporter = FakeErrorReporter(),
override val linkAuth: LinkAuth = FakeLinkAuth()
) : NativeLinkComponent
Loading