Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-10 20:54:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/staging' into arti

Browse source
This commit is contained in:
sneurlax 2023-09-12 10:24:27 -05:00
commit fd5bded8a6
3 changed files with 104 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

181
lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart
View file

@ -370,92 +370,98 @@ class _WalletNetworkSettingsViewState
style: STextStyles.navBarTitle(context), style: STextStyles.navBarTitle(context),
), ),
actions: [ actions: [
Padding( if (ref
padding: const EdgeInsets.only( .read(walletsChangeNotifierProvider)
top: 10, .getManager(widget.walletId)
bottom: 10, .coin !=
right: 10, Coin.epicCash)
), Padding(
child: AspectRatio( padding: const EdgeInsets.only(
aspectRatio: 1, top: 10,
child: AppBarIconButton( bottom: 10,
key: const Key( right: 10,
"walletNetworkSettingsAddNewNodeViewButton"), ),
size: 36, child: AspectRatio(
shadows: const [], aspectRatio: 1,
color: Theme.of(context) child: AppBarIconButton(
.extension<StackColors>()! key: const Key(
.background, "walletNetworkSettingsAddNewNodeViewButton"),
icon: SvgPicture.asset( size: 36,
Assets.svg.verticalEllipsis, shadows: const [],
color: Theme.of(context) color: Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.accentColorDark, .background,
width: 20, icon: SvgPicture.asset(
height: 20, Assets.svg.verticalEllipsis,
), color: Theme.of(context)
onPressed: () { .extension<StackColors>()!
showDialog<dynamic>( .accentColorDark,
barrierColor: Colors.transparent, width: 20,
barrierDismissible: true, height: 20,
context: context, ),
builder: (_) { onPressed: () {
return Stack( showDialog<dynamic>(
children: [ barrierColor: Colors.transparent,
Positioned( barrierDismissible: true,
top: 9, context: context,
right: 10, builder: (_) {
child: Container( return Stack(
decoration: BoxDecoration( children: [
color: Theme.of(context) Positioned(
.extension<StackColors>()! top: 9,
.popupBG, right: 10,
borderRadius: BorderRadius.circular( child: Container(
Constants.size.circularBorderRadius), decoration: BoxDecoration(
// boxShadow: [CFColors.standardBoxShadow], color: Theme.of(context)
boxShadow: const [], .extension<StackColors>()!
), .popupBG,
child: Column( borderRadius: BorderRadius.circular(
crossAxisAlignment: Constants
CrossAxisAlignment.start, .size.circularBorderRadius),
children: [ // boxShadow: [CFColors.standardBoxShadow],
GestureDetector( boxShadow: const [],
onTap: () { ),
Navigator.of(context).pop(); child: Column(
showDialog<void>( crossAxisAlignment:
context: context, CrossAxisAlignment.start,
useSafeArea: false, children: [
barrierDismissible: true, GestureDetector(
builder: (context) { onTap: () {
return ConfirmFullRescanDialog( Navigator.of(context).pop();
onConfirm: _attemptRescan, showDialog<void>(
); context: context,
}, useSafeArea: false,
); barrierDismissible: true,
}, builder: (context) {
child: RoundedWhiteContainer( return ConfirmFullRescanDialog(
child: Material( onConfirm: _attemptRescan,
color: Colors.transparent, );
child: Text( },
"Rescan blockchain", );
style: },
STextStyles.baseXS(context), child: RoundedWhiteContainer(
child: Material(
color: Colors.transparent,
child: Text(
"Rescan blockchain",
style: STextStyles.baseXS(
context),
),
), ),
), ),
), ),
), ],
], ),
), ),
), ),
), ],
], );
); },
}, );
); },
}, ),
), ),
), ),
),
], ],
), ),
body: Padding( body: Padding(
@ -963,11 +969,21 @@ class _WalletNetworkSettingsViewState
.select((value) => value.getManager(widget.walletId).coin)), .select((value) => value.getManager(widget.walletId).coin)),
popBackToRoute: WalletNetworkSettingsView.routeName, popBackToRoute: WalletNetworkSettingsView.routeName,
), ),
if (isDesktop) if (isDesktop &&
ref
.read(walletsChangeNotifierProvider)
.getManager(widget.walletId)
.coin !=
Coin.epicCash)
const SizedBox( const SizedBox(
height: 32, height: 32,
), ),
if (isDesktop) if (isDesktop &&
ref
.read(walletsChangeNotifierProvider)
.getManager(widget.walletId)
.coin !=
Coin.epicCash)
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
bottom: 12, bottom: 12,
@ -983,7 +999,12 @@ class _WalletNetworkSettingsViewState
], ],
), ),
), ),
if (isDesktop) if (isDesktop &&
ref
.read(walletsChangeNotifierProvider)
.getManager(widget.walletId)
.coin !=
Coin.epicCash)
RoundedWhiteContainer( RoundedWhiteContainer(
borderColor: isDesktop borderColor: isDesktop
? Theme.of(context).extension<StackColors>()!.background ? Theme.of(context).extension<StackColors>()!.background

9
lib/pages/wallet_view/transaction_views/transaction_details_view.dart
View file

@ -1579,13 +1579,8 @@ class _TransactionDetailsViewState
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat, floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: (coin == Coin.epicCash && floatingActionButton: (coin == Coin.epicCash &&
_transaction.isConfirmed( _transaction.getConfirmations(currentHeight) < 1 &&
currentHeight, _transaction.isCancelled == false)
coin.requiredConfirmations,
) ==
false &&
_transaction.isCancelled == false &&
_transaction.type == TransactionType.outgoing)
? ConditionalParent( ? ConditionalParent(
condition: isDesktop, condition: isDesktop,
builder: (child) => Padding( builder: (child) => Padding(

2
pubspec.yaml
View file

@ -11,7 +11,7 @@ description: Stack Wallet
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.7.19+187 version: 1.7.20+188
environment: environment:
sdk: ">=3.0.2 <4.0.0" sdk: ">=3.0.2 <4.0.0"