Commit graph

289 commits

Author SHA1 Message Date
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
Diego Salazar
70e257f5bf
Bump version (v1.6.6, build 148) 2023-03-27 18:34:44 -06:00
julian
e29d8dc047 Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
2023-03-27 08:50:10 -06:00
julian
f44774745e WIP amount class 2023-03-24 11:08:02 -06:00
Diego Salazar
d582eb9062
Bump version (v1.6.5, build 147) 2023-03-23 20:08:43 -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
Diego Salazar
e76fd0b00a
Bump version (1.6.4, build 146) 2023-03-22 15:29:23 -06:00
julian
b9b7ed3733 missing asset 2023-03-22 14:00:01 -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
57b01fbf25 Merge remote-tracking branch 'origin/staging' into ui-fixes 2023-03-20 09:46:33 -06:00
julian
9340f4a45d dark chans 2023-03-20 09:46:23 -06:00
Diego Salazar
dad7d4500d
Bump version (1.6.3, build 145) 2023-03-17 17:50:03 -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
540f0b817b paynym asset change 2023-03-17 09:01:52 -06:00
Diego Salazar
5223613a80
Bump version (1.6.2, build 144) 2023-03-16 18:48:33 -06:00
julian
6c1d9d2912 WIP desktop send view coin control 2023-03-15 12:01:10 -06:00
julian
4be2bd6fcd freeze button fix 2023-03-15 09:48:39 -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
Diego Salazar
747124acfc
Bump version (1.6.1, 143) 2023-03-11 09:28:02 -07:00
Diego Salazar
25b329532c
Bump version (1.6.0, 142) 2023-03-09 15:50:25 -07:00
Diego Salazar
449d23f1ae
Build 141 2023-03-08 18:56:38 -07:00
Diego Salazar
26e7b531ce
Bump verison (1.6.0, build 1) 2023-03-08 15:24:25 -07:00
julian
ec237d0001 Merge remote-tracking branch 'origin/staging' into coin_control 2023-03-08 13:42:12 -06:00
Diego Salazar
8bb41255ea
build 139 2023-03-07 11:51:00 -07:00
Diego Salazar
a7496a5732
Bump version (1.5.50, build 138) 2023-03-07 09:04:24 -07:00
Diego Salazar
f2720ad90e
Bump verison (1.5.48, build 135) 2023-03-06 11:19:27 -07:00
julian
7319f509f0 add coin control option to mobile more menu + assets fix 2023-03-06 10:34:41 -06:00
Diego Salazar
72aa633aa7
Bump verison (1.5.47, build 134) 2023-03-03 14:58:44 -07:00
julian
23d38ef4d9 added some utility extensions 2023-03-03 11:35:43 -06:00
Diego Salazar
2346817d0e
Merge pull request #384 from cypherstack/ui-fixes
Added coin svgs and other image fixes
2023-03-03 08:55:32 -07: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
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
Diego Salazar
ae55877338
Bump version (v.1.5.46, build 133) 2023-02-25 08:58:25 -07:00
Diego Salazar
81d40639a7
Bump version (1.5.45, build 132) 2023-02-24 19:53:03 -07:00
Diego Salazar
cb10de89a6
Bump version (v1.5.44, build 131) 2023-02-23 19:35:38 -07:00
julian
d657681d23 Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	pubspec.lock
2023-02-23 14:27:49 -06:00
julian
495c922953 bump version 2023-02-22 15:13:21 -06:00
Diego Salazar
e81a857945
Bump version (1.5.42, build 129) 2023-02-22 09:14:25 -07:00
Diego Salazar
e651713f4d
Bump version (1.5.41, build 128) 2023-02-21 17:14:12 -07:00
likho
928f0e4e51 When default epic server is down default to EU, if that is down do not allow TX sending 2023-02-21 18:48:59 +02:00
Diego Salazar
6ac9fdb38c
Update pubspec.yaml 2023-02-16 14:32:57 -07:00
julian
c96e468f89 update bip47 lib dependency 2023-02-16 14:22:30 -06:00
julian
76794f14b8 update bip47 lib 2023-02-15 16:16:34 -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
Diego Salazar
8e959e06e3
v39, 126 2023-02-13 18:38:41 -07:00
julian
6f860b5aa6 implicitly include all assets in theme sub dirs 2023-02-13 18:19:41 -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
f81e61b0cd Merge remote-tracking branch 'origin/staging' into paynyms 2023-02-13 16:09:56 -06: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
Diego Salazar
5d033dd446
build 125 2023-02-10 18:37:49 -07:00
Diego Salazar
128d752ff6
bump version (1.5.38, 124) 2023-02-10 15:06:57 -07:00
ryleedavis
9a1717859a forest bg + themed coin.png 2023-02-10 14:10:00 -07:00
sneurlax
44074428a9 Merge branch 'staging' into ui-fixes 2023-02-10 13:55:58 -06:00
sneurlax
23bb519874 Merge branch 'favoritefavorite' into ui-fixes 2023-02-10 11:35:39 -06:00
Diego Salazar
0a42e2aa17
Bump build (123) 2023-02-09 17:43:22 -07:00
ryleedavis
d1f22cdc06 prep for adding in forest theme colors 2023-02-09 14:37:25 -07:00
Diego Salazar
3104fdd856
bump version (1.5.37, 122) 2023-02-07 13:23:36 -07:00
julian
d4db845494 Merge branch 'exchange_refactor' into paynyms
# Conflicts:
#	test/pages/send_view/send_view_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/wallet_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-02-07 11:17:16 -06:00
julian
57c31e9fa2 mb icon and refcode 2023-02-06 15:34:17 -06:00
julian
255020f1d8 Merge remote-tracking branch 'origin/staging' into paynyms 2023-02-03 18:54:38 -06:00
julian
b0c00d8ec7 db refactor and added address labels 2023-02-03 13:22:21 -06:00
Diego Salazar
a7bff0f018
121 2023-02-02 18:12:11 -07:00
julian
266a433aa3 add paynym share 2023-02-01 10:08:30 -06:00
Diego Salazar
1e92f96ff1
Update pubspec.yaml 2023-01-31 11:29:04 -07: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
Diego Salazar
83cf471b6f
Update pubspec.yaml 2023-01-30 15:03:12 -07:00
Diego Salazar
29bf67b2ce
Update pubspec.yaml 2023-01-30 14:18:45 -07:00
Diego Salazar
d4cbf035fe
Update pubspec.yaml 2023-01-27 20:13:20 -07:00
Diego Salazar
e86fa521bf
Merge branch 'staging' into ui-fixes 2023-01-27 17:26:00 -07:00
julian
61ad20e919 Merge remote-tracking branch 'origin/simplex' into paynyms
# Conflicts:
#	lib/utilities/enums/coin_enum.dart
2023-01-27 15:05:29 -06:00
sneurlax
2a6b46f761 Merge remote-tracking branch 'cypherstack/staging' into simplex 2023-01-26 17:35:30 -06:00
sneurlax
eed39d7826 remove non-stack coin images 2023-01-26 17:35:04 -06:00
Diego Salazar
caa096e4e8
Update pubspec.yaml 2023-01-26 10:47:39 -07:00
julian
5de22ca858 Merge branch 'simplex' into paynyms 2023-01-26 10:16:01 -06:00
julian
bb94ad1070 update swb ref 2023-01-26 10:06:08 -06:00
julian
188a9bc0d0 update swb ref 2023-01-26 10:05:49 -06:00
julian
b49a1942a6 update to versioned desktop secure storage and login key blob 2023-01-26 10:02:36 -06:00
julian
3c9aa827bf update to versioned desktop secure storage and login key blob 2023-01-26 10:01:51 -06:00
Diego Salazar
4deef90a90
Update pubspec.yaml 2023-01-25 18:22:47 -07:00
julian
9c44dc6c6b add support to make adding segwit paynym support simple once implemented 2023-01-25 14:33:59 -06:00
Diego Salazar
d4114ed9f8
Bump version (v1.5.35, build 110) 2023-01-25 12:31:55 -07:00
julian
1965501bf8 added address scanning for send and receiving addresses given the context of your own payment code and another, address type choice also added for send/receive address generation 2023-01-25 11:13:21 -06:00
sneurlax
32ca83673a Merge remote-tracking branch 'cypherstack/ui-fixes' into simplex 2023-01-24 12:29:13 -06:00
julian
ecd5df1ca0 update swb lib 2023-01-24 11:13:29 -06:00
sneurlax
e465030d3d add light version of simplex logo for dark themes 2023-01-24 11:12:40 -06:00
ryleedavis
7fe1fefea2 Merge remote-tracking branch 'origin/isar_migrate' into ui-fixes 2023-01-23 17:31:24 -07:00
ryleedavis
90eb0b77c0 WIP: fruit sorbet background 2023-01-23 15:36:13 -07:00
ryleedavis
edec5f0c2a adding fruit sorbet theme type and selector svg 2023-01-23 10:58:06 -07:00
julian
c9b4006dd6 increment build number 2023-01-23 10:33:36 -06:00
sneurlax
b376b00d7c add icons for buy coins 2023-01-20 18:21:36 -06:00
julian
93e1e2f98a update version 2023-01-20 16:28:13 -06:00