mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2025-03-12 09:27:01 +00:00
Merge branch 'isar_migrate_fix' into paynyms
This commit is contained in:
julian
commit
b9d006b6ea
6 changed files with 740 additions and 954 deletions
|
|
@ -38,6 +38,7 @@ import 'package:stackwallet/utilities/enums/wallet_balance_toggle_state.dart';
|
|||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_colors.dart';
|
||||
import 'package:stackwallet/widgets/background.dart';
|
||||
import 'package:stackwallet/widgets/conditional_parent.dart';
|
||||
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
|
||||
import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart';
|
||||
import 'package:stackwallet/widgets/custom_loading_overlay.dart';
|
||||
|
|
@ -77,6 +78,8 @@ class _WalletViewState extends ConsumerState<WalletView> {
|
|||
late StreamSubscription<dynamic> _syncStatusSubscription;
|
||||
late StreamSubscription<dynamic> _nodeStatusSubscription;
|
||||
|
||||
bool _rescanningOnOpen = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
walletId = widget.walletId;
|
||||
|
|
@ -91,7 +94,18 @@ class _WalletViewState extends ConsumerState<WalletView> {
|
|||
_shouldDisableAutoSyncOnLogOut = false;
|
||||
}
|
||||
|
||||
ref.read(managerProvider).refresh();
|
||||
if (ref.read(managerProvider).rescanOnOpenVersion == Constants.rescanV1) {
|
||||
_rescanningOnOpen = true;
|
||||
ref.read(managerProvider).fullRescan(20, 1000).then(
|
||||
(_) => ref.read(managerProvider).resetRescanOnOpen().then(
|
||||
(_) => WidgetsBinding.instance.addPostFrameCallback(
|
||||
(_) => setState(() => _rescanningOnOpen = false),
|
||||
),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
ref.read(managerProvider).refresh();
|
||||
}
|
||||
|
||||
if (ref.read(managerProvider).isRefreshing) {
|
||||
_currentSyncStatus = WalletSyncStatus.syncing;
|
||||
|
|
@ -372,418 +386,448 @@ class _WalletViewState extends ConsumerState<WalletView> {
|
|||
|
||||
final coin = ref.watch(managerProvider.select((value) => value.coin));
|
||||
|
||||
return WillPopScope(
|
||||
onWillPop: _onWillPop,
|
||||
child: Background(
|
||||
child: Scaffold(
|
||||
backgroundColor:
|
||||
Theme.of(context).extension<StackColors>()!.background,
|
||||
appBar: AppBar(
|
||||
leading: AppBarBackButton(
|
||||
onPressed: () {
|
||||
_logout();
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
),
|
||||
titleSpacing: 0,
|
||||
title: Row(
|
||||
children: [
|
||||
SvgPicture.asset(
|
||||
Assets.svg.iconFor(coin: coin),
|
||||
// color: Theme.of(context).extension<StackColors>()!.accentColorDark
|
||||
width: 24,
|
||||
height: 24,
|
||||
return ConditionalParent(
|
||||
condition: _rescanningOnOpen,
|
||||
builder: (child) {
|
||||
return WillPopScope(
|
||||
onWillPop: () async => !_rescanningOnOpen,
|
||||
child: Stack(
|
||||
children: [
|
||||
child,
|
||||
Background(
|
||||
child: CustomLoadingOverlay(
|
||||
message:
|
||||
"Migration in progress\nThis could take a while\nPlease don't leave this screen",
|
||||
subMessage: "This only needs to run once per wallet",
|
||||
eventBus: null,
|
||||
textColor:
|
||||
Theme.of(context).extension<StackColors>()!.textDark,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 16,
|
||||
),
|
||||
Expanded(
|
||||
child: Text(
|
||||
ref.watch(
|
||||
managerProvider.select((value) => value.walletName)),
|
||||
style: STextStyles.navBarTitle(context),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
top: 10,
|
||||
bottom: 10,
|
||||
right: 10,
|
||||
),
|
||||
child: AspectRatio(
|
||||
aspectRatio: 1,
|
||||
child: AppBarIconButton(
|
||||
key: const Key("walletViewRadioButton"),
|
||||
size: 36,
|
||||
shadows: const [],
|
||||
color:
|
||||
Theme.of(context).extension<StackColors>()!.background,
|
||||
icon: _buildNetworkIcon(_currentSyncStatus),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pushNamed(
|
||||
WalletNetworkSettingsView.routeName,
|
||||
arguments: Tuple3(
|
||||
walletId,
|
||||
_currentSyncStatus,
|
||||
_currentNodeStatus,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
top: 10,
|
||||
bottom: 10,
|
||||
right: 10,
|
||||
),
|
||||
child: AspectRatio(
|
||||
aspectRatio: 1,
|
||||
child: AppBarIconButton(
|
||||
key: const Key("walletViewAlertsButton"),
|
||||
size: 36,
|
||||
shadows: const [],
|
||||
color:
|
||||
Theme.of(context).extension<StackColors>()!.background,
|
||||
icon: SvgPicture.asset(
|
||||
ref.watch(notificationsProvider.select((value) =>
|
||||
value.hasUnreadNotificationsFor(walletId)))
|
||||
? Assets.svg.bellNew(context)
|
||||
: Assets.svg.bell,
|
||||
width: 20,
|
||||
height: 20,
|
||||
color: ref.watch(notificationsProvider.select((value) =>
|
||||
value.hasUnreadNotificationsFor(walletId)))
|
||||
? null
|
||||
: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.topNavIconPrimary,
|
||||
),
|
||||
onPressed: () {
|
||||
// reset unread state
|
||||
ref.refresh(unreadNotificationsStateProvider);
|
||||
|
||||
Navigator.of(context)
|
||||
.pushNamed(
|
||||
NotificationsView.routeName,
|
||||
arguments: walletId,
|
||||
)
|
||||
.then((_) {
|
||||
final Set<int> unreadNotificationIds = ref
|
||||
.read(unreadNotificationsStateProvider.state)
|
||||
.state;
|
||||
if (unreadNotificationIds.isEmpty) return;
|
||||
|
||||
List<Future<dynamic>> futures = [];
|
||||
for (int i = 0;
|
||||
i < unreadNotificationIds.length - 1;
|
||||
i++) {
|
||||
futures.add(ref
|
||||
.read(notificationsProvider)
|
||||
.markAsRead(
|
||||
unreadNotificationIds.elementAt(i), false));
|
||||
}
|
||||
|
||||
// wait for multiple to update if any
|
||||
Future.wait(futures).then((_) {
|
||||
// only notify listeners once
|
||||
ref
|
||||
.read(notificationsProvider)
|
||||
.markAsRead(unreadNotificationIds.last, true);
|
||||
});
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
top: 10,
|
||||
bottom: 10,
|
||||
right: 10,
|
||||
),
|
||||
child: AspectRatio(
|
||||
aspectRatio: 1,
|
||||
child: AppBarIconButton(
|
||||
key: const Key("walletViewSettingsButton"),
|
||||
size: 36,
|
||||
shadows: const [],
|
||||
color:
|
||||
Theme.of(context).extension<StackColors>()!.background,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.bars,
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.accentColorDark,
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
onPressed: () {
|
||||
//todo: check if print needed
|
||||
// debugPrint("wallet view settings tapped");
|
||||
Navigator.of(context).pushNamed(
|
||||
WalletSettingsView.routeName,
|
||||
arguments: Tuple4(
|
||||
walletId,
|
||||
ref.read(managerProvider).coin,
|
||||
_currentSyncStatus,
|
||||
_currentNodeStatus,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
body: SafeArea(
|
||||
child: Container(
|
||||
color: Theme.of(context).extension<StackColors>()!.background,
|
||||
child: Column(
|
||||
);
|
||||
},
|
||||
child: WillPopScope(
|
||||
onWillPop: _onWillPop,
|
||||
child: Background(
|
||||
child: Scaffold(
|
||||
backgroundColor:
|
||||
Theme.of(context).extension<StackColors>()!.background,
|
||||
appBar: AppBar(
|
||||
leading: AppBarBackButton(
|
||||
onPressed: () {
|
||||
_logout();
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
),
|
||||
titleSpacing: 0,
|
||||
title: Row(
|
||||
children: [
|
||||
const SizedBox(
|
||||
height: 10,
|
||||
SvgPicture.asset(
|
||||
Assets.svg.iconFor(coin: coin),
|
||||
// color: Theme.of(context).extension<StackColors>()!.accentColorDark
|
||||
width: 24,
|
||||
height: 24,
|
||||
),
|
||||
Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: WalletSummary(
|
||||
walletId: walletId,
|
||||
managerProvider: managerProvider,
|
||||
initialSyncStatus: ref.watch(managerProvider
|
||||
.select((value) => value.isRefreshing))
|
||||
? WalletSyncStatus.syncing
|
||||
: WalletSyncStatus.synced,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 16,
|
||||
),
|
||||
Expanded(
|
||||
child: Text(
|
||||
ref.watch(
|
||||
managerProvider.select((value) => value.walletName)),
|
||||
style: STextStyles.navBarTitle(context),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
top: 10,
|
||||
bottom: 10,
|
||||
right: 10,
|
||||
),
|
||||
child: AspectRatio(
|
||||
aspectRatio: 1,
|
||||
child: AppBarIconButton(
|
||||
key: const Key("walletViewRadioButton"),
|
||||
size: 36,
|
||||
shadows: const [],
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.background,
|
||||
icon: _buildNetworkIcon(_currentSyncStatus),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pushNamed(
|
||||
WalletNetworkSettingsView.routeName,
|
||||
arguments: Tuple3(
|
||||
walletId,
|
||||
_currentSyncStatus,
|
||||
_currentNodeStatus,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
if (coin == Coin.firo)
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
top: 10,
|
||||
bottom: 10,
|
||||
right: 10,
|
||||
),
|
||||
child: AspectRatio(
|
||||
aspectRatio: 1,
|
||||
child: AppBarIconButton(
|
||||
key: const Key("walletViewAlertsButton"),
|
||||
size: 36,
|
||||
shadows: const [],
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.background,
|
||||
icon: SvgPicture.asset(
|
||||
ref.watch(notificationsProvider.select((value) =>
|
||||
value.hasUnreadNotificationsFor(walletId)))
|
||||
? Assets.svg.bellNew(context)
|
||||
: Assets.svg.bell,
|
||||
width: 20,
|
||||
height: 20,
|
||||
color: ref.watch(notificationsProvider.select((value) =>
|
||||
value.hasUnreadNotificationsFor(walletId)))
|
||||
? null
|
||||
: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.topNavIconPrimary,
|
||||
),
|
||||
onPressed: () {
|
||||
// reset unread state
|
||||
ref.refresh(unreadNotificationsStateProvider);
|
||||
|
||||
Navigator.of(context)
|
||||
.pushNamed(
|
||||
NotificationsView.routeName,
|
||||
arguments: walletId,
|
||||
)
|
||||
.then((_) {
|
||||
final Set<int> unreadNotificationIds = ref
|
||||
.read(unreadNotificationsStateProvider.state)
|
||||
.state;
|
||||
if (unreadNotificationIds.isEmpty) return;
|
||||
|
||||
List<Future<dynamic>> futures = [];
|
||||
for (int i = 0;
|
||||
i < unreadNotificationIds.length - 1;
|
||||
i++) {
|
||||
futures.add(ref
|
||||
.read(notificationsProvider)
|
||||
.markAsRead(
|
||||
unreadNotificationIds.elementAt(i), false));
|
||||
}
|
||||
|
||||
// wait for multiple to update if any
|
||||
Future.wait(futures).then((_) {
|
||||
// only notify listeners once
|
||||
ref
|
||||
.read(notificationsProvider)
|
||||
.markAsRead(unreadNotificationIds.last, true);
|
||||
});
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
top: 10,
|
||||
bottom: 10,
|
||||
right: 10,
|
||||
),
|
||||
child: AspectRatio(
|
||||
aspectRatio: 1,
|
||||
child: AppBarIconButton(
|
||||
key: const Key("walletViewSettingsButton"),
|
||||
size: 36,
|
||||
shadows: const [],
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.background,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.bars,
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.accentColorDark,
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
onPressed: () {
|
||||
//todo: check if print needed
|
||||
// debugPrint("wallet view settings tapped");
|
||||
Navigator.of(context).pushNamed(
|
||||
WalletSettingsView.routeName,
|
||||
arguments: Tuple4(
|
||||
walletId,
|
||||
ref.read(managerProvider).coin,
|
||||
_currentSyncStatus,
|
||||
_currentNodeStatus,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
body: SafeArea(
|
||||
child: Container(
|
||||
color: Theme.of(context).extension<StackColors>()!.background,
|
||||
child: Column(
|
||||
children: [
|
||||
const SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
if (coin == Coin.firo)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: TextButton(
|
||||
style: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.getSecondaryEnabledButtonStyle(context),
|
||||
onPressed: () async {
|
||||
await showDialog<void>(
|
||||
context: context,
|
||||
builder: (context) => StackDialog(
|
||||
title: "Attention!",
|
||||
message:
|
||||
"You're about to anonymize all of your public funds.",
|
||||
leftButton: TextButton(
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
child: Text(
|
||||
"Cancel",
|
||||
style: STextStyles.button(context)
|
||||
.copyWith(
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.accentColorDark,
|
||||
Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: WalletSummary(
|
||||
walletId: walletId,
|
||||
managerProvider: managerProvider,
|
||||
initialSyncStatus: ref.watch(managerProvider
|
||||
.select((value) => value.isRefreshing))
|
||||
? WalletSyncStatus.syncing
|
||||
: WalletSyncStatus.synced,
|
||||
),
|
||||
),
|
||||
),
|
||||
if (coin == Coin.firo)
|
||||
const SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
if (coin == Coin.firo)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: TextButton(
|
||||
style: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.getSecondaryEnabledButtonStyle(context),
|
||||
onPressed: () async {
|
||||
await showDialog<void>(
|
||||
context: context,
|
||||
builder: (context) => StackDialog(
|
||||
title: "Attention!",
|
||||
message:
|
||||
"You're about to anonymize all of your public funds.",
|
||||
leftButton: TextButton(
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
child: Text(
|
||||
"Cancel",
|
||||
style: STextStyles.button(context)
|
||||
.copyWith(
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.accentColorDark,
|
||||
),
|
||||
),
|
||||
),
|
||||
rightButton: TextButton(
|
||||
onPressed: () async {
|
||||
Navigator.of(context).pop();
|
||||
|
||||
unawaited(attemptAnonymize());
|
||||
},
|
||||
style: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.getPrimaryEnabledButtonStyle(
|
||||
context),
|
||||
child: Text(
|
||||
"Continue",
|
||||
style: STextStyles.button(context),
|
||||
),
|
||||
),
|
||||
),
|
||||
rightButton: TextButton(
|
||||
onPressed: () async {
|
||||
Navigator.of(context).pop();
|
||||
|
||||
unawaited(attemptAnonymize());
|
||||
},
|
||||
style: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.getPrimaryEnabledButtonStyle(
|
||||
context),
|
||||
child: Text(
|
||||
"Continue",
|
||||
style: STextStyles.button(context),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
child: Text(
|
||||
"Anonymize funds",
|
||||
style: STextStyles.button(context).copyWith(
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.buttonTextSecondary,
|
||||
),
|
||||
);
|
||||
},
|
||||
child: Text(
|
||||
"Anonymize funds",
|
||||
style: STextStyles.button(context).copyWith(
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.buttonTextSecondary,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
"Transactions",
|
||||
style: STextStyles.itemSubtitle(context).copyWith(
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.textDark3,
|
||||
),
|
||||
),
|
||||
CustomTextButton(
|
||||
text: "See all",
|
||||
onTap: () {
|
||||
Navigator.of(context).pushNamed(
|
||||
AllTransactionsView.routeName,
|
||||
arguments: walletId,
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
"Transactions",
|
||||
style: STextStyles.itemSubtitle(context).copyWith(
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.textDark3,
|
||||
),
|
||||
),
|
||||
CustomTextButton(
|
||||
text: "See all",
|
||||
onTap: () {
|
||||
Navigator.of(context).pushNamed(
|
||||
AllTransactionsView.routeName,
|
||||
arguments: walletId,
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
const SizedBox(
|
||||
height: 12,
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 12,
|
||||
),
|
||||
Expanded(
|
||||
child: Stack(
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(bottom: 14),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.vertical(
|
||||
top: Radius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
bottom: Radius.circular(
|
||||
// WalletView.navBarHeight / 2.0,
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(
|
||||
Expanded(
|
||||
child: Stack(
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(bottom: 14),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.vertical(
|
||||
top: Radius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
bottom: Radius.circular(
|
||||
// WalletView.navBarHeight / 2.0,
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment:
|
||||
CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Expanded(
|
||||
child: TransactionsList(
|
||||
managerProvider: managerProvider,
|
||||
walletId: walletId,
|
||||
),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(
|
||||
Constants.size.circularBorderRadius,
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment:
|
||||
CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Expanded(
|
||||
child: TransactionsList(
|
||||
managerProvider: managerProvider,
|
||||
walletId: walletId,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
Column(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
bottom: 14,
|
||||
left: 16,
|
||||
right: 16,
|
||||
),
|
||||
child: WalletNavigationBar(
|
||||
walletId: widget.walletId,
|
||||
coin: ref.watch(managerProvider
|
||||
.select((value) => value.coin)),
|
||||
enableExchange: Constants.enableExchange &&
|
||||
ref.watch(managerProvider.select(
|
||||
(value) => value.coin)) !=
|
||||
Coin.epicCash,
|
||||
height: WalletView.navBarHeight,
|
||||
onExchangePressed: () =>
|
||||
_onExchangePressed(context),
|
||||
onReceivePressed: () async {
|
||||
final coin =
|
||||
ref.read(managerProvider).coin;
|
||||
if (mounted) {
|
||||
unawaited(
|
||||
Navigator.of(context).pushNamed(
|
||||
ReceiveView.routeName,
|
||||
Column(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
bottom: 14,
|
||||
left: 16,
|
||||
right: 16,
|
||||
),
|
||||
child: WalletNavigationBar(
|
||||
walletId: widget.walletId,
|
||||
coin: ref.watch(managerProvider
|
||||
.select((value) => value.coin)),
|
||||
enableExchange:
|
||||
Constants.enableExchange &&
|
||||
ref.watch(managerProvider.select(
|
||||
(value) => value.coin)) !=
|
||||
Coin.epicCash,
|
||||
height: WalletView.navBarHeight,
|
||||
onExchangePressed: () =>
|
||||
_onExchangePressed(context),
|
||||
onReceivePressed: () async {
|
||||
final coin =
|
||||
ref.read(managerProvider).coin;
|
||||
if (mounted) {
|
||||
unawaited(
|
||||
Navigator.of(context).pushNamed(
|
||||
ReceiveView.routeName,
|
||||
arguments: Tuple2(
|
||||
walletId,
|
||||
coin,
|
||||
),
|
||||
));
|
||||
}
|
||||
},
|
||||
onSendPressed: () {
|
||||
final walletId =
|
||||
ref.read(managerProvider).walletId;
|
||||
final coin =
|
||||
ref.read(managerProvider).coin;
|
||||
switch (ref
|
||||
.read(
|
||||
walletBalanceToggleStateProvider
|
||||
.state)
|
||||
.state) {
|
||||
case WalletBalanceToggleState.full:
|
||||
ref
|
||||
.read(
|
||||
publicPrivateBalanceStateProvider
|
||||
.state)
|
||||
.state = "Public";
|
||||
break;
|
||||
case WalletBalanceToggleState
|
||||
.available:
|
||||
ref
|
||||
.read(
|
||||
publicPrivateBalanceStateProvider
|
||||
.state)
|
||||
.state = "Private";
|
||||
break;
|
||||
}
|
||||
Navigator.of(context).pushNamed(
|
||||
SendView.routeName,
|
||||
arguments: Tuple2(
|
||||
walletId,
|
||||
coin,
|
||||
),
|
||||
);
|
||||
},
|
||||
onBuyPressed: () {
|
||||
unawaited(
|
||||
Navigator.of(context).pushNamed(
|
||||
BuyInWalletView.routeName,
|
||||
arguments: coin,
|
||||
));
|
||||
}
|
||||
},
|
||||
onSendPressed: () {
|
||||
final walletId =
|
||||
ref.read(managerProvider).walletId;
|
||||
final coin =
|
||||
ref.read(managerProvider).coin;
|
||||
switch (ref
|
||||
.read(walletBalanceToggleStateProvider
|
||||
.state)
|
||||
.state) {
|
||||
case WalletBalanceToggleState.full:
|
||||
ref
|
||||
.read(
|
||||
publicPrivateBalanceStateProvider
|
||||
.state)
|
||||
.state = "Public";
|
||||
break;
|
||||
case WalletBalanceToggleState.available:
|
||||
ref
|
||||
.read(
|
||||
publicPrivateBalanceStateProvider
|
||||
.state)
|
||||
.state = "Private";
|
||||
break;
|
||||
}
|
||||
Navigator.of(context).pushNamed(
|
||||
SendView.routeName,
|
||||
arguments: Tuple2(
|
||||
walletId,
|
||||
coin,
|
||||
),
|
||||
);
|
||||
},
|
||||
onBuyPressed: () {
|
||||
unawaited(Navigator.of(context).pushNamed(
|
||||
BuyInWalletView.routeName,
|
||||
arguments: coin,
|
||||
));
|
||||
},
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
],
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -24,12 +24,15 @@ import 'package:stackwallet/services/event_bus/events/global/wallet_sync_status_
|
|||
import 'package:stackwallet/services/event_bus/global_event_bus.dart';
|
||||
import 'package:stackwallet/services/mixins/paynym_wallet_interface.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/enums/backup_frequency_type.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart';
|
||||
import 'package:stackwallet/utilities/logger.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/theme/stack_colors.dart';
|
||||
import 'package:stackwallet/widgets/background.dart';
|
||||
import 'package:stackwallet/widgets/conditional_parent.dart';
|
||||
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
|
||||
import 'package:stackwallet/widgets/custom_loading_overlay.dart';
|
||||
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
|
||||
|
|
@ -63,6 +66,7 @@ class _DesktopWalletViewState extends ConsumerState<DesktopWalletView> {
|
|||
late final EventBus eventBus;
|
||||
|
||||
late final bool _shouldDisableAutoSyncOnLogOut;
|
||||
bool _rescanningOnOpen = false;
|
||||
|
||||
Future<void> onBackPressed() async {
|
||||
await _logout();
|
||||
|
|
@ -265,7 +269,18 @@ class _DesktopWalletViewState extends ConsumerState<DesktopWalletView> {
|
|||
_shouldDisableAutoSyncOnLogOut = false;
|
||||
}
|
||||
|
||||
ref.read(managerProvider).refresh();
|
||||
if (ref.read(managerProvider).rescanOnOpenVersion == Constants.rescanV1) {
|
||||
_rescanningOnOpen = true;
|
||||
ref.read(managerProvider).fullRescan(20, 1000).then(
|
||||
(_) => ref.read(managerProvider).resetRescanOnOpen().then(
|
||||
(_) => WidgetsBinding.instance.addPostFrameCallback(
|
||||
(_) => setState(() => _rescanningOnOpen = false),
|
||||
),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
ref.read(managerProvider).refresh();
|
||||
}
|
||||
|
||||
super.initState();
|
||||
}
|
||||
|
|
@ -284,241 +299,263 @@ class _DesktopWalletViewState extends ConsumerState<DesktopWalletView> {
|
|||
final managerProvider = ref.watch(walletsChangeNotifierProvider
|
||||
.select((value) => value.getManagerProvider(widget.walletId)));
|
||||
|
||||
return DesktopScaffold(
|
||||
appBar: DesktopAppBar(
|
||||
background: Theme.of(context).extension<StackColors>()!.popupBG,
|
||||
leading: Expanded(
|
||||
child: Row(
|
||||
children: [
|
||||
const SizedBox(
|
||||
width: 32,
|
||||
return ConditionalParent(
|
||||
condition: _rescanningOnOpen,
|
||||
builder: (child) {
|
||||
return Stack(
|
||||
children: [
|
||||
child,
|
||||
Background(
|
||||
child: CustomLoadingOverlay(
|
||||
message:
|
||||
"Migration in progress\nThis could take a while\nPlease don't leave this screen",
|
||||
subMessage: "This only needs to run once per wallet",
|
||||
eventBus: null,
|
||||
textColor: Theme.of(context).extension<StackColors>()!.textDark,
|
||||
),
|
||||
AppBarIconButton(
|
||||
size: 32,
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.textFieldDefaultBG,
|
||||
shadows: const [],
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.arrowLeft,
|
||||
width: 18,
|
||||
height: 18,
|
||||
)
|
||||
],
|
||||
);
|
||||
},
|
||||
child: DesktopScaffold(
|
||||
appBar: DesktopAppBar(
|
||||
background: Theme.of(context).extension<StackColors>()!.popupBG,
|
||||
leading: Expanded(
|
||||
child: Row(
|
||||
children: [
|
||||
const SizedBox(
|
||||
width: 32,
|
||||
),
|
||||
AppBarIconButton(
|
||||
size: 32,
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.topNavIconPrimary,
|
||||
.textFieldDefaultBG,
|
||||
shadows: const [],
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.arrowLeft,
|
||||
width: 18,
|
||||
height: 18,
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.topNavIconPrimary,
|
||||
),
|
||||
onPressed: onBackPressed,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 15,
|
||||
),
|
||||
SvgPicture.asset(
|
||||
Assets.svg.iconFor(coin: coin),
|
||||
width: 32,
|
||||
height: 32,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
ConstrainedBox(
|
||||
constraints: const BoxConstraints(
|
||||
minWidth: 48,
|
||||
),
|
||||
child: IntrinsicWidth(
|
||||
child: DesktopWalletNameField(
|
||||
walletId: widget.walletId,
|
||||
),
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
Row(
|
||||
children: [
|
||||
NetworkInfoButton(
|
||||
walletId: widget.walletId,
|
||||
eventBus: eventBus,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 2,
|
||||
),
|
||||
WalletKeysButton(
|
||||
walletId: widget.walletId,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 2,
|
||||
),
|
||||
DeleteWalletButton(
|
||||
walletId: widget.walletId,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
useSpacers: false,
|
||||
isCompactHeight: true,
|
||||
),
|
||||
body: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
children: [
|
||||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(20),
|
||||
child: Row(
|
||||
children: [
|
||||
SvgPicture.asset(
|
||||
Assets.svg.iconFor(coin: coin),
|
||||
width: 40,
|
||||
height: 40,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 10,
|
||||
),
|
||||
DesktopWalletSummary(
|
||||
walletId: widget.walletId,
|
||||
managerProvider: managerProvider,
|
||||
initialSyncStatus: ref.watch(managerProvider
|
||||
.select((value) => value.isRefreshing))
|
||||
? WalletSyncStatus.syncing
|
||||
: WalletSyncStatus.synced,
|
||||
),
|
||||
const Spacer(),
|
||||
if (coin == Coin.firo) const SizedBox(width: 10),
|
||||
if (coin == Coin.firo)
|
||||
SecondaryButton(
|
||||
width: 180,
|
||||
buttonHeight: ButtonHeight.l,
|
||||
label: "Anonymize funds",
|
||||
onPressed: () async {
|
||||
await showDialog<void>(
|
||||
context: context,
|
||||
barrierDismissible: false,
|
||||
builder: (context) => DesktopDialog(
|
||||
maxWidth: 500,
|
||||
maxHeight: 210,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 32, vertical: 20),
|
||||
child: Column(
|
||||
children: [
|
||||
Text(
|
||||
"Attention!",
|
||||
style: STextStyles.desktopH2(context),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
"You're about to anonymize all of your public funds.",
|
||||
style:
|
||||
STextStyles.desktopTextSmall(context),
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.center,
|
||||
children: [
|
||||
SecondaryButton(
|
||||
width: 200,
|
||||
buttonHeight: ButtonHeight.l,
|
||||
label: "Cancel",
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
PrimaryButton(
|
||||
width: 200,
|
||||
buttonHeight: ButtonHeight.l,
|
||||
label: "Continue",
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
|
||||
unawaited(attemptAnonymize());
|
||||
},
|
||||
)
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
if (ref.watch(walletsChangeNotifierProvider.select(
|
||||
(value) => value
|
||||
.getManager(widget.walletId)
|
||||
.hasPaynymSupport)))
|
||||
SecondaryButton(
|
||||
label: "PayNym",
|
||||
width: 160,
|
||||
buttonHeight: ButtonHeight.l,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.user,
|
||||
height: 20,
|
||||
width: 20,
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.buttonTextSecondary,
|
||||
),
|
||||
onPressed: onPaynymButtonPressed,
|
||||
),
|
||||
// if (coin == Coin.firo) const SizedBox(width: 16),
|
||||
// SecondaryButton(
|
||||
// width: 180,
|
||||
// buttonHeight: ButtonHeight.l,
|
||||
// onPressed: () {
|
||||
// _onExchangePressed(context);
|
||||
// },
|
||||
// label: "Exchange",
|
||||
// icon: Container(
|
||||
// width: 24,
|
||||
// height: 24,
|
||||
// decoration: BoxDecoration(
|
||||
// borderRadius: BorderRadius.circular(24),
|
||||
// color: Theme.of(context)
|
||||
// .extension<StackColors>()!
|
||||
// .buttonBackPrimary
|
||||
// .withOpacity(0.2),
|
||||
// ),
|
||||
// child: Center(
|
||||
// child: SvgPicture.asset(
|
||||
// Assets.svg.arrowRotate2,
|
||||
// width: 14,
|
||||
// height: 14,
|
||||
// color: Theme.of(context)
|
||||
// .extension<StackColors>()!
|
||||
// .buttonTextSecondary,
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
],
|
||||
),
|
||||
onPressed: onBackPressed,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 15,
|
||||
height: 24,
|
||||
),
|
||||
SvgPicture.asset(
|
||||
Assets.svg.iconFor(coin: coin),
|
||||
width: 32,
|
||||
height: 32,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
ConstrainedBox(
|
||||
constraints: const BoxConstraints(
|
||||
minWidth: 48,
|
||||
Expanded(
|
||||
child: Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 450,
|
||||
child: MyWallet(
|
||||
walletId: widget.walletId,
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 16,
|
||||
),
|
||||
Expanded(
|
||||
child: RecentDesktopTransactions(
|
||||
walletId: widget.walletId,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: IntrinsicWidth(
|
||||
child: DesktopWalletNameField(
|
||||
walletId: widget.walletId,
|
||||
),
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
Row(
|
||||
children: [
|
||||
NetworkInfoButton(
|
||||
walletId: widget.walletId,
|
||||
eventBus: eventBus,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 2,
|
||||
),
|
||||
WalletKeysButton(
|
||||
walletId: widget.walletId,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 2,
|
||||
),
|
||||
DeleteWalletButton(
|
||||
walletId: widget.walletId,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
useSpacers: false,
|
||||
isCompactHeight: true,
|
||||
),
|
||||
body: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
children: [
|
||||
RoundedWhiteContainer(
|
||||
padding: const EdgeInsets.all(20),
|
||||
child: Row(
|
||||
children: [
|
||||
SvgPicture.asset(
|
||||
Assets.svg.iconFor(coin: coin),
|
||||
width: 40,
|
||||
height: 40,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 10,
|
||||
),
|
||||
DesktopWalletSummary(
|
||||
walletId: widget.walletId,
|
||||
managerProvider: managerProvider,
|
||||
initialSyncStatus: ref.watch(managerProvider
|
||||
.select((value) => value.isRefreshing))
|
||||
? WalletSyncStatus.syncing
|
||||
: WalletSyncStatus.synced,
|
||||
),
|
||||
const Spacer(),
|
||||
if (coin == Coin.firo) const SizedBox(width: 10),
|
||||
if (coin == Coin.firo)
|
||||
SecondaryButton(
|
||||
width: 180,
|
||||
buttonHeight: ButtonHeight.l,
|
||||
label: "Anonymize funds",
|
||||
onPressed: () async {
|
||||
await showDialog<void>(
|
||||
context: context,
|
||||
barrierDismissible: false,
|
||||
builder: (context) => DesktopDialog(
|
||||
maxWidth: 500,
|
||||
maxHeight: 210,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 32, vertical: 20),
|
||||
child: Column(
|
||||
children: [
|
||||
Text(
|
||||
"Attention!",
|
||||
style: STextStyles.desktopH2(context),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
"You're about to anonymize all of your public funds.",
|
||||
style:
|
||||
STextStyles.desktopTextSmall(context),
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
SecondaryButton(
|
||||
width: 200,
|
||||
buttonHeight: ButtonHeight.l,
|
||||
label: "Cancel",
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
PrimaryButton(
|
||||
width: 200,
|
||||
buttonHeight: ButtonHeight.l,
|
||||
label: "Continue",
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
|
||||
unawaited(attemptAnonymize());
|
||||
},
|
||||
)
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
if (ref.watch(walletsChangeNotifierProvider.select((value) =>
|
||||
value.getManager(widget.walletId).hasPaynymSupport)))
|
||||
SecondaryButton(
|
||||
label: "PayNym",
|
||||
width: 160,
|
||||
buttonHeight: ButtonHeight.l,
|
||||
icon: SvgPicture.asset(
|
||||
Assets.svg.user,
|
||||
height: 20,
|
||||
width: 20,
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.buttonTextSecondary,
|
||||
),
|
||||
onPressed: onPaynymButtonPressed,
|
||||
),
|
||||
// if (coin == Coin.firo) const SizedBox(width: 16),
|
||||
// SecondaryButton(
|
||||
// width: 180,
|
||||
// buttonHeight: ButtonHeight.l,
|
||||
// onPressed: () {
|
||||
// _onExchangePressed(context);
|
||||
// },
|
||||
// label: "Exchange",
|
||||
// icon: Container(
|
||||
// width: 24,
|
||||
// height: 24,
|
||||
// decoration: BoxDecoration(
|
||||
// borderRadius: BorderRadius.circular(24),
|
||||
// color: Theme.of(context)
|
||||
// .extension<StackColors>()!
|
||||
// .buttonBackPrimary
|
||||
// .withOpacity(0.2),
|
||||
// ),
|
||||
// child: Center(
|
||||
// child: SvgPicture.asset(
|
||||
// Assets.svg.arrowRotate2,
|
||||
// width: 14,
|
||||
// height: 14,
|
||||
// color: Theme.of(context)
|
||||
// .extension<StackColors>()!
|
||||
// .buttonTextSecondary,
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 24,
|
||||
),
|
||||
Expanded(
|
||||
child: Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 450,
|
||||
child: MyWallet(
|
||||
walletId: widget.walletId,
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 16,
|
||||
),
|
||||
Expanded(
|
||||
child: RecentDesktopTransactions(
|
||||
walletId: widget.walletId,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import 'dart:async';
|
|||
|
||||
import 'package:event_bus/event_bus.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:stackwallet/hive/db.dart';
|
||||
import 'package:stackwallet/models/balance.dart';
|
||||
import 'package:stackwallet/models/isar/models/isar_models.dart' as isar_models;
|
||||
import 'package:stackwallet/models/models.dart';
|
||||
|
|
@ -227,4 +228,18 @@ class Manager with ChangeNotifier {
|
|||
int get currentHeight => _currentWallet.storedChainHeight;
|
||||
|
||||
bool get hasPaynymSupport => _currentWallet is PaynymWalletInterface;
|
||||
|
||||
int get rescanOnOpenVersion =>
|
||||
DB.instance.get<dynamic>(
|
||||
boxName: DB.boxNameDBInfo,
|
||||
key: "rescan_on_open_$walletId",
|
||||
) as int? ??
|
||||
0;
|
||||
|
||||
Future<void> resetRescanOnOpen() async {
|
||||
await DB.instance.delete<dynamic>(
|
||||
key: "rescan_on_open_$walletId",
|
||||
boxName: DB.boxNameDBInfo,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ abstract class Constants {
|
|||
}
|
||||
|
||||
static bool enableExchange = Util.isDesktop || !Platform.isIOS;
|
||||
static bool enableBuy = true; // true for development, TODO change to "Util.isDesktop || !Platform.isIOS;" as above or even just = enableExchange
|
||||
static bool enableBuy =
|
||||
true; // true for development, TODO change to "Util.isDesktop || !Platform.isIOS;" as above or even just = enableExchange
|
||||
|
||||
//TODO: correct for monero?
|
||||
static const int _satsPerCoinMonero = 1000000000000;
|
||||
|
|
@ -41,6 +42,8 @@ abstract class Constants {
|
|||
|
||||
static const int currentHiveDbVersion = 5;
|
||||
|
||||
static const int rescanV1 = 1;
|
||||
|
||||
static int satsPerCoin(Coin coin) {
|
||||
switch (coin) {
|
||||
case Coin.bitcoin:
|
||||
|
|
|
|||
|
|
@ -1,24 +1,19 @@
|
|||
import 'dart:convert';
|
||||
|
||||
import 'package:hive/hive.dart';
|
||||
import 'package:stackwallet/db/main_db.dart';
|
||||
import 'package:stackwallet/electrumx_rpc/electrumx.dart';
|
||||
import 'package:stackwallet/hive/db.dart';
|
||||
import 'package:stackwallet/models/exchange/change_now/exchange_transaction.dart';
|
||||
import 'package:stackwallet/models/exchange/response_objects/trade.dart';
|
||||
import 'package:stackwallet/models/isar/models/isar_models.dart' as isar_models;
|
||||
import 'package:stackwallet/models/models.dart';
|
||||
import 'package:stackwallet/models/node_model.dart';
|
||||
import 'package:stackwallet/services/mixins/wallet_db.dart';
|
||||
import 'package:stackwallet/services/node_service.dart';
|
||||
import 'package:stackwallet/services/wallets_service.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/default_nodes.dart';
|
||||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
|
||||
import 'package:stackwallet/utilities/format.dart';
|
||||
import 'package:stackwallet/utilities/logger.dart';
|
||||
import 'package:stackwallet/utilities/prefs.dart';
|
||||
import 'package:tuple/tuple.dart';
|
||||
|
||||
class DbVersionMigrator with WalletDB {
|
||||
Future<void> migrate(
|
||||
|
|
@ -207,206 +202,9 @@ class DbVersionMigrator with WalletDB {
|
|||
|
||||
final walletBox = await Hive.openBox<dynamic>(info.walletId);
|
||||
|
||||
final receiveDerivePrefix = "${walletId}_receiveDerivations";
|
||||
final changeDerivePrefix = "${walletId}_changeDerivations";
|
||||
|
||||
const receiveAddressesPrefix = "receivingAddresses";
|
||||
const changeAddressesPrefix = "changeAddresses";
|
||||
|
||||
final p2pkhRcvDerivations =
|
||||
(await secureStore.read(key: receiveDerivePrefix)) ??
|
||||
(await secureStore.read(key: "${receiveDerivePrefix}P2PKH"));
|
||||
final p2shRcvDerivations =
|
||||
await secureStore.read(key: "${receiveDerivePrefix}P2SH");
|
||||
final p2wpkhRcvDerivations =
|
||||
await secureStore.read(key: "${receiveDerivePrefix}P2WPKH");
|
||||
|
||||
final p2pkhCngDerivations =
|
||||
(await secureStore.read(key: changeDerivePrefix)) ??
|
||||
(await secureStore.read(key: "${changeDerivePrefix}P2PKH"));
|
||||
final p2shCngDerivations =
|
||||
await secureStore.read(key: "${changeDerivePrefix}P2SH");
|
||||
final p2wpkhCngDerivations =
|
||||
await secureStore.read(key: "${changeDerivePrefix}P2WPKH");
|
||||
|
||||
// useless?
|
||||
// const receiveIndexPrefix = "receivingIndex";
|
||||
// const changeIndexPrefix = "changeIndex";
|
||||
// final p2pkhRcvIndex = walletBox.get(receiveIndexPrefix) as int? ??
|
||||
// walletBox.get("${receiveIndexPrefix}P2PKH") as int?;
|
||||
// final p2shRcvIndex =
|
||||
// walletBox.get("${receiveIndexPrefix}P2SH") as int?;
|
||||
// final p2wpkhRcvIndex =
|
||||
// walletBox.get("${receiveIndexPrefix}P2WPKH") as int?;
|
||||
//
|
||||
// final p2pkhCngIndex = walletBox.get(changeIndexPrefix) as int? ??
|
||||
// walletBox.get("${changeIndexPrefix}P2PKH") as int?;
|
||||
// final p2shCngIndex =
|
||||
// walletBox.get("${changeIndexPrefix}P2SH") as int?;
|
||||
// final p2wpkhCngIndex =
|
||||
// walletBox.get("${changeIndexPrefix}P2WPKH") as int?;
|
||||
|
||||
final List<isar_models.Address> newAddresses = [];
|
||||
|
||||
if (p2pkhRcvDerivations != null) {
|
||||
newAddresses.addAll(
|
||||
_v4GetAddressesFromDerivationString(
|
||||
p2pkhRcvDerivations,
|
||||
isar_models.AddressType.p2pkh,
|
||||
isar_models.AddressSubType.receiving,
|
||||
walletId,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
if (p2shRcvDerivations != null) {
|
||||
newAddresses.addAll(
|
||||
_v4GetAddressesFromDerivationString(
|
||||
p2shRcvDerivations,
|
||||
isar_models.AddressType.p2sh,
|
||||
isar_models.AddressSubType.receiving,
|
||||
walletId,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
if (p2wpkhRcvDerivations != null) {
|
||||
newAddresses.addAll(
|
||||
_v4GetAddressesFromDerivationString(
|
||||
p2wpkhRcvDerivations,
|
||||
isar_models.AddressType.p2wpkh,
|
||||
isar_models.AddressSubType.receiving,
|
||||
walletId,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
if (p2pkhCngDerivations != null) {
|
||||
newAddresses.addAll(
|
||||
_v4GetAddressesFromDerivationString(
|
||||
p2pkhCngDerivations,
|
||||
isar_models.AddressType.p2pkh,
|
||||
isar_models.AddressSubType.change,
|
||||
walletId,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
if (p2shCngDerivations != null) {
|
||||
newAddresses.addAll(
|
||||
_v4GetAddressesFromDerivationString(
|
||||
p2shCngDerivations,
|
||||
isar_models.AddressType.p2sh,
|
||||
isar_models.AddressSubType.change,
|
||||
walletId,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
if (p2wpkhCngDerivations != null) {
|
||||
newAddresses.addAll(
|
||||
_v4GetAddressesFromDerivationString(
|
||||
p2wpkhCngDerivations,
|
||||
isar_models.AddressType.p2wpkh,
|
||||
isar_models.AddressSubType.change,
|
||||
walletId,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final currentNewSet = newAddresses.map((e) => e.value).toSet();
|
||||
|
||||
final p2pkhRcvAddresses = _v4GetAddressesFromList(
|
||||
_getList(walletBox.get(receiveAddressesPrefix) ??
|
||||
walletBox.get("${receiveAddressesPrefix}P2PKH")),
|
||||
isar_models.AddressType.p2pkh,
|
||||
isar_models.AddressSubType.receiving,
|
||||
walletId);
|
||||
for (final address in p2pkhRcvAddresses) {
|
||||
if (!currentNewSet.contains(address.value)) {
|
||||
newAddresses.add(address);
|
||||
}
|
||||
}
|
||||
|
||||
final p2shRcvAddresses = _v4GetAddressesFromList(
|
||||
_getList(walletBox.get("${receiveAddressesPrefix}P2SH")),
|
||||
isar_models.AddressType.p2sh,
|
||||
isar_models.AddressSubType.receiving,
|
||||
walletId);
|
||||
for (final address in p2shRcvAddresses) {
|
||||
if (!currentNewSet.contains(address.value)) {
|
||||
newAddresses.add(address);
|
||||
}
|
||||
}
|
||||
|
||||
final p2wpkhRcvAddresses = _v4GetAddressesFromList(
|
||||
_getList(walletBox.get("${receiveAddressesPrefix}P2WPKH")),
|
||||
isar_models.AddressType.p2wpkh,
|
||||
isar_models.AddressSubType.receiving,
|
||||
walletId);
|
||||
for (final address in p2wpkhRcvAddresses) {
|
||||
if (!currentNewSet.contains(address.value)) {
|
||||
newAddresses.add(address);
|
||||
}
|
||||
}
|
||||
|
||||
final p2pkhCngAddresses = _v4GetAddressesFromList(
|
||||
_getList(walletBox.get(changeAddressesPrefix) ??
|
||||
walletBox.get("${changeAddressesPrefix}P2PKH")),
|
||||
isar_models.AddressType.p2wpkh,
|
||||
isar_models.AddressSubType.change,
|
||||
walletId);
|
||||
for (final address in p2pkhCngAddresses) {
|
||||
if (!currentNewSet.contains(address.value)) {
|
||||
newAddresses.add(address);
|
||||
}
|
||||
}
|
||||
|
||||
final p2shCngAddresses = _v4GetAddressesFromList(
|
||||
_getList(walletBox.get("${changeAddressesPrefix}P2SH")),
|
||||
isar_models.AddressType.p2wpkh,
|
||||
isar_models.AddressSubType.change,
|
||||
walletId);
|
||||
for (final address in p2shCngAddresses) {
|
||||
if (!currentNewSet.contains(address.value)) {
|
||||
newAddresses.add(address);
|
||||
}
|
||||
}
|
||||
|
||||
final p2wpkhCngAddresses = _v4GetAddressesFromList(
|
||||
_getList(walletBox.get("${changeAddressesPrefix}P2WPKH")),
|
||||
isar_models.AddressType.p2wpkh,
|
||||
isar_models.AddressSubType.change,
|
||||
walletId);
|
||||
for (final address in p2wpkhCngAddresses) {
|
||||
if (!currentNewSet.contains(address.value)) {
|
||||
newAddresses.add(address);
|
||||
}
|
||||
}
|
||||
|
||||
// transactions
|
||||
final txnData = walletBox.get("latest_tx_model") as TransactionData?;
|
||||
final txns = txnData?.getAllTransactions().values ?? [];
|
||||
final txnDataLelantus =
|
||||
walletBox.get("latest_lelantus_tx_model") as TransactionData?;
|
||||
final txnsLelantus = txnDataLelantus?.getAllTransactions().values ?? [];
|
||||
|
||||
final List<Tuple2<isar_models.Transaction, isar_models.Address?>>
|
||||
newTransactions = [];
|
||||
|
||||
newTransactions
|
||||
.addAll(_parseTransactions(txns, walletId, false, newAddresses));
|
||||
newTransactions.addAll(
|
||||
_parseTransactions(txnsLelantus, walletId, true, newAddresses));
|
||||
|
||||
// store newly parsed data in isar
|
||||
await MainDB.instance.initMainDB();
|
||||
initWalletDB();
|
||||
await db.isar.writeTxn(() async {
|
||||
await db.isar.addresses.putAll(newAddresses);
|
||||
});
|
||||
await db.addNewTransactionData(newTransactions, walletId);
|
||||
|
||||
// delete data from hive
|
||||
await walletBox.delete(receiveAddressesPrefix);
|
||||
await walletBox.delete("${receiveAddressesPrefix}P2PKH");
|
||||
|
|
@ -418,154 +216,20 @@ class DbVersionMigrator with WalletDB {
|
|||
await walletBox.delete("${changeAddressesPrefix}P2WPKH");
|
||||
await walletBox.delete("latest_tx_model");
|
||||
await walletBox.delete("latest_lelantus_tx_model");
|
||||
}
|
||||
}
|
||||
|
||||
List<Tuple2<isar_models.Transaction, isar_models.Address?>>
|
||||
_parseTransactions(
|
||||
Iterable<Transaction> txns,
|
||||
String walletId,
|
||||
bool isLelantus,
|
||||
List<isar_models.Address> parsedAddresses,
|
||||
) {
|
||||
List<Tuple2<isar_models.Transaction, isar_models.Address?>> transactions =
|
||||
[];
|
||||
for (final tx in txns) {
|
||||
final type = tx.txType.toLowerCase() == "received"
|
||||
? isar_models.TransactionType.incoming
|
||||
: isar_models.TransactionType.outgoing;
|
||||
final subType = tx.subType.toLowerCase() == "mint"
|
||||
? isar_models.TransactionSubType.mint
|
||||
: tx.subType.toLowerCase() == "join"
|
||||
? isar_models.TransactionSubType.join
|
||||
: isar_models.TransactionSubType.none;
|
||||
|
||||
final List<isar_models.Input> inputs = [];
|
||||
final List<isar_models.Output> outputs = [];
|
||||
|
||||
for (final inp in tx.inputs) {
|
||||
final input = isar_models.Input(
|
||||
txid: inp.txid,
|
||||
vout: inp.vout,
|
||||
scriptSig: inp.scriptsig,
|
||||
scriptSigAsm: inp.scriptsigAsm,
|
||||
isCoinbase: inp.isCoinbase,
|
||||
sequence: inp.sequence,
|
||||
innerRedeemScriptAsm: inp.innerRedeemscriptAsm,
|
||||
);
|
||||
inputs.add(input);
|
||||
}
|
||||
for (final out in tx.outputs) {
|
||||
final output = isar_models.Output(
|
||||
scriptPubKey: out.scriptpubkey,
|
||||
scriptPubKeyAsm: out.scriptpubkeyAsm,
|
||||
scriptPubKeyType: out.scriptpubkeyType,
|
||||
scriptPubKeyAddress: out.scriptpubkeyAddress,
|
||||
value: out.value,
|
||||
);
|
||||
outputs.add(output);
|
||||
// set empty mnemonic passphrase as we used that by default before
|
||||
if ((await secureStore.read(key: '${walletId}_mnemonicPassphrase')) ==
|
||||
null) {
|
||||
await secureStore.write(
|
||||
key: '${walletId}_mnemonicPassphrase', value: "");
|
||||
}
|
||||
|
||||
final transaction = isar_models.Transaction(
|
||||
walletId: walletId,
|
||||
txid: tx.txid,
|
||||
timestamp: tx.timestamp,
|
||||
type: type,
|
||||
subType: subType,
|
||||
amount: tx.amount,
|
||||
fee: tx.fees,
|
||||
height: tx.height,
|
||||
isCancelled: tx.isCancelled,
|
||||
isLelantus: false,
|
||||
slateId: tx.slateId,
|
||||
otherData: tx.otherData,
|
||||
inputs: inputs,
|
||||
outputs: outputs,
|
||||
// set flag to initiate full rescan on opening wallet
|
||||
await DB.instance.put<dynamic>(
|
||||
boxName: DB.boxNameDBInfo,
|
||||
key: "rescan_on_open_$walletId",
|
||||
value: Constants.rescanV1,
|
||||
);
|
||||
|
||||
isar_models.Address? address;
|
||||
if (tx.address.isNotEmpty) {
|
||||
final addresses = parsedAddresses.where((e) => e.value == tx.address);
|
||||
if (addresses.isNotEmpty) {
|
||||
address = addresses.first;
|
||||
} else {
|
||||
address = isar_models.Address(
|
||||
walletId: walletId,
|
||||
value: tx.address,
|
||||
publicKey: [],
|
||||
derivationIndex: -1,
|
||||
derivationPath: null,
|
||||
type: isar_models.AddressType.unknown,
|
||||
subType: type == isar_models.TransactionType.incoming
|
||||
? isar_models.AddressSubType.receiving
|
||||
: isar_models.AddressSubType.unknown,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
transactions.add(Tuple2(transaction, address));
|
||||
}
|
||||
return transactions;
|
||||
}
|
||||
|
||||
List<isar_models.Address> _v4GetAddressesFromDerivationString(
|
||||
String derivationsString,
|
||||
isar_models.AddressType type,
|
||||
isar_models.AddressSubType subType,
|
||||
String walletId,
|
||||
) {
|
||||
final List<isar_models.Address> addresses = [];
|
||||
|
||||
final derivations =
|
||||
Map<String, dynamic>.from(jsonDecode(derivationsString) as Map);
|
||||
|
||||
for (final entry in derivations.entries) {
|
||||
final addr = entry.value["address"] as String? ?? entry.key;
|
||||
final pubKey = entry.value["pubKey"] as String? ??
|
||||
entry.value["publicKey"] as String;
|
||||
final index = int.tryParse(entry.key) ?? -1;
|
||||
|
||||
final address = isar_models.Address(
|
||||
walletId: walletId,
|
||||
value: addr,
|
||||
publicKey: Format.stringToUint8List(pubKey),
|
||||
derivationIndex: index,
|
||||
derivationPath: null, // we have no idea what the full path is
|
||||
type: type,
|
||||
subType: subType,
|
||||
);
|
||||
addresses.add(address);
|
||||
}
|
||||
|
||||
return addresses;
|
||||
}
|
||||
|
||||
List<isar_models.Address> _v4GetAddressesFromList(
|
||||
List<String> addressStrings,
|
||||
isar_models.AddressType type,
|
||||
isar_models.AddressSubType subType,
|
||||
String walletId,
|
||||
) {
|
||||
final List<isar_models.Address> addresses = [];
|
||||
|
||||
for (final addr in addressStrings) {
|
||||
final address = isar_models.Address(
|
||||
walletId: walletId,
|
||||
value: addr,
|
||||
publicKey: [],
|
||||
derivationIndex: -1,
|
||||
derivationPath: null, // index unknown
|
||||
type: type,
|
||||
subType: subType,
|
||||
);
|
||||
addresses.add(address);
|
||||
}
|
||||
|
||||
return addresses;
|
||||
}
|
||||
|
||||
List<String> _getList(dynamic list) {
|
||||
if (list == null) return [];
|
||||
return List<String>.from(list as List);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,15 @@ class CustomLoadingOverlay extends ConsumerStatefulWidget {
|
|||
const CustomLoadingOverlay({
|
||||
Key? key,
|
||||
required this.message,
|
||||
this.subMessage,
|
||||
required this.eventBus,
|
||||
this.textColor,
|
||||
}) : super(key: key);
|
||||
|
||||
final String message;
|
||||
final String? subMessage;
|
||||
final EventBus? eventBus;
|
||||
final Color? textColor;
|
||||
|
||||
@override
|
||||
ConsumerState<CustomLoadingOverlay> createState() =>
|
||||
|
|
@ -56,10 +60,12 @@ class _CustomLoadingOverlayState extends ConsumerState<CustomLoadingOverlay> {
|
|||
children: [
|
||||
Text(
|
||||
widget.message,
|
||||
textAlign: TextAlign.center,
|
||||
style: STextStyles.pageTitleH2(context).copyWith(
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.loadingOverlayTextColor,
|
||||
color: widget.textColor ??
|
||||
Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.loadingOverlayTextColor,
|
||||
),
|
||||
),
|
||||
if (widget.eventBus != null)
|
||||
|
|
@ -70,11 +76,28 @@ class _CustomLoadingOverlayState extends ConsumerState<CustomLoadingOverlay> {
|
|||
Text(
|
||||
"${(_percent * 100).toStringAsFixed(2)}%",
|
||||
style: STextStyles.pageTitleH2(context).copyWith(
|
||||
color: Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.loadingOverlayTextColor,
|
||||
color: widget.textColor ??
|
||||
Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.loadingOverlayTextColor,
|
||||
),
|
||||
),
|
||||
if (widget.subMessage != null)
|
||||
const SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
if (widget.subMessage != null)
|
||||
Text(
|
||||
widget.subMessage!,
|
||||
textAlign: TextAlign.center,
|
||||
style: STextStyles.pageTitleH2(context).copyWith(
|
||||
fontSize: 14,
|
||||
color: widget.textColor ??
|
||||
Theme.of(context)
|
||||
.extension<StackColors>()!
|
||||
.loadingOverlayTextColor,
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
|
|
|
|||
Loading…
Reference in a new issue