diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart index d02d246fa..516376305 100644 --- a/lib/src/screens/send/send_page.dart +++ b/lib/src/screens/send/send_page.dart @@ -493,7 +493,7 @@ class SendPage extends BasePage { bitcoin!.updateFeeRates(sendViewModel.wallet); } - reaction((_) => sendViewModel.state, (ExecutionState state) { + reaction((_) => sendViewModel.state, (ExecutionState state) async { if (dialogContext != null && dialogContext?.mounted == true) { Navigator.of(dialogContext!).pop(); } @@ -522,6 +522,15 @@ class SendPage extends BasePage { } if (state is IsExecutingState) { + + if (sendViewModel.wallet.type == WalletType.monero) { + await Future.delayed(const Duration(milliseconds: 200)); + final currentState = sendViewModel.state; + if (currentState is ExecutedSuccessfullyState || currentState is FailureState) { + return; + } + } + WidgetsBinding.instance.addPostFrameCallback((_) { if (context.mounted) { showModalBottomSheet( diff --git a/lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart b/lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart index a5bdafc7c..dd253192a 100644 --- a/lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart +++ b/lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart @@ -403,15 +403,18 @@ class AddressExpansionTile extends StatelessWidget { children: [ Expanded( child: Text(isBatchSending ? name : contactType, - style: itemTitleTextStyle, softWrap: true)), - Text(isBatchSending ? amount : name, - style: TextStyle( - fontSize: 14, - fontFamily: 'Lato', - fontWeight: FontWeight.w600, - color: Theme.of(context).extension()!.titleColor, - decoration: TextDecoration.none, - )), + style: itemTitleTextStyle)), + Expanded( + child: Text(isBatchSending ? amount : name, + textAlign: TextAlign.end, + style: TextStyle( + fontSize: 14, + fontFamily: 'Lato', + fontWeight: FontWeight.w600, + color: Theme.of(context).extension()!.titleColor, + decoration: TextDecoration.none, + )), + ), ], ), children: [