Skip to content

Commit a66ffe6

Browse files
committed
Merge remote-tracking branch 'origin/feat/nav3' into feat/nav3
# Conflicts: # app/src/main/java/to/bitkit/ui/nav/entries/HomeEntries.kt
2 parents 5b5fe6e + e73fbef commit a66ffe6

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

app/src/main/java/to/bitkit/ui/nav/entries/HomeEntries.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import to.bitkit.ui.screens.wallets.activity.ActivityDetailScreen
2626
import to.bitkit.ui.screens.wallets.activity.ActivityExploreScreen
2727
import to.bitkit.ui.screens.wallets.activity.AllActivityScreen
2828
import to.bitkit.ui.screens.wallets.suggestion.BuyIntroScreen
29+
import to.bitkit.ui.utils.RequestNotificationPermissions
2930
import to.bitkit.viewmodels.ActivityListViewModel
3031
import to.bitkit.viewmodels.AppViewModel
3132
import to.bitkit.viewmodels.SettingsViewModel
@@ -200,6 +201,14 @@ private fun HomeEntry(
200201
settingsViewModel: SettingsViewModel,
201202
) {
202203
val mainUiState by walletViewModel.uiState.collectAsStateWithLifecycle()
204+
val isRecoveryMode by walletViewModel.isRecoveryMode.collectAsStateWithLifecycle()
205+
206+
RequestNotificationPermissions(
207+
showPermissionDialog = !isRecoveryMode,
208+
onPermissionChange = { granted ->
209+
settingsViewModel.setNotificationPreference(granted)
210+
}
211+
)
203212

204213
HomeScreen(
205214
mainUiState = mainUiState,

app/src/main/java/to/bitkit/ui/onboarding/TermsOfUseScreen.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ private fun TermsText(
135135
}
136136
}
137137

138-
139138
@Preview(showSystemUi = true)
140139
@Composable
141140
private fun TermsPreview() {

app/src/main/java/to/bitkit/ui/settings/backgroundPayments/BackgroundPaymentsSettings.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,13 @@ fun BackgroundPaymentsSettings(
4343
val showNotificationDetails by settingsViewModel.showNotificationDetails.collectAsStateWithLifecycle()
4444

4545
RequestNotificationPermissions(
46-
onPermissionChange = { granted ->
47-
settingsViewModel.setNotificationPreference(granted)
48-
},
49-
showPermissionDialog = false
46+
onPermissionChange = settingsViewModel::setNotificationPreference,
47+
showPermissionDialog = false,
5048
)
5149

5250
Content(
5351
onBack = onBack,
54-
onSystemSettingsClick = {
55-
NotificationUtils.openNotificationSettings(context)
56-
},
52+
onSystemSettingsClick = { NotificationUtils.openNotificationSettings(context) },
5753
hasPermission = notificationsGranted,
5854
showDetails = showNotificationDetails,
5955
toggleNotificationDetails = settingsViewModel::toggleNotificationDetails,

0 commit comments

Comments
 (0)