Commit graph

6 commits

Author SHA1 Message Date
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-CStack
8f80b6976f load address ids in futurebuilder 2023-03-07 07:48:25 -06:00
julian
c7bcabf328 address label save fix 2023-03-06 13:27:04 -06:00
julian
16efeea1db project structure 2023-03-01 15:52:13 -06:00
julian
b0c00d8ec7 db refactor and added address labels 2023-02-03 13:22:21 -06:00
julian
a22973cd35 WIP addresses list ui 2023-02-02 15:37:59 -06:00