Skip to content

Commit 02f9d5b

Browse files
committed
fix: remove backup gating
1 parent 2dcb7ae commit 02f9d5b

3 files changed

Lines changed: 2 additions & 30 deletions

File tree

app/src/main/java/to/bitkit/ui/components/AuthCheckScreen.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ fun AuthCheckScreen(
4141
app.removePin()
4242
navController.popBackStack()
4343
}
44-
45-
AuthCheckAction.SHOW_BACKUP_SHEET -> {
46-
navController.popBackStack()
47-
app.showSheet(Sheet.Backup())
48-
}
4944
}
5045
},
5146
onBack = { navController.popBackStack() },
@@ -56,5 +51,4 @@ object AuthCheckAction {
5651
const val TOGGLE_BIOMETRICS = "TOGGLE_BIOMETRICS"
5752
const val TOGGLE_PIN_FOR_PAYMENTS = "TOGGLE_PIN_FOR_PAYMENTS"
5853
const val DISABLE_PIN = "DISABLE_PIN"
59-
const val SHOW_BACKUP_SHEET = "SHOW_BACKUP_SHEET"
6054
}

app/src/main/java/to/bitkit/ui/settings/SettingsScreen.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,15 +158,7 @@ fun SettingsScreen(
158158
navController.navigateTo(Routes.BackgroundPaymentsIntro)
159159
}
160160
}
161-
SettingsEvent.BackupWalletClick -> {
162-
if (isPinEnabled) {
163-
navController.navigateToAuthCheck(
164-
onSuccessActionId = AuthCheckAction.SHOW_BACKUP_SHEET,
165-
)
166-
} else {
167-
app.showSheet(Sheet.Backup())
168-
}
169-
}
161+
SettingsEvent.BackupWalletClick -> app.showSheet(Sheet.Backup())
170162
SettingsEvent.DataBackupsClick -> navController.navigateTo(Routes.BackupSettings)
171163
SettingsEvent.ResetWalletClick ->
172164
navController.navigateTo(Routes.ResetAndRestoreSettings)

app/src/main/java/to/bitkit/ui/settings/backups/ResetAndRestoreScreen.kt

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,17 @@ import androidx.compose.ui.res.painterResource
2323
import androidx.compose.ui.res.stringResource
2424
import androidx.compose.ui.tooling.preview.Preview
2525
import androidx.compose.ui.unit.dp
26-
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2726
import androidx.navigation.NavController
2827
import to.bitkit.R
2928
import to.bitkit.ui.appViewModel
30-
import to.bitkit.ui.components.AuthCheckAction
3129
import to.bitkit.ui.components.BodyM
3230
import to.bitkit.ui.components.PrimaryButton
3331
import to.bitkit.ui.components.SecondaryButton
3432
import to.bitkit.ui.components.Sheet
35-
import to.bitkit.ui.navigateToAuthCheck
3633
import to.bitkit.ui.scaffold.AppAlertDialog
3734
import to.bitkit.ui.scaffold.AppTopBar
3835
import to.bitkit.ui.scaffold.DrawerNavIcon
3936
import to.bitkit.ui.scaffold.ScreenColumn
40-
import to.bitkit.ui.settingsViewModel
4137
import to.bitkit.ui.theme.AppThemeSurface
4238
import to.bitkit.ui.theme.Colors
4339
import to.bitkit.ui.walletViewModel
@@ -48,21 +44,11 @@ fun ResetAndRestoreScreen(
4844
) {
4945
val app = appViewModel ?: return
5046
val wallet = walletViewModel ?: return
51-
val settings = settingsViewModel ?: return
52-
val isPinEnabled by settings.isPinEnabled.collectAsStateWithLifecycle()
5347
var showDialog by remember { mutableStateOf(false) }
5448

5549
Content(
5650
showConfirmDialog = showDialog,
57-
onClickBackup = {
58-
if (isPinEnabled) {
59-
navController.navigateToAuthCheck(
60-
onSuccessActionId = AuthCheckAction.SHOW_BACKUP_SHEET,
61-
)
62-
} else {
63-
app.showSheet(Sheet.Backup())
64-
}
65-
},
51+
onClickBackup = { app.showSheet(Sheet.Backup()) },
6652
onClickReset = { showDialog = true },
6753
onResetConfirm = { wallet.wipeWallet() },
6854
onResetDismiss = { showDialog = false },

0 commit comments

Comments
 (0)