Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-03-22 15:19:11 +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

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

@ -370,6 +370,11 @@ class _WalletNetworkSettingsViewState
style: STextStyles.navBarTitle(context), style: STextStyles.navBarTitle(context),
), ),
actions: [ actions: [
if (ref
.read(walletsChangeNotifierProvider)
.getManager(widget.walletId)
.coin !=
Coin.epicCash)
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
top: 10, top: 10,
@ -411,7 +416,8 @@ class _WalletNetworkSettingsViewState
.extension<StackColors>()! .extension<StackColors>()!
.popupBG, .popupBG,
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius), Constants
.size.circularBorderRadius),
// boxShadow: [CFColors.standardBoxShadow], // boxShadow: [CFColors.standardBoxShadow],
boxShadow: const [], boxShadow: const [],
), ),
@ -438,8 +444,8 @@ class _WalletNetworkSettingsViewState
color: Colors.transparent, color: Colors.transparent,
child: Text( child: Text(
"Rescan blockchain", "Rescan blockchain",
style: style: STextStyles.baseXS(
STextStyles.baseXS(context), context),
), ),
), ),
), ),
@ -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"