Skip to content

feat: show sat/vB fee rate inline next to fee amount #1365

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

Open
sneurlax wants to merge 1 commit into
base: staging
Choose a base branch
from
+37 −57
Open

feat: show sat/vB fee rate inline next to fee amount #1365

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 37 additions & 57 deletions lib/pages/send_view/confirm_transaction_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,10 +1066,25 @@ class _ConfirmTransactionViewState
"Transaction fee",
style: STextStyles.smallMed12(context),
),
SelectableText(
ref.watch(pAmountFormatter(coin)).format(fee!),
style: STextStyles.itemSubtitle12(context),
textAlign: TextAlign.right,
Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
children: [
SelectableText(
ref.watch(pAmountFormatter(coin)).format(fee!),
style: STextStyles.itemSubtitle12(context),
textAlign: TextAlign.right,
),
if (widget.txData.fee != null &&
widget.txData.vSize != null &&
widget.txData.vSize! > 0)
Text(
" (~${(fee.raw.toInt() / widget.txData.vSize!).toStringAsFixed(1)} sat/vB)",
style: STextStyles.smallMed12(context),
textAlign: TextAlign.right,
),
],
),
],
),
Expand All @@ -1089,25 +1104,6 @@ class _ConfirmTransactionViewState
],
),
),
if (widget.txData.fee != null && widget.txData.vSize != null)
const SizedBox(height: 12),
if (widget.txData.fee != null && widget.txData.vSize != null)
RoundedWhiteContainer(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"sats/vByte",
style: STextStyles.smallMed12(context),
),
const SizedBox(height: 4),
SelectableText(
"~${fee!.raw.toInt() ~/ widget.txData.vSize!}",
style: STextStyles.itemSubtitle12(context),
),
],
),
),
if ((coin is Epiccash || coin is Mimblewimblecoin) &&
widget.txData.noteOnChain!.isNotEmpty)
const SizedBox(height: 12),
Expand Down Expand Up @@ -1641,40 +1637,24 @@ class _ConfirmTransactionViewState
color: Theme.of(
context,
).extension<StackColors>()!.textFieldDefaultBG,
child: SelectableText(
ref.watch(pAmountFormatter(coin)).format(fee!),
style: STextStyles.itemSubtitle(context),
),
),
),
if (isDesktop &&
!widget.isPaynymTransaction &&
widget.txData.fee != null &&
widget.txData.vSize != null)
Padding(
padding: const EdgeInsets.only(left: 32),
child: Text(
"sats/vByte",
style: STextStyles.desktopTextExtraExtraSmall(context),
),
),
if (isDesktop &&
!widget.isPaynymTransaction &&
widget.txData.fee != null &&
widget.txData.vSize != null)
Padding(
padding: const EdgeInsets.only(top: 10, left: 32, right: 32),
child: RoundedContainer(
padding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 18,
),
color: Theme.of(
context,
).extension<StackColors>()!.textFieldDefaultBG,
child: SelectableText(
"~${fee!.raw.toInt() ~/ widget.txData.vSize!}",
style: STextStyles.itemSubtitle(context),
child: Row(
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
children: [
SelectableText(
ref.watch(pAmountFormatter(coin)).format(fee!),
style: STextStyles.itemSubtitle(context),
),
if (widget.txData.fee != null &&
widget.txData.vSize != null &&
widget.txData.vSize! > 0)
Text(
" (~${(fee.raw.toInt() / widget.txData.vSize!).toStringAsFixed(1)} sat/vB)",
style: STextStyles.desktopTextExtraExtraSmall(
context,
),
),
],
),
),
),
Expand Down
Loading