Merge branch 'staging' into desktop

This commit is contained in:
julian 2022-09-16 10:24:08 -06:00
commit 42ec269ee2

View file

@ -189,7 +189,7 @@ class _WalletViewState extends ConsumerState<WalletView> {
return false; return false;
} }
void _logout() { void _logout() async {
if (_shouldDisableAutoSyncOnLogOut) { if (_shouldDisableAutoSyncOnLogOut) {
// disable auto sync if it was enabled only when loading wallet // disable auto sync if it was enabled only when loading wallet
ref.read(managerProvider).shouldAutoSync = false; ref.read(managerProvider).shouldAutoSync = false;
@ -199,7 +199,7 @@ class _WalletViewState extends ConsumerState<WalletView> {
if (ref.read(prefsChangeNotifierProvider).isAutoBackupEnabled && if (ref.read(prefsChangeNotifierProvider).isAutoBackupEnabled &&
ref.read(prefsChangeNotifierProvider).backupFrequencyType == ref.read(prefsChangeNotifierProvider).backupFrequencyType ==
BackupFrequencyType.afterClosingAWallet) { BackupFrequencyType.afterClosingAWallet) {
ref.read(autoSWBServiceProvider).doBackup(); unawaited(ref.read(autoSWBServiceProvider).doBackup());
} }
} }
@ -364,7 +364,13 @@ class _WalletViewState extends ConsumerState<WalletView> {
onWillPop: _onWillPop, onWillPop: _onWillPop,
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
automaticallyImplyLeading: false, leading: AppBarBackButton(
onPressed: () {
_logout();
Navigator.of(context).pop();
},
),
titleSpacing: 0,
title: Row( title: Row(
children: [ children: [
SvgPicture.asset( SvgPicture.asset(