Skip to content

Improve UI: refined modals, added confirmations and missing action buttons #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Catrya merged 3 commits into from
Jul 22, 2025
Merged

Improve UI: refined modals, added confirmations and missing action buttons #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f439a0
Improved modal UI and added confirmation flows
Catrya Jul 22, 2025
227d5b2
Button sizes and missing translations
Catrya Jul 22, 2025
489277d
Remove duplicate entries
Catrya Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/core/app_theme.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,16 @@ class AppTheme {
textTheme: _buildTextTheme(),
elevatedButtonTheme: ElevatedButtonThemeData(
style: ElevatedButton.styleFrom(
foregroundColor: cream1,
foregroundColor: Colors.black,
backgroundColor: mostroGreen,
textStyle: GoogleFonts.robotoCondensed(
fontWeight: FontWeight.w500,
fontWeight: FontWeight.bold,
fontSize: 14.0,
),
padding: const EdgeInsets.symmetric(vertical: 15, horizontal: 30),
fixedSize: const Size.fromHeight(48),
minimumSize: Size.zero,
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
),
textButtonTheme: TextButtonThemeData(
Expand Down
75 changes: 75 additions & 0 deletions lib/features/order/models/order_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,12 +284,28 @@ class OrderState {
Action.dispute,
Action.sendDm,
],
Action.cooperativeCancelInitiatedByYou: [
Action.dispute,
Action.sendDm,
],
},
Status.fiatSent: {
Action.fiatSentOk: [
Action.release,
Action.cancel,
Action.dispute,
Action.sendDm,
],
Action.cooperativeCancelInitiatedByPeer: [
Action.release,
Action.cancel,
Action.dispute,
Action.sendDm,
],
Action.cooperativeCancelInitiatedByYou: [
Action.release,
Action.dispute,
Action.sendDm,
],
},
Status.success: {
Expand All @@ -309,6 +325,31 @@ class OrderState {
Action.adminCanceled: [],
Action.cooperativeCancelAccepted: [],
},
Status.cooperativelyCanceled: {
Action.cooperativeCancelInitiatedByYou: [
Action.sendDm,
Action.dispute,
Action.release,
],
Action.cooperativeCancelInitiatedByPeer: [
Action.sendDm,
Action.dispute,
Action.cancel,
Action.release,
],
},
Status.dispute: {
Action.disputeInitiatedByYou: [
Action.sendDm,
Action.cancel,
Action.release,
],
Action.disputeInitiatedByPeer: [
Action.sendDm,
Action.cancel,
Action.release,
],
},
},
Role.buyer: {
Status.pending: {
Expand Down Expand Up @@ -359,13 +400,26 @@ class OrderState {
Action.dispute,
Action.sendDm,
],
Action.cooperativeCancelInitiatedByYou: [
Action.dispute,
Action.sendDm,
],
},
Status.fiatSent: {
Action.fiatSentOk: [
Action.cancel,
Action.dispute,
Action.sendDm,
],
Action.cooperativeCancelInitiatedByPeer: [
Action.cancel,
Action.dispute,
Action.sendDm,
],
Action.cooperativeCancelInitiatedByYou: [
Action.dispute,
Action.sendDm,
],
},
Status.success: {
Action.rate: [
Expand All @@ -384,6 +438,27 @@ class OrderState {
Action.adminCanceled: [],
Action.cooperativeCancelAccepted: [],
},
Status.cooperativelyCanceled: {
Action.cooperativeCancelInitiatedByYou: [
Action.sendDm,
Action.dispute,
],
Action.cooperativeCancelInitiatedByPeer: [
Action.sendDm,
Action.dispute,
Action.cancel,
],
},
Status.dispute: {
Action.disputeInitiatedByYou: [
Action.sendDm,
Action.cancel,
],
Action.disputeInitiatedByPeer: [
Action.sendDm,
Action.cancel,
],
},
},
};
}
2 changes: 1 addition & 1 deletion lib/features/order/screens/order_confirmation_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class OrderConfirmationScreen extends ConsumerWidget {
ElevatedButton(
key: const Key('homeButton'),
onPressed: () => context.go('/'),
child: const Text('Back to Home'),
child: Text(S.of(context)!.backToHome),
),
],
),
Expand Down
6 changes: 4 additions & 2 deletions lib/features/order/widgets/action_buttons.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:mostro_mobile/core/app_theme.dart';
import 'package:mostro_mobile/data/models/enums/action.dart' as nostr_action;
import 'package:mostro_mobile/shared/widgets/mostro_reactive_button.dart';
import 'package:mostro_mobile/generated/l10n.dart';

class ActionButtons extends StatelessWidget {
final VoidCallback onCancel;
Expand Down Expand Up @@ -33,7 +34,7 @@ class ActionButtons extends StatelessWidget {
borderRadius: BorderRadius.circular(24),
),
),
child: const Text('Cancel'),
child: Text(S.of(context)!.cancel),
),
),
),
Expand All @@ -43,14 +44,15 @@ class ActionButtons extends StatelessWidget {
height: 48,
child: MostroReactiveButton(
key: const Key('submitOrderButton'),
label: 'Submit',
label: S.of(context)!.submit,
buttonStyle: ButtonStyleType.raised,
orderId: currentRequestId?.toString() ?? '',
action: nostr_action.Action.newOrder,
onPressed: onSubmit,
timeout: const Duration(seconds: 5),
showSuccessIndicator: true,
backgroundColor: AppTheme.purpleButton,
foregroundColor: Colors.white,
),
),
),
Expand Down
Loading