fix: Show correct title when reconnecting to your ledger device (#2152)

Konstantin Ullrich committed Apr 3, 2025 at 00:20 UTC 27eaa1b1cc819704ca19fc8e8b9c068d59ef607c
3 files changed +33 -25
lib/router.dart
+31 -24
@@ -277,33 +277,40 @@ Route<dynamic> createRoute(RouteSettings settings) {
277 case Routes.restoreWalletFromHardwareWallet:
278 if (isSingleCoin) {
279 return MaterialPageRoute<void>(
280 - builder: (_) => ConnectDevicePage(
281 - ConnectDevicePageParams(
282 - walletType: availableWalletTypes.first,
283 - onConnectDevice: (BuildContext context, _) => Navigator.of(context).pushNamed(
284 - Routes.chooseHardwareWalletAccount,
285 - arguments: [availableWalletTypes.first]),
286 - ),
287 - getIt.get<LedgerViewModel>(),
288 - ));
289 - }
290 - return CupertinoPageRoute<void>(
291 - builder: (_) => getIt.get<NewWalletTypePage>(
292 - param1: NewWalletTypeArguments(
293 - onTypeSelected: (BuildContext context, WalletType type) {
294 - final arguments = ConnectDevicePageParams(
295 - walletType: type,
296 - onConnectDevice: (BuildContext context, _) => Navigator.of(context)
297 - .pushNamed(Routes.chooseHardwareWalletAccount, arguments: [type]),
298 - );
299 -
300 - Navigator.of(context).pushNamed(Routes.connectDevices, arguments: arguments);
301 - },
302 - isCreate: false,
303 - isHardwareWallet: true,
280 + builder: (_) => ConnectDevicePage(
281 + ConnectDevicePageParams(
282 + walletType: availableWalletTypes.first,
283 + onConnectDevice: (BuildContext context, _) =>
284 + Navigator.of(context).pushNamed(
285 + Routes.chooseHardwareWalletAccount,
286 + arguments: [availableWalletTypes.first]),
287 + isReconnect: false,
288 ),
289 + getIt.get<LedgerViewModel>(),
290 ),
291 );
292 + }
293 + return CupertinoPageRoute<void>(
294 + builder: (_) => getIt.get<NewWalletTypePage>(
295 + param1: NewWalletTypeArguments(
296 + onTypeSelected: (BuildContext context, WalletType type) {
297 + final arguments = ConnectDevicePageParams(
298 + walletType: type,
299 + onConnectDevice: (BuildContext context, _) =>
300 + Navigator.of(context).pushNamed(
301 + Routes.chooseHardwareWalletAccount,
302 + arguments: [type]),
303 + isReconnect: false,
304 + );
305 +
306 + Navigator.of(context)
307 + .pushNamed(Routes.connectDevices, arguments: arguments);
308 + },
309 + isCreate: false,
310 + isHardwareWallet: true,
311 + ),
312 + ),
313 + );
314
315 case Routes.restoreWalletTypeFromQR:
316 return CupertinoPageRoute<void>(
lib/src/screens/connect_device/connect_device_page.dart
+1 -1
@@ -28,7 +28,7 @@ class ConnectDevicePageParams {
28 required this.walletType,
29 required this.onConnectDevice,
30 this.allowChangeWallet = false,
31 - this.isReconnect = false,
31 + this.isReconnect = true,
32 });
33 }
34
lib/src/screens/wallet_list/wallet_list_page.dart
+1
@@ -525,6 +525,7 @@ class WalletListBodyState extends State<WalletListBody> {
525 didConnect = true;
526 Navigator.of(context).pop();
527 },
528 + isReconnect: true,
529 ),
530 );
531