Commit graph

28 commits

Author SHA1 Message Date
julian
b92fb5b547 Merge remote-tracking branch 'origin_SW/add_nano' into flutter_upgrade
# Conflicts:
#	pubspec.lock
2023-06-05 14:48:03 -06:00
julian
044c957152 refactor dropdown2 and qr image 2023-06-05 07:40:56 -06:00
detherminal
95a0309b8b docs: add header to source code again 2023-05-27 00:21:16 +03:00
detherminal
ccf5e68fc6 Revert "docs: add copyright header to all source code"
This reverts commit 84ac798bb8.
2023-05-27 00:19:24 +03:00
detherminal
84ac798bb8 docs: add copyright header to all source code 2023-05-26 19:33:04 +03:00
julian
71992ea0c8 fix: use SvgPicture.file constructors for themed assets located in the filesystem 2023-05-09 17:59:26 -06:00
julian
e53e7e5055 set up installing of themes and including default themes 2023-05-09 15:58:42 -06:00
julian
236b895ae4 fix: delete themed assets from bundle and remove remaining references to assets.dart for themed icon assets 2023-05-09 09:21:04 -06:00
julian
5d1ee78452 Merge branch 'ui-fixes' into add-ethereum 2023-04-03 10:38:02 -06:00
julian
a92040194a desktop address list 2023-04-03 10:10:54 -06:00
julian
75bfad3471 desktop address list card styling 2023-04-02 13:48:14 -06:00
julian
24904f3476 Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	lib/utilities/show_loading.dart
2023-03-28 12:37:09 -06:00
julian
cb73cb6eaf temp address tags color fix 2023-03-27 15:34:45 -06:00
julian
44a87df41c merge clean up 2023-03-23 18:21:09 -06:00
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
33faa07047 address details tx history 2023-03-22 13:28:28 -06:00
julian
9fa2d4535d merge fixes 2023-03-22 09:25:21 -06:00
julian
702054ac61 Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	assets/svg/themed/forest/ethereum.png
#	assets/svg/themed/forest/ethereum.svg
#	lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart
#	lib/pages/receive_view/addresses/edit_address_label_view.dart
#	lib/pages/receive_view/addresses/receiving_addresses_view.dart
#	lib/pages/wallet_view/sub_widgets/wallet_navigation_bar.dart
#	lib/pages/wallet_view/wallet_view.dart
#	lib/route_generator.dart
#	lib/utilities/assets.dart
#	lib/utilities/constants.dart
#	lib/widgets/animated_widgets/rotate_icon.dart
#	pubspec.lock
#	pubspec.yaml
2023-03-22 08:54:25 -06:00
julian
c35eaf0b0f WIP address details 2023-03-21 17:18:07 -06:00
julian
172429f94a add address tags property and update generated 2023-03-21 10:37:01 -06:00
julian
06b3d69b45 rename file to match class declaration 2023-03-07 11:12:51 -06:00
julian-CStack
8f80b6976f load address ids in futurebuilder 2023-03-07 07:48:25 -06:00
julian
5f4e8a6e58 show receiving and change addresses 2023-03-06 15:09:32 -06:00
julian
c7bcabf328 address label save fix 2023-03-06 13:27:04 -06:00
julian
16efeea1db project structure 2023-03-01 15:52:13 -06:00
julian
b0c00d8ec7 db refactor and added address labels 2023-02-03 13:22:21 -06:00
julian
19d0cb378d sort receiving addresses by lowest index first 2023-02-03 08:27:27 -06:00
julian
a22973cd35 WIP addresses list ui 2023-02-02 15:37:59 -06:00