diff --git a/lib/router.dart b/lib/router.dart index 35177c0eb..b0501c550 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -277,33 +277,40 @@ Route createRoute(RouteSettings settings) { case Routes.restoreWalletFromHardwareWallet: if (isSingleCoin) { return MaterialPageRoute( - builder: (_) => ConnectDevicePage( - ConnectDevicePageParams( - walletType: availableWalletTypes.first, - onConnectDevice: (BuildContext context, _) => Navigator.of(context).pushNamed( - Routes.chooseHardwareWalletAccount, - arguments: [availableWalletTypes.first]), - ), - getIt.get(), - )); - } - return CupertinoPageRoute( - builder: (_) => getIt.get( - param1: NewWalletTypeArguments( - onTypeSelected: (BuildContext context, WalletType type) { - final arguments = ConnectDevicePageParams( - walletType: type, - onConnectDevice: (BuildContext context, _) => Navigator.of(context) - .pushNamed(Routes.chooseHardwareWalletAccount, arguments: [type]), - ); - - Navigator.of(context).pushNamed(Routes.connectDevices, arguments: arguments); - }, - isCreate: false, - isHardwareWallet: true, + builder: (_) => ConnectDevicePage( + ConnectDevicePageParams( + walletType: availableWalletTypes.first, + onConnectDevice: (BuildContext context, _) => + Navigator.of(context).pushNamed( + Routes.chooseHardwareWalletAccount, + arguments: [availableWalletTypes.first]), + isReconnect: false, ), + getIt.get(), ), ); + } + return CupertinoPageRoute( + builder: (_) => getIt.get( + param1: NewWalletTypeArguments( + onTypeSelected: (BuildContext context, WalletType type) { + final arguments = ConnectDevicePageParams( + walletType: type, + onConnectDevice: (BuildContext context, _) => + Navigator.of(context).pushNamed( + Routes.chooseHardwareWalletAccount, + arguments: [type]), + isReconnect: false, + ); + + Navigator.of(context) + .pushNamed(Routes.connectDevices, arguments: arguments); + }, + isCreate: false, + isHardwareWallet: true, + ), + ), + ); case Routes.restoreWalletTypeFromQR: return CupertinoPageRoute( diff --git a/lib/src/screens/connect_device/connect_device_page.dart b/lib/src/screens/connect_device/connect_device_page.dart index 5e52b887c..8452a59be 100644 --- a/lib/src/screens/connect_device/connect_device_page.dart +++ b/lib/src/screens/connect_device/connect_device_page.dart @@ -28,7 +28,7 @@ class ConnectDevicePageParams { required this.walletType, required this.onConnectDevice, this.allowChangeWallet = false, - this.isReconnect = false, + this.isReconnect = true, }); } diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart index 62f79bdc4..507773467 100644 --- a/lib/src/screens/wallet_list/wallet_list_page.dart +++ b/lib/src/screens/wallet_list/wallet_list_page.dart @@ -525,6 +525,7 @@ class WalletListBodyState extends State { didConnect = true; Navigator.of(context).pop(); }, + isReconnect: true, ), );