Merge mso7nueh-main into main: resolve conflicts

pubspec.yaml

@@ -1,6 +1,6 @@
 name: eatvio_app
 description: A new Flutter project.
-version: 1.3.3+83
+version: 1.3.4+83
 publish_to: 'none'
 
 environment:
@@ -77,8 +77,9 @@ dependencies:
   vk_id: ^1.0.3
   flutter_login_yandex: ^0.0.5
   markdown: ^7.3.0
-  gpassword: ^1.0.0
+  flutter_password_generator: ^1.0.3
   mobile_scanner: ^7.1.3
+  material_symbols_icons: ^4.2874.0
 
 dev_dependencies:
   build_runner: ^2.7.0
@@ -86,6 +87,7 @@ dev_dependencies:
   json_serializable: ^6.10.0
   retrofit_generator: ^10.0.2
   mockito: ^5.5.0
+  mocktail: ^1.0.4
   network_image_mock: ^2.1.1
 
   flutter_test: