desktop tx details scroll fix

This commit is contained in:
julian 2022-10-29 13:44:37 -06:00
parent 5fd47de9a2
commit 32eb9bb920

View file

@ -252,7 +252,8 @@ class _TransactionDetailsViewState
const DesktopDialogCloseButton(), const DesktopDialogCloseButton(),
], ],
), ),
Padding( Expanded(
child: Padding(
padding: isDesktop padding: isDesktop
? const EdgeInsets.only( ? const EdgeInsets.only(
right: 32, right: 32,
@ -265,6 +266,7 @@ class _TransactionDetailsViewState
: null, : null,
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),
child: SingleChildScrollView( child: SingleChildScrollView(
primary: isDesktop ? false : null,
child: Padding( child: Padding(
padding: isDesktop padding: isDesktop
? const EdgeInsets.all(0) ? const EdgeInsets.all(0)
@ -310,7 +312,8 @@ class _TransactionDetailsViewState
_transaction.isCancelled _transaction.isCancelled
? "Cancelled" ? "Cancelled"
: whatIsIt(_transaction.txType), : whatIsIt(_transaction.txType),
style: STextStyles.desktopTextMedium( style:
STextStyles.desktopTextMedium(
context), context),
), ),
], ],
@ -326,7 +329,8 @@ class _TransactionDetailsViewState
? (amount / 10000.toDecimal()) ? (amount / 10000.toDecimal())
.toDecimal() .toDecimal()
: coin == Coin.wownero : coin == Coin.wownero
? (amount / 1000.toDecimal()) ? (amount /
1000.toDecimal())
.toDecimal() .toDecimal()
: amount, : amount,
locale: ref.watch( locale: ref.watch(
@ -346,21 +350,24 @@ class _TransactionDetailsViewState
.extension<StackColors>()! .extension<StackColors>()!
.textDark, .textDark,
) )
: STextStyles.titleBold12(context), : STextStyles.titleBold12(
context),
), ),
const SizedBox( const SizedBox(
height: 2, height: 2,
), ),
if (ref.watch( if (ref.watch(
prefsChangeNotifierProvider.select( prefsChangeNotifierProvider.select(
(value) => value.externalCalls))) (value) =>
value.externalCalls)))
SelectableText( SelectableText(
"$amountPrefix${Format.localizedStringAsFixed(value: (coin == Coin.monero ? (amount / 10000.toDecimal()).toDecimal() : coin == Coin.wownero ? (amount / 1000.toDecimal()).toDecimal() : amount) * ref.watch(priceAnd24hChangeNotifierProvider.select((value) => value.getPrice(coin).item1)), locale: ref.watch( "$amountPrefix${Format.localizedStringAsFixed(value: (coin == Coin.monero ? (amount / 10000.toDecimal()).toDecimal() : coin == Coin.wownero ? (amount / 1000.toDecimal()).toDecimal() : amount) * ref.watch(priceAnd24hChangeNotifierProvider.select((value) => value.getPrice(coin).item1)), locale: ref.watch(
localeServiceChangeNotifierProvider localeServiceChangeNotifierProvider
.select((value) => .select((value) =>
value.locale), value.locale),
), decimalPlaces: 2)} ${ref.watch( ), decimalPlaces: 2)} ${ref.watch(
prefsChangeNotifierProvider.select( prefsChangeNotifierProvider
.select(
(value) => value.currency, (value) => value.currency,
), ),
)}", )}",
@ -430,8 +437,10 @@ class _TransactionDetailsViewState
), ),
), ),
if (!((coin == Coin.monero || coin == Coin.wownero) && if (!((coin == Coin.monero || coin == Coin.wownero) &&
_transaction.txType.toLowerCase() == "sent") && _transaction.txType.toLowerCase() ==
!((coin == Coin.firo || coin == Coin.firoTestNet) && "sent") &&
!((coin == Coin.firo ||
coin == Coin.firoTestNet) &&
_transaction.subType == "mint")) _transaction.subType == "mint"))
isDesktop isDesktop
? const _Divider() ? const _Divider()
@ -439,19 +448,23 @@ class _TransactionDetailsViewState
height: 12, height: 12,
), ),
if (!((coin == Coin.monero || coin == Coin.wownero) && if (!((coin == Coin.monero || coin == Coin.wownero) &&
_transaction.txType.toLowerCase() == "sent") && _transaction.txType.toLowerCase() ==
!((coin == Coin.firo || coin == Coin.firoTestNet) && "sent") &&
!((coin == Coin.firo ||
coin == Coin.firoTestNet) &&
_transaction.subType == "mint")) _transaction.subType == "mint"))
RoundedWhiteContainer( RoundedWhiteContainer(
padding: isDesktop padding: isDesktop
? const EdgeInsets.all(16) ? const EdgeInsets.all(16)
: const EdgeInsets.all(12), : const EdgeInsets.all(12),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Text( Text(
_transaction.txType.toLowerCase() == _transaction.txType.toLowerCase() ==
@ -490,7 +503,8 @@ class _TransactionDetailsViewState
.desktopTextExtraExtraSmall( .desktopTextExtraExtraSmall(
context) context)
.copyWith( .copyWith(
color: Theme.of(context) color: Theme.of(
context)
.extension< .extension<
StackColors>()! StackColors>()!
.textDark, .textDark,
@ -546,7 +560,8 @@ class _TransactionDetailsViewState
"Note", "Note",
style: isDesktop style: isDesktop
? STextStyles ? STextStyles
.desktopTextExtraExtraSmall(context) .desktopTextExtraExtraSmall(
context)
: STextStyles.itemSubtitle(context), : STextStyles.itemSubtitle(context),
), ),
isDesktop isDesktop
@ -594,8 +609,8 @@ class _TransactionDetailsViewState
), ),
Text( Text(
"Edit", "Edit",
style: style: STextStyles.link2(
STextStyles.link2(context), context),
), ),
], ],
), ),
@ -607,7 +622,8 @@ class _TransactionDetailsViewState
), ),
FutureBuilder( FutureBuilder(
future: ref.watch( future: ref.watch(
notesServiceChangeNotifierProvider(walletId) notesServiceChangeNotifierProvider(
walletId)
.select((value) => value.getNoteFor( .select((value) => value.getNoteFor(
txid: _transaction.txid))), txid: _transaction.txid))),
builder: (builderContext, builder: (builderContext,
@ -655,7 +671,8 @@ class _TransactionDetailsViewState
"Date", "Date",
style: isDesktop style: isDesktop
? STextStyles ? STextStyles
.desktopTextExtraExtraSmall(context) .desktopTextExtraExtraSmall(
context)
: STextStyles.itemSubtitle(context), : STextStyles.itemSubtitle(context),
), ),
if (isDesktop) if (isDesktop)
@ -676,7 +693,8 @@ class _TransactionDetailsViewState
.extension<StackColors>()! .extension<StackColors>()!
.textDark, .textDark,
) )
: STextStyles.itemSubtitle12(context), : STextStyles.itemSubtitle12(
context),
), ),
], ],
), ),
@ -686,7 +704,8 @@ class _TransactionDetailsViewState
_transaction.timestamp, _transaction.timestamp,
), ),
style: isDesktop style: isDesktop
? STextStyles.desktopTextExtraExtraSmall( ? STextStyles
.desktopTextExtraExtraSmall(
context) context)
.copyWith( .copyWith(
color: Theme.of(context) color: Theme.of(context)
@ -728,11 +747,13 @@ class _TransactionDetailsViewState
localeServiceChangeNotifierProvider localeServiceChangeNotifierProvider
.select( .select(
(value) => value.locale)), (value) => value.locale)),
decimalPlaces: Constants.decimalPlaces) decimalPlaces:
Constants.decimalPlaces)
: "Pending" : "Pending"
: Format.localizedStringAsFixed( : Format.localizedStringAsFixed(
value: coin == Coin.monero value: coin == Coin.monero
? (fee / 10000.toDecimal()).toDecimal() ? (fee / 10000.toDecimal())
.toDecimal()
: coin == Coin.wownero : coin == Coin.wownero
? (fee / 1000.toDecimal()) ? (fee / 1000.toDecimal())
.toDecimal() .toDecimal()
@ -743,11 +764,13 @@ class _TransactionDetailsViewState
decimalPlaces: Constants.decimalPlaces); decimalPlaces: Constants.decimalPlaces);
return Row( return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"Transaction fee", "Transaction fee",
@ -815,11 +838,13 @@ class _TransactionDetailsViewState
: "Pending"; : "Pending";
return Row( return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"Block height", "Block height",
@ -884,7 +909,8 @@ class _TransactionDetailsViewState
children: [ children: [
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"Transaction ID", "Transaction ID",
@ -912,7 +938,8 @@ class _TransactionDetailsViewState
.extension<StackColors>()! .extension<StackColors>()!
.textDark, .textDark,
) )
: STextStyles.itemSubtitle12(context), : STextStyles.itemSubtitle12(
context),
), ),
if (coin != Coin.epicCash) if (coin != Coin.epicCash)
const SizedBox( const SizedBox(
@ -1081,10 +1108,12 @@ class _TransactionDetailsViewState
: const EdgeInsets.all(12), : const EdgeInsets.all(12),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"Slate ID", "Slate ID",
@ -1109,7 +1138,8 @@ class _TransactionDetailsViewState
.extension<StackColors>()! .extension<StackColors>()!
.textDark, .textDark,
) )
: STextStyles.itemSubtitle12(context), : STextStyles.itemSubtitle12(
context),
), ),
// ), // ),
// ), // ),
@ -1136,6 +1166,7 @@ class _TransactionDetailsViewState
), ),
), ),
), ),
),
], ],
), ),
), ),