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

token view pop fix

Browse source
This commit is contained in:
julian 2023-03-28 16:21:26 -06:00
parent 5e5730d5a5
commit b0d37804fa
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/widgets/master_wallet_card.dart
View file

@ -125,7 +125,7 @@ class _MasterWalletCardState extends ConsumerState<MasterWalletCard> {
child: WalletSheetCard(
walletId: widget.walletId,
contractAddress: e,
// popPrevious: true,
popPrevious: true,
),
),
),

24
lib/widgets/wallet_card.dart
View file

@ -12,12 +12,11 @@ import 'package:stackwallet/services/ethereum/ethereum_token_service.dart';
import 'package:stackwallet/services/transaction_notification_tracker.dart';
import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/show_loading.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart';
import 'package:stackwallet/widgets/wallet_info_row/wallet_info_row.dart';
import 'package:tuple/tuple.dart';
import '../utilities/show_loading.dart';
class WalletSheetCard extends ConsumerWidget {
const WalletSheetCard({
Key? key,
@ -45,15 +44,17 @@ class WalletSheetCard extends ConsumerWidget {
),
),
onPressed: () async {
final nav = Navigator.of(context);
final manager =
ref.read(walletsChangeNotifierProvider).getManager(walletId);
if (manager.coin == Coin.monero || manager.coin == Coin.wownero) {
await manager.initializeExisting();
}
if (context.mounted) {
if (popPrevious) Navigator.of(context).pop();
if (popPrevious) nav.pop();
unawaited(
Navigator.of(context).pushNamed(
nav.pushNamed(
WalletView.routeName,
arguments: Tuple2(
walletId,
@ -83,12 +84,15 @@ class WalletSheetCard extends ConsumerWidget {
message: "Loading ${contract.name}",
);
if (context.mounted) {
await Navigator.of(context).pushNamed(
TokenView.routeName,
arguments: walletId,
);
}
// pop loading
nav.pop();
// if (context.mounted) {
await nav.pushNamed(
TokenView.routeName,
arguments: walletId,
);
// }
}
}
},