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
..
global_settings_view	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-02-14 08:24:04 -06:00
sub_widgets	mobile settings item text color update	2023-02-10 14:49:23 -06:00
wallet_settings_view	rename and fix text button style update bug	2023-01-30 15:34:21 -06:00