julian 0d7a0a8fb9 Merge branch 'staging' into add-ecash ... # Conflicts: # lib/utilities/assets.dart # lib/utilities/theme/color_theme.dart		2023-05-17 12:11:08 -06:00
..
db	add contacts migration from hive to isar and remove contact class conversion	2023-05-15 14:12:06 -06:00
dto/ethereum	move amount.dart file	2023-04-06 15:24:56 -06:00
electrumx_rpc	Strongly typed used serials list	2023-05-16 13:29:48 -06:00
exceptions	MB doesn't store trade/order history indefinitely	2023-03-06 13:59:30 -06:00
models	Merge branch 'ui-fixes' into address_book_isar	2023-05-15 14:15:34 -06:00
notifications	clean up and fixed bugs found while porting themes to duo	2023-05-13 21:25:46 -06:00
pages	Merge branch 'staging' into add-ecash	2023-05-17 12:11:08 -06:00
pages_desktop_specific	fix eye icon overflow error on desktop	2023-05-16 13:36:59 -06:00
providers	Merge remote-tracking branch 'origin_SW/staging' into themes	2023-05-08 10:55:11 -06:00
services	Merge branch 'staging' into add-ecash	2023-05-17 12:11:08 -06:00
themes	Merge branch 'staging' into add-ecash	2023-05-17 12:11:08 -06:00
utilities	Merge branch 'staging' into add-ecash	2023-05-17 12:11:08 -06:00
widgets	Merge remote-tracking branch 'origin_SW/staging' into ui-fixes	2023-05-15 15:34:30 -06:00
main.dart	fix: missing updated data version	2023-05-15 14:21:09 -06:00
route_generator.dart	add contacts migration from hive to isar and remove contact class conversion	2023-05-15 14:12:06 -06:00