From 30ef7ca04d28793f6b9b8df0587873be1f82d684 Mon Sep 17 00:00:00 2001 From: Gerardo Guijarro Date: Mon, 25 Sep 2023 17:05:56 -0600 Subject: [PATCH] Dao name --- lib/app.dart | 15 ++++++++------- lib/ui/settings/settings_view.dart | 14 +------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/lib/app.dart b/lib/app.dart index 340f931c..2b3da449 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -97,7 +97,7 @@ class HyphaAppView extends StatelessWidget { _showSignTransactionBottomSheet(data); }, showJoinDaoRationale: (daoName, secret) { - _showJoinDaoRationale(daoName, secret); + _showJoinDaoRationale(daoName, secret, context); }, ); context.read().add(const DeeplinkEvent.clearPageCommand()); @@ -226,16 +226,17 @@ class HyphaAppView extends StatelessWidget { ); } - void _showJoinDaoRationale(String daoName, String secret) { - Get.Get.bottomSheet( - FractionallySizedBox( - heightFactor: UIConstants.bottomSheetHeightFraction, - child: JoinDaoRationaleBottomSheet(daoName: daoName, secret: secret), - ), + void _showJoinDaoRationale(String daoName, String secret, BuildContext context) { + showModalBottomSheet( + useSafeArea: true, isScrollControlled: true, + builder: (context) { + return JoinDaoRationaleBottomSheet(daoName: daoName, secret: secret); + }, shape: const RoundedRectangleBorder( borderRadius: BorderRadius.vertical(top: Radius.circular(30)), ), + context: context, ); } } diff --git a/lib/ui/settings/settings_view.dart b/lib/ui/settings/settings_view.dart index 1fadc36b..657d63c4 100644 --- a/lib/ui/settings/settings_view.dart +++ b/lib/ui/settings/settings_view.dart @@ -10,7 +10,6 @@ import 'package:hypha_wallet/design/hypha_colors.dart'; import 'package:hypha_wallet/design/icons/hypha_icons.dart'; import 'package:hypha_wallet/design/themes/extensions/theme_extension_provider.dart'; import 'package:hypha_wallet/ui/blocs/authentication/authentication_bloc.dart'; -import 'package:hypha_wallet/ui/onboarding/join_dao/join_dao_rationale_bottom_sheet.dart'; import 'package:hypha_wallet/ui/settings/hypha_confirmation_page.dart'; import 'package:hypha_wallet/ui/settings/interactor/settings_bloc.dart'; import 'package:hypha_wallet/ui/settings/save_key_page.dart'; @@ -83,18 +82,7 @@ class SettingsView extends StatelessWidget { subtitle: 'Your private key (and the 12 secret words) are the only way to retrieve your hypha account and funds', onTap: () { - showModalBottomSheet( - useSafeArea: true, - isScrollControlled: true, - builder: (context) { - return const JoinDaoRationaleBottomSheet(daoName: 'Cuties in Bali', secret: 'secret'); - }, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.vertical(top: Radius.circular(30)), - ), - context: context, - ); - // Get.to(() => SaveKeyPage(state.userAuthData!.eOSPrivateKey.toString())); + Get.to(() => SaveKeyPage(state.userAuthData!.eOSPrivateKey.toString())); }, ); },