Commit graph

118 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
9f64393d35 precache chan theme selector 2023-03-17 16:15:05 -06:00
julian
c88338f9ad use gifs instead of lottie animations for static animated assets 2023-03-17 15:44:37 -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
67e7e6e421 certain svg asset precache 2023-03-17 10:47:38 -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
87c15c2c39 add lottie animations for sending as well as some clean up 2023-03-13 13:16:48 -06:00
julian
e9790752c8 asset clean up and reorg 2023-03-13 09:33:20 -06:00
julian
ec237d0001 Merge remote-tracking branch 'origin/staging' into coin_control 2023-03-08 13:42:12 -06:00
julian
7319f509f0 add coin control option to mobile more menu + assets fix 2023-03-06 10:34:41 -06:00
ryleedavis
5c9fe44cbd replace png pictures with svg pictures 2023-03-06 09:08:40 -07:00
julian
27de4d868e add coin control icon assets 2023-03-06 09:55:10 -06: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
82842f1aa0 token view refresh, and WIP token icon assets and other small fixes 2023-02-27 11:42:22 -06: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
a7b88647bc fix svg def issue + changed forest coin images 2023-02-24 09:51:23 -07:00
julian
2ef56ac66b temp eth asset fix 2023-02-23 14:36:23 -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
ab412873c9 added stack.svg for forest and fruit theme + corrected size 2023-02-21 15:28:38 -07:00
ryleedavis
41aaf8dd50 implemented new theme coin svgs 2023-02-21 15:13:56 -07: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
15b37b6f5c merge clean up and update eth to use isar for tx history and addresses 2023-02-14 11:43:48 -06: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
fbeb7425cb Merge remote-tracking branch 'origin/ui-fixes' into paynyms 2023-02-13 17:24:04 -06: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
julian
4b1ff8fd09 added custom button key to pinpad and used it for biometrics reopen 2023-02-13 14:16:47 -06:00
ryleedavis
7498068a73 file name + themed coin.png fix 2023-02-10 14:39:59 -07:00
ryleedavis
9a1717859a forest bg + themed coin.png 2023-02-10 14:10:00 -07:00
sneurlax
23bb519874 Merge branch 'favoritefavorite' into ui-fixes 2023-02-10 11:35:39 -06:00
ryleedavis
8da63b6f3d add forest theme to background.dart 2023-02-10 09:36:15 -07:00
ryleedavis
d1f22cdc06 prep for adding in forest theme colors 2023-02-09 14:37:25 -07:00
julian
57c31e9fa2 mb icon and refcode 2023-02-06 15:34:17 -06:00
julian
95ff076d3d add paynym bot image background 2023-01-31 11:35:58 -06:00
julian
92076bf12a add image assets 2023-01-31 09:17:25 -06:00
sneurlax
957b9cb6a3 fix buy image in wallet view on mobile 2023-01-27 11:47:42 -06:00
sneurlax
eed39d7826 remove non-stack coin images 2023-01-26 17:35:04 -06:00
sneurlax
fb257ef39e also switch simplex image for oled black theme 2023-01-24 13:28:39 -06:00