Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-03-12 09:27:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

uncomment problem-Expanded()s

Browse source
This commit is contained in:
sneurlax 2023-10-19 17:32:46 -05:00
parent f96306cb76
commit 10d172184f
2 changed files with 66 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
lib/pages/cashfusion/fusion_progress_view.dart
View file

@ -139,20 +139,22 @@ class _FusionProgressViewState extends ConsumerState<FusionProgressView> {
child: Column(
children: [
if (_fusionRoundsCompleted == 0)
RoundedContainer(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarBackError,
child: Text(
"Do not close this window. If you exit, "
"the process will be canceled.",
style:
STextStyles.smallMed14(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarTextError,
Expanded(
child: RoundedContainer(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarBackError,
child: Text(
"Do not close this window. If you exit, "
"the process will be canceled.",
style: STextStyles.smallMed14(context)
.copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarTextError,
),
textAlign: TextAlign.center,
),
textAlign: TextAlign.center,
),
),
if (_fusionRoundsCompleted > 0)
@ -180,23 +182,21 @@ class _FusionProgressViewState extends ConsumerState<FusionProgressView> {
walletId: widget.walletId,
),
if (_succeeded)
/*Expanded(
child: */
PrimaryButton(
buttonHeight: ButtonHeight.m,
label: "Fuse again",
onPressed: () => _fuseAgain,
Expanded(
child: PrimaryButton(
buttonHeight: ButtonHeight.m,
label: "Fuse again",
onPressed: () => _fuseAgain,
),
),
// ),
if (_failed)
/*Expanded(
child: */
PrimaryButton(
buttonHeight: ButtonHeight.m,
label: "Try again",
onPressed: () => _fuseAgain,
Expanded(
child: PrimaryButton(
buttonHeight: ButtonHeight.m,
label: "Try again",
onPressed: () => _fuseAgain,
),
),
// ),
if (!_succeeded && !_failed) const Spacer(),
const SizedBox(
height: 16,

79
lib/pages_desktop_specific/cashfusion/sub_widgets/fusion_dialog.dart
View file

@ -184,39 +184,40 @@ class _FusionDialogViewState extends ConsumerState<FusionDialogView> {
child: Column(
children: [
if (_fusionRoundsCompleted == 0)
RoundedContainer(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarBackError,
child: Text(
"Do not close this window. If you exit, "
"the process will be canceled.",
style: STextStyles.smallMed14(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarTextError,
Expanded(
child: RoundedContainer(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarBackError,
child: Text(
"Do not close this window. If you exit, "
"the process will be canceled.",
style: STextStyles.smallMed14(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarTextError,
),
textAlign: TextAlign.center,
),
textAlign: TextAlign.center,
),
),
if (_fusionRoundsCompleted > 0)
/*Expanded(
child: */
RoundedContainer(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarBackInfo,
child: Text(
"Fusion rounds completed: $_fusionRoundsCompleted",
style: STextStyles.w500_14(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarTextInfo,
Expanded(
child: RoundedContainer(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarBackInfo,
child: Text(
"Fusion rounds completed: $_fusionRoundsCompleted",
style: STextStyles.w500_14(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.snackBarTextInfo,
),
textAlign: TextAlign.center,
),
textAlign: TextAlign.center,
),
),
// ),
const SizedBox(
height: 20,
),
@ -229,27 +230,25 @@ class _FusionDialogViewState extends ConsumerState<FusionDialogView> {
Row(
children: [
if (_succeeded)
/*Expanded(
child: */
PrimaryButton(
buttonHeight: ButtonHeight.m,
label: "Fuse again",
onPressed: () => _fuseAgain,
Expanded(
child: PrimaryButton(
buttonHeight: ButtonHeight.m,
label: "Fuse again",
onPressed: () => _fuseAgain,
),
),
// ),
if (_succeeded)
const SizedBox(
width: 16,
),
if (_failed)
/*Expanded(
child: */
PrimaryButton(
buttonHeight: ButtonHeight.m,
label: "Try again",
onPressed: () => _fuseAgain,
Expanded(
child: PrimaryButton(
buttonHeight: ButtonHeight.m,
label: "Try again",
onPressed: () => _fuseAgain,
),
),
// ),
if (_failed)
const SizedBox(
width: 16,