zec
/
secant-android-wallet
mirror of https://github.com/zcash/secant-android-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Home redesign

This commit is contained in:
Milan Cerovsky 2025-03-07 13:45:52 +01:00
parent 3ff1df9d0d
commit 89bd2110f7
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-lib/src/main/java/co/electriccoin/zcash/ui/common/usecase/NavigateToCoinbaseUseCase.kt
View File

@ -9,10 +9,14 @@ class NavigateToCoinbaseUseCase(
private val accountDataSource: AccountDataSource,
private val navigationRouter: NavigationRouter
) {
suspend operator fun invoke() {
suspend operator fun invoke(replaceCurrentScreen: Boolean) {
val transparent = accountDataSource.getZashiAccount().transparent
val url = getUrl(transparent.address.address)
navigationRouter.forward(ExternalUrl(url))
if (replaceCurrentScreen) {
navigationRouter.replace(ExternalUrl(url))
} else {
navigationRouter.forward(ExternalUrl(url))
}
}
private fun getUrl(address: String): String {

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/common/usecase/ViewTransactionDetailAfterSuccessfulProposalUseCase.kt
View File

@ -9,12 +9,10 @@ class ViewTransactionDetailAfterSuccessfulProposalUseCase(
private val keystoneProposalRepository: KeystoneProposalRepository,
private val zashiProposalRepository: ZashiProposalRepository,
private val navigationRouter: NavigationRouter,
private val observeClearSend: ObserveClearSendUseCase,
) {
operator fun invoke(txId: String) {
zashiProposalRepository.clear()
keystoneProposalRepository.clear()
observeClearSend.requestClear()
navigationRouter.replaceAll(TransactionDetail(txId))
}
}

4
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/viewmodel/IntegrationsViewModel.kt
View File

@ -116,13 +116,13 @@ class IntegrationsViewModel(
private fun onBuyWithCoinbaseClicked() =
viewModelScope.launch {
hideBottomSheet()
navigateToCoinbase()
navigateToCoinbase(isDialog)
}
private fun onConnectKeystoneClick() =
viewModelScope.launch {
hideBottomSheet()
navigationRouter.forward(ConnectKeystone)
navigationRouter.replace(ConnectKeystone)
}
private fun onFlexaClicked() =

26
ui-screenshot-test/src/main/java/co/electroniccoin/zcash/ui/screenshot/ScreenshotTest.kt
View File

@ -341,19 +341,19 @@ class ScreenshotTest : UiTestPrerequisites() {
onboardingScreenshots(resContext, tag, composeTestRule)
// To ensure that the bottom tab is available, or wait until it is
composeTestRule.waitUntilAtLeastOneExists(hasTestTag(HomeTag.TAB_ACCOUNT), DEFAULT_TIMEOUT_MILLISECONDS)
composeTestRule.navigateInHomeTab(HomeTag.TAB_ACCOUNT)
accountScreenshots(tag, composeTestRule)
composeTestRule.navigateInHomeTab(HomeTag.TAB_SEND)
sendZecScreenshots(resContext, tag, composeTestRule)
composeTestRule.navigateInHomeTab(HomeTag.TAB_RECEIVE)
receiveZecScreenshots(resContext, tag, composeTestRule)
composeTestRule.navigateInHomeTab(HomeTag.TAB_BALANCES)
balancesScreenshots(resContext, tag, composeTestRule)
// composeTestRule.waitUntilAtLeastOneExists(hasTestTag(HomeTag.TAB_ACCOUNT), DEFAULT_TIMEOUT_MILLISECONDS)
//
// composeTestRule.navigateInHomeTab(HomeTag.TAB_ACCOUNT)
// accountScreenshots(tag, composeTestRule)
//
// composeTestRule.navigateInHomeTab(HomeTag.TAB_SEND)
// sendZecScreenshots(resContext, tag, composeTestRule)
//
// composeTestRule.navigateInHomeTab(HomeTag.TAB_RECEIVE)
// receiveZecScreenshots(resContext, tag, composeTestRule)
//
// composeTestRule.navigateInHomeTab(HomeTag.TAB_BALANCES)
// balancesScreenshots(resContext, tag, composeTestRule)
navigateTo(NavigationTargets.SETTINGS)
settingsScreenshots(resContext, tag, composeTestRule)