diff --git a/lib/src/screens/restore/restore_options_page.dart b/lib/src/screens/restore/restore_options_page.dart index 8827ed47e..da50c6a76 100644 --- a/lib/src/screens/restore/restore_options_page.dart +++ b/lib/src/screens/restore/restore_options_page.dart @@ -24,35 +24,37 @@ class RestoreOptionsPage extends BasePage { left: 20.0, right: 20.0, ), - child: Column( - children: [ - Flexible( - child: RestoreButton( - onPressed: () { - Navigator.pushNamed( - context, Routes.restoreWalletOptionsFromWelcome); - }, - image: _imageSeedKeys, - aspectRatioImage: _aspectRatioImage, - titleColor: Palette.lightViolet, - color: Palette.lightViolet, - title: S.of(context).restore_title_from_seed_keys, - description: S.of(context).restore_description_from_seed_keys, - textButton: S.of(context).restore_next, - ), - ), - Flexible( + child: SingleChildScrollView( + child: Column( + children: [ + Container( child: RestoreButton( - onPressed: () {}, - image: _imageRestoreSeed, - aspectRatioImage: _aspectRatioImage, - titleColor: Palette.cakeGreen, - color: Palette.cakeGreen, - title: S.of(context).restore_title_from_backup, - description: S.of(context).restore_description_from_backup, - textButton: S.of(context).restore_next, - )) - ], + onPressed: () { + Navigator.pushNamed( + context, Routes.restoreWalletOptionsFromWelcome); + }, + image: _imageSeedKeys, + aspectRatioImage: _aspectRatioImage, + titleColor: Palette.lightViolet, + color: Palette.lightViolet, + title: S.of(context).restore_title_from_seed_keys, + description: S.of(context).restore_description_from_seed_keys, + textButton: S.of(context).restore_next, + ), + ), + Container( + child: RestoreButton( + onPressed: () {}, + image: _imageRestoreSeed, + aspectRatioImage: _aspectRatioImage, + titleColor: Palette.cakeGreen, + color: Palette.cakeGreen, + title: S.of(context).restore_title_from_backup, + description: S.of(context).restore_description_from_backup, + textButton: S.of(context).restore_next, + )) + ], + ), ), ); } diff --git a/lib/src/screens/restore/restore_wallet_options_page.dart b/lib/src/screens/restore/restore_wallet_options_page.dart index 62f2ae5e1..e0f9bc72b 100644 --- a/lib/src/screens/restore/restore_wallet_options_page.dart +++ b/lib/src/screens/restore/restore_wallet_options_page.dart @@ -29,37 +29,39 @@ class RestoreWalletOptionsPage extends BasePage { left: 20.0, right: 20.0, ), - child: Column( - children: [ - Flexible( - child: RestoreButton( - onPressed: () { - seedLanguageStore.setCurrentRoute(Routes.restoreWalletFromSeed); - Navigator.pushNamed(context, Routes.seedLanguage); - }, - image: _imageSeed, - aspectRatioImage: _aspectRatioImage, - titleColor: Palette.lightViolet, - color: Palette.lightViolet, - title: S.of(context).restore_title_from_seed, - description: S.of(context).restore_description_from_seed, - textButton: S.of(context).restore_next, - )), - Flexible( - child: RestoreButton( - onPressed: () { - seedLanguageStore.setCurrentRoute(Routes.restoreWalletFromKeys); - Navigator.pushNamed(context, Routes.seedLanguage); - }, - image: _imageKeys, - aspectRatioImage: _aspectRatioImage, - titleColor: Palette.cakeGreen, - color: Palette.cakeGreen, - title: S.of(context).restore_title_from_keys, - description: S.of(context).restore_description_from_keys, - textButton: S.of(context).restore_next, - )) - ], + child: SingleChildScrollView( + child: Column( + children: [ + Container( + child: RestoreButton( + onPressed: () { + seedLanguageStore.setCurrentRoute(Routes.restoreWalletFromSeed); + Navigator.pushNamed(context, Routes.seedLanguage); + }, + image: _imageSeed, + aspectRatioImage: _aspectRatioImage, + titleColor: Palette.lightViolet, + color: Palette.lightViolet, + title: S.of(context).restore_title_from_seed, + description: S.of(context).restore_description_from_seed, + textButton: S.of(context).restore_next, + )), + Container( + child: RestoreButton( + onPressed: () { + seedLanguageStore.setCurrentRoute(Routes.restoreWalletFromKeys); + Navigator.pushNamed(context, Routes.seedLanguage); + }, + image: _imageKeys, + aspectRatioImage: _aspectRatioImage, + titleColor: Palette.cakeGreen, + color: Palette.cakeGreen, + title: S.of(context).restore_title_from_keys, + description: S.of(context).restore_description_from_keys, + textButton: S.of(context).restore_next, + )) + ], + ), ), ); } diff --git a/lib/src/screens/restore/widgets/restore_button.dart b/lib/src/screens/restore/widgets/restore_button.dart index af3b0cc07..9df200685 100644 --- a/lib/src/screens/restore/widgets/restore_button.dart +++ b/lib/src/screens/restore/widgets/restore_button.dart @@ -45,17 +45,7 @@ class RestoreButton extends StatelessWidget { child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Flexible( - child: Container( - child: AspectRatio( - aspectRatio: aspectRatioImage, - child: FittedBox( - fit: BoxFit.contain, - child: image, - ), - ), - ), - ), + image, Column( children: [ Padding( @@ -66,7 +56,7 @@ class RestoreButton extends StatelessWidget { style: TextStyle( color: titleColor, fontWeight: FontWeight.bold), - maxLines: 1, + maxLines: 2, ), ), Padding(