From bd9a6a7f96f259b163aebb8ca260bdfd09d64665 Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Wed, 22 May 2024 13:09:02 -0400 Subject: [PATCH] chore(home): tip not activated improvements * keep tip cards on screen when not activated banner is present * allow invalid cards to be rescanned Signed-off-by: Brandon McAnsh --- .../main/java/com/getcode/view/main/home/HomeViewModel.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt b/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt index 149fba775..2064cffef 100644 --- a/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt +++ b/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt @@ -723,10 +723,6 @@ class HomeViewModel @Inject constructor( runCatching { tipController.fetch(username, payload) } .onFailure { - // User not found - // Prevent scanning invalid tip cards repeatedly - scannedRendezvous.add(payload.rendezvous.publicKey) - cancelTip() TopBarManager.showMessage( TopBarManager.TopBarMessage( title = resources.getString(R.string.error_title_invalidTipCard), @@ -741,8 +737,10 @@ class HomeViewModel @Inject constructor( viewModelScope.launch { _eventFlow.emit(HomeEvent.SendIntent(intent)) } + cancelTip() }, - secondaryText = resources.getString(R.string.action_notNow) + secondaryText = resources.getString(R.string.action_notNow), + secondaryAction = ::cancelTip ) ) }.onSuccess {