Commit graph

135 commits

Author SHA1 Message Date
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
ryleedavis
ee5a97c2fb add monkey icon 2023-07-21 17:59:01 -06:00
julian
5b4a803215 add ordinals icon 2023-07-18 11:51:57 -06:00
julian
79670c5d47 WIP ordinal details view 2023-07-18 11:03:57 -06:00
julian
69a850b9db fix: anonymize more option icon 2023-05-19 16:44:57 -06:00
julian
dff6e769e7 fix: replace asset 2023-05-12 11:15:55 -06:00
julian
63fff1d644 Add desktop custom theme selection and download ui. As well fixed a couple bugs on the mobile version 2023-05-12 09:32:35 -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
e8cab19c47 WIP trocador assets and kyc info 2023-04-28 17:02:55 -06:00
julian
dbc34168ef arrow rotate svg clean up 2023-04-24 12:18:50 -06:00
julian
b527583a40 update arrow rotate asset 2023-04-20 16:31:15 -06:00
julian
ecc075d5fc Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	lib/utilities/theme/forest_colors.dart
2023-04-06 12:42:05 -06:00
ryleedavis
1021270310 copied stack icon into orange theme 2023-04-05 16:28:03 -06:00
julian
563799feee Merge remote-tracking branch 'origin/staging' into add-ethereum 2023-04-03 10:37:51 -06:00
ryleedavis
ff94875497 add orange theme selector + edit svgs 2023-03-31 21:43:21 -06:00
ryleedavis
fabc9a6fd2 added orange theme svgs 2023-03-31 16:31:11 -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
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
9340f4a45d dark chans 2023-03-20 09:46:23 -06:00
julian
3963f29318 chans theme desktop selector fix and padding fixes 2023-03-17 13:12:09 -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
6c1d9d2912 WIP desktop send view coin control 2023-03-15 12:01:10 -06:00
julian
0a90f32f5f move updated assets 2023-03-13 09:35:51 -06:00
julian
e9790752c8 asset clean up and reorg 2023-03-13 09:33:20 -06:00
julian
c77993a3e5 update output icon + colors 2023-03-08 11:23:28 -06:00
julian
27de4d868e add coin control icon assets 2023-03-06 09:55:10 -06:00
ryleedavis
642d8efe63 fruit sorbet selector color fix 2023-03-01 15:56:51 -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
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
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
d657681d23 Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	pubspec.lock
2023-02-23 14:27:49 -06:00
julian
d8096fdf93 Merge branch 'ui-fixes' into paynyms
# Conflicts:
#	pubspec.yaml
2023-02-21 16:41:06 -06:00
ryleedavis
ce98482705 fruit sorbet coin images 2023-02-14 14:29:41 -07:00
ryleedavis
c37ec4fb81 fruit and ocean easy/incognito pngs + ocean stack img 2023-02-14 11:33:11 -07:00
julian
056fa1947c Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
#	lib/pages/wallet_view/sub_widgets/wallet_navigation_bar.dart
#	lib/pages/wallet_view/wallet_view.dart
#	lib/services/price.dart
#	lib/utilities/assets.dart
#	pubspec.lock
#	pubspec.yaml
2023-02-14 08:24:04 -06:00
julian-CStack
057a233604
Merge branch 'staging' into ui-fixes 2023-02-13 17:31:58 -06:00
julian
fbeb7425cb Merge remote-tracking branch 'origin/ui-fixes' into paynyms 2023-02-13 17:24:04 -06:00
ryleedavis
3cde634da7 added fruit sorbet coin images 2023-02-13 16:10:53 -07:00
ryleedavis
f59f9156bd persona-easy and incognito for forest 2023-02-13 16:00:26 -07:00
ryleedavis
d5847ae25e move persona-easy/incognito to theme files 2023-02-13 15:24:09 -07:00
julian
e50855a4c9 added proper icons for biometrics button 2023-02-13 16:01:18 -06:00