Skip to content

Add msg when user can't vote #665

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
AlaaElattar merged 6 commits into from
Oct 23, 2024
Merged

Add msg when user can't vote #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f8b78ec
Add msg when user can't vote
AlaaElattar Oct 21, 2024
b59de49
update onBackground to onSurface
AlaaElattar Oct 21, 2024
5ef7bab
add custom dialog for voting dialog in dao
AlaaElattar Oct 22, 2024
91deda6
Update result dialog with using CustomDialog
AlaaElattar Oct 22, 2024
b8eb07a
update all dailogues & check if user voted before
AlaaElattar Oct 23, 2024
391b703
update Yes button to be the same color as No button.
AlaaElattar Oct 23, 2024
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
12 changes: 6 additions & 6 deletions app/lib/widgets/dao/show_result_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:threebotlogin/services/tfchain_service.dart';
import 'package:threebotlogin/widgets/custom_dialog.dart';

class ShowResultDialog extends StatefulWidget {
final String proposalHash;
Expand Down Expand Up @@ -179,11 +180,10 @@ class _ShowResultDialogState extends State<ShowResultDialog>
);
}

return Dialog(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
backgroundColor: Theme.of(context).colorScheme.surface,
child: content);
return CustomDialog(
title: 'Voting Result',
widgetDescription: content,
image: Icons.how_to_vote_outlined,
);
}
}
222 changes: 121 additions & 101 deletions app/lib/widgets/dao/vote_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,115 +81,121 @@ class _VoteDialogState extends State<VoteDialog> {
),
);
} else {
content = Padding(
padding: const EdgeInsets.all(30),
child: Flex(
direction: Axis.vertical,
mainAxisSize: MainAxisSize.min,
children: [
DropdownMenu(
menuHeight: MediaQuery.sizeOf(context).height * 0.3,
enableFilter: true,
width: MediaQuery.sizeOf(context).width * 0.55,
textStyle: Theme.of(context).textTheme.bodyLarge!.copyWith(
color: Theme.of(context).colorScheme.onSurface,
),
trailingIcon: const Icon(
CupertinoIcons.chevron_down,
size: 18,
if (farms.isEmpty) {
content = Text(
'No farms available with online node to vote.',
style: Theme.of(context).textTheme.bodyLarge!.copyWith(
color: Theme.of(context).colorScheme.onSurface,
),
selectedTrailingIcon: const Icon(
CupertinoIcons.chevron_up,
size: 18,
),
inputDecorationTheme: InputDecorationTheme(
filled: true,
fillColor: Theme.of(context).colorScheme.secondaryContainer,
enabledBorder: UnderlineInputBorder(
borderRadius: const BorderRadius.all(Radius.circular(4)),
borderSide: BorderSide(
color: Theme.of(context).colorScheme.secondaryContainer,
width: 8.0,
),
textAlign: TextAlign.center,
);
} else {
content = Padding(
padding: const EdgeInsets.all(30),
child: Flex(
direction: Axis.vertical,
mainAxisSize: MainAxisSize.min,
children: [
DropdownMenu(
menuHeight: MediaQuery.sizeOf(context).height * 0.3,
enableFilter: true,
width: MediaQuery.sizeOf(context).width * 0.55,
textStyle: Theme.of(context).textTheme.bodyLarge!.copyWith(
color: Theme.of(context).colorScheme.onSurface,
),
trailingIcon: const Icon(
CupertinoIcons.chevron_down,
size: 18,
),
),
menuStyle: MenuStyle(
shape: WidgetStateProperty.all<RoundedRectangleBorder>(
const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(4)),
selectedTrailingIcon: const Icon(
CupertinoIcons.chevron_up,
size: 18,
),
inputDecorationTheme: InputDecorationTheme(
filled: true,
fillColor: Theme.of(context).colorScheme.secondaryContainer,
enabledBorder: UnderlineInputBorder(
borderRadius: const BorderRadius.all(Radius.circular(4)),
borderSide: BorderSide(
color: Theme.of(context).colorScheme.secondaryContainer,
width: 8.0,
),
),
),
),
label: Text(
'Select Farm',
style: Theme.of(context).textTheme.bodyLarge!.copyWith(
color: Theme.of(context).colorScheme.onSecondaryContainer,
menuStyle: MenuStyle(
shape: WidgetStateProperty.all<RoundedRectangleBorder>(
const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(4)),
),
),
dropdownMenuEntries: _buildDropdownMenuEntries(farms),
onSelected: (int? value) {
if (value != null) {
farmId = value;
}
},
),
const SizedBox(height: 20),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
ElevatedButton(
onPressed: () {
_vote(true);
},
child: yesLoading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
strokeWidth: 2,
))
: Text(
'Yes',
style:
Theme.of(context).textTheme.bodyLarge!.copyWith(
color: Theme.of(context)
.colorScheme
.onPrimaryContainer,
),
),
),
),
ElevatedButton(
onPressed: () {
_vote(false);
},
child: noLoading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
strokeWidth: 2,
))
: Text(
'No',
style:
Theme.of(context).textTheme.bodyLarge!.copyWith(
color: Theme.of(context)
.colorScheme
.onPrimaryContainer,
),
),
label: Text(
'Select Farm',
style: Theme.of(context).textTheme.bodyLarge!.copyWith(
color:
Theme.of(context).colorScheme.onSecondaryContainer,
),
),
],
),
],
),
);
dropdownMenuEntries: _buildDropdownMenuEntries(farms),
onSelected: (int? value) {
if (value != null) {
farmId = value;
}
},
),
],
),
);
}
}
return Dialog(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
child: content);
return CustomDialog(
title: 'Vote',
widgetDescription: content,
image: Icons.how_to_vote_outlined,
actions: farms.isEmpty && !loading
? <Widget>[
TextButton(
child: const Text('Close'),
onPressed: () {
Navigator.pop(context);
},
),
]
: loading
? null
: <Widget>[
TextButton(
child: noLoading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
strokeWidth: 2,
),
)
: const Text('No'),
onPressed: () {
_vote(false);
},
),
TextButton(
child: yesLoading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
strokeWidth: 2,
),
)
: const Text(
'Yes',
),
onPressed: () async {
_vote(true);
},
)
],
);
}

void _vote(bool approve) async {
Expand All @@ -200,6 +206,20 @@ class _VoteDialogState extends State<VoteDialog> {
final farm = farms.firstWhere((farm) => farm.farmID == farmId);
final twinId = farm.twinId;
final seed = twinIdWallets[twinId]!['tfchainSeed'];
final votes = await getProposalVotes(widget.proposalHash);

final hasVotedYes = votes.ayes.any((vote) => vote.farmId == farmId);
final hasVotedNo = votes.nays.any((vote) => vote.farmId == farmId);

if ((approve && hasVotedYes) || (!approve && hasVotedNo)) {
_showDialog('Voted!', 'You have voted successfully.', Icons.check,
DialogType.Info);
setState(() {
yesLoading = false;
noLoading = false;
});
return;
}
try {
await vote(approve, widget.proposalHash, farmId!, seed!);

Expand Down