Skip to content

Commit 27511ec

Browse files
authored
Merge pull request #142 from code-payments/chore/rescope-home-to-screen
chore: rescope home VM to screen; reset no longer needed
2 parents f4aa8c7 + 5be70f7 commit 27511ec

3 files changed

Lines changed: 3 additions & 14 deletions

File tree

app/src/main/java/com/getcode/navigation/screens/MainScreens.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ data class HomeScreen(
4949

5050
@Composable
5151
override fun Content() {
52-
val vm = getActivityScopedViewModel<HomeViewModel>()
53-
val tlvm = getActivityScopedViewModel<TopLevelViewModel>()
52+
val vm = getViewModel<HomeViewModel>()
5453

5554
startupLog("home rendered")
5655
HomeScreen(vm, cashLink, requestPayload)
@@ -67,13 +66,6 @@ data class HomeScreen(
6766
}
6867
}
6968
}
70-
71-
LaunchedEffect(tlvm) {
72-
tlvm.eventFlow
73-
.filterIsInstance<TopLevelViewModel.Event.LogoutCompleted>()
74-
.onEach { vm.reset() }
75-
.launchIn(this)
76-
}
7769
}
7870
}
7971

app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ class HomeViewModel @Inject constructor(
218218
},
219219
onFailure = {
220220
Timber.e(t = it, message = "Auto airdrop failed")
221+
prefRepository.set(PrefsBool.IS_ELIGIBLE_GET_FIRST_KIN_AIRDROP, false)
221222
}
222223
)
223224
.launchIn(viewModelScope)
@@ -294,10 +295,6 @@ class HomeViewModel @Inject constructor(
294295
}
295296
}
296297

297-
fun reset() {
298-
uiFlow.update { HomeUiModel() }
299-
}
300-
301298
fun onCameraPermissionChanged(isGranted: Boolean) {
302299
uiFlow.update { it.copy(isCameraPermissionGranted = isGranted) }
303300
}

buildSrc/src/main/java/Dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ object Versions {
6767

6868
const val markwon = "4.6.2"
6969
const val timber = "5.0.1"
70-
const val voyager = "1.0.0-rc10"
70+
const val voyager = "1.0.0"
7171
}
7272

7373
object Classpath {

0 commit comments

Comments
 (0)