julian 46e0258737 Merge remote-tracking branch 'origin_SW/staging' into ordinals ... # Conflicts: # lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart # lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/more_features/more_features_dialog.dart # pubspec.yaml		2023-07-26 17:05:33 -06:00
..
sub_widgets	add monkey image to hive and display on wallet card	2023-07-26 11:54:10 -06:00
transaction_views	show failed instead of cancelled for eth failed txns	2023-07-20 15:13:56 -06:00
wallet_view.dart	Merge remote-tracking branch 'origin_SW/staging' into ordinals	2023-07-26 17:05:33 -06:00