Commit graph

160 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
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
3c345f2668 chans loading screen animated asset update 2023-03-21 09:29:58 -06:00
julian
9340f4a45d dark chans 2023-03-20 09:46:23 -06:00
julian
50ac5cfd04 better quality chan gifs 2023-03-20 08:33:57 -06:00
julian
c88338f9ad use gifs instead of lottie animations for static animated assets 2023-03-17 15:44:37 -06:00
julian
3963f29318 chans theme desktop selector fix and padding fixes 2023-03-17 13:12:09 -06:00
julian
968b93a41c chan fixes 2023-03-17 12:56:40 -06:00
julian
db1f5f622f WIP chans theme 2023-03-17 11:44:30 -06:00
julian
7e857bb5d5 svg defs fix 2023-03-17 10:46:03 -06:00
julian
5cab9c1ce8 svg defs fix 2023-03-17 09:46:55 -06:00
julian
e6119d82bb clean up last conditional png/svg switches 2023-03-17 09:07:34 -06:00
julian
540f0b817b paynym asset change 2023-03-17 09:01:52 -06:00
julian
43f2fd7e77 chan theme and assets clean up 2023-03-17 08:57:40 -06:00
julian
6c1d9d2912 WIP desktop send view coin control 2023-03-15 12:01:10 -06:00
julian
34c7f9f183 update lottie files 2023-03-14 07:44:57 -06:00
julian
87c15c2c39 add lottie animations for sending as well as some clean up 2023-03-13 13:16:48 -06:00
julian
0a90f32f5f move updated assets 2023-03-13 09:35:51 -06:00
julian
6da86cd5d6 Merge remote-tracking branch 'origin/ui-fixes' into coin_control
# Conflicts:
#	assets/images/dark/stack.svg
#	assets/images/light/stack.svg
#	assets/images/oledBlack/stack.svg
2023-03-13 09:34:08 -06:00
julian
e9790752c8 asset clean up and reorg 2023-03-13 09:33:20 -06:00
ryleedavis
1195800143 intro stack image 2023-03-13 08:52:54 -06:00
ryleedavis
e7a52bdae2 stack.svg added to themes 2023-03-10 18:53:40 -06:00
ryleedavis
f5b7887469 stack.svg added to themes 2023-03-10 08:50:57 -07:00
julian
ec237d0001 Merge remote-tracking branch 'origin/staging' into coin_control 2023-03-08 13:42:12 -06:00
julian
c77993a3e5 update output icon + colors 2023-03-08 11:23:28 -06:00
ryleedavis
372782346d revised bitcoin coin image 2023-03-07 18:08:04 -07:00
ryleedavis
f264e202b2 added svgs and removed pngs for coin images 2023-03-06 09:07:45 -07:00
julian
27de4d868e add coin control icon assets 2023-03-06 09:55:10 -06:00
ryleedavis
562dbfb058 dogecoin and firo coin images added 2023-03-03 09:48:42 -07:00
ryleedavis
23e544ccca bitcoin and epic-cash coin images 2023-03-03 08:16:59 -07:00
ryleedavis
242e39e4f7 added wownero + bitcoin images 2023-03-02 09:45:19 -07:00
ryleedavis
642d8efe63 fruit sorbet selector color fix 2023-03-01 15:56:51 -07:00
ryleedavis
dba1d23c58 added namecoin.svg 2023-03-01 09:16:27 -07:00
ryleedavis
3744e626b3 added coin svgs 2023-03-01 08:52:06 -07:00
ryleedavis
d382341dc6 ocean theme incognito image fix 2023-02-28 18:24:52 -07:00
julian
1d97be9f73 hard coded bnb icon 2023-02-28 14:26:13 -06:00
julian
4239187602 eth images 2023-02-28 09:33:56 -06:00
julian
c34721c98c Merge remote-tracking branch 'origin/ui-fixes' into add-ethereum 2023-02-27 16:49:42 -06:00
ryleedavis
cc809956a8 fix ocean stack.svg + add ocean theme to pubspec.yaml 2023-02-27 15:17:15 -07:00
julian
0956ee3137 update eth icon 2023-02-27 16:01:54 -06:00
julian
73ae19dfbe Merge remote-tracking branch 'origin/ui-fixes' into add-ethereum 2023-02-27 15:34:16 -06:00
ryleedavis
95c3cf1df5 ocean stack.png 2023-02-27 13:41:18 -07:00
ryleedavis
7b88a7e6d0 oceanBreeze mobile persona-easy/incognito 2023-02-27 13:38:21 -07:00
ryleedavis
d33cc34970 oceanBreeze persona-easy/incognito 2023-02-27 13:32:50 -07:00
julian
8dbefd87fe eth token summary layout and style 2023-02-27 10:37:41 -06:00
julian
2287cd751e Merge remote-tracking branch 'origin/paynyms' into add-ethereum 2023-02-27 08:42:35 -06:00
ryleedavis
9a9f71ea3e fix coin image <def> issue 2023-02-24 15:11:04 -07:00
ryleedavis
a7b88647bc fix svg def issue + changed forest coin images 2023-02-24 09:51:23 -07:00
ryleedavis
5e89a21695 forest coin images 2023-02-24 09:44:20 -07:00