Commit graph

24 commits

Author SHA1 Message Date
julian
3e1e68237a Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	lib/models/isar/models/blockchain_data/address.dart
#	lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart
#	lib/pages/settings_views/global_settings_view/appearance_settings_view.dart
#	lib/pages_desktop_specific/settings/settings_menu/appearance_settings.dart
#	lib/utilities/db_version_migration.dart
#	test/pages/send_view/send_view_test.mocks.dart
#	test/screen_tests/address_book_view/subviews/add_address_book_view_screen_test.mocks.dart
#	test/screen_tests/address_book_view/subviews/address_book_entry_details_view_screen_test.mocks.dart
#	test/screen_tests/address_book_view/subviews/edit_address_book_entry_view_screen_test.mocks.dart
#	test/screen_tests/exchange/exchange_view_test.mocks.dart
#	test/screen_tests/lockscreen_view_screen_test.mocks.dart
#	test/screen_tests/main_view_tests/main_view_screen_testA_test.mocks.dart
#	test/screen_tests/main_view_tests/main_view_screen_testB_test.mocks.dart
#	test/screen_tests/main_view_tests/main_view_screen_testC_test.mocks.dart
#	test/screen_tests/onboarding/backup_key_view_screen_test.mocks.dart
#	test/screen_tests/onboarding/backup_key_warning_view_screen_test.mocks.dart
#	test/screen_tests/onboarding/create_pin_view_screen_test.mocks.dart
#	test/screen_tests/onboarding/restore_wallet_view_screen_test.mocks.dart
#	test/screen_tests/onboarding/verify_backup_key_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/currency_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/network_settings_subviews/add_custom_node_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/network_settings_subviews/node_details_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/wallet_backup_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rescan_warning_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/wallet_delete_mnemonic_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_view_screen_test.mocks.dart
#	test/screen_tests/transaction_subviews/transaction_search_results_view_screen_test.mocks.dart
#	test/screen_tests/wallet_view/confirm_send_view_screen_test.mocks.dart
#	test/screen_tests/wallet_view/receive_view_screen_test.mocks.dart
#	test/screen_tests/wallet_view/send_view_screen_test.mocks.dart
#	test/screen_tests/wallet_view/wallet_view_screen_test.mocks.dart
#	test/widget_tests/managed_favorite_test.mocks.dart
#	test/widget_tests/table_view/table_view_row_test.mocks.dart
#	test/widget_tests/transaction_card_test.mocks.dart
#	test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.mocks.dart
#	test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
2023-03-23 18:13:24 -06:00
julian
9fa2d4535d merge fixes 2023-03-22 09:25:21 -06:00
julian
6cd649a195 utxo details title 2023-03-20 10:23:42 -06:00
julian
77f167171f mobile coin control sort 2023-03-16 16:42:46 -06:00
julian
c856e42322 mobile coin control search 2023-03-16 16:12:16 -06:00
julian
a87cf5807c desktop UTXO details ui fix 2023-03-15 07:46:55 -06:00
julian
3421c45e64 utxo details desktop styled 2023-03-14 08:40:09 -06:00
julian
b2ce88e33d WIP desktop utxo details 2023-03-13 17:09:14 -06:00
julian
9ed1897c87 utxo label display 2023-03-09 16:50:25 -06:00
julian
16d18dd21f frozen color 2023-03-08 13:41:28 -06:00
julian
ea49ed32ab update balance after viewing coin control 2023-03-08 12:22:33 -06:00
julian
93003d2880 show address label in utxo details view 2023-03-08 11:45:21 -06:00
julian
5f35048688 utxo confirmed status ui indication 2023-03-08 11:34:00 -06:00
julian
c77993a3e5 update output icon + colors 2023-03-08 11:23:28 -06:00
julian
fd02935f54 do not show marked as used utxos 2023-03-08 10:01:13 -06:00
julian
6d22304d7b coin control select for sending 2023-03-07 15:45:22 -06:00
julian
3d04dc9ef8 multi select utxo ui 2023-03-07 13:53:08 -06:00
julian
f844b7eef2 text style fix 2023-03-07 12:43:39 -06:00
julian
056e1661c5 utxo confirmations ui fix 2023-03-07 12:40:47 -06:00
julian
e40cb3d66d utxo details ui and edit functionality 2023-03-07 11:11:57 -06:00
julian
6e547d6f34 utxo details navigation and skeleton view 2023-03-07 09:39:34 -06:00
julian
5f4e8a6e58 show receiving and change addresses 2023-03-06 15:09:32 -06:00
julian
c70a8f415c correct address for utxo card 2023-03-06 14:47:14 -06:00
julian
456abf7ee4 basic coin control view 2023-03-06 12:11:13 -06:00