Skip to content

fix: pin entry stalling when the auth route is rebuilt mid-entry #3589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Blazebrain wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: pin entry stalling when the auth route is rebuilt mid-entry #3589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 27 additions & 31 deletions lib/router.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,16 +523,15 @@ Route<dynamic> createRoute(RouteSettings settings) {
);

case Routes.auth:
return MaterialPageRoute<void>(
fullscreenDialog: true,
builder: (_) => SettingsStoreBase.walletPasswordDirectInput
? getIt.get<WalletUnlockPage>(
param1: WalletUnlockArguments(
callback: settings.arguments as OnAuthenticationFinished),
instanceName: 'wallet_unlock_verifiable',
param2: true)
: getIt.get<AuthPage>(
param1: settings.arguments as OnAuthenticationFinished, param2: true));
final page = SettingsStoreBase.walletPasswordDirectInput
? getIt.get<WalletUnlockPage>(
param1:
WalletUnlockArguments(callback: settings.arguments as OnAuthenticationFinished),
instanceName: "wallet_unlock_verifiable",
param2: true)
: getIt.get<AuthPage>(
param1: settings.arguments as OnAuthenticationFinished, param2: true);
return MaterialPageRoute<void>(fullscreenDialog: true, builder: (_) => page);

case Routes.totpAuthCodePage:
final args = settings.arguments as TotpAuthArgumentsModel;
Expand All @@ -544,28 +543,24 @@ Route<dynamic> createRoute(RouteSettings settings) {
);

case Routes.walletUnlockLoadable:
return MaterialPageRoute<void>(
fullscreenDialog: true,
builder: (_) => getIt.get<WalletUnlockPage>(
param1: settings.arguments as WalletUnlockArguments,
instanceName: 'wallet_unlock_loadable',
param2: true));
final page = getIt.get<WalletUnlockPage>(
param1: settings.arguments as WalletUnlockArguments,
instanceName: "wallet_unlock_loadable",
param2: true);
return MaterialPageRoute<void>(fullscreenDialog: true, builder: (_) => page);

case Routes.unlock:
final page = SettingsStoreBase.walletPasswordDirectInput
? getIt.get<WalletUnlockPage>(
param1:
WalletUnlockArguments(callback: settings.arguments as OnAuthenticationFinished),
param2: false,
instanceName: "wallet_unlock_verifiable")
: getIt.get<AuthPage>(
param1: settings.arguments as OnAuthenticationFinished, param2: false);
return MaterialPageRoute<void>(
fullscreenDialog: true,
builder: (_) => SettingsStoreBase.walletPasswordDirectInput
? WillPopScope(
child: getIt.get<WalletUnlockPage>(
param1: WalletUnlockArguments(
callback: settings.arguments as OnAuthenticationFinished),
param2: false,
instanceName: 'wallet_unlock_verifiable'),
onWillPop: () async => false)
: WillPopScope(
child: getIt.get<AuthPage>(
param1: settings.arguments as OnAuthenticationFinished, param2: false),
onWillPop: () async => false));
builder: (_) => WillPopScope(child: page, onWillPop: () async => false));

case Routes.silentPaymentsSettings:
return handleRouteWithPlatformAwareness(
Expand Down Expand Up @@ -637,11 +632,12 @@ Route<dynamic> createRoute(RouteSettings settings) {
return CupertinoPageRoute<void>(builder: (_) => page);

case Routes.login:
final page = SettingsStoreBase.walletPasswordDirectInput
? getIt.get<WalletUnlockPage>(instanceName: "wallet_password_login")
: getIt.get<AuthPage>(instanceName: "login");
return CupertinoPageRoute<void>(
builder: (context) => WillPopScope(
child: SettingsStoreBase.walletPasswordDirectInput
? getIt.get<WalletUnlockPage>(instanceName: 'wallet_password_login')
: getIt.get<AuthPage>(instanceName: 'login'),
child: page,
onWillPop: () async =>
// FIX-ME: Additional check does it works correctly
(await SystemChannels.platform.invokeMethod<bool>('SystemNavigator.pop') ??
Expand Down
Loading